aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRene Ladan <rene@FreeBSD.org>2022-03-02 09:32:47 +0000
committerRene Ladan <rene@FreeBSD.org>2022-03-02 09:32:47 +0000
commitbfedd5f1f016c174f3fe18cd38c8517ece7b1e9b (patch)
tree1d6f8dd03169ed2d788d910cce625af1608e74d0
parente18a8c4a1f1a85473f7d25dadf958405f131c81b (diff)
downloadports-bfedd5f1f016c174f3fe18cd38c8517ece7b1e9b.tar.gz
ports-bfedd5f1f016c174f3fe18cd38c8517ece7b1e9b.zip
www/chromium: update to 99.0.4844.51
On the port side, this update brings: - libvulkan enabled by default - more unit tests enabled - no longer dependent on Python 2.7 Security: https://vuxml.freebsd.org/freebsd/e0914087-9a09-11ec-9e61-3065ec8fd3ec.html
-rw-r--r--www/chromium/Makefile18
-rw-r--r--www/chromium/Makefile.tests7
-rw-r--r--www/chromium/distinfo14
-rw-r--r--www/chromium/files/patch-BUILD.gn12
-rw-r--r--www/chromium/files/patch-apps_ui_views_app__window__frame__view.cc8
-rw-r--r--www/chromium/files/patch-base_BUILD.gn70
-rw-r--r--www/chromium/files/patch-base_allocator_partition__allocator_address__space__randomization.h4
-rw-r--r--www/chromium/files/patch-base_allocator_partition__allocator_page__allocator.h8
-rw-r--r--www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h20
-rw-r--r--www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h6
-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.h22
-rw-r--r--www/chromium/files/patch-base_allocator_partition__allocator_partition__root.h14
-rw-r--r--www/chromium/files/patch-base_allocator_partition__allocator_spinning__mutex.cc6
-rw-r--r--www/chromium/files/patch-base_allocator_partition__allocator_starscan_stack_stack.cc4
-rw-r--r--www/chromium/files/patch-base_base__paths__posix.cc16
-rw-r--r--www/chromium/files/patch-base_base__switches.cc6
-rw-r--r--www/chromium/files/patch-base_base__switches.h6
-rw-r--r--www/chromium/files/patch-base_compiler__specific.h4
-rw-r--r--www/chromium/files/patch-base_cpu.h10
-rw-r--r--www/chromium/files/patch-base_debug_debugger__posix.cc22
-rw-r--r--www/chromium/files/patch-base_debug_proc__maps__linux.cc6
-rw-r--r--www/chromium/files/patch-base_debug_stack__trace__posix.cc18
-rw-r--r--www/chromium/files/patch-base_files_file__path__watcher__unittest.cc29
-rw-r--r--www/chromium/files/patch-base_files_file__util__unittest.cc20
-rw-r--r--www/chromium/files/patch-base_files_important__file__writer__cleaner.cc8
-rw-r--r--www/chromium/files/patch-base_files_scoped__file.cc8
-rw-r--r--www/chromium/files/patch-base_i18n_icu__util.cc21
-rw-r--r--www/chromium/files/patch-base_logging__unittest.cc31
-rw-r--r--www/chromium/files/patch-base_memory_discardable__memory.cc26
-rw-r--r--www/chromium/files/patch-base_memory_discardable__memory__internal.h6
-rw-r--r--www/chromium/files/patch-base_memory_madv__free__discardable__memory__posix.cc10
-rw-r--r--www/chromium/files/patch-base_memory_platform__shared__memory__region.h20
-rw-r--r--www/chromium/files/patch-base_memory_platform__shared__memory__region__posix.cc14
-rw-r--r--www/chromium/files/patch-base_message__loop_message__pump__glib.cc8
-rw-r--r--www/chromium/files/patch-base_native__library__posix.cc8
-rw-r--r--www/chromium/files/patch-base_native__library__unittest.cc11
-rw-r--r--www/chromium/files/patch-base_posix_can__lower__nice__to.cc8
-rw-r--r--www/chromium/files/patch-base_posix_unix__domain__socket.cc16
-rw-r--r--www/chromium/files/patch-base_posix_unix__domain__socket__unittest.cc11
-rw-r--r--www/chromium/files/patch-base_process_kill.h6
-rw-r--r--www/chromium/files/patch-base_process_kill__posix.cc6
-rw-r--r--www/chromium/files/patch-base_process_launch.h10
-rw-r--r--www/chromium/files/patch-base_process_memory.cc10
-rw-r--r--www/chromium/files/patch-base_process_process__handle.cc6
-rw-r--r--www/chromium/files/patch-base_process_process__handle.h6
-rw-r--r--www/chromium/files/patch-base_process_process__metrics.cc22
-rw-r--r--www/chromium/files/patch-base_process_process__metrics.h108
-rw-r--r--www/chromium/files/patch-base_process_process__metrics__posix.cc14
-rw-r--r--www/chromium/files/patch-base_process_process__posix.cc27
-rw-r--r--www/chromium/files/patch-base_process_process__unittest.cc11
-rw-r--r--www/chromium/files/patch-base_profiler_stack__sampling__profiler__test__util.cc11
-rw-r--r--www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc11
-rw-r--r--www/chromium/files/patch-base_rand__util.h6
-rw-r--r--www/chromium/files/patch-base_rand__util__posix.cc16
-rw-r--r--www/chromium/files/patch-base_strings_safe__sprintf__unittest.cc18
-rw-r--r--www/chromium/files/patch-base_strings_string__util.cc11
-rw-r--r--www/chromium/files/patch-base_synchronization_lock__impl.h8
-rw-r--r--www/chromium/files/patch-base_syslog__logging.cc14
-rw-r--r--www/chromium/files/patch-base_system_sys__info.cc8
-rw-r--r--www/chromium/files/patch-base_system_sys__info.h8
-rw-r--r--www/chromium/files/patch-base_system_sys__info__unittest.cc19
-rw-r--r--www/chromium/files/patch-base_task_thread__pool_environment__config__unittest.cc11
-rw-r--r--www/chromium/files/patch-base_test_launcher_test__launcher.cc4
-rw-r--r--www/chromium/files/patch-base_test_test__file__util__linux.cc4
-rw-r--r--www/chromium/files/patch-base_test_test__file__util__posix.cc11
-rw-r--r--www/chromium/files/patch-base_third__party_symbolize_symbolize.cc6
-rw-r--r--www/chromium/files/patch-base_threading_platform__thread.h8
-rw-r--r--www/chromium/files/patch-base_threading_platform__thread__linux.cc34
-rw-r--r--www/chromium/files/patch-base_threading_platform__thread__posix.cc14
-rw-r--r--www/chromium/files/patch-base_threading_platform__thread__unittest.cc47
-rw-r--r--www/chromium/files/patch-base_threading_thread__local__storage__unittest.cc11
-rw-r--r--www/chromium/files/patch-base_time_time.cc10
-rw-r--r--www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc8
-rw-r--r--www/chromium/files/patch-base_trace__event_process__memory__dump.cc20
-rw-r--r--www/chromium/files/patch-base_tracing_trace__time.cc10
-rw-r--r--www/chromium/files/patch-base_tracing_trace__time.h8
-rw-r--r--www/chromium/files/patch-build_config_BUILD.gn4
-rw-r--r--www/chromium/files/patch-build_config_compiler_BUILD.gn18
-rw-r--r--www/chromium/files/patch-build_linux_chrome.map4
-rw-r--r--www/chromium/files/patch-build_toolchain_gcc__toolchain.gni6
-rw-r--r--www/chromium/files/patch-cc_BUILD.gn10
-rw-r--r--www/chromium/files/patch-chrome_app_chrome__command__ids.h6
-rw-r--r--www/chromium/files/patch-chrome_app_chrome__main.cc16
-rw-r--r--www/chromium/files/patch-chrome_app_chrome__main__delegate.cc78
-rw-r--r--www/chromium/files/patch-chrome_app_chromium__strings.grd8
-rw-r--r--www/chromium/files/patch-chrome_app_generated__resources.grd12
-rw-r--r--www/chromium/files/patch-chrome_app_google__chrome__strings.grd8
-rw-r--r--www/chromium/files/patch-chrome_app_settings__strings.grdp10
-rw-r--r--www/chromium/files/patch-chrome_browser_about__flags.cc148
-rw-r--r--www/chromium/files/patch-chrome_browser_after__startup__task__utils.cc16
-rw-r--r--www/chromium/files/patch-chrome_browser_apps_platform__apps_api_music__manager__private_device__id__linux.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.cc14
-rw-r--r--www/chromium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.h6
-rw-r--r--www/chromium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_background_background__mode__manager.cc8
-rw-r--r--www/chromium/files/patch-chrome_browser_background_background__mode__optimizer.cc8
-rw-r--r--www/chromium/files/patch-chrome_browser_browser__process__impl.cc22
-rw-r--r--www/chromium/files/patch-chrome_browser_browser__process__impl.h6
-rw-r--r--www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc46
-rw-r--r--www/chromium/files/patch-chrome_browser_chrome__browser__main.cc44
-rw-r--r--www/chromium/files/patch-chrome_browser_chrome__browser__main__extra__parts__linux.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc8
-rw-r--r--www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc106
-rw-r--r--www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h8
-rw-r--r--www/chromium/files/patch-chrome_browser_crash__upload__list_crash__upload__list.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_custom__handlers_chrome__protocol__handler__registry__delegate.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_defaults.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_dev__ui__browser__resources.grd8
-rw-r--r--www/chromium/files/patch-chrome_browser_device__identity_device__oauth2__token__service__factory.cc8
-rw-r--r--www/chromium/files/patch-chrome_browser_devtools_devtools__eye__dropper.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc30
-rw-r--r--www/chromium/files/patch-chrome_browser_download_download__commands.cc14
-rw-r--r--www/chromium/files/patch-chrome_browser_download_download__commands.h8
-rw-r--r--www/chromium/files/patch-chrome_browser_download_download__item__model.cc18
-rw-r--r--www/chromium/files/patch-chrome_browser_download_download__prefs.cc46
-rw-r--r--www/chromium/files/patch-chrome_browser_download_download__prefs.h14
-rw-r--r--www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc14
-rw-r--r--www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_key__management_core_persistence_key__persistence__delegate__factory.cc14
-rw-r--r--www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc10
-rw-r--r--www/chromium/files/patch-chrome_browser_enterprise_remote__commands_cbcm__remote__commands__factory.cc20
-rw-r--r--www/chromium/files/patch-chrome_browser_enterprise_signals_device__info__fetcher.cc14
-rw-r--r--www/chromium/files/patch-chrome_browser_extensions_BUILD.gn4
-rw-r--r--www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_chrome__desktop__report__request__helper.cc22
-rw-r--r--www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.h6
-rw-r--r--www/chromium/files/patch-chrome_browser_extensions_api_messaging_native__process__launcher__posix.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc14
-rw-r--r--www/chromium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc14
-rw-r--r--www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc14
-rw-r--r--www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc16
-rw-r--r--www/chromium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc8
-rw-r--r--www/chromium/files/patch-chrome_browser_first__run_first__run__dialog.h6
-rw-r--r--www/chromium/files/patch-chrome_browser_first__run_first__run__internal.h6
-rw-r--r--www/chromium/files/patch-chrome_browser_flag__descriptions.cc65
-rw-r--r--www/chromium/files/patch-chrome_browser_flag__descriptions.h65
-rw-r--r--www/chromium/files/patch-chrome_browser_headless_headless__mode__util.cc16
-rw-r--r--www/chromium/files/patch-chrome_browser_intranet__redirect__detector.h8
-rw-r--r--www/chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_media_audio__service__util.cc18
-rw-r--r--www/chromium/files/patch-chrome_browser_media_router_discovery_BUILD.gn11
-rw-r--r--www/chromium/files/patch-chrome_browser_media_router_discovery_discovery__network__list__posix.cc23
-rw-r--r--www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__event__log__uploader.cc8
-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.cc24
-rw-r--r--www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.h10
-rw-r--r--www/chromium/files/patch-chrome_browser_memory__details.cc14
-rw-r--r--www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc30
-rw-r--r--www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc26
-rw-r--r--www/chromium/files/patch-chrome_browser_metrics_perf_cpu__identity.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc39
-rw-r--r--www/chromium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc24
-rw-r--r--www/chromium/files/patch-chrome_browser_notifications_notification__platform__bridge__delegator.cc8
-rw-r--r--www/chromium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_performance__manager_policies_high__pmf__discard__policy.cc10
-rw-r--r--www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__recorder__util.cc8
-rw-r--r--www/chromium/files/patch-chrome_browser_performance__monitor_process__monitor.cc10
-rw-r--r--www/chromium/files/patch-chrome_browser_performance__monitor_process__monitor.h8
-rw-r--r--www/chromium/files/patch-chrome_browser_platform__util__linux.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_plugins_plugins__resource__service.cc8
-rw-r--r--www/chromium/files/patch-chrome_browser_policy_browser__signin__policy__handler.cc8
-rw-r--r--www/chromium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc28
-rw-r--r--www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc40
-rw-r--r--www/chromium/files/patch-chrome_browser_policy_device__management__service__configuration.cc26
-rw-r--r--www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc42
-rw-r--r--www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_printing_print__job__worker.cc8
-rw-r--r--www/chromium/files/patch-chrome_browser_process__singleton__posix.cc18
-rw-r--r--www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc10
-rw-r--r--www/chromium/files/patch-chrome_browser_profiles_profile__impl.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_profiles_profiles__state.cc8
-rw-r--r--www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc16
-rw-r--r--www/chromium/files/patch-chrome_browser_resources_new__tab__page_new__tab__page.js8
-rw-r--r--www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html6
-rw-r--r--www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.ts16
-rw-r--r--www/chromium/files/patch-chrome_browser_resources_settings_autofill__page_passwords__shared__css.html6
-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.cc22
-rw-r--r--www/chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.h14
-rw-r--r--www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc8
-rw-r--r--www/chromium/files/patch-chrome_browser_send__tab__to__self_receiving__ui__handler__registry.cc25
-rw-r--r--www/chromium/files/patch-chrome_browser_send__tab__to__self_send__tab__to__self__client__service.cc14
-rw-r--r--www/chromium/files/patch-chrome_browser_sharing_sharing__device__registration.cc8
-rw-r--r--www/chromium/files/patch-chrome_browser_sharing_sharing__handler__registry__impl.cc20
-rw-r--r--www/chromium/files/patch-chrome_browser_signin_signin__util.cc10
-rw-r--r--www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc12
-rw-r--r--www/chromium/files/patch-chrome_browser_sync_device__info__sync__client__impl.cc8
-rw-r--r--www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc28
-rw-r--r--www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h24
-rw-r--r--www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc28
-rw-r--r--www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.h26
-rw-r--r--www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_task__manager_task__manager__observer.h6
-rw-r--r--www/chromium/files/patch-chrome_browser_themes_theme__helper.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_themes_theme__service__factory.cc14
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc18
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_browser__dialogs.h22
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc12
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_exclusive__access_exclusive__access__bubble.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_sad__tab.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_signin__view__controller.cc12
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_signin__view__controller__delegate.h10
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_signin_dice__web__signin__interceptor__delegate.cc8
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc8
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc45
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc32
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__columns.cc8
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc14
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc14
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc10
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc10
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h8
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_download_download__item__view.cc10
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_eye__dropper_eye__dropper__view.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_eye__dropper_eye__dropper__view__aura.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_first__run__dialog.cc10
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_frame_browser__desktop__window__tree__host__linux.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_frame_browser__desktop__window__tree__host__linux.h6
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc26
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc10
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc8
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc14
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.h6
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc14
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc14
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc18
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h10
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_tabs_new__tab__button.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc20
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__controller.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc10
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc72
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_webui_connectors__internals_zero__trust__utils.cc14
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_webui_ntp_app__launcher__handler.cc22
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc10
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.h6
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc34
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__ui.cc22
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_window__sizer_window__sizer.cc8
-rw-r--r--www/chromium/files/patch-chrome_browser_web__applications_extension__status__utils.h6
-rw-r--r--www/chromium/files/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_web__applications_externally__managed__app__install__task.cc10
-rw-r--r--www/chromium/files/patch-chrome_browser_web__applications_web__app__file__handler__registration.h6
-rw-r--r--www/chromium/files/patch-chrome_browser_web__applications_web__app__install__task.cc10
-rw-r--r--www/chromium/files/patch-chrome_browser_web__applications_web__app__provider.cc10
-rw-r--r--www/chromium/files/patch-chrome_browser_web__applications_web__app__shortcut.cc30
-rw-r--r--www/chromium/files/patch-chrome_browser_web__applications_web__app__shortcut.h20
-rw-r--r--www/chromium/files/patch-chrome_browser_web__applications_web__app__shortcut__manager.cc12
-rw-r--r--www/chromium/files/patch-chrome_common_channel__info.h6
-rw-r--r--www/chromium/files/patch-chrome_common_channel__info__posix.cc6
-rw-r--r--www/chromium/files/patch-chrome_common_chrome__features.cc86
-rw-r--r--www/chromium/files/patch-chrome_common_chrome__features.h66
-rw-r--r--www/chromium/files/patch-chrome_common_chrome__paths.cc46
-rw-r--r--www/chromium/files/patch-chrome_common_chrome__paths.h26
-rw-r--r--www/chromium/files/patch-chrome_common_chrome__paths__internal.h6
-rw-r--r--www/chromium/files/patch-chrome_common_chrome__switches.cc18
-rw-r--r--www/chromium/files/patch-chrome_common_chrome__switches.h16
-rw-r--r--www/chromium/files/patch-chrome_common_extensions_command.cc6
-rw-r--r--www/chromium/files/patch-chrome_common_media_cdm__host__file__path.cc6
-rw-r--r--www/chromium/files/patch-chrome_common_pref__names.cc42
-rw-r--r--www/chromium/files/patch-chrome_common_pref__names.h46
-rw-r--r--www/chromium/files/patch-chrome_common_webui__url__constants.cc72
-rw-r--r--www/chromium/files/patch-chrome_common_webui__url__constants.h42
-rw-r--r--www/chromium/files/patch-chrome_renderer_chrome__render__frame__observer.cc10
-rw-r--r--www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.cc16
-rw-r--r--www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.h14
-rw-r--r--www/chromium/files/patch-chrome_service_cloud__print_print__system.cc11
-rw-r--r--www/chromium/files/patch-chrome_services_file__util_public_mojom_safe__document__analyzer__mojom__traits.h10
-rw-r--r--www/chromium/files/patch-chrome_services_printing_print__backend__service__impl.cc8
-rw-r--r--www/chromium/files/patch-chrome_services_speech_audio__source__fetcher__impl.cc6
-rw-r--r--www/chromium/files/patch-chrome_test_BUILD.gn4
-rw-r--r--www/chromium/files/patch-chrome_test_chromedriver_key__converter__unittest.cc20
-rw-r--r--www/chromium/files/patch-chrome_test_chromedriver_keycode__text__conversion__unittest.cc20
-rw-r--r--www/chromium/files/patch-chrome_updater_app_app__install.cc6
-rw-r--r--www/chromium/files/patch-chrome_updater_app_app__uninstall.cc10
-rw-r--r--www/chromium/files/patch-chrome_updater_configurator.cc10
-rw-r--r--www/chromium/files/patch-chrome_updater_device__management_cloud__policy__util.cc24
-rw-r--r--www/chromium/files/patch-chrome_updater_device__management_dm__client.cc8
-rw-r--r--www/chromium/files/patch-chrome_updater_device__management_dm__storage.cc8
-rw-r--r--www/chromium/files/patch-chrome_updater_installer.cc8
-rw-r--r--www/chromium/files/patch-chrome_updater_lib__util.cc6
-rw-r--r--www/chromium/files/patch-chrome_updater_updater.cc8
-rw-r--r--www/chromium/files/patch-chrome_updater_util.cc8
-rw-r--r--www/chromium/files/patch-chrome_utility_services.cc20
-rw-r--r--www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc46
-rw-r--r--www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc22
-rw-r--r--www/chromium/files/patch-chromecast_browser_cast__content__browser__client__receiver__bindings.cc12
-rw-r--r--www/chromium/files/patch-chromecast_media_base_default__monotonic__clock.cc16
-rw-r--r--www/chromium/files/patch-chromecast_renderer_cast__content__renderer__client.cc8
-rw-r--r--www/chromium/files/patch-components_autofill__payments__strings.grdp11
-rw-r--r--www/chromium/files/patch-components_autofill_core_browser_autofill__external__delegate.cc8
-rw-r--r--www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc11
-rw-r--r--www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc10
-rw-r--r--www/chromium/files/patch-components_autofill_core_common_autofill__util.cc8
-rw-r--r--www/chromium/files/patch-components_cast__channel_cast__message__util.cc6
-rw-r--r--www/chromium/files/patch-components_content__settings_core_browser_website__settings__registry.cc12
-rw-r--r--www/chromium/files/patch-components_cookie__config_cookie__store__util.cc8
-rw-r--r--www/chromium/files/patch-components_crash_core_app_BUILD.gn4
-rw-r--r--www/chromium/files/patch-components_embedder__support_user__agent__utils__unittest.cc20
-rw-r--r--www/chromium/files/patch-components_feature__engagement_public_event__constants.cc8
-rw-r--r--www/chromium/files/patch-components_feature__engagement_public_event__constants.h8
-rw-r--r--www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc20
-rw-r--r--www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc24
-rw-r--r--www/chromium/files/patch-components_feature__engagement_public_feature__constants.h20
-rw-r--r--www/chromium/files/patch-components_feature__engagement_public_feature__list.cc22
-rw-r--r--www/chromium/files/patch-components_feature__engagement_public_feature__list.h40
-rw-r--r--www/chromium/files/patch-components_feed_core_v2_proto__util.cc4
-rw-r--r--www/chromium/files/patch-components_feed_core_v2_proto__util__unittest.cc13
-rw-r--r--www/chromium/files/patch-components_feed_core_v2_test_proto__printer.cc13
-rw-r--r--www/chromium/files/patch-components_flags__ui_flags__state.cc10
-rw-r--r--www/chromium/files/patch-components_gwp__asan_crash__handler_crash__analyzer.cc14
-rw-r--r--www/chromium/files/patch-components_invalidation_impl_invalidation__switches.cc8
-rw-r--r--www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc10
-rw-r--r--www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator__unittest.cc11
-rw-r--r--www/chromium/files/patch-components_os__crypt_os__crypt.h53
-rw-r--r--www/chromium/files/patch-components_paint__preview_browser_paint__preview__client__unittest.cc13
-rw-r--r--www/chromium/files/patch-components_paint__preview_player_player__compositor__delegate.cc13
-rw-r--r--www/chromium/files/patch-components_password__manager_core_browser_login__database.cc29
-rw-r--r--www/chromium/files/patch-components_password__manager_core_browser_login__database__unittest.cc29
-rw-r--r--www/chromium/files/patch-components_password__manager_core_browser_sync_password__sync__bridge.cc11
-rw-r--r--www/chromium/files/patch-components_password__manager_core_common_password__manager__features.cc20
-rw-r--r--www/chromium/files/patch-components_password__manager_core_common_password__manager__features.h16
-rw-r--r--www/chromium/files/patch-components_performance__manager_features.cc6
-rw-r--r--www/chromium/files/patch-components_permissions_prediction__service_prediction__common.cc20
-rw-r--r--www/chromium/files/patch-components_permissions_prediction__service_prediction__service__common.cc11
-rw-r--r--www/chromium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc11
-rw-r--r--www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc8
-rw-r--r--www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc51
-rw-r--r--www/chromium/files/patch-components_policy_resources_policy__templates.json44
-rw-r--r--www/chromium/files/patch-components_policy_tools_generate__policy__source.py4
-rw-r--r--www/chromium/files/patch-components_safe__browsing_content_common_file__type__policies__unittest.cc11
-rw-r--r--www/chromium/files/patch-components_safe__browsing_core_browser_db_v4__protocol__manager__util.cc10
-rw-r--r--www/chromium/files/patch-components_safe__browsing_core_browser_realtime_url__lookup__service__base.cc12
-rw-r--r--www/chromium/files/patch-components_security__interstitials_content_utils.cc8
-rw-r--r--www/chromium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.cc18
-rw-r--r--www/chromium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.h10
-rw-r--r--www/chromium/files/patch-components_startup__metric__utils_browser_startup__metric__utils.cc10
-rw-r--r--www/chromium/files/patch-components_storage__monitor_BUILD.gn11
-rw-r--r--www/chromium/files/patch-components_storage__monitor_removable__device__constants.cc6
-rw-r--r--www/chromium/files/patch-components_storage__monitor_removable__device__constants.h6
-rw-r--r--www/chromium/files/patch-components_sync__device__info_local__device__info__util.cc8
-rw-r--r--www/chromium/files/patch-components_translate_core_browser_translate__prefs.cc10
-rw-r--r--www/chromium/files/patch-components_translate_core_common_translate__util.cc12
-rw-r--r--www/chromium/files/patch-components_update__client_update__query__params.cc4
-rw-r--r--www/chromium/files/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc6
-rw-r--r--www/chromium/files/patch-components_viz_common_features.cc12
-rw-r--r--www/chromium/files/patch-components_viz_common_gpu_dawn__context__provider.cc14
-rw-r--r--www/chromium/files/patch-components_viz_host_host__display__client.cc8
-rw-r--r--www/chromium/files/patch-components_viz_host_host__display__client.h6
-rw-r--r--www/chromium/files/patch-components_viz_host_renderer__settings__creation.cc8
-rw-r--r--www/chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc8
-rw-r--r--www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.cc10
-rw-r--r--www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.h10
-rw-r--r--www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc14
-rw-r--r--www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h6
-rw-r--r--www/chromium/files/patch-components_viz_test_fake__display__client.cc8
-rw-r--r--www/chromium/files/patch-components_viz_test_fake__display__client.h11
-rw-r--r--www/chromium/files/patch-components_viz_test_mock__display__client.h6
-rw-r--r--www/chromium/files/patch-content_app_content__main.cc8
-rw-r--r--www/chromium/files/patch-content_app_content__main__runner__impl.cc73
-rw-r--r--www/chromium/files/patch-content_browser_BUILD.gn6
-rw-r--r--www/chromium/files/patch-content_browser_browser__child__process__host__impl.cc4
-rw-r--r--www/chromium/files/patch-content_browser_browser__main__loop.cc26
-rw-r--r--www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc14
-rw-r--r--www/chromium/files/patch-content_browser_compositor_viz__process__transport__factory.cc8
-rw-r--r--www/chromium/files/patch-content_browser_compute__pressure_cpu__probe.cc6
-rw-r--r--www/chromium/files/patch-content_browser_devtools_protocol_system__info__handler.cc8
-rw-r--r--www/chromium/files/patch-content_browser_download_download__manager__impl.cc20
-rw-r--r--www/chromium/files/patch-content_browser_font__access_font__enumeration__cache.h8
-rw-r--r--www/chromium/files/patch-content_browser_gpu_compositor__util.cc10
-rw-r--r--www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc8
-rw-r--r--www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc16
-rw-r--r--www/chromium/files/patch-content_browser_media_media__keys__listener__manager__impl.cc8
-rw-r--r--www/chromium/files/patch-content_browser_ppapi__plugin__process__host__receiver__bindings.cc10
-rw-r--r--www/chromium/files/patch-content_browser_renderer__host_delegated__frame__host.cc6
-rw-r--r--www/chromium/files/patch-content_browser_renderer__host_input_input__device__change__observer.cc26
-rw-r--r--www/chromium/files/patch-content_browser_renderer__host_pepper_pepper__file__io__host.cc10
-rw-r--r--www/chromium/files/patch-content_browser_renderer__host_render__message__filter.cc16
-rw-r--r--www/chromium/files/patch-content_browser_renderer__host_render__message__filter.h10
-rw-r--r--www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc22
-rw-r--r--www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h10
-rw-r--r--www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc8
-rw-r--r--www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc32
-rw-r--r--www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.h8
-rw-r--r--www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc8
-rw-r--r--www/chromium/files/patch-content_browser_scheduler_responsiveness_jank__monitor__impl.cc6
-rw-r--r--www/chromium/files/patch-content_browser_scheduler_responsiveness_native__event__observer.cc10
-rw-r--r--www/chromium/files/patch-content_browser_scheduler_responsiveness_native__event__observer.h26
-rw-r--r--www/chromium/files/patch-content_browser_utility__process__host__receiver__bindings.cc10
-rw-r--r--www/chromium/files/patch-content_browser_utility__sandbox__delegate.cc8
-rw-r--r--www/chromium/files/patch-content_browser_v8__snapshot__files.cc12
-rw-r--r--www/chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc16
-rw-r--r--www/chromium/files/patch-content_browser_webui_web__ui__main__frame__observer.cc28
-rw-r--r--www/chromium/files/patch-content_browser_webui_web__ui__main__frame__observer.h10
-rw-r--r--www/chromium/files/patch-content_browser_zygote__host_zygote__host__impl__linux.cc14
-rw-r--r--www/chromium/files/patch-content_child_child__process.cc6
-rw-r--r--www/chromium/files/patch-content_common_BUILD.gn4
-rw-r--r--www/chromium/files/patch-content_common_font__list__unittest.cc11
-rw-r--r--www/chromium/files/patch-content_common_mojo__core__library__support.cc6
-rw-r--r--www/chromium/files/patch-content_common_sandbox__init__linux.cc19
-rw-r--r--www/chromium/files/patch-content_common_user__agent.cc28
-rw-r--r--www/chromium/files/patch-content_gpu_gpu__main.cc42
-rw-r--r--www/chromium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc12
-rw-r--r--www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc16
-rw-r--r--www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h14
-rw-r--r--www/chromium/files/patch-content_ppapi__plugin_ppapi__plugin__main.cc15
-rw-r--r--www/chromium/files/patch-content_public_browser_font__access__context.h11
-rw-r--r--www/chromium/files/patch-content_public_common_common__param__traits__macros.h8
-rw-r--r--www/chromium/files/patch-content_public_common_content__features.cc49
-rw-r--r--www/chromium/files/patch-content_public_common_content__features.h19
-rw-r--r--www/chromium/files/patch-content_public_common_content__switches.cc10
-rw-r--r--www/chromium/files/patch-content_public_common_content__switches.h8
-rw-r--r--www/chromium/files/patch-content_public_common_use__zoom__for__dsf__policy.cc10
-rw-r--r--www/chromium/files/patch-content_public_test_mock__render__thread.cc11
-rw-r--r--www/chromium/files/patch-content_renderer_render__process__impl.cc18
-rw-r--r--www/chromium/files/patch-content_renderer_render__thread__impl.cc32
-rw-r--r--www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc26
-rw-r--r--www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h14
-rw-r--r--www/chromium/files/patch-content_renderer_renderer__main__platform__delegate__linux.cc6
-rw-r--r--www/chromium/files/patch-content_shell_BUILD.gn4
-rw-r--r--www/chromium/files/patch-content_shell_app_shell__main__delegate.cc6
-rw-r--r--www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc12
-rw-r--r--www/chromium/files/patch-content_shell_browser_shell__paths.cc14
-rw-r--r--www/chromium/files/patch-content_shell_utility_shell__content__utility__client.cc14
-rw-r--r--www/chromium/files/patch-content_test_BUILD.gn6
-rw-r--r--www/chromium/files/patch-content_utility_services.cc16
-rw-r--r--www/chromium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.cc16
-rw-r--r--www/chromium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.h14
-rw-r--r--www/chromium/files/patch-content_utility_utility__main.cc26
-rw-r--r--www/chromium/files/patch-device_fido_features.cc17
-rw-r--r--www/chromium/files/patch-device_gamepad_gamepad__provider.cc6
-rw-r--r--www/chromium/files/patch-device_gamepad_hid__writer__linux.cc4
-rw-r--r--www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc14
-rw-r--r--www/chromium/files/patch-extensions_browser_api_networking__private_networking__private__delegate__factory.cc14
-rw-r--r--www/chromium/files/patch-extensions_browser_browser__context__keyed__service__factories.cc10
-rw-r--r--www/chromium/files/patch-extensions_browser_extension__prefs.cc8
-rw-r--r--www/chromium/files/patch-extensions_browser_pref__names.cc8
-rw-r--r--www/chromium/files/patch-extensions_browser_pref__names.h6
-rw-r--r--www/chromium/files/patch-extensions_common_api___permission__features.json6
-rw-r--r--www/chromium/files/patch-extensions_common_features_feature.cc4
-rw-r--r--www/chromium/files/patch-extensions_renderer_bindings_api__binding__util.cc8
-rw-r--r--www/chromium/files/patch-extensions_shell_app_shell__main__delegate.cc16
-rw-r--r--www/chromium/files/patch-extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc6
-rw-r--r--www/chromium/files/patch-extensions_shell_browser_shell__browser__main__parts.cc8
-rw-r--r--www/chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.cc8
-rw-r--r--www/chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.h10
-rw-r--r--www/chromium/files/patch-extensions_shell_common_switches.cc11
-rw-r--r--www/chromium/files/patch-extensions_shell_common_switches.h11
-rw-r--r--www/chromium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc18
-rw-r--r--www/chromium/files/patch-gpu_command__buffer_service_external__semaphore.cc6
-rw-r--r--www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc18
-rw-r--r--www/chromium/files/patch-gpu_command__buffer_service_shared__image__backing__factory__angle__vulkan.cc11
-rw-r--r--www/chromium/files/patch-gpu_command__buffer_service_shared__image__factory.cc20
-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.cc18
-rw-r--r--www/chromium/files/patch-gpu_config_gpu__test__config.cc10
-rw-r--r--www/chromium/files/patch-gpu_config_gpu__util.cc8
-rw-r--r--www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.cc14
-rw-r--r--www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.h6
-rw-r--r--www/chromium/files/patch-gpu_ipc_service_gpu__init.cc44
-rw-r--r--www/chromium/files/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc14
-rw-r--r--www/chromium/files/patch-gpu_ipc_service_x__util.h10
-rw-r--r--www/chromium/files/patch-gpu_vulkan_generate__bindings.py24
-rw-r--r--www/chromium/files/patch-gpu_vulkan_vulkan__device__queue.cc10
-rw-r--r--www/chromium/files/patch-gpu_vulkan_vulkan__device__queue.h8
-rw-r--r--www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc24
-rw-r--r--www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h56
-rw-r--r--www/chromium/files/patch-gpu_vulkan_vulkan__image.cc8
-rw-r--r--www/chromium/files/patch-gpu_vulkan_vulkan__image.h12
-rw-r--r--www/chromium/files/patch-headless_lib_browser_headless__browser__main__parts.h8
-rw-r--r--www/chromium/files/patch-headless_lib_browser_headless__browser__main__parts__linux.cc8
-rw-r--r--www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc11
-rw-r--r--www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.h8
-rw-r--r--www/chromium/files/patch-headless_lib_browser_headless__request__context__manager.cc27
-rw-r--r--www/chromium/files/patch-headless_lib_browser_headless__web__contents__impl.cc6
-rw-r--r--www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc11
-rw-r--r--www/chromium/files/patch-headless_lib_headless__macros.h11
-rw-r--r--www/chromium/files/patch-headless_public_headless__browser.cc6
-rw-r--r--www/chromium/files/patch-ipc_ipc__channel.h8
-rw-r--r--www/chromium/files/patch-ipc_ipc__channel__common.cc6
-rw-r--r--www/chromium/files/patch-ipc_ipc__channel__mojo.cc8
-rw-r--r--www/chromium/files/patch-ipc_ipc__message__utils.cc12
-rw-r--r--www/chromium/files/patch-ipc_ipc__message__utils.h12
-rw-r--r--www/chromium/files/patch-media_BUILD.gn4
-rw-r--r--www/chromium/files/patch-media_audio_audio__features.cc10
-rw-r--r--www/chromium/files/patch-media_audio_audio__input__device.cc6
-rw-r--r--www/chromium/files/patch-media_audio_audio__output__proxy__unittest.cc14
-rw-r--r--www/chromium/files/patch-media_audio_sndio_audio__manager__sndio.cc20
-rw-r--r--www/chromium/files/patch-media_audio_sndio_sndio__input.cc7
-rw-r--r--www/chromium/files/patch-media_audio_sndio_sndio__output.cc64
-rw-r--r--www/chromium/files/patch-media_base_audio__latency.cc8
-rw-r--r--www/chromium/files/patch-media_base_media__switches.cc30
-rw-r--r--www/chromium/files/patch-media_base_media__switches.h21
-rw-r--r--www/chromium/files/patch-media_base_scopedfd__helper.h10
-rw-r--r--www/chromium/files/patch-media_base_user__input__monitor__unittest.cc29
-rw-r--r--www/chromium/files/patch-media_base_vector__math.cc6
-rw-r--r--www/chromium/files/patch-media_base_video__frame.cc34
-rw-r--r--www/chromium/files/patch-media_base_video__frame.h26
-rw-r--r--www/chromium/files/patch-media_capture_video_create__video__capture__device__factory.cc10
-rw-r--r--www/chromium/files/patch-media_capture_video_fake__video__capture__device__factory.cc8
-rw-r--r--www/chromium/files/patch-media_capture_video_file__video__capture__device__factory.cc8
-rw-r--r--www/chromium/files/patch-media_capture_video_linux_fake__v4l2__impl.cc11
-rw-r--r--www/chromium/files/patch-media_capture_video_linux_fake__v4l2__impl.h18
-rw-r--r--www/chromium/files/patch-media_capture_video_video__capture__buffer__pool__impl.cc6
-rw-r--r--www/chromium/files/patch-media_capture_video_video__capture__device__client.cc8
-rw-r--r--www/chromium/files/patch-media_cdm_cdm__paths__unittest.cc20
-rw-r--r--www/chromium/files/patch-media_gpu_buffer__validation.cc16
-rw-r--r--www/chromium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc14
-rw-r--r--www/chromium/files/patch-media_gpu_gpu__video__encode__accelerator__factory.cc6
-rw-r--r--www/chromium/files/patch-media_gpu_vaapi_vaapi__video__decoder.cc8
-rw-r--r--www/chromium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc8
-rw-r--r--www/chromium/files/patch-media_media__options.gni6
-rw-r--r--www/chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc8
-rw-r--r--www/chromium/files/patch-media_video_fake__gpu__memory__buffer.cc26
-rw-r--r--www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc6
-rw-r--r--www/chromium/files/patch-media_video_video__encode__accelerator__adapter.cc12
-rw-r--r--www/chromium/files/patch-media_video_video__encode__accelerator__adapter__test.cc11
-rw-r--r--www/chromium/files/patch-media_webrtc_audio__processor.cc12
-rw-r--r--www/chromium/files/patch-media_webrtc_helpers__unittests.cc20
-rw-r--r--www/chromium/files/patch-media_webrtc_webrtc__features.cc6
-rw-r--r--www/chromium/files/patch-mojo_core_BUILD.gn4
-rw-r--r--www/chromium/files/patch-mojo_core_embedder_features.h8
-rw-r--r--www/chromium/files/patch-mojo_public_c_system_thunks.cc20
-rw-r--r--www/chromium/files/patch-mojo_public_js_mojo__bindings__resources.grd4
-rw-r--r--www/chromium/files/patch-mojo_public_tools_bindings_mojom.gni4
-rw-r--r--www/chromium/files/patch-net_BUILD.gn48
-rw-r--r--www/chromium/files/patch-net_base_address__tracker__linux.cc410
-rw-r--r--www/chromium/files/patch-net_base_address__tracker__linux.h12
-rw-r--r--www/chromium/files/patch-net_base_network__change__notifier.cc35
-rw-r--r--www/chromium/files/patch-net_cert_cert__verifier.cc6
-rw-r--r--www/chromium/files/patch-net_cert_cert__verify__proc.cc8
-rw-r--r--www/chromium/files/patch-net_cert_cert__verify__proc.h8
-rw-r--r--www/chromium/files/patch-net_cert_cert__verify__proc__unittest.cc11
-rw-r--r--www/chromium/files/patch-net_cert_test__root__certs__unittest.cc11
-rw-r--r--www/chromium/files/patch-net_dns_BUILD.gn14
-rw-r--r--www/chromium/files/patch-net_dns_dns__config__service__posix.cc26
-rw-r--r--www/chromium/files/patch-net_dns_dns__reloader.cc20
-rw-r--r--www/chromium/files/patch-net_dns_dns__reloader.h6
-rw-r--r--www/chromium/files/patch-net_dns_dns__util.cc4
-rw-r--r--www/chromium/files/patch-net_dns_host__resolver__manager.cc10
-rw-r--r--www/chromium/files/patch-net_dns_host__resolver__proc.cc10
-rw-r--r--www/chromium/files/patch-net_dns_public_BUILD.gn16
-rw-r--r--www/chromium/files/patch-net_dns_public_resolv__reader.h13
-rw-r--r--www/chromium/files/patch-net_dns_public_scoped__res__state.h10
-rw-r--r--www/chromium/files/patch-net_http_http__auth__gssapi__posix.cc12
-rw-r--r--www/chromium/files/patch-net_http_http__auth__gssapi__posix.h6
-rw-r--r--www/chromium/files/patch-net_proxy__resolution_configured__proxy__resolution__service.cc18
-rw-r--r--www/chromium/files/patch-net_socket_socket__posix.cc11
-rw-r--r--www/chromium/files/patch-net_socket_tcp__socket__posix.cc20
-rw-r--r--www/chromium/files/patch-net_socket_udp__socket__posix.cc6
-rw-r--r--www/chromium/files/patch-net_socket_udp__socket__unittest.cc47
-rw-r--r--www/chromium/files/patch-net_socket_unix__domain__client__socket__posix.cc11
-rw-r--r--www/chromium/files/patch-net_third__party_quiche_BUILD.gn33
-rw-r--r--www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__comparision__tool.cc14
-rw-r--r--www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc18
-rw-r--r--www/chromium/files/patch-net_tools_quic_quic__http__proxy__backend.cc6
-rw-r--r--www/chromium/files/patch-net_traffic__annotation_network__traffic__annotation.h20
-rw-r--r--www/chromium/files/patch-net_url__request_url__fetcher.cc10
-rw-r--r--www/chromium/files/patch-net_url__request_url__fetcher.h10
-rw-r--r--www/chromium/files/patch-net_url__request_url__request__context.cc10
-rw-r--r--www/chromium/files/patch-net_url__request_url__request__context.h10
-rw-r--r--www/chromium/files/patch-net_url__request_url__request__context__builder.cc8
-rw-r--r--www/chromium/files/patch-pdf_font__table__linux.cc10
-rw-r--r--www/chromium/files/patch-pdf_out__of__process__instance.cc14
-rw-r--r--www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc10
-rw-r--r--www/chromium/files/patch-printing_mojom_printing__context__mojom__traits.cc10
-rw-r--r--www/chromium/files/patch-printing_mojom_printing__context__mojom__traits.h6
-rw-r--r--www/chromium/files/patch-printing_print__settings.cc22
-rw-r--r--www/chromium/files/patch-printing_print__settings.h22
-rw-r--r--www/chromium/files/patch-printing_print__settings__conversion.cc8
-rw-r--r--www/chromium/files/patch-printing_printing__features.cc8
-rw-r--r--www/chromium/files/patch-printing_sandbox_print__backend__sandbox__hook__linux.cc23
-rw-r--r--www/chromium/files/patch-remoting_base_chromoting__event.cc8
-rw-r--r--www/chromium/files/patch-remoting_base_host__settings.cc14
-rw-r--r--www/chromium/files/patch-remoting_client_display_sys__opengl.h8
-rw-r--r--www/chromium/files/patch-remoting_codec_webrtc__video__encoder__vpx.cc6
-rw-r--r--www/chromium/files/patch-remoting_host_base_switches.cc8
-rw-r--r--www/chromium/files/patch-remoting_host_base_switches.h8
-rw-r--r--www/chromium/files/patch-remoting_host_chromoting__host.cc6
-rw-r--r--www/chromium/files/patch-remoting_host_chromoting__host__context.cc6
-rw-r--r--www/chromium/files/patch-remoting_host_chromoting__host__services__client.cc22
-rw-r--r--www/chromium/files/patch-remoting_host_evaluate__capability.cc6
-rw-r--r--www/chromium/files/patch-remoting_host_heartbeat__sender.cc8
-rw-r--r--www/chromium/files/patch-remoting_host_host__attributes.cc6
-rw-r--r--www/chromium/files/patch-remoting_host_host__details.cc8
-rw-r--r--www/chromium/files/patch-remoting_host_host__main.cc24
-rw-r--r--www/chromium/files/patch-remoting_host_ipc__constants.cc6
-rw-r--r--www/chromium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc22
-rw-r--r--www/chromium/files/patch-remoting_host_me2me__desktop__environment.cc8
-rw-r--r--www/chromium/files/patch-remoting_host_remote__open__url_remote__open__url__client.cc14
-rw-r--r--www/chromium/files/patch-remoting_host_remote__open__url_remote__open__url__util.cc8
-rw-r--r--www/chromium/files/patch-remoting_host_remote__open__url_url__forwarder__configurator.cc6
-rw-r--r--www/chromium/files/patch-remoting_host_remoting__me2me__host.cc74
-rw-r--r--www/chromium/files/patch-remoting_host_setup_start__host__main.cc18
-rw-r--r--www/chromium/files/patch-remoting_resources_remoting__strings.grd6
-rw-r--r--www/chromium/files/patch-sandbox_linux_services_libc__interceptor.cc4
-rw-r--r--www/chromium/files/patch-sandbox_policy_features.cc8
-rw-r--r--www/chromium/files/patch-sandbox_policy_mojom_sandbox.mojom4
-rw-r--r--www/chromium/files/patch-sandbox_policy_sandbox.cc16
-rw-r--r--www/chromium/files/patch-sandbox_policy_sandbox.h8
-rw-r--r--www/chromium/files/patch-sandbox_policy_sandbox__type.cc26
-rw-r--r--www/chromium/files/patch-sandbox_policy_switches.cc8
-rw-r--r--www/chromium/files/patch-sandbox_policy_switches.h10
-rw-r--r--www/chromium/files/patch-services_cert__verifier_cert__verifier__creation.cc27
-rw-r--r--www/chromium/files/patch-services_device_geolocation_location__arbitrator.cc6
-rw-r--r--www/chromium/files/patch-services_device_hid_BUILD.gn4
-rw-r--r--www/chromium/files/patch-services_device_hid_hid__service.cc22
-rw-r--r--www/chromium/files/patch-services_device_serial_serial__device__enumerator.cc14
-rw-r--r--www/chromium/files/patch-services_device_serial_serial__io__handler__posix.cc6
-rw-r--r--www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc4
-rw-r--r--www/chromium/files/patch-services_device_usb_BUILD.gn6
-rw-r--r--www/chromium/files/patch-services_network_BUILD.gn4
-rw-r--r--www/chromium/files/patch-services_network_network__context.cc11
-rw-r--r--www/chromium/files/patch-services_network_network__service.cc17
-rw-r--r--www/chromium/files/patch-services_network_network__service.h11
-rw-r--r--www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h16
-rw-r--r--www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__linux.cc4
-rw-r--r--www/chromium/files/patch-services_tracing_public_cpp_perfetto_perfetto__config.cc6
-rw-r--r--www/chromium/files/patch-services_video__capture_broadcasting__receiver.cc10
-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_renderer_driver__utils.h4
-rw-r--r--www/chromium/files/patch-third__party_angle_src_libANGLE_validationEGL.h11
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc22
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.cc10
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.h22
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_core_editing_editing__behavior.cc6
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc14
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc20
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc8
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_core_html_forms_internal__popup__menu.cc6
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc6
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc16
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc12
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc14
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_modules_media_audio_audio__device__factory.cc11
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc11
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc11
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc11
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc6
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__webcodecs__video__frame.cc12
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn11
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc6
-rw-r--r--www/chromium/files/patch-third__party_boringssl_BUILD.generated.gni4
-rw-r--r--www/chromium/files/patch-third__party_boringssl_BUILD.gn11
-rw-r--r--www/chromium/files/patch-third__party_boringssl_src_include_openssl_cpu.h11
-rw-r--r--www/chromium/files/patch-third__party_crashpad_crashpad_minidump_minidump__misc__info__writer.cc4
-rw-r--r--www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_address__types.h14
-rw-r--r--www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_capture__context.h25
-rw-r--r--www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_metrics.cc10
-rw-r--r--www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_uuid.cc10
-rw-r--r--www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_close__multiple.cc8
-rw-r--r--www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_drop__privileges.cc6
-rw-r--r--www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_signals.cc22
-rw-r--r--www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_symbolic__constants__posix.cc14
-rw-r--r--www/chromium/files/patch-third__party_dawn_src_include_dawn__native_VulkanBackend.h4
-rw-r--r--www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_arm64_config.h57
-rw-r--r--www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config.asm53
-rw-r--r--www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config.h57
-rw-r--r--www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config.asm68
-rw-r--r--www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config.h74
-rw-r--r--www/chromium/files/patch-third__party_libxml_linux_config.h4
-rw-r--r--www/chromium/files/patch-third__party_maldoca_BUILD.gn13
-rw-r--r--www/chromium/files/patch-third__party_nasm_BUILD.gn4
-rw-r--r--www/chromium/files/patch-third__party_pdfium_core_fxcrt_cfx__datetime.cpp8
-rw-r--r--www/chromium/files/patch-third__party_pdfium_core_fxge_cfx__fontmapper.cpp10
-rw-r--r--www/chromium/files/patch-third__party_pdfium_core_fxge_linux_fx__linux__impl.cpp6
-rw-r--r--www/chromium/files/patch-third__party_pdfium_fxjs_fx__date__helpers.cpp4
-rw-r--r--www/chromium/files/patch-third__party_pdfium_xfa_fxfa_parser_cxfa__timezoneprovider.cpp4
-rw-r--r--www/chromium/files/patch-third__party_perfetto_src_base_test_vm__test__utils.cc11
-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_skia_src_ports_SkOSFile__posix.cpp11
-rw-r--r--www/chromium/files/patch-third__party_skia_src_ports_SkOSFile__stdio.cpp11
-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_WSI_libXCB.cpp16
-rw-r--r--www/chromium/files/patch-third__party_test__fonts_fontconfig_BUILD.gn15
-rw-r--r--www/chromium/files/patch-third__party_vulkan__memory__allocator_include_vk__mem__alloc.h18
-rw-r--r--www/chromium/files/patch-third__party_webrtc_modules_desktop__capture_linux_x11_x__server__pixel__buffer.cc15
-rw-r--r--www/chromium/files/patch-third__party_webrtc_modules_desktop__capture_linux_x__server__pixel__buffer.cc16
-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_network.cc15
-rw-r--r--www/chromium/files/patch-tools_gn_build_gen.py8
-rw-r--r--www/chromium/files/patch-ui_base_clipboard_clipboard__constants.cc8
-rw-r--r--www/chromium/files/patch-ui_base_clipboard_clipboard__constants.h10
-rw-r--r--www/chromium/files/patch-ui_base_cursor_cursor__factory.cc8
-rw-r--r--www/chromium/files/patch-ui_base_cursor_cursor__factory.h6
-rw-r--r--www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__factory.cc12
-rw-r--r--www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__non__backed.cc8
-rw-r--r--www/chromium/files/patch-ui_base_ime_dummy__text__input__client.cc8
-rw-r--r--www/chromium/files/patch-ui_base_ime_dummy__text__input__client.h6
-rw-r--r--www/chromium/files/patch-ui_base_ime_fake__text__input__client.cc8
-rw-r--r--www/chromium/files/patch-ui_base_ime_fake__text__input__client.h6
-rw-r--r--www/chromium/files/patch-ui_base_ime_init_input__method__initializer.cc40
-rw-r--r--www/chromium/files/patch-ui_base_ime_text__input__client.h6
-rw-r--r--www/chromium/files/patch-ui_base_resource_resource__bundle.cc6
-rw-r--r--www/chromium/files/patch-ui_base_test_skia__gold__pixel__diff.cc8
-rw-r--r--www/chromium/files/patch-ui_base_ui__base__features.cc18
-rw-r--r--www/chromium/files/patch-ui_base_webui_web__ui__util.cc6
-rw-r--r--www/chromium/files/patch-ui_base_x_x11__shm__image__pool.cc14
-rw-r--r--www/chromium/files/patch-ui_compositor_compositor.cc6
-rw-r--r--www/chromium/files/patch-ui_compositor_compositor.h6
-rw-r--r--www/chromium/files/patch-ui_compositor_compositor__observer.h6
-rw-r--r--www/chromium/files/patch-ui_events_event.cc12
-rw-r--r--www/chromium/files/patch-ui_events_event__switches.cc6
-rw-r--r--www/chromium/files/patch-ui_events_event__switches.h6
-rw-r--r--www/chromium/files/patch-ui_events_keycodes_dom_keycode__converter.cc10
-rw-r--r--www/chromium/files/patch-ui_gfx_BUILD.gn4
-rw-r--r--www/chromium/files/patch-ui_gfx_canvas__skia.cc8
-rw-r--r--www/chromium/files/patch-ui_gfx_font__list.cc6
-rw-r--r--www/chromium/files/patch-ui_gfx_font__render__params.h12
-rw-r--r--www/chromium/files/patch-ui_gfx_font__util.cc10
-rw-r--r--www/chromium/files/patch-ui_gfx_gpu__memory__buffer.cc10
-rw-r--r--www/chromium/files/patch-ui_gfx_gpu__memory__buffer.h14
-rw-r--r--www/chromium/files/patch-ui_gfx_ipc_gfx__param__traits__macros.h28
-rw-r--r--www/chromium/files/patch-ui_gfx_mojom_buffer__types__mojom__traits.cc10
-rw-r--r--www/chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.cc20
-rw-r--r--www/chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.h14
-rw-r--r--www/chromium/files/patch-ui_gfx_native__pixmap__handle.cc46
-rw-r--r--www/chromium/files/patch-ui_gfx_native__pixmap__handle.h22
-rw-r--r--www/chromium/files/patch-ui_gfx_native__widget__types.h10
-rw-r--r--www/chromium/files/patch-ui_gfx_render__text__api__fuzzer.cc26
-rw-r--r--www/chromium/files/patch-ui_gfx_switches.cc6
-rw-r--r--www/chromium/files/patch-ui_gfx_switches.h6
-rw-r--r--www/chromium/files/patch-ui_gfx_x_generated__protos_dri3.cc4
-rw-r--r--www/chromium/files/patch-ui_gfx_x_generated__protos_shm.cc4
-rw-r--r--www/chromium/files/patch-ui_gl_BUILD.gn13
-rw-r--r--www/chromium/files/patch-ui_gl_gl__features.cc8
-rw-r--r--www/chromium/files/patch-ui_gl_gl__image__glx__native__pixmap.cc4
-rw-r--r--www/chromium/files/patch-ui_gl_init_gl__factory.cc6
-rw-r--r--www/chromium/files/patch-ui_gl_sync__control__vsync__provider.cc18
-rw-r--r--www/chromium/files/patch-ui_gl_sync__control__vsync__provider.h10
-rw-r--r--www/chromium/files/patch-ui_message__center_views_message__popup__view.cc6
-rw-r--r--www/chromium/files/patch-ui_native__theme_native__theme.h6
-rw-r--r--www/chromium/files/patch-ui_native__theme_native__theme__base.cc8
-rw-r--r--www/chromium/files/patch-ui_ozone_common_egl__util.cc4
-rw-r--r--www/chromium/files/patch-ui_ozone_platform_x11_ozone__platform__x11.cc6
-rw-r--r--www/chromium/files/patch-ui_ozone_public_ozone__platform.h8
-rw-r--r--www/chromium/files/patch-ui_strings_app__locale__settings.grd8
-rw-r--r--www/chromium/files/patch-ui_views_controls_prefix__selector.cc6
-rw-r--r--www/chromium/files/patch-ui_views_controls_prefix__selector.h6
-rw-r--r--www/chromium/files/patch-ui_views_controls_textfield_textfield.cc32
-rw-r--r--www/chromium/files/patch-ui_views_controls_textfield_textfield.h8
-rw-r--r--www/chromium/files/patch-ui_views_corewm_tooltip__aura.cc6
-rw-r--r--www/chromium/files/patch-ui_views_examples_widget__example.cc6
-rw-r--r--www/chromium/files/patch-ui_views_focus_focus__manager.cc10
-rw-r--r--www/chromium/files/patch-ui_views_style_platform__style.cc12
-rw-r--r--www/chromium/files/patch-ui_views_views__delegate.cc6
-rw-r--r--www/chromium/files/patch-ui_views_views__delegate.h6
-rw-r--r--www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__screen__ozone.cc6
-rw-r--r--www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc8
-rw-r--r--www/chromium/files/patch-ui_views_widget_native__widget__aura.cc18
-rw-r--r--www/chromium/files/patch-ui_views_widget_widget.cc14
-rw-r--r--www/chromium/files/patch-ui_views_window_custom__frame__view.cc6
-rw-r--r--www/chromium/files/patch-ui_views_window_dialog__delegate.cc6
-rw-r--r--www/chromium/files/patch-ui_views_window_frame__background.cc8
-rw-r--r--www/chromium/files/patch-v8_BUILD.gn8
-rw-r--r--www/chromium/files/patch-v8_src_api_api.cc4
-rw-r--r--www/chromium/files/patch-v8_src_base_platform_platform-posix.cc6
-rw-r--r--www/chromium/files/patch-weblayer_browser_content__browser__client__impl.cc13
-rw-r--r--www/chromium/files/patch-weblayer_browser_content__browser__client__impl.h4
-rw-r--r--www/chromium/pkg-plist2
766 files changed, 6057 insertions, 5232 deletions
diff --git a/www/chromium/Makefile b/www/chromium/Makefile
index 5a7dd8ae27a7..b7ee68b405cf 100644
--- a/www/chromium/Makefile
+++ b/www/chromium/Makefile
@@ -1,11 +1,10 @@
# Created by: Florent Thoumie <flz@FreeBSD.org>
PORTNAME= chromium
-PORTVERSION= 98.0.4758.102
-PORTREVISION= 3
+PORTVERSION= 99.0.4844.51
CATEGORIES= www
MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \
- LOCAL/rene/chromium/:fonts
+ https://nerd.hu/distfiles/:fonts
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= chromium@FreeBSD.org
@@ -28,7 +27,6 @@ BUILD_DEPENDS= bash:shells/bash \
${LOCALBASE}/share/usbids/usb.ids:misc/usbids \
${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib@${PY_FLAVOR} \
${LOCALBASE}/include/va/va.h:multimedia/libva \
- ${LOCALBASE}/bin/python2.7:lang/python27 \
${LOCALBASE}/libdata/pkgconfig/dri.pc:graphics/mesa-dri
LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi2-atk \
@@ -65,12 +63,11 @@ LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi2-atk \
RUN_DEPENDS= xdg-open:devel/xdg-utils \
noto-basic>0:x11-fonts/noto-basic
-USES= bison compiler:c++17-lang cpe desktop-file-utils dos2unix gl gnome jpeg localbase:ldflags \
+USES= bison compiler:c++17-lang cpe desktop-file-utils gl gnome jpeg localbase:ldflags \
ninja perl5 pkgconfig python:3.6-3.9,build shebangfix tar:xz xorg
CPE_VENDOR= google
CPE_PRODUCT= chrome
-DOS2UNIX_FILES= third_party/vulkan_memory_allocator/include/vk_mem_alloc.h
USE_GL= gbm gl
USE_GNOME= atk dconf gdkpixbuf2 glib20 gtk30 libxml2 libxslt
USE_LDCONFIG= ${DATADIR}
@@ -82,8 +79,7 @@ SHEBANG_FILES= chrome/tools/build/linux/chrome-wrapper buildtools/linux64/clang-
MAKE_ARGS= -C out/${BUILDTYPE}
ALL_TARGET= chrome
-BINARY_ALIAS= python=${LOCALBASE}/bin/python2.7 \
- python3=${PYTHON_CMD}
+BINARY_ALIAS= python3=${PYTHON_CMD}
# TODO bz@ : install libwidevinecdm.so (see third_party/widevine/cdm/BUILD.gn)
#
@@ -198,7 +194,7 @@ SNDIO_VARS_OFF= GN_ARGS+=use_sndio=false
.include "Makefile.tests"
TEST_DISTFILES= ${PORTNAME}-${DISTVERSION}-testdata${EXTRACT_SUFX} \
- test_fonts-85${EXTRACT_SUFX}:fonts
+ test_fonts-cd96fc55dc243f6c6f4cb63ad117cad6cd48dceb.tar.gz:fonts
TEST_ALL_TARGET= ${TEST_TARGETS}
.include <bsd.port.options.mk>
@@ -306,6 +302,8 @@ do-install:
.for f in libEGL.so libGLESv2.so libVkICD_mock_icd.so
${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR}
.endfor
+ ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/libvulkan.so.1 \
+ ${STAGEDIR}${DATADIR}/libvulkan.so
.if ${BUILDTYPE} == Debug
${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/libVkLayer_khronos_validation.so ${STAGEDIR}${DATADIR}
.endif
@@ -323,8 +321,6 @@ do-install:
post-install-DEBUG-on:
${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/*.so \
${STAGEDIR}${DATADIR}
- ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/libvulkan.so.1 \
- ${STAGEDIR}${DATADIR}
${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/character_data_generator \
${STAGEDIR}${DATADIR}
diff --git a/www/chromium/Makefile.tests b/www/chromium/Makefile.tests
index d8a1b3138355..aea948673823 100644
--- a/www/chromium/Makefile.tests
+++ b/www/chromium/Makefile.tests
@@ -1,7 +1,12 @@
TEST_TARGETS= base_unittests \
+ blink_unittests \
chromedriver_unittests \
+ components_unittests \
+ content_unittests \
crypto_unittests \
headless_unittests \
+ media_unittests \
+ mojo_unittests \
+ net_unittests \
printing_unittests \
url_unittests
-
diff --git a/www/chromium/distinfo b/www/chromium/distinfo
index 4f04e0f5b957..7139f2f3df3c 100644
--- a/www/chromium/distinfo
+++ b/www/chromium/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1645271488
-SHA256 (chromium-98.0.4758.102.tar.xz) = 415b47e912766cd07f9f52e95bc6470b835acf1d6f566ae32e66ba8be608f33e
-SIZE (chromium-98.0.4758.102.tar.xz) = 1242565220
-SHA256 (chromium-98.0.4758.102-testdata.tar.xz) = d18ea0af0a9a87d53e75fbdbd886b17f689e00486f819905b38f02a2619504e6
-SIZE (chromium-98.0.4758.102-testdata.tar.xz) = 258963780
-SHA256 (test_fonts-85.tar.xz) = f22b61b3639acb147c98ec2e2305d8b96f0b55c8c74c40e2ea696402fae8cef9
-SIZE (test_fonts-85.tar.xz) = 9511984
+TIMESTAMP = 1646114129
+SHA256 (chromium-99.0.4844.51.tar.xz) = 97c52e57eca0dc8b752d274047f38c88aaa86036c0587b26b056efbd3fb2bae3
+SIZE (chromium-99.0.4844.51.tar.xz) = 1316125164
+SHA256 (chromium-99.0.4844.51-testdata.tar.xz) = 80e07d1684b07d0390fbb53115ba6a48e39781f2f805d4e17dac657a00a4363e
+SIZE (chromium-99.0.4844.51-testdata.tar.xz) = 258957904
+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 fbf272d4b247..e6324afdb6fc 100644
--- a/www/chromium/files/patch-BUILD.gn
+++ b/www/chromium/files/patch-BUILD.gn
@@ -1,4 +1,4 @@
---- BUILD.gn.orig 2022-02-07 13:39:41 UTC
+--- BUILD.gn.orig 2022-02-28 16:54:41 UTC
+++ BUILD.gn
@@ -52,7 +52,7 @@ declare_args() {
root_extra_deps = []
@@ -18,7 +18,7 @@
deps += [
"//third_party/breakpad:breakpad_unittests",
"//third_party/breakpad:core-2-minidump",
-@@ -638,6 +638,15 @@ group("gn_all") {
+@@ -636,6 +636,15 @@ group("gn_all") {
}
}
@@ -34,7 +34,7 @@
if (is_mac) {
deps += [
"//third_party/breakpad:crash_inspector",
-@@ -688,7 +697,7 @@ group("gn_all") {
+@@ -686,7 +695,7 @@ group("gn_all") {
host_os == "win") {
deps += [ "//chrome/test/mini_installer:mini_installer_tests" ]
}
@@ -43,7 +43,7 @@
deps += [ "//third_party/breakpad:symupload($host_toolchain)" ]
}
-@@ -1139,7 +1148,7 @@ if (!is_ios) {
+@@ -1137,7 +1146,7 @@ if (!is_ios) {
data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ]
}
@@ -52,7 +52,7 @@
data_deps +=
[ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ]
}
-@@ -1148,7 +1157,7 @@ if (!is_ios) {
+@@ -1146,7 +1155,7 @@ if (!is_ios) {
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
}
@@ -61,7 +61,7 @@
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
}
-@@ -1525,7 +1534,7 @@ group("chromium_builder_perf") {
+@@ -1521,7 +1530,7 @@ group("chromium_builder_perf") {
if (is_win) {
data_deps += [ "//chrome/installer/mini_installer:mini_installer" ]
diff --git a/www/chromium/files/patch-apps_ui_views_app__window__frame__view.cc b/www/chromium/files/patch-apps_ui_views_app__window__frame__view.cc
index 4c99002b2147..151948510862 100644
--- a/www/chromium/files/patch-apps_ui_views_app__window__frame__view.cc
+++ b/www/chromium/files/patch-apps_ui_views_app__window__frame__view.cc
@@ -1,11 +1,11 @@
---- apps/ui/views/app_window_frame_view.cc.orig 2022-02-07 13:39:41 UTC
+--- apps/ui/views/app_window_frame_view.cc.orig 2022-02-28 16:54:41 UTC
+++ apps/ui/views/app_window_frame_view.cc
-@@ -137,7 +137,7 @@ gfx::Rect AppWindowFrameView::GetWindowBoundsForClient
+@@ -138,7 +138,7 @@ gfx::Rect AppWindowFrameView::GetWindowBoundsForClient
gfx::Rect window_bounds = client_bounds;
// TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
// complete.
--#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
// Get the difference between the widget's client area bounds and window
// bounds, and grow |window_bounds| by that amount.
gfx::Insets native_frame_insets =
diff --git a/www/chromium/files/patch-base_BUILD.gn b/www/chromium/files/patch-base_BUILD.gn
index 20b36c33a916..72069cf118ab 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-02-07 13:39:41 UTC
+--- base/BUILD.gn.orig 2022-02-28 16:54:41 UTC
+++ base/BUILD.gn
-@@ -975,7 +975,7 @@ component("base") {
+@@ -993,7 +993,7 @@ mixed_component("base") {
"timer/hi_res_timer_manager_posix.cc",
]
@@ -9,7 +9,7 @@
sources += [
"cpu_affinity_posix.cc",
"cpu_affinity_posix.h",
-@@ -986,6 +986,12 @@ component("base") {
+@@ -1004,6 +1004,12 @@ mixed_component("base") {
"profiler/thread_delegate_posix.h",
]
}
@@ -22,7 +22,7 @@
}
if (is_win) {
-@@ -1416,11 +1422,24 @@ component("base") {
+@@ -1462,11 +1468,23 @@ mixed_component("base") {
# building inside the cros_sdk environment - use host_toolchain as a
# more robust check for this.
if (!use_sysroot &&
@@ -39,7 +39,6 @@
+
+ if (is_freebsd) {
+ libs += [
-+ "iconv",
+ "execinfo",
+ "util",
+ ]
@@ -48,21 +47,28 @@
if (use_allocator_shim) {
sources += [
"allocator/allocator_shim.cc",
-@@ -1443,7 +1462,7 @@ component("base") {
- "allocator/early_zone_registration_mac.h",
+@@ -1490,7 +1508,7 @@ mixed_component("base") {
]
+ configs += [ "//base/allocator:mac_no_default_new_delete_symbols" ]
}
- if (is_chromeos || is_linux) {
+ if (is_chromeos || (is_linux && !is_bsd)) {
sources += [
"allocator/allocator_shim_override_cpp_symbols.h",
"allocator/allocator_shim_override_glibc_weak_symbols.h",
-@@ -2176,6 +2195,42 @@ component("base") {
- "linux_util.h",
- ]
+@@ -1550,7 +1568,7 @@ mixed_component("base") {
+ # Allow more direct string conversions on platforms with native utf8
+ # strings
+ # TODO(crbug/1052397): Consider replacing is_ash with is_chromeos once lacros switches to target_os=chromeos
+- if (is_apple || is_chromeos_ash || is_chromecast || is_fuchsia) {
++ if (is_apple || is_chromeos_ash || is_chromecast || is_fuchsia || is_bsd) {
+ defines += [ "SYSTEM_NATIVE_UTF8" ]
+ }
+
+@@ -2222,6 +2240,42 @@ mixed_component("base") {
}
-+ }
-+
+ }
+
+ if (is_bsd) {
+ sources -= [
+ "files/file_path_watcher_linux.cc",
@@ -97,6 +103,44 @@
+ "process/process_metrics_freebsd.cc",
+ "system/sys_info_freebsd.cc",
+ ]
++ }
++
+ # iOS
+ if (is_ios) {
+ sources -= [
+@@ -3465,7 +3519,7 @@ test("base_unittests") {
+ }
}
- # iOS
+- if (is_linux || is_chromeos) {
++ if ((is_linux || is_chromeos) && !is_bsd) {
+ sources += [
+ "debug/proc_maps_linux_unittest.cc",
+ "files/scoped_file_linux_unittest.cc",
+@@ -3513,7 +3567,7 @@ test("base_unittests") {
+ "posix/unix_domain_socket_unittest.cc",
+ "task/thread_pool/task_tracker_posix_unittest.cc",
+ ]
+- if (!is_nacl && !is_apple) {
++ if (!is_nacl && !is_apple && !is_bsd) {
+ sources += [
+ "cpu_affinity_posix_unittest.cc",
+ "profiler/stack_copier_signal_unittest.cc",
+@@ -3525,7 +3579,7 @@ test("base_unittests") {
+ # Allow more direct string conversions on platforms with native utf8
+ # strings
+ # TODO(crbug/1052397): Consider replacing is_ash with is_chromeos once lacros switches to target_os=chromeos
+- if (is_apple || is_chromeos_ash || is_chromecast || is_fuchsia) {
++ if (is_apple || is_chromeos_ash || is_chromecast || is_fuchsia || is_bsd) {
+ defines += [ "SYSTEM_NATIVE_UTF8" ]
+ }
+
+@@ -3689,7 +3743,7 @@ test("base_unittests") {
+ }
+ }
+
+- if (is_fuchsia || is_linux || is_chromeos) {
++ if ((is_fuchsia || is_linux || is_chromeos) && !is_bsd) {
+ sources += [
+ "debug/elf_reader_unittest.cc",
+ "debug/test_elf_image_builder.cc",
diff --git a/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 c15f7b02a90a..3f03f54ad491 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,6 +1,6 @@
---- base/allocator/partition_allocator/address_space_randomization.h.orig 2021-10-07 16:50:24 UTC
+--- base/allocator/partition_allocator/address_space_randomization.h.orig 2022-02-28 16:54:41 UTC
+++ base/allocator/partition_allocator/address_space_randomization.h
-@@ -36,7 +36,7 @@ AslrMask(uintptr_t bits) {
+@@ -38,7 +38,7 @@ AslrMask(uintptr_t bits) {
#if defined(ARCH_CPU_64_BITS)
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator.h b/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator.h
index 3d932a28ff32..57ceca3efe3a 100644
--- a/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator.h
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator.h
@@ -1,11 +1,11 @@
---- base/allocator/partition_allocator/page_allocator.h.orig 2022-02-23 16:08:07 UTC
+--- base/allocator/partition_allocator/page_allocator.h.orig 2022-02-28 16:54:41 UTC
+++ base/allocator/partition_allocator/page_allocator.h
-@@ -170,7 +170,7 @@ BASE_EXPORT void DecommitAndZeroSystemPages(void* addr
+@@ -194,7 +194,7 @@ BASE_EXPORT void DecommitAndZeroSystemPages(void* addr
// Whether decommitted memory is guaranteed to be zeroed when it is
// recommitted. Do not assume that this will not change over time.
constexpr BASE_EXPORT bool DecommittedMemoryIsAlwaysZeroed() {
--#if defined(OS_APPLE)
-+#if defined(OS_APPLE) || defined(OS_BSD)
+-#if BUILDFLAG(IS_APPLE)
++#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD)
return false;
#else
return true;
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h b/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h
index c5069330b3dd..700bf383a007 100644
--- a/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h
@@ -1,16 +1,16 @@
---- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2022-02-23 16:08:07 UTC
+--- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2022-02-28 16:54:41 UTC
+++ base/allocator/partition_allocator/page_allocator_internals_posix.h
-@@ -339,8 +339,12 @@ bool TryRecommitSystemPagesInternal(
- }
+@@ -346,8 +346,12 @@ bool TryRecommitSystemPagesInternal(
- void DiscardSystemPagesInternal(void* address, size_t length) {
--#if defined(OS_APPLE)
-+#if defined(OS_APPLE) || defined(OS_BSD)
-+#if defined(OS_BSD)
-+ int ret = madvise(address, length, MADV_FREE);
+ void DiscardSystemPagesInternal(uintptr_t address, size_t length) {
+ void* ptr = reinterpret_cast<void*>(address);
+-#if BUILDFLAG(IS_APPLE)
++#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD)
++#if BUILDFLAG(IS_BSD)
++ int ret = madvise(ptr, length, MADV_FREE);
+#else
- int ret = madvise(address, length, MADV_FREE_REUSABLE);
+ int ret = madvise(ptr, length, MADV_FREE_REUSABLE);
+#endif
if (ret) {
// MADV_FREE_REUSABLE sometimes fails, so fall back to MADV_DONTNEED.
- ret = madvise(address, length, MADV_DONTNEED);
+ ret = madvise(ptr, length, MADV_DONTNEED);
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 b525560e52b0..011bdf1a8e7b 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,11 +1,11 @@
---- base/allocator/partition_allocator/partition_alloc_config.h.orig 2022-02-07 13:39:41 UTC
+--- base/allocator/partition_allocator/partition_alloc_config.h.orig 2022-02-28 16:54:41 UTC
+++ base/allocator/partition_allocator/partition_alloc_config.h
@@ -59,7 +59,7 @@ static_assert(sizeof(void*) != 8, "");
// POSIX is not only UNIX, e.g. macOS and other OSes. We do use Linux-specific
// features such as futex(2).
--#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
#define PA_HAS_LINUX_KERNEL
#endif
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
deleted file mode 100644
index 3c37a2b8e5a7..000000000000
--- a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- base/allocator/partition_allocator/partition_alloc_constants.h.orig 2022-02-07 13:39:41 UTC
-+++ base/allocator/partition_allocator/partition_alloc_constants.h
-@@ -361,7 +361,7 @@ constexpr size_t kBitsPerSizeT = sizeof(void*) * CHAR_
- // PartitionPurgeDecommitEmptySlotSpans flag will eagerly decommit all entries
- // in the ring buffer, so with periodic purge enabled, this typically happens
- // every few seconds.
--#if defined(OS_LINUX) || defined(OS_APPLE)
-+#if defined(OS_LINUX) || defined(OS_APPLE) || defined(OS_BSD)
- // Set to a higher value on Linux and macOS, to assess impact on performance
- // bots. This roughly halves the number of syscalls done during a speedometer
- // 2.0 run on these platforms.
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 3fd97ed4f2bf..138e9832363f 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,12 +1,22 @@
---- base/allocator/partition_allocator/partition_page.h.orig 2022-02-07 13:39:41 UTC
+--- base/allocator/partition_allocator/partition_page.h.orig 2022-02-28 16:54:41 UTC
+++ base/allocator/partition_allocator/partition_page.h
-@@ -141,7 +141,8 @@ struct __attribute__((packed)) SlotSpanMetadata {
- // in PartitionPage, which has other fields as well, and must fit in 32 bytes.
+@@ -129,7 +129,8 @@ struct __attribute__((packed)) SlotSpanMetadata {
+ PartitionBucket<thread_safe>* const bucket = nullptr;
// CHECK()ed in AllocNewSlotSpan().
--#if defined(PA_HAS_64_BITS_POINTERS) && defined(OS_APPLE)
-+#if (defined(PA_HAS_64_BITS_POINTERS) && defined(OS_APPLE)) || \
-+ (defined(OS_FREEBSD) && defined(__i386__))
+-#if defined(PA_HAS_64_BITS_POINTERS) && BUILDFLAG(IS_APPLE)
++#if (defined(PA_HAS_64_BITS_POINTERS) && BUILDFLAG(IS_APPLE)) || \
++ (BUILDFLAG(IS_FREEBSD) && defined(__i386__))
// 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.
+@@ -143,7 +144,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;
++#if !BUILDFLAG(IS_FREEBSD) && defined(__i386__)
+ static_assert(kMaxSlotsPerSlotSpan < (1 << kMaxSlotsPerSlotSpanBits), "");
++#endif
+
+ // |marked_full| isn't equivalent to being full. Slot span is marked as full
+ // iff it isn't on the active slot span list (or any other list).
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__root.h b/www/chromium/files/patch-base_allocator_partition__allocator_partition__root.h
index 86e2996e9bc2..a53eb22b38b2 100644
--- a/www/chromium/files/patch-base_allocator_partition__allocator_partition__root.h
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__root.h
@@ -1,11 +1,11 @@
---- base/allocator/partition_allocator/partition_root.h.orig 2022-02-07 13:39:41 UTC
+--- base/allocator/partition_allocator/partition_root.h.orig 2022-02-28 16:54:41 UTC
+++ base/allocator/partition_allocator/partition_root.h
-@@ -1044,7 +1044,7 @@ ALWAYS_INLINE void PartitionRoot<thread_safe>::FreeNoH
+@@ -1019,7 +1019,7 @@ ALWAYS_INLINE void PartitionRoot<thread_safe>::FreeNoH
// essentially).
- #if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && \
- ((defined(OS_ANDROID) && !BUILDFLAG(IS_CHROMECAST)) || \
-- (defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)))
-+ ((defined(OS_LINUX) || defined(OS_BSD)) && defined(ARCH_CPU_64_BITS)))
- PA_CHECK(IsManagedByPartitionAlloc(reinterpret_cast<uintptr_t>(ptr)));
+ #if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && \
+ ((BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMECAST)) || \
+- (BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_64_BITS)))
++ ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_64_BITS)))
+ PA_CHECK(IsManagedByPartitionAlloc(address));
#endif
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_spinning__mutex.cc b/www/chromium/files/patch-base_allocator_partition__allocator_spinning__mutex.cc
index be1594ebc8d8..2fa346356669 100644
--- a/www/chromium/files/patch-base_allocator_partition__allocator_spinning__mutex.cc
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_spinning__mutex.cc
@@ -1,4 +1,4 @@
---- base/allocator/partition_allocator/spinning_mutex.cc.orig 2022-02-07 13:39:41 UTC
+--- base/allocator/partition_allocator/spinning_mutex.cc.orig 2022-02-28 16:54:41 UTC
+++ base/allocator/partition_allocator/spinning_mutex.cc
@@ -17,7 +17,15 @@
@@ -16,7 +16,7 @@
#include <sys/syscall.h>
#include <unistd.h>
#endif // defined(PA_HAS_LINUX_KERNEL)
-@@ -86,8 +94,13 @@ void SpinningMutex::FutexWait() {
+@@ -85,8 +93,13 @@ void SpinningMutex::FutexWait() {
// |kLockedContended| anymore. Note that even without spurious wakeups, the
// value of |state_| is not guaranteed when this returns, as another thread
// may get the lock before we get to run.
@@ -30,7 +30,7 @@
if (err) {
// These are programming error, check them.
-@@ -99,8 +112,14 @@ void SpinningMutex::FutexWait() {
+@@ -98,8 +111,14 @@ void SpinningMutex::FutexWait() {
void SpinningMutex::FutexWake() {
int saved_errno = errno;
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 09e46dc3b1a8..54cc31592590 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-07 13:39:41 UTC
+--- base/allocator/partition_allocator/starscan/stack/stack.cc.orig 2022-02-28 16:54:41 UTC
+++ base/allocator/partition_allocator/starscan/stack/stack.cc
@@ -17,6 +17,10 @@
#include <pthread.h>
@@ -47,4 +47,4 @@
+ return nullptr;
}
- #elif defined(OS_POSIX) || defined(OS_FUCHSIA)
+ #elif BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA)
diff --git a/www/chromium/files/patch-base_base__paths__posix.cc b/www/chromium/files/patch-base_base__paths__posix.cc
index e4e467db6322..9b6827056e06 100644
--- a/www/chromium/files/patch-base_base__paths__posix.cc
+++ b/www/chromium/files/patch-base_base__paths__posix.cc
@@ -1,4 +1,4 @@
---- base/base_paths_posix.cc.orig 2022-02-07 13:39:41 UTC
+--- base/base_paths_posix.cc.orig 2022-02-28 16:54:41 UTC
+++ base/base_paths_posix.cc
@@ -15,6 +15,7 @@
#include <ostream>
@@ -12,21 +12,21 @@
#include "base/process/process_metrics.h"
#include "build/build_config.h"
--#if defined(OS_FREEBSD)
-+#if defined(OS_BSD)
+-#if BUILDFLAG(IS_FREEBSD)
++#if BUILDFLAG(IS_BSD)
#include <sys/param.h>
#include <sys/sysctl.h>
-+#if defined(OS_OPENBSD)
++#if BUILDFLAG(IS_OPENBSD)
+#include <kvm.h>
+#define MAXTOKENS 2
+#endif
- #elif defined(OS_SOLARIS) || defined(OS_AIX)
+ #elif BUILDFLAG(IS_SOLARIS) || BUILDFLAG(IS_AIX)
#include <stdlib.h>
#endif
@@ -68,13 +73,65 @@ bool PathProviderPosix(int key, FilePath* result) {
*result = FilePath(bin_dir);
return true;
- #elif defined(OS_OPENBSD) || defined(OS_AIX)
+ #elif BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_AIX)
- // There is currently no way to get the executable path on OpenBSD
- char* cpath;
- if ((cpath = getenv("CHROME_EXE_PATH")) != NULL)
@@ -35,7 +35,7 @@
- *result = FilePath("/usr/local/chrome/chrome");
- return true;
+ char *cpath;
-+#if !defined(OS_AIX)
++#if !BUILDFLAG(IS_AIX)
+ struct kinfo_file *files;
+ kvm_t *kd = NULL;
+ char errbuf[_POSIX2_LINE_MAX];
@@ -89,7 +89,7 @@
+ else
+ *result = FilePath("/usr/local/chrome/chrome");
+ return true;
-+#if !defined(OS_AIX)
++#if !BUILDFLAG(IS_AIX)
+ }
+ return ret;
+#endif
diff --git a/www/chromium/files/patch-base_base__switches.cc b/www/chromium/files/patch-base_base__switches.cc
index be1fb8bcdacd..59678d7551d9 100644
--- a/www/chromium/files/patch-base_base__switches.cc
+++ b/www/chromium/files/patch-base_base__switches.cc
@@ -1,11 +1,11 @@
---- base/base_switches.cc.orig 2022-02-07 13:39:41 UTC
+--- base/base_switches.cc.orig 2022-02-28 16:54:41 UTC
+++ base/base_switches.cc
@@ -170,7 +170,7 @@ const char kForceFieldTrialParams[] = "force-fieldtria
#endif
--#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
// Controls whether or not retired instruction counts are surfaced for threads
// in trace events on Linux.
//
diff --git a/www/chromium/files/patch-base_base__switches.h b/www/chromium/files/patch-base_base__switches.h
index 3388972738b8..8b90f08b6a9e 100644
--- a/www/chromium/files/patch-base_base__switches.h
+++ b/www/chromium/files/patch-base_base__switches.h
@@ -1,11 +1,11 @@
---- base/base_switches.h.orig 2022-02-07 13:39:41 UTC
+--- base/base_switches.h.orig 2022-02-28 16:54:41 UTC
+++ base/base_switches.h
@@ -60,7 +60,7 @@ extern const char kEnableIdleTracing[];
extern const char kForceFieldTrialParams[];
#endif
--#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
extern const char kEnableThreadInstructionCount[];
// TODO(crbug.com/1176772): Remove kEnableCrashpad and IsCrashpadEnabled() when
diff --git a/www/chromium/files/patch-base_compiler__specific.h b/www/chromium/files/patch-base_compiler__specific.h
index d9fcba02e013..5424b9804aa7 100644
--- a/www/chromium/files/patch-base_compiler__specific.h
+++ b/www/chromium/files/patch-base_compiler__specific.h
@@ -1,6 +1,6 @@
---- base/compiler_specific.h.orig 2022-02-07 13:39:41 UTC
+--- base/compiler_specific.h.orig 2022-02-28 16:54:41 UTC
+++ base/compiler_specific.h
-@@ -366,7 +366,7 @@ inline constexpr bool AnalyzerAssumeTrue(bool arg) {
+@@ -359,7 +359,7 @@ inline constexpr bool AnalyzerAssumeTrue(bool arg) {
#endif // defined(__clang_analyzer__)
// Use nomerge attribute to disable optimization of merging multiple same calls.
diff --git a/www/chromium/files/patch-base_cpu.h b/www/chromium/files/patch-base_cpu.h
index 1879d459ce46..68c6722e4905 100644
--- a/www/chromium/files/patch-base_cpu.h
+++ b/www/chromium/files/patch-base_cpu.h
@@ -1,11 +1,11 @@
---- base/cpu.h.orig 2022-02-07 13:39:41 UTC
+--- base/cpu.h.orig 2022-02-28 16:54:41 UTC
+++ base/cpu.h
-@@ -104,7 +104,7 @@ class BASE_EXPORT CPU final {
+@@ -108,7 +108,7 @@ class BASE_EXPORT CPU final {
const std::string& cpu_brand() const { return cpu_brand_; }
- #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \
-- defined(OS_AIX)
-+ defined(OS_AIX) || defined(OS_BSD)
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
+- BUILDFLAG(IS_AIX)
++ BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD)
enum class CoreType {
kUnknown = 0,
kOther,
diff --git a/www/chromium/files/patch-base_debug_debugger__posix.cc b/www/chromium/files/patch-base_debug_debugger__posix.cc
index 63a56d85b575..01e51311eb4a 100644
--- a/www/chromium/files/patch-base_debug_debugger__posix.cc
+++ b/www/chromium/files/patch-base_debug_debugger__posix.cc
@@ -1,21 +1,21 @@
---- base/debug/debugger_posix.cc.orig 2022-02-07 13:39:41 UTC
+--- base/debug/debugger_posix.cc.orig 2022-02-28 16:54:41 UTC
+++ base/debug/debugger_posix.cc
@@ -36,6 +36,10 @@
#include <sys/sysctl.h>
#endif
-+#if defined(OS_OPENBSD)
++#if BUILDFLAG(IS_OPENBSD)
+#include <sys/proc.h>
+#endif
+
- #if defined(OS_FREEBSD)
+ #if BUILDFLAG(IS_FREEBSD)
#include <sys/user.h>
#endif
-@@ -95,32 +99,51 @@ bool BeingDebugged() {
+@@ -96,32 +100,51 @@ bool BeingDebugged() {
// Caution: struct kinfo_proc is marked __APPLE_API_UNSTABLE. The source and
// binary interfaces may change.
-+#if defined(OS_OPENBSD)
++#if BUILDFLAG(IS_OPENBSD)
+ struct kinfo_proc *info;
+ size_t info_size;
+#else
@@ -23,7 +23,7 @@
size_t info_size = sizeof(info);
+#endif
- #if defined(OS_OPENBSD)
+ #if BUILDFLAG(IS_OPENBSD)
if (sysctl(mib, base::size(mib), NULL, &info_size, NULL, 0) < 0)
return -1;
@@ -37,7 +37,7 @@
+ int sysctl_result = sysctl(mib, base::size(mib), info, &info_size, NULL, 0);
#endif
-+#if !defined(OS_OPENBSD)
++#if !BUILDFLAG(IS_OPENBSD)
int sysctl_result = sysctl(mib, base::size(mib), &info, &info_size, NULL, 0);
+#endif
DCHECK_EQ(sysctl_result, 0);
@@ -50,18 +50,18 @@
// This process is being debugged if the P_TRACED flag is set.
is_set = true;
- #if defined(OS_FREEBSD)
+ #if BUILDFLAG(IS_FREEBSD)
being_debugged = (info.ki_flag & P_TRACED) != 0;
--#elif defined(OS_BSD)
+-#elif BUILDFLAG(IS_BSD)
- being_debugged = (info.p_flag & P_TRACED) != 0;
-+#elif defined(OS_OPENBSD)
++#elif BUILDFLAG(IS_OPENBSD)
+ being_debugged = (info->p_psflags & PS_TRACED) != 0;
#else
being_debugged = (info.kp_proc.p_flag & P_TRACED) != 0;
+#endif
+
+out:
-+#if defined(OS_OPENBSD)
++#if BUILDFLAG(IS_OPENBSD)
+ free(info);
#endif
return being_debugged;
diff --git a/www/chromium/files/patch-base_debug_proc__maps__linux.cc b/www/chromium/files/patch-base_debug_proc__maps__linux.cc
index c728ce89a006..4ed7cb701ed6 100644
--- a/www/chromium/files/patch-base_debug_proc__maps__linux.cc
+++ b/www/chromium/files/patch-base_debug_proc__maps__linux.cc
@@ -1,11 +1,11 @@
---- base/debug/proc_maps_linux.cc.orig 2022-02-07 13:39:41 UTC
+--- base/debug/proc_maps_linux.cc.orig 2022-02-28 16:54:41 UTC
+++ base/debug/proc_maps_linux.cc
@@ -13,7 +13,7 @@
#include "base/strings/string_split.h"
#include "build/build_config.h"
--#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
#include <inttypes.h>
#endif
diff --git a/www/chromium/files/patch-base_debug_stack__trace__posix.cc b/www/chromium/files/patch-base_debug_stack__trace__posix.cc
index 1852f89074be..5ddbea4f56ac 100644
--- a/www/chromium/files/patch-base_debug_stack__trace__posix.cc
+++ b/www/chromium/files/patch-base_debug_stack__trace__posix.cc
@@ -1,25 +1,25 @@
---- base/debug/stack_trace_posix.cc.orig 2022-02-07 13:39:41 UTC
+--- base/debug/stack_trace_posix.cc.orig 2022-02-28 16:54:41 UTC
+++ base/debug/stack_trace_posix.cc
-@@ -35,7 +35,7 @@
+@@ -37,7 +37,7 @@
#include <AvailabilityMacros.h>
#endif
--#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
#include "base/debug/proc_maps_linux.h"
#endif
-@@ -693,6 +693,9 @@ class SandboxSymbolizeHelper {
+@@ -695,6 +695,9 @@ class SandboxSymbolizeHelper {
// for the modules that are loaded in the current process.
// Returns true on success.
bool CacheMemoryRegions() {
-+#if defined(OS_BSD)
++#if BUILDFLAG(IS_BSD)
+ return false;
+#else
// Reads /proc/self/maps.
std::string contents;
if (!ReadProcMaps(&contents)) {
-@@ -710,6 +713,7 @@ class SandboxSymbolizeHelper {
+@@ -712,6 +715,7 @@ class SandboxSymbolizeHelper {
is_initialized_ = true;
return true;
@@ -27,12 +27,12 @@
}
// Opens all object files and caches their file descriptors.
-@@ -866,7 +870,7 @@ size_t CollectStackTrace(void** trace, size_t count) {
+@@ -868,7 +872,7 @@ size_t CollectStackTrace(void** trace, size_t count) {
// If we do not have unwind tables, then try tracing using frame pointers.
return base::debug::TraceStackFramePointers(const_cast<const void**>(trace),
count, 0);
-#elif !defined(__UCLIBC__) && !defined(_AIX)
-+#elif !defined(__UCLIBC__) && !defined(_AIX) && !defined(OS_BSD)
++#elif !defined(__UCLIBC__) && !defined(_AIX) && !BUILDFLAG(IS_BSD)
// Though the backtrace API man page does not list any possible negative
// return values, we take no chance.
return base::saturated_cast<size_t>(backtrace(trace, count));
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
new file mode 100644
index 000000000000..e0978f8b9384
--- /dev/null
+++ b/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc
@@ -0,0 +1,29 @@
+--- base/files/file_path_watcher_unittest.cc.orig 2022-02-28 16:54:41 UTC
++++ base/files/file_path_watcher_unittest.cc
+@@ -450,7 +450,7 @@ TEST_F(FilePathWatcherTest, WatchDirectory) {
+ VLOG(1) << "Waiting for file1 creation";
+ ASSERT_TRUE(WaitForEvents());
+
+-#if !BUILDFLAG(IS_APPLE)
++#if !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD)
+ // 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 {
+ Execute
+ };
+
+-#if BUILDFLAG(IS_APPLE)
++#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD)
+ bool ChangeFilePermissions(const FilePath& path, Permission perm, bool allow) {
+ struct stat stat_buf;
+
+@@ -1069,7 +1069,7 @@ bool ChangeFilePermissions(const FilePath& path, Permi
+ }
+ #endif // BUILDFLAG(IS_APPLE)
+
+-#if BUILDFLAG(IS_APPLE)
++#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD)
+ // Linux implementation of FilePathWatcher doesn't catch attribute changes.
+ // http://crbug.com/78043
+ // Windows implementation of FilePathWatcher catches attribute changes that
diff --git a/www/chromium/files/patch-base_files_file__util__unittest.cc b/www/chromium/files/patch-base_files_file__util__unittest.cc
new file mode 100644
index 000000000000..4ab8b350d668
--- /dev/null
+++ b/www/chromium/files/patch-base_files_file__util__unittest.cc
@@ -0,0 +1,20 @@
+--- base/files/file_util_unittest.cc.orig 2022-02-28 16:54:41 UTC
++++ base/files/file_util_unittest.cc
+@@ -3524,7 +3524,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) {
+ }
+ #endif // BUILDFLAG(IS_WIN)
+
+-#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE)
++#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD)
+ TEST_F(FileUtilTest, ReadFileToStringWithProcFileSystem) {
+ FilePath file_path("/proc/cpuinfo");
+ std::string data = "temp";
+@@ -4240,7 +4240,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles
+ NULL);
+ #else
+ size_t bytes_written =
+- ::write(::fileno(output_file.get()), content.c_str(), content.length());
++ ::write(fileno(output_file.get()), content.c_str(), content.length());
+ #endif
+ EXPECT_EQ(content.length(), bytes_written);
+ ::fflush(output_file.get());
diff --git a/www/chromium/files/patch-base_files_important__file__writer__cleaner.cc b/www/chromium/files/patch-base_files_important__file__writer__cleaner.cc
index 63a8f084dee3..80f08d51a819 100644
--- a/www/chromium/files/patch-base_files_important__file__writer__cleaner.cc
+++ b/www/chromium/files/patch-base_files_important__file__writer__cleaner.cc
@@ -1,12 +1,12 @@
---- base/files/important_file_writer_cleaner.cc.orig 2022-02-07 13:39:41 UTC
+--- base/files/important_file_writer_cleaner.cc.orig 2022-02-28 16:54:41 UTC
+++ base/files/important_file_writer_cleaner.cc
-@@ -24,7 +24,8 @@ namespace base {
+@@ -25,7 +25,8 @@ namespace base {
namespace {
base::Time GetUpperBoundTime() {
--#if defined(OS_ANDROID) || defined(OS_IOS) || defined(OS_FUCHSIA)
+-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_FUCHSIA)
+// needed because of .CreationTime() pledge
-+#if defined(OS_ANDROID) || defined(OS_IOS) || defined(OS_FUCHSIA) || defined(OS_BSD)
++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
// If process creation time is not available then use instance creation
// time as the upper-bound for old files. Modification times may be
// rounded-down to coarse-grained increments, e.g. FAT has 2s granularity,
diff --git a/www/chromium/files/patch-base_files_scoped__file.cc b/www/chromium/files/patch-base_files_scoped__file.cc
index 874e2e3d597a..350c73cc76e7 100644
--- a/www/chromium/files/patch-base_files_scoped__file.cc
+++ b/www/chromium/files/patch-base_files_scoped__file.cc
@@ -1,11 +1,11 @@
---- base/files/scoped_file.cc.orig 2022-02-07 13:39:41 UTC
+--- base/files/scoped_file.cc.orig 2022-02-28 16:54:41 UTC
+++ base/files/scoped_file.cc
@@ -31,7 +31,7 @@ void ScopedFDCloseTraits::Free(int fd) {
int ret = IGNORE_EINTR(close(fd));
- #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_APPLE) || \
-- defined(OS_FUCHSIA) || defined(OS_ANDROID)
-+ defined(OS_FUCHSIA) || defined(OS_ANDROID) || defined(OS_BSD)
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_APPLE) || \
+- BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_ANDROID)
++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
// NB: Some file descriptors can return errors from close() e.g. network
// filesystems such as NFS and Linux input devices. On Linux, macOS, and
// Fuchsia's POSIX layer, errors from close other than EBADF do not indicate
diff --git a/www/chromium/files/patch-base_i18n_icu__util.cc b/www/chromium/files/patch-base_i18n_icu__util.cc
index 36122feefefa..f5d9b12738d7 100644
--- a/www/chromium/files/patch-base_i18n_icu__util.cc
+++ b/www/chromium/files/patch-base_i18n_icu__util.cc
@@ -1,21 +1,20 @@
---- base/i18n/icu_util.cc.orig 2022-02-07 13:39:41 UTC
+--- base/i18n/icu_util.cc.orig 2022-02-28 16:54:41 UTC
+++ base/i18n/icu_util.cc
-@@ -49,7 +49,7 @@
- #include "third_party/icu/source/common/unicode/unistr.h"
+@@ -52,7 +52,7 @@
#endif
--#if defined(OS_ANDROID) || defined(OS_FUCHSIA) || \
-+#if defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(OS_BSD) || \
- ((defined(OS_LINUX) || defined(OS_CHROMEOS)) && !BUILDFLAG(IS_CHROMECAST))
+ #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \
+- ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \
++ ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && \
+ !BUILDFLAG(IS_CHROMECAST))
#include "third_party/icu/source/i18n/unicode/timezone.h"
#endif
-@@ -343,7 +343,8 @@ void InitializeIcuTimeZone() {
+@@ -346,7 +346,7 @@ void InitializeIcuTimeZone() {
FuchsiaIntlProfileWatcher::GetPrimaryTimeZoneIdForIcuInitialization();
icu::TimeZone::adoptDefault(
icu::TimeZone::createTimeZone(icu::UnicodeString::fromUTF8(zone_id)));
--#elif (defined(OS_LINUX) || defined(OS_CHROMEOS)) && !BUILDFLAG(IS_CHROMECAST)
-+#elif (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && \
-+ !BUILDFLAG(IS_CHROMECAST)
+-#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \
++#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && \
+ !BUILDFLAG(IS_CHROMECAST)
// To respond to the time zone change properly, the default time zone
// cache in ICU has to be populated on starting up.
- // See TimeZoneMonitorLinux::NotifyClientsFromImpl().
diff --git a/www/chromium/files/patch-base_logging__unittest.cc b/www/chromium/files/patch-base_logging__unittest.cc
new file mode 100644
index 000000000000..875546922a1c
--- /dev/null
+++ b/www/chromium/files/patch-base_logging__unittest.cc
@@ -0,0 +1,31 @@
+--- base/logging_unittest.cc.orig 2022-02-28 16:54:41 UTC
++++ base/logging_unittest.cc
+@@ -32,7 +32,7 @@
+ #include "base/posix/eintr_wrapper.h"
+ #endif // BUILDFLAG(IS_POSIX)
+
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FREEBSD)
+ #include <ucontext.h>
+ #endif
+
+@@ -552,14 +552,18 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo
+ // need the arch-specific boilerplate below, which is inspired by breakpad.
+ // At the same time, on OSX, ucontext.h is deprecated but si_addr works fine.
+ uintptr_t crash_addr = 0;
+-#if BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FREEBSD)
+ crash_addr = reinterpret_cast<uintptr_t>(info->si_addr);
+ #else // OS_*
+ ucontext_t* context = reinterpret_cast<ucontext_t*>(context_ptr);
+ #if defined(ARCH_CPU_X86)
+ crash_addr = static_cast<uintptr_t>(context->uc_mcontext.gregs[REG_EIP]);
+ #elif defined(ARCH_CPU_X86_64)
++#if BUILDFLAG(IS_OPENBSD)
++ crash_addr = static_cast<uintptr_t>(context->sc_rip);
++#else
+ crash_addr = static_cast<uintptr_t>(context->uc_mcontext.gregs[REG_RIP]);
++#endif
+ #elif defined(ARCH_CPU_ARMEL)
+ crash_addr = static_cast<uintptr_t>(context->uc_mcontext.arm_pc);
+ #elif defined(ARCH_CPU_ARM64)
diff --git a/www/chromium/files/patch-base_memory_discardable__memory.cc b/www/chromium/files/patch-base_memory_discardable__memory.cc
index 136569ca00cd..350a28608203 100644
--- a/www/chromium/files/patch-base_memory_discardable__memory.cc
+++ b/www/chromium/files/patch-base_memory_discardable__memory.cc
@@ -1,38 +1,38 @@
---- base/memory/discardable_memory.cc.orig 2022-02-07 13:39:41 UTC
+--- base/memory/discardable_memory.cc.orig 2022-02-28 16:54:41 UTC
+++ base/memory/discardable_memory.cc
@@ -24,7 +24,7 @@ const base::Feature kMadvFreeDiscardableMemory{
"MadvFreeDiscardableMemory", base::FEATURE_DISABLED_BY_DEFAULT};
- #endif // defined(OS_POSIX)
+ #endif // BUILDFLAG(IS_POSIX)
--#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
const base::Feature kDiscardableMemoryBackingTrial{
"DiscardableMemoryBackingTrial", base::FEATURE_DISABLED_BY_DEFAULT};
-@@ -48,7 +48,7 @@ const base::FeatureParam<DiscardableMemoryTrialGroup>
+@@ -49,7 +49,7 @@ const base::FeatureParam<DiscardableMemoryTrialGroup>
namespace {
--#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
DiscardableMemoryBacking GetBackingForFieldTrial() {
DiscardableMemoryTrialGroup trial_group =
-@@ -66,7 +66,7 @@ DiscardableMemoryBacking GetBackingForFieldTrial() {
+@@ -68,7 +68,7 @@ DiscardableMemoryBacking GetBackingForFieldTrial() {
} // namespace
--#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
// Probe capabilities of this device to determine whether we should participate
// in the discardable memory backing trial.
-@@ -95,7 +95,7 @@ DiscardableMemory::DiscardableMemory() = default;
+@@ -98,7 +98,7 @@ DiscardableMemory::DiscardableMemory() = default;
DiscardableMemory::~DiscardableMemory() = default;
DiscardableMemoryBacking GetDiscardableMemoryBacking() {
--#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
if (DiscardableMemoryBackingFieldTrialIsEnabled()) {
return GetBackingForFieldTrial();
}
diff --git a/www/chromium/files/patch-base_memory_discardable__memory__internal.h b/www/chromium/files/patch-base_memory_discardable__memory__internal.h
index c511cb6b113c..13bef7210432 100644
--- a/www/chromium/files/patch-base_memory_discardable__memory__internal.h
+++ b/www/chromium/files/patch-base_memory_discardable__memory__internal.h
@@ -1,11 +1,11 @@
---- base/memory/discardable_memory_internal.h.orig 2022-02-07 13:39:41 UTC
+--- base/memory/discardable_memory_internal.h.orig 2022-02-28 16:54:41 UTC
+++ base/memory/discardable_memory_internal.h
@@ -10,7 +10,7 @@
#include "base/metrics/field_trial_params.h"
#include "build/build_config.h"
--#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
namespace base {
diff --git a/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 51230808b76b..1f2283b19981 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,17 +1,17 @@
---- base/memory/madv_free_discardable_memory_posix.cc.orig 2022-02-07 13:39:41 UTC
+--- base/memory/madv_free_discardable_memory_posix.cc.orig 2022-02-28 16:54:41 UTC
+++ base/memory/madv_free_discardable_memory_posix.cc
-@@ -292,6 +292,10 @@ void MadvFreeDiscardableMemoryPosix::SetKeepMemoryForT
+@@ -294,6 +294,10 @@ void MadvFreeDiscardableMemoryPosix::SetKeepMemoryForT
bool MadvFreeDiscardableMemoryPosix::IsResident() const {
DFAKE_SCOPED_RECURSIVE_LOCK(thread_collision_warner_);
+// XXX mincore
-+#if defined(OS_BSD)
++#if BUILDFLAG(IS_BSD)
+ return false;
+#else
- #if defined(OS_APPLE)
+ #if BUILDFLAG(IS_APPLE)
std::vector<char> vec(allocated_pages_);
#else
-@@ -307,6 +311,7 @@ bool MadvFreeDiscardableMemoryPosix::IsResident() cons
+@@ -309,6 +313,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 6057569add0b..002915dba49c 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,29 +1,29 @@
---- base/memory/platform_shared_memory_region.h.orig 2021-12-14 11:44:55 UTC
+--- base/memory/platform_shared_memory_region.h.orig 2022-02-28 16:54:41 UTC
+++ base/memory/platform_shared_memory_region.h
-@@ -24,7 +24,7 @@
+@@ -23,7 +23,7 @@
#include "base/files/scoped_file.h"
#endif
--#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
namespace content {
class SandboxIPCHandler;
}
-@@ -117,7 +117,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion {
+@@ -116,7 +116,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion {
kMaxValue = GET_SHMEM_TEMP_DIR_FAILURE
};
--#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
// Structure to limit access to executable region creation.
struct ExecutableRegion {
private:
-@@ -264,7 +264,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion {
+@@ -263,7 +263,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion {
CheckPlatformHandlePermissionsCorrespondToMode);
static PlatformSharedMemoryRegion Create(Mode mode,
size_t size
--#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
,
bool executable = false
#endif
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 a35c8d880061..dc7c81b3ea39 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,11 +1,11 @@
---- base/memory/platform_shared_memory_region_posix.cc.orig 2022-02-07 13:39:41 UTC
+--- base/memory/platform_shared_memory_region_posix.cc.orig 2022-02-28 16:54:41 UTC
+++ base/memory/platform_shared_memory_region_posix.cc
@@ -70,7 +70,7 @@ FDPair ScopedFDPair::get() const {
return {fd.get(), readonly_fd.get()};
}
--#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#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 =
@@ -13,8 +13,8 @@
// static
PlatformSharedMemoryRegion PlatformSharedMemoryRegion::Create(Mode mode,
size_t size
--#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
,
bool executable
#endif
@@ -22,8 +22,8 @@
// flag.
FilePath directory;
if (!GetShmemTempDir(
--#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
executable,
#else
false /* executable */,
diff --git a/www/chromium/files/patch-base_message__loop_message__pump__glib.cc b/www/chromium/files/patch-base_message__loop_message__pump__glib.cc
index 5cf21bba2dbd..047712904c6f 100644
--- a/www/chromium/files/patch-base_message__loop_message__pump__glib.cc
+++ b/www/chromium/files/patch-base_message__loop_message__pump__glib.cc
@@ -1,10 +1,10 @@
---- base/message_loop/message_pump_glib.cc.orig 2021-09-14 01:51:47 UTC
+--- base/message_loop/message_pump_glib.cc.orig 2022-02-28 16:54:41 UTC
+++ base/message_loop/message_pump_glib.cc
@@ -8,6 +8,11 @@
#include <glib.h>
#include <math.h>
-+#if defined(OS_BSD)
++#if BUILDFLAG(IS_BSD)
+#include <pthread.h>
+#include <pthread_np.h>
+#endif
@@ -12,11 +12,11 @@
#include "base/logging.h"
#include "base/notreached.h"
#include "base/numerics/safe_conversions.h"
-@@ -49,9 +54,13 @@ int GetTimeIntervalMilliseconds(TimeTicks next_task_ti
+@@ -50,9 +55,13 @@ int GetTimeIntervalMilliseconds(TimeTicks next_task_ti
}
bool RunningOnMainThread() {
-+#if defined(OS_BSD)
++#if BUILDFLAG(IS_BSD)
+ return pthread_main_np();
+#else
auto pid = getpid();
diff --git a/www/chromium/files/patch-base_native__library__posix.cc b/www/chromium/files/patch-base_native__library__posix.cc
index a7ea746723c5..1aca9e8e282e 100644
--- a/www/chromium/files/patch-base_native__library__posix.cc
+++ b/www/chromium/files/patch-base_native__library__posix.cc
@@ -1,11 +1,11 @@
---- base/native_library_posix.cc.orig 2021-04-14 18:40:48 UTC
+--- base/native_library_posix.cc.orig 2022-02-28 16:54:41 UTC
+++ base/native_library_posix.cc
-@@ -31,7 +31,7 @@ NativeLibrary LoadNativeLibraryWithOptions(const FileP
+@@ -32,7 +32,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;
--#if defined(OS_ANDROID) || !defined(RTLD_DEEPBIND)
-+#if defined(OS_ANDROID) || !defined(RTLD_DEEPBIND) || defined(OS_BSD)
+-#if BUILDFLAG(IS_ANDROID) || !defined(RTLD_DEEPBIND)
++#if BUILDFLAG(IS_ANDROID) || !defined(RTLD_DEEPBIND) || BUILDFLAG(IS_BSD)
// Certain platforms don't define RTLD_DEEPBIND. Android dlopen() requires
// further investigation, as it might vary across versions. Crash here to
// warn developers that they're trying to rely on uncertain behavior.
diff --git a/www/chromium/files/patch-base_native__library__unittest.cc b/www/chromium/files/patch-base_native__library__unittest.cc
new file mode 100644
index 000000000000..4729ea97fb39
--- /dev/null
+++ b/www/chromium/files/patch-base_native__library__unittest.cc
@@ -0,0 +1,11 @@
+--- base/native_library_unittest.cc.orig 2022-02-28 16:54:41 UTC
++++ base/native_library_unittest.cc
+@@ -119,7 +119,7 @@ TEST(NativeLibraryTest, LoadLibrary) {
+ // versions with respect to symbol resolution scope.
+ // TSan and MSan error out on RTLD_DEEPBIND, https://crbug.com/705255
+ #if !BUILDFLAG(IS_ANDROID) && !defined(THREAD_SANITIZER) && \
+- !defined(MEMORY_SANITIZER)
++ !defined(MEMORY_SANITIZER) && !BUILDFLAG(IS_BSD)
+
+ // Verifies that the |prefer_own_symbols| option satisfies its guarantee that
+ // a loaded library will always prefer local symbol resolution before
diff --git a/www/chromium/files/patch-base_posix_can__lower__nice__to.cc b/www/chromium/files/patch-base_posix_can__lower__nice__to.cc
index 43b20c5e8988..67a5d35808ae 100644
--- a/www/chromium/files/patch-base_posix_can__lower__nice__to.cc
+++ b/www/chromium/files/patch-base_posix_can__lower__nice__to.cc
@@ -1,16 +1,16 @@
---- base/posix/can_lower_nice_to.cc.orig 2022-02-07 13:39:41 UTC
+--- base/posix/can_lower_nice_to.cc.orig 2022-02-28 16:54:41 UTC
+++ base/posix/can_lower_nice_to.cc
@@ -11,8 +11,12 @@
#include "build/build_config.h"
-+#if defined(OS_FREEBSD)
++#if BUILDFLAG(IS_FREEBSD)
+#include <sys/param.h>
+#endif
+
// Not defined on AIX by default.
--#if defined(OS_AIX)
-+#if defined(OS_AIX) || defined(OS_BSD)
+-#if BUILDFLAG(IS_AIX)
++#if BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD)
#if defined(RLIMIT_NICE)
#error Assumption about OS_AIX is incorrect
#endif
diff --git a/www/chromium/files/patch-base_posix_unix__domain__socket.cc b/www/chromium/files/patch-base_posix_unix__domain__socket.cc
index db441a342cef..9fac90a4accf 100644
--- a/www/chromium/files/patch-base_posix_unix__domain__socket.cc
+++ b/www/chromium/files/patch-base_posix_unix__domain__socket.cc
@@ -1,11 +1,11 @@
---- base/posix/unix_domain_socket.cc.orig 2022-02-07 13:39:41 UTC
+--- base/posix/unix_domain_socket.cc.orig 2022-02-28 16:54:41 UTC
+++ base/posix/unix_domain_socket.cc
@@ -50,7 +50,7 @@ bool CreateSocketPair(ScopedFD* one, ScopedFD* two) {
// static
bool UnixDomainSocket::EnableReceiveProcessId(int fd) {
--#if !defined(OS_APPLE)
-+#if !defined(OS_APPLE) && !defined(OS_BSD)
+-#if !BUILDFLAG(IS_APPLE)
++#if !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD)
const int enable = 1;
return setsockopt(fd, SOL_SOCKET, SO_PASSCRED, &enable, sizeof(enable)) == 0;
#else
@@ -13,8 +13,8 @@
const size_t kControlBufferSize =
CMSG_SPACE(sizeof(int) * kMaxFileDescriptors)
--#if !defined(OS_APPLE)
-+#if !defined(OS_APPLE) && !defined(OS_BSD)
+-#if !BUILDFLAG(IS_APPLE)
++#if !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD)
// macOS does not support ucred.
// macOS supports xucred, but this structure is insufficient.
+ CMSG_SPACE(sizeof(struct ucred))
@@ -22,8 +22,8 @@
wire_fds = reinterpret_cast<int*>(CMSG_DATA(cmsg));
wire_fds_len = payload_len / sizeof(int);
}
--#if !defined(OS_APPLE)
-+#if !defined(OS_APPLE) && !defined(OS_BSD)
+-#if !BUILDFLAG(IS_APPLE)
++#if !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD)
// macOS does not support SCM_CREDENTIALS.
if (cmsg->cmsg_level == SOL_SOCKET &&
cmsg->cmsg_type == SCM_CREDENTIALS) {
@@ -31,7 +31,7 @@
socklen_t pid_size = sizeof(pid);
if (getsockopt(fd, SOL_LOCAL, LOCAL_PEERPID, &pid, &pid_size) != 0)
pid = -1;
-+#elif defined(OS_BSD)
++#elif BUILDFLAG(IS_BSD)
+ NOTIMPLEMENTED();
+ pid = -1;
#else
diff --git a/www/chromium/files/patch-base_posix_unix__domain__socket__unittest.cc b/www/chromium/files/patch-base_posix_unix__domain__socket__unittest.cc
new file mode 100644
index 000000000000..b2744d4abb50
--- /dev/null
+++ b/www/chromium/files/patch-base_posix_unix__domain__socket__unittest.cc
@@ -0,0 +1,11 @@
+--- base/posix/unix_domain_socket_unittest.cc.orig 2022-02-28 16:54:41 UTC
++++ base/posix/unix_domain_socket_unittest.cc
+@@ -10,6 +10,8 @@
+ #include <sys/types.h>
+ #include <unistd.h>
+
++#include <signal.h>
++
+ #include "base/bind.h"
+ #include "base/callback_helpers.h"
+ #include "base/files/file_util.h"
diff --git a/www/chromium/files/patch-base_process_kill.h b/www/chromium/files/patch-base_process_kill.h
index d74a364d078e..df8eb9fb5f9c 100644
--- a/www/chromium/files/patch-base_process_kill.h
+++ b/www/chromium/files/patch-base_process_kill.h
@@ -1,11 +1,11 @@
---- base/process/kill.h.orig 2022-02-07 13:39:41 UTC
+--- base/process/kill.h.orig 2022-02-28 16:54:41 UTC
+++ base/process/kill.h
@@ -112,7 +112,7 @@ BASE_EXPORT TerminationStatus GetTerminationStatus(Pro
BASE_EXPORT TerminationStatus GetKnownDeadTerminationStatus(
ProcessHandle handle, int* exit_code);
--#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
// Spawns a thread to wait asynchronously for the child |process| to exit
// and then reaps it.
BASE_EXPORT void EnsureProcessGetsReaped(Process process);
diff --git a/www/chromium/files/patch-base_process_kill__posix.cc b/www/chromium/files/patch-base_process_kill__posix.cc
index 1fc27331b044..f2229616fa15 100644
--- a/www/chromium/files/patch-base_process_kill__posix.cc
+++ b/www/chromium/files/patch-base_process_kill__posix.cc
@@ -1,11 +1,11 @@
---- base/process/kill_posix.cc.orig 2022-02-07 13:39:41 UTC
+--- base/process/kill_posix.cc.orig 2022-02-28 16:54:41 UTC
+++ base/process/kill_posix.cc
@@ -159,7 +159,7 @@ void EnsureProcessTerminated(Process process) {
0, new BackgroundReaper(std::move(process), Seconds(2)));
}
--#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
void EnsureProcessGetsReaped(Process process) {
DCHECK(!process.is_current());
diff --git a/www/chromium/files/patch-base_process_launch.h b/www/chromium/files/patch-base_process_launch.h
index 0fe8b6553511..61716eeeb3f4 100644
--- a/www/chromium/files/patch-base_process_launch.h
+++ b/www/chromium/files/patch-base_process_launch.h
@@ -1,11 +1,11 @@
---- base/process/launch.h.orig 2022-02-07 13:39:41 UTC
+--- base/process/launch.h.orig 2022-02-28 16:54:41 UTC
+++ base/process/launch.h
-@@ -192,7 +192,7 @@ struct BASE_EXPORT LaunchOptions {
+@@ -195,7 +195,7 @@ struct BASE_EXPORT LaunchOptions {
bool clear_environment = false;
- #endif // OS_WIN || OS_POSIX || OS_FUCHSIA
+ #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA)
--#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
// If non-zero, start the process using clone(), using flags as provided.
// Unlike in clone, clone_flags may not contain a custom termination signal
// that is sent to the parent when the child dies. The termination signal will
diff --git a/www/chromium/files/patch-base_process_memory.cc b/www/chromium/files/patch-base_process_memory.cc
index 67b524cc8e85..13cd43d79b6c 100644
--- a/www/chromium/files/patch-base_process_memory.cc
+++ b/www/chromium/files/patch-base_process_memory.cc
@@ -1,10 +1,10 @@
---- base/process/memory.cc.orig 2022-02-07 13:39:41 UTC
+--- base/process/memory.cc.orig 2022-02-28 16:54:41 UTC
+++ base/process/memory.cc
-@@ -63,14 +63,16 @@ NOINLINE void OnNoMemoryInternal(size_t size) {
+@@ -65,14 +65,16 @@ NOINLINE void OnNoMemoryInternal(size_t size) {
} // namespace internal
-+#if !defined(OS_BSD)
++#if !BUILDFLAG(IS_BSD)
void TerminateBecauseOutOfMemory(size_t size) {
internal::OnNoMemoryInternal(size);
}
@@ -13,8 +13,8 @@
// Defined in memory_mac.mm for macOS + use_allocator="none". In case of
// USE_PARTITION_ALLOC_AS_MALLOC, no need to route the call to the system
// default calloc of macOS.
--#if !defined(OS_APPLE) || BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC)
-+#if (!defined(OS_APPLE) && !defined(OS_BSD)) || BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC)
+-#if !BUILDFLAG(IS_APPLE) || BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC)
++#if (!BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD)) || BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC)
bool UncheckedCalloc(size_t num_items, size_t size, void** result) {
const size_t alloc_size = num_items * size;
diff --git a/www/chromium/files/patch-base_process_process__handle.cc b/www/chromium/files/patch-base_process_process__handle.cc
index 781e7bafa948..efb95e7c3b54 100644
--- a/www/chromium/files/patch-base_process_process__handle.cc
+++ b/www/chromium/files/patch-base_process_process__handle.cc
@@ -1,11 +1,11 @@
---- base/process/process_handle.cc.orig 2021-04-14 18:40:48 UTC
+--- base/process/process_handle.cc.orig 2022-02-28 16:54:41 UTC
+++ base/process/process_handle.cc
@@ -30,7 +30,7 @@ UniqueProcId GetUniqueIdForProcess() {
: UniqueProcId(GetCurrentProcId());
}
--#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_AIX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD)
void InitUniqueIdForProcessInPidNamespace(ProcessId pid_outside_of_namespace) {
DCHECK(pid_outside_of_namespace != kNullProcessId);
diff --git a/www/chromium/files/patch-base_process_process__handle.h b/www/chromium/files/patch-base_process_process__handle.h
index 1708776734a2..5e25e86d099c 100644
--- a/www/chromium/files/patch-base_process_process__handle.h
+++ b/www/chromium/files/patch-base_process_process__handle.h
@@ -1,11 +1,11 @@
---- base/process/process_handle.h.orig 2021-07-19 18:45:05 UTC
+--- base/process/process_handle.h.orig 2022-02-28 16:54:41 UTC
+++ base/process/process_handle.h
@@ -106,7 +106,7 @@ BASE_EXPORT ProcessId GetCurrentProcId();
// processes may be reused.
BASE_EXPORT UniqueProcId GetUniqueIdForProcess();
--#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
// When a process is started in a different PID namespace from the browser
// process, this function must be called with the process's PID in the browser's
// PID namespace in order to initialize its unique ID. Not thread safe.
diff --git a/www/chromium/files/patch-base_process_process__metrics.cc b/www/chromium/files/patch-base_process_process__metrics.cc
index aff587d7cf98..a20644fcc0a1 100644
--- a/www/chromium/files/patch-base_process_process__metrics.cc
+++ b/www/chromium/files/patch-base_process_process__metrics.cc
@@ -1,11 +1,11 @@
---- base/process/process_metrics.cc.orig 2022-02-07 13:39:41 UTC
+--- base/process/process_metrics.cc.orig 2022-02-28 16:54:41 UTC
+++ base/process/process_metrics.cc
@@ -18,7 +18,7 @@ namespace base {
namespace {
- #if defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \
-- defined(OS_AIX)
-+ defined(OS_AIX) || defined(OS_BSD)
+ #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
+- BUILDFLAG(IS_AIX)
++ BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD)
int CalculateEventsPerSecond(uint64_t event_count,
uint64_t* last_event_count,
base::TimeTicks* last_calculated) {
@@ -13,8 +13,8 @@
SystemMetrics system_metrics;
system_metrics.committed_memory_ = GetSystemCommitCharge();
--#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
GetSystemMemoryInfo(&system_metrics.memory_info_);
GetVmStatInfo(&system_metrics.vmstat_info_);
GetSystemDiskInfo(&system_metrics.disk_info_);
@@ -22,17 +22,17 @@
Value res(Value::Type::DICTIONARY);
res.SetIntKey("committed_memory", static_cast<int>(committed_memory_));
--#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
Value meminfo = memory_info_.ToValue();
Value vmstat = vmstat_info_.ToValue();
meminfo.MergeDictionary(&vmstat);
@@ -126,7 +126,7 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage(
#endif
- #if defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \
-- defined(OS_AIX)
-+ defined(OS_AIX) || defined(OS_BSD)
+ #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
+- BUILDFLAG(IS_AIX)
++ BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD)
int ProcessMetrics::CalculateIdleWakeupsPerSecond(
uint64_t absolute_idle_wakeups) {
return CalculateEventsPerSecond(absolute_idle_wakeups,
diff --git a/www/chromium/files/patch-base_process_process__metrics.h b/www/chromium/files/patch-base_process_process__metrics.h
index d56de6d74153..940559196a29 100644
--- a/www/chromium/files/patch-base_process_process__metrics.h
+++ b/www/chromium/files/patch-base_process_process__metrics.h
@@ -1,20 +1,20 @@
---- base/process/process_metrics.h.orig 2022-02-07 13:39:41 UTC
+--- base/process/process_metrics.h.orig 2022-02-28 16:54:41 UTC
+++ base/process/process_metrics.h
-@@ -37,7 +37,7 @@
+@@ -36,7 +36,7 @@
#endif
- #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \
-- defined(OS_AIX)
-+ defined(OS_AIX) || defined(OS_BSD)
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
+- BUILDFLAG(IS_AIX)
++ BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD)
#include <string>
#include <utility>
#include <vector>
-@@ -53,7 +53,7 @@ class Value;
+@@ -52,7 +52,7 @@ class Value;
// Full declaration is in process_metrics_iocounters.h.
struct IoCounters;
--#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
// Minor and major page fault counts since the process creation.
// Both counts are process-wide, and exclude child processes.
//
@@ -22,98 +22,98 @@
// convenience wrapper for CreateProcessMetrics().
static std::unique_ptr<ProcessMetrics> CreateCurrentProcessMetrics();
--#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
// Resident Set Size is a Linux/Android specific memory concept. Do not
// attempt to extend this to other platforms.
BASE_EXPORT size_t GetResidentSetSize() const;
@@ -134,7 +134,7 @@ class BASE_EXPORT ProcessMetrics {
- TimeDelta GetCumulativeCPUUsage() WARN_UNUSED_RESULT;
+ [[nodiscard]] TimeDelta GetCumulativeCPUUsage();
- #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \
-- defined(OS_AIX)
-+ defined(OS_AIX) || defined(OS_BSD)
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
+- BUILDFLAG(IS_AIX)
++ BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD)
// Emits the cumulative CPU usage for all currently active threads since they
// were started into the output parameter (replacing its current contents).
// Threads that have already terminated will not be reported. Thus, the sum of
@@ -217,7 +217,7 @@ class BASE_EXPORT ProcessMetrics {
int GetOpenFdSoftLimit() const;
- #endif // defined(OS_POSIX)
+ #endif // BUILDFLAG(IS_POSIX)
--#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
// Bytes of swap as reported by /proc/[pid]/status.
uint64_t GetVmSwapBytes() const;
-@@ -237,7 +237,7 @@ class BASE_EXPORT ProcessMetrics {
- #endif // !defined(OS_MAC)
+@@ -238,7 +238,7 @@ class BASE_EXPORT ProcessMetrics {
+ #endif // !BUILDFLAG(IS_MAC)
- #if defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \
-- defined(OS_AIX)
-+ defined(OS_AIX) || defined(OS_BSD)
+ #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
+- BUILDFLAG(IS_AIX)
++ BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD)
int CalculateIdleWakeupsPerSecond(uint64_t absolute_idle_wakeups);
#endif
- #if defined(OS_APPLE)
-@@ -248,7 +248,7 @@ class BASE_EXPORT ProcessMetrics {
+ #if BUILDFLAG(IS_APPLE)
+@@ -249,7 +249,7 @@ class BASE_EXPORT ProcessMetrics {
#endif
- #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \
-- defined(OS_AIX)
-+ defined(OS_AIX) || defined(OS_BSD)
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
+- BUILDFLAG(IS_AIX)
++ BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD)
CPU::CoreType GetCoreType(int core_index);
- #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) ||
- // defined(OS_AIX)
-@@ -273,7 +273,7 @@ class BASE_EXPORT ProcessMetrics {
+ #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;
- #if defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \
-- defined(OS_AIX)
-+ defined(OS_AIX) || defined(OS_BSD)
+ #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
+- BUILDFLAG(IS_AIX)
++ BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD)
// Same thing for idle wakeups.
TimeTicks last_idle_wakeups_time_;
uint64_t last_absolute_idle_wakeups_;
-@@ -316,7 +316,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_de
+@@ -317,7 +317,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_de
- #if defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || \
- defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_AIX) || \
-- defined(OS_FUCHSIA)
-+ defined(OS_FUCHSIA) || defined(OS_BSD)
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_AIX) || \
+- BUILDFLAG(IS_FUCHSIA)
++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
// Data about system-wide memory consumption. Values are in KB. Available on
// Windows, Mac, Linux, Android and Chrome OS.
//
-@@ -351,7 +351,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
+@@ -352,7 +352,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
#endif
- #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \
-- defined(OS_AIX)
-+ defined(OS_AIX) || defined(OS_BSD)
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
+- BUILDFLAG(IS_AIX)
++ BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD)
// This provides an estimate of available memory as described here:
// https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=34e431b0ae398fc54ea69ff85ec700722c9da773
// NOTE: this is ONLY valid in kernels 3.14 and up. Its value will always
-@@ -366,7 +366,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
+@@ -367,7 +367,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
#endif
- #if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \
-- defined(OS_AIX) || defined(OS_FUCHSIA)
-+ defined(OS_AIX) || defined(OS_FUCHSIA) || defined(OS_BSD)
+ #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
+- BUILDFLAG(IS_AIX) || BUILDFLAG(IS_FUCHSIA)
++ BUILDFLAG(IS_AIX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
int buffers = 0;
int cached = 0;
int active_anon = 0;
-@@ -403,7 +403,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK
- // defined(OS_FUCHSIA)
+@@ -404,7 +404,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK
+ // BUILDFLAG(IS_FUCHSIA)
- #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \
-- defined(OS_AIX)
-+ defined(OS_AIX) || defined(OS_BSD)
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
+- BUILDFLAG(IS_AIX)
++ BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD)
// Parse the data found in /proc/<pid>/stat and return the sum of the
// CPU-related ticks. Returns -1 on parse error.
// Exposed for testing.
-@@ -590,7 +590,7 @@ class BASE_EXPORT SystemMetrics {
+@@ -591,7 +591,7 @@ class BASE_EXPORT SystemMetrics {
FRIEND_TEST_ALL_PREFIXES(SystemMetricsTest, SystemMetrics);
size_t committed_memory_;
--#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
SystemMemoryInfoKB memory_info_;
VmStatInfo vmstat_info_;
SystemDiskInfo disk_info_;
diff --git a/www/chromium/files/patch-base_process_process__metrics__posix.cc b/www/chromium/files/patch-base_process_process__metrics__posix.cc
index 9e3e19fc7abb..e51334a26d54 100644
--- a/www/chromium/files/patch-base_process_process__metrics__posix.cc
+++ b/www/chromium/files/patch-base_process_process__metrics__posix.cc
@@ -1,20 +1,20 @@
---- base/process/process_metrics_posix.cc.orig 2022-02-07 13:39:41 UTC
+--- base/process/process_metrics_posix.cc.orig 2022-02-28 16:54:41 UTC
+++ base/process/process_metrics_posix.cc
@@ -20,6 +20,8 @@
- #if defined(OS_APPLE)
+ #if BUILDFLAG(IS_APPLE)
#include <malloc/malloc.h>
-+#elif defined(OS_OPENBSD)
++#elif BUILDFLAG(IS_OPENBSD)
+#include <stdlib.h>
#else
#include <malloc.h>
#endif
-@@ -136,7 +138,7 @@ size_t ProcessMetrics::GetMallocUsage() {
+@@ -133,7 +135,7 @@ size_t ProcessMetrics::GetMallocUsage() {
return stats.size_in_use;
- #elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+ #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
return GetMallocUsageMallinfo();
--#elif defined(OS_FUCHSIA)
-+#elif defined(OS_FUCHSIA) || defined(OS_BSD)
+-#elif BUILDFLAG(IS_FUCHSIA)
++#elif BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
// TODO(fuchsia): Not currently exposed. https://crbug.com/735087.
return 0;
#endif
diff --git a/www/chromium/files/patch-base_process_process__posix.cc b/www/chromium/files/patch-base_process_process__posix.cc
index b2245b1ea796..8a7b5721a4a7 100644
--- a/www/chromium/files/patch-base_process_process__posix.cc
+++ b/www/chromium/files/patch-base_process_process__posix.cc
@@ -1,6 +1,11 @@
---- base/process/process_posix.cc.orig 2022-02-07 13:39:41 UTC
+--- base/process/process_posix.cc.orig 2022-02-28 16:54:41 UTC
+++ base/process/process_posix.cc
-@@ -27,6 +27,11 @@
+@@ -23,10 +23,15 @@
+ #include "build/build_config.h"
+ #include "third_party/abseil-cpp/absl/types/optional.h"
+
+-#if BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
#include <sys/event.h>
#endif
@@ -12,6 +17,24 @@
#if BUILDFLAG(CLANG_PROFILING)
#include "base/test/clang_profiling.h"
#endif
+@@ -95,7 +100,7 @@ bool WaitpidWithTimeout(base::ProcessHandle handle,
+ return ret_pid > 0;
+ }
+
+-#if BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+ // Using kqueue on Mac so that we can wait on non-child processes.
+ // We can't use kqueues on child processes because we need to reap
+ // our own children using wait.
+@@ -200,7 +205,7 @@ bool WaitForExitWithTimeoutImpl(base::ProcessHandle ha
+ const bool exited = (parent_pid < 0);
+
+ if (!exited && parent_pid != our_pid) {
+-#if BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+ // On Mac we can wait on non child processes.
+ return WaitForSingleNonChildProcess(handle, timeout);
+ #else
@@ -358,7 +363,55 @@ void Process::Exited(int exit_code) const {}
int Process::GetPriority() const {
diff --git a/www/chromium/files/patch-base_process_process__unittest.cc b/www/chromium/files/patch-base_process_process__unittest.cc
new file mode 100644
index 000000000000..0b87a05680b7
--- /dev/null
+++ b/www/chromium/files/patch-base_process_process__unittest.cc
@@ -0,0 +1,11 @@
+--- base/process/process_unittest.cc.orig 2022-02-28 16:54:41 UTC
++++ base/process/process_unittest.cc
+@@ -140,7 +140,7 @@ TEST_F(ProcessTest, CreationTimeOtherProcess) {
+ // was spawned and a time recorded after it was spawned. However, since the
+ // base::Time and process creation clocks don't match, tolerate some error.
+ constexpr base::TimeDelta kTolerance =
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ // On Linux, process creation time is relative to boot time which has a
+ // 1-second resolution. Tolerate 1 second for the imprecise boot time and
+ // 100 ms for the imprecise clock.
diff --git a/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
new file mode 100644
index 000000000000..3fd7776ba195
--- /dev/null
+++ b/www/chromium/files/patch-base_profiler_stack__sampling__profiler__test__util.cc
@@ -0,0 +1,11 @@
+--- base/profiler/stack_sampling_profiler_test_util.cc.orig 2022-02-28 16:54:41 UTC
++++ base/profiler/stack_sampling_profiler_test_util.cc
+@@ -32,7 +32,7 @@
+ // Fortunately, it provides _alloca, which functions identically.
+ #include <malloc.h>
+ #define alloca _alloca
+-#else
++#elif !BUILDFLAG(IS_BSD)
+ #include <alloca.h>
+ #endif
+
diff --git a/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc b/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc
new file mode 100644
index 000000000000..d739c9137c77
--- /dev/null
+++ b/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc
@@ -0,0 +1,11 @@
+--- base/profiler/stack_sampling_profiler_unittest.cc.orig 2022-02-28 16:54:41 UTC
++++ base/profiler/stack_sampling_profiler_unittest.cc
+@@ -41,7 +41,7 @@
+ #include <intrin.h>
+ #include <malloc.h>
+ #include <windows.h>
+-#else
++#elif !BUILDFLAG(IS_BSD)
+ #include <alloca.h>
+ #endif
+
diff --git a/www/chromium/files/patch-base_rand__util.h b/www/chromium/files/patch-base_rand__util.h
index 1b379c09a366..7afa38819627 100644
--- a/www/chromium/files/patch-base_rand__util.h
+++ b/www/chromium/files/patch-base_rand__util.h
@@ -1,11 +1,11 @@
---- base/rand_util.h.orig 2022-02-07 13:39:41 UTC
+--- base/rand_util.h.orig 2022-02-28 16:54:41 UTC
+++ base/rand_util.h
@@ -77,7 +77,7 @@ void RandomShuffle(Itr first, Itr last) {
std::shuffle(first, last, RandomBitGenerator());
}
--#if defined(OS_POSIX)
-+#if defined(OS_POSIX) && !defined(OS_OPENBSD)
+-#if BUILDFLAG(IS_POSIX)
++#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_OPENBSD)
BASE_EXPORT int GetUrandomFD();
#endif
diff --git a/www/chromium/files/patch-base_rand__util__posix.cc b/www/chromium/files/patch-base_rand__util__posix.cc
index 0d7503d62921..5e00097c8aa2 100644
--- a/www/chromium/files/patch-base_rand__util__posix.cc
+++ b/www/chromium/files/patch-base_rand__util__posix.cc
@@ -1,19 +1,19 @@
---- base/rand_util_posix.cc.orig 2022-02-07 13:39:41 UTC
+--- base/rand_util_posix.cc.orig 2022-02-28 16:54:41 UTC
+++ base/rand_util_posix.cc
@@ -17,7 +17,7 @@
#include "base/posix/eintr_wrapper.h"
#include "build/build_config.h"
--#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && !defined(OS_NACL)
-+#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && !defined(OS_NACL) && !defined(OS_BSD)
+-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_NACL)
++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD)
#include "third_party/lss/linux_syscall_support.h"
- #elif defined(OS_MAC)
+ #elif BUILDFLAG(IS_MAC)
// TODO(crbug.com/995996): Waiting for this header to appear in the iOS SDK.
@@ -34,6 +34,7 @@ static constexpr int kOpenFlags = O_RDONLY;
static constexpr int kOpenFlags = O_RDONLY | O_CLOEXEC;
#endif
-+#if !defined(OS_OPENBSD)
++#if !BUILDFLAG(IS_OPENBSD)
// We keep the file descriptor for /dev/urandom around so we don't need to
// reopen it (which is expensive), and since we may not even be able to reopen
// it if we are later put in a sandbox. This class wraps the file descriptor so
@@ -29,8 +29,8 @@
// (https://chromium-review.googlesource.com/c/chromium/src/+/1545096) and land
// it or some form of it.
void RandBytes(void* output, size_t output_length) {
-+#if !defined(OS_OPENBSD)
- #if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && !defined(OS_NACL)
++#if !BUILDFLAG(IS_OPENBSD)
+ #if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_NACL)
// We have to call `getrandom` via Linux Syscall Support, rather than through
// the libc wrapper, because we might not have an up-to-date libc (e.g. on
@@ -93,11 +96,16 @@ void RandBytes(void* output, size_t output_length) {
@@ -42,7 +42,7 @@
+#endif
}
-+#if !defined(OS_OPENBSD)
++#if !BUILDFLAG(IS_OPENBSD)
int GetUrandomFD() {
static NoDestructor<URandomFd> urandom_fd;
return urandom_fd->fd();
diff --git a/www/chromium/files/patch-base_strings_safe__sprintf__unittest.cc b/www/chromium/files/patch-base_strings_safe__sprintf__unittest.cc
new file mode 100644
index 000000000000..f4353c3b265d
--- /dev/null
+++ b/www/chromium/files/patch-base_strings_safe__sprintf__unittest.cc
@@ -0,0 +1,18 @@
+--- base/strings/safe_sprintf_unittest.cc.orig 2022-02-28 16:54:41 UTC
++++ base/strings/safe_sprintf_unittest.cc
+@@ -731,6 +731,7 @@ TEST(SafeSPrintfTest, EmbeddedNul) {
+ #endif
+ }
+
++#if !BUILDFLAG(IS_BSD)
+ TEST(SafeSPrintfTest, EmitNULL) {
+ char buf[40];
+ #if defined(__GNUC__)
+@@ -747,6 +748,7 @@ TEST(SafeSPrintfTest, EmitNULL) {
+ #pragma GCC diagnostic pop
+ #endif
+ }
++#endif
+
+ TEST(SafeSPrintfTest, PointerSize) {
+ // The internal data representation is a 64bit value, independent of the
diff --git a/www/chromium/files/patch-base_strings_string__util.cc b/www/chromium/files/patch-base_strings_string__util.cc
deleted file mode 100644
index 1003ec60edef..000000000000
--- a/www/chromium/files/patch-base_strings_string__util.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- base/strings/string_util.cc.orig 2022-02-07 13:39:41 UTC
-+++ base/strings/string_util.cc
-@@ -36,7 +36,7 @@ namespace base {
- bool IsWprintfFormatPortable(const wchar_t* format) {
- // This snippet of code checks that we can build C++17 code.
- // TODO(thakis): Enable this on all platforms, and then remove it again.
--#if !defined(OS_LINUX) && !BUILDFLAG(CFI_ICALL_CHECK) && \
-+#if !defined(OS_LINUX) && !defined(OS_BSD) && !BUILDFLAG(CFI_ICALL_CHECK) && \
- !BUILDFLAG(CFI_CAST_CHECK)
- if constexpr (constexpr int i = 0; i > 0) {
- }
diff --git a/www/chromium/files/patch-base_synchronization_lock__impl.h b/www/chromium/files/patch-base_synchronization_lock__impl.h
index 5e7c175fb687..f9f875ee3934 100644
--- a/www/chromium/files/patch-base_synchronization_lock__impl.h
+++ b/www/chromium/files/patch-base_synchronization_lock__impl.h
@@ -1,10 +1,10 @@
---- base/synchronization/lock_impl.h.orig 2022-02-07 13:39:41 UTC
+--- base/synchronization/lock_impl.h.orig 2022-02-28 16:54:41 UTC
+++ base/synchronization/lock_impl.h
@@ -107,6 +107,10 @@ void LockImpl::Unlock() {
}
- #elif defined(OS_POSIX) || defined(OS_FUCHSIA)
-+#if defined(OS_FREEBSD)
+ #elif BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA)
++#if BUILDFLAG(IS_FREEBSD)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wthread-safety-analysis"
+#endif
@@ -15,7 +15,7 @@
int rv = pthread_mutex_unlock(&native_handle_);
DCHECK_EQ(rv, 0) << ". " << strerror(rv);
}
-+#if defined(OS_FREEBSD)
++#if BUILDFLAG(IS_FREEBSD)
+#pragma GCC diagnostic pop
+#endif
#endif
diff --git a/www/chromium/files/patch-base_syslog__logging.cc b/www/chromium/files/patch-base_syslog__logging.cc
index 9c9bf076d52b..5c1921e82d4a 100644
--- a/www/chromium/files/patch-base_syslog__logging.cc
+++ b/www/chromium/files/patch-base_syslog__logging.cc
@@ -1,20 +1,20 @@
---- base/syslog_logging.cc.orig 2021-12-31 00:57:18 UTC
+--- base/syslog_logging.cc.orig 2022-02-28 16:54:41 UTC
+++ base/syslog_logging.cc
-@@ -13,7 +13,7 @@
+@@ -15,7 +15,7 @@
#include "base/strings/string_util.h"
#include "base/win/scoped_handle.h"
#include "base/win/win_util.h"
--#elif defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
// <syslog.h> defines LOG_INFO, LOG_WARNING macros that could conflict with
// base::LOG_INFO, base::LOG_WARNING.
#include <syslog.h>
-@@ -145,7 +145,7 @@ EventLogMessage::~EventLogMessage() {
+@@ -147,7 +147,7 @@ EventLogMessage::~EventLogMessage() {
if (user_sid != nullptr)
::LocalFree(user_sid);
--#elif defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
const char kEventSource[] = "chrome";
openlog(kEventSource, LOG_NOWAIT | LOG_PID, LOG_USER);
// We can't use the defined names for the logging severity from syslog.h
diff --git a/www/chromium/files/patch-base_system_sys__info.cc b/www/chromium/files/patch-base_system_sys__info.cc
index 66ca14e577d0..f991071fe48a 100644
--- a/www/chromium/files/patch-base_system_sys__info.cc
+++ b/www/chromium/files/patch-base_system_sys__info.cc
@@ -1,11 +1,11 @@
---- base/system/sys_info.cc.orig 2022-02-07 13:39:41 UTC
+--- base/system/sys_info.cc.orig 2022-02-28 16:54:41 UTC
+++ base/system/sys_info.cc
@@ -100,7 +100,7 @@ void SysInfo::GetHardwareInfo(base::OnceCallback<void(
- #if defined(OS_WIN) || defined(OS_ANDROID) || defined(OS_APPLE)
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_APPLE)
base::ThreadPool::PostTaskAndReplyWithResult(
FROM_HERE, {}, base::BindOnce(&GetHardwareInfoSync), std::move(callback));
--#elif defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
base::ThreadPool::PostTaskAndReplyWithResult(
FROM_HERE, {base::MayBlock()}, base::BindOnce(&GetHardwareInfoSync),
std::move(callback));
diff --git a/www/chromium/files/patch-base_system_sys__info.h b/www/chromium/files/patch-base_system_sys__info.h
index 4991e13686f3..0b5c5c8cefa4 100644
--- a/www/chromium/files/patch-base_system_sys__info.h
+++ b/www/chromium/files/patch-base_system_sys__info.h
@@ -1,4 +1,4 @@
---- base/system/sys_info.h.orig 2022-02-07 13:39:41 UTC
+--- base/system/sys_info.h.orig 2022-02-28 16:54:41 UTC
+++ base/system/sys_info.h
@@ -236,6 +236,8 @@ class BASE_EXPORT SysInfo {
// On Desktop this returns true when memory <= 2GB.
@@ -12,9 +12,9 @@
@@ -246,7 +248,7 @@ class BASE_EXPORT SysInfo {
static HardwareInfo GetHardwareInfoSync();
- #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \
-- defined(OS_AIX)
-+ defined(OS_AIX) || defined(OS_BSD)
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
+- BUILDFLAG(IS_AIX)
++ BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD)
static int64_t AmountOfAvailablePhysicalMemory(
const SystemMemoryInfoKB& meminfo);
#endif
diff --git a/www/chromium/files/patch-base_system_sys__info__unittest.cc b/www/chromium/files/patch-base_system_sys__info__unittest.cc
new file mode 100644
index 000000000000..590b817eaf49
--- /dev/null
+++ b/www/chromium/files/patch-base_system_sys__info__unittest.cc
@@ -0,0 +1,19 @@
+--- base/system/sys_info_unittest.cc.orig 2022-02-28 16:54:41 UTC
++++ base/system/sys_info_unittest.cc
+@@ -228,12 +228,15 @@ TEST_F(SysInfoTest, GetHardwareInfo) {
+ EXPECT_TRUE(IsStringUTF8(hardware_info->model));
+ bool empty_result_expected =
+ #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_WIN) || \
+- BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++ BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ false;
+ #else
+ true;
+ #endif
+ EXPECT_EQ(hardware_info->manufacturer.empty(), empty_result_expected);
++#if BUILDFLAG(IS_BSD)
++ empty_result_expected = true;
++#endif
+ EXPECT_EQ(hardware_info->model.empty(), empty_result_expected);
+ }
+
diff --git a/www/chromium/files/patch-base_task_thread__pool_environment__config__unittest.cc b/www/chromium/files/patch-base_task_thread__pool_environment__config__unittest.cc
new file mode 100644
index 000000000000..18a649f3ba84
--- /dev/null
+++ b/www/chromium/files/patch-base_task_thread__pool_environment__config__unittest.cc
@@ -0,0 +1,11 @@
+--- base/task/thread_pool/environment_config_unittest.cc.orig 2022-02-28 16:54:41 UTC
++++ base/task/thread_pool/environment_config_unittest.cc
+@@ -15,7 +15,7 @@ TEST(ThreadPoolEnvironmentConfig, CanUseBackgroundPrio
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE)
+ EXPECT_TRUE(CanUseBackgroundPriorityForWorkerThread());
+ #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \
+- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_NACL)
++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_NACL) || BUILDFLAG(IS_BSD)
+ EXPECT_FALSE(CanUseBackgroundPriorityForWorkerThread());
+ #else
+ #error Platform doesn't match any block
diff --git a/www/chromium/files/patch-base_test_launcher_test__launcher.cc b/www/chromium/files/patch-base_test_launcher_test__launcher.cc
index 9625a1f0bd0d..adf2c80b15ce 100644
--- a/www/chromium/files/patch-base_test_launcher_test__launcher.cc
+++ b/www/chromium/files/patch-base_test_launcher_test__launcher.cc
@@ -1,9 +1,9 @@
---- base/test/launcher/test_launcher.cc.orig 2022-02-07 13:39:41 UTC
+--- base/test/launcher/test_launcher.cc.orig 2022-02-28 16:54:41 UTC
+++ base/test/launcher/test_launcher.cc
@@ -63,6 +63,7 @@
#include "testing/gtest/include/gtest/gtest.h"
- #if defined(OS_POSIX)
+ #if BUILDFLAG(IS_POSIX)
+#include <signal.h>
#include <fcntl.h>
diff --git a/www/chromium/files/patch-base_test_test__file__util__linux.cc b/www/chromium/files/patch-base_test_test__file__util__linux.cc
index 137d156cf616..21b4b25775a0 100644
--- a/www/chromium/files/patch-base_test_test__file__util__linux.cc
+++ b/www/chromium/files/patch-base_test_test__file__util__linux.cc
@@ -1,6 +1,6 @@
---- base/test/test_file_util_linux.cc.orig 2022-02-07 13:39:41 UTC
+--- base/test/test_file_util_linux.cc.orig 2022-02-28 16:54:41 UTC
+++ base/test/test_file_util_linux.cc
-@@ -52,8 +52,10 @@ bool EvictFileFromSystemCache(const FilePath& file) {
+@@ -54,8 +54,10 @@ bool EvictFileFromSystemCache(const FilePath& file) {
return false;
if (fdatasync(fd.get()) != 0)
return false;
diff --git a/www/chromium/files/patch-base_test_test__file__util__posix.cc b/www/chromium/files/patch-base_test_test__file__util__posix.cc
new file mode 100644
index 000000000000..37c9bbbb70ec
--- /dev/null
+++ b/www/chromium/files/patch-base_test_test__file__util__posix.cc
@@ -0,0 +1,11 @@
+--- base/test/test_file_util_posix.cc.orig 2022-02-28 16:54:41 UTC
++++ base/test/test_file_util_posix.cc
+@@ -88,7 +88,7 @@ void SyncPageCacheToDisk() {
+ }
+
+ #if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_APPLE) && \
+- !BUILDFLAG(IS_ANDROID)
++ !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_BSD)
+ bool EvictFileFromSystemCache(const FilePath& file) {
+ // There doesn't seem to be a POSIX way to cool the disk cache.
+ NOTIMPLEMENTED();
diff --git a/www/chromium/files/patch-base_third__party_symbolize_symbolize.cc b/www/chromium/files/patch-base_third__party_symbolize_symbolize.cc
index c73aac47312a..774ea24cf00c 100644
--- a/www/chromium/files/patch-base_third__party_symbolize_symbolize.cc
+++ b/www/chromium/files/patch-base_third__party_symbolize_symbolize.cc
@@ -1,10 +1,10 @@
---- base/third_party/symbolize/symbolize.cc.orig 2022-02-07 13:39:41 UTC
+--- base/third_party/symbolize/symbolize.cc.orig 2022-02-28 16:54:41 UTC
+++ base/third_party/symbolize/symbolize.cc
-@@ -113,7 +113,7 @@ _END_GOOGLE_NAMESPACE_
+@@ -114,7 +114,7 @@ _END_GOOGLE_NAMESPACE_
#if defined(HAVE_DLFCN_H)
#include <dlfcn.h>
#endif
--#if defined(OS_OPENBSD)
+-#if BUILDFLAG(IS_OPENBSD)
+#if defined(__OpenBSD__)
#include <sys/exec_elf.h>
#else
diff --git a/www/chromium/files/patch-base_threading_platform__thread.h b/www/chromium/files/patch-base_threading_platform__thread.h
index b1b6cf3f78e9..fcbe67b6616c 100644
--- a/www/chromium/files/patch-base_threading_platform__thread.h
+++ b/www/chromium/files/patch-base_threading_platform__thread.h
@@ -1,11 +1,11 @@
---- base/threading/platform_thread.h.orig 2022-02-07 13:39:41 UTC
+--- base/threading/platform_thread.h.orig 2022-02-28 16:54:41 UTC
+++ base/threading/platform_thread.h
-@@ -243,7 +243,7 @@ class BASE_EXPORT PlatformThread {
+@@ -205,7 +205,7 @@ class BASE_EXPORT PlatformThread {
// Returns a realtime period provided by `delegate`.
static TimeDelta GetRealtimePeriod(Delegate* delegate);
--#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
// Toggles a specific thread's priority at runtime. This can be used to
// change the priority of a thread in a different process and will fail
// if the calling process does not have proper permissions. The
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 fcd82b84be44..a63f03e00a9e 100644
--- a/www/chromium/files/patch-base_threading_platform__thread__linux.cc
+++ b/www/chromium/files/patch-base_threading_platform__thread__linux.cc
@@ -1,21 +1,21 @@
---- base/threading/platform_thread_linux.cc.orig 2022-02-07 13:39:41 UTC
+--- base/threading/platform_thread_linux.cc.orig 2022-02-28 16:54:41 UTC
+++ base/threading/platform_thread_linux.cc
@@ -29,7 +29,9 @@
- #if !defined(OS_NACL) && !defined(OS_AIX)
+ #if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_AIX)
#include <pthread.h>
-+#if !defined(OS_BSD)
++#if !BUILDFLAG(IS_BSD)
#include <sys/prctl.h>
+#endif
#include <sys/resource.h>
#include <sys/time.h>
#include <sys/types.h>
@@ -132,7 +134,7 @@ int sched_setattr(pid_t pid,
- #endif // !defined(OS_NACL) && !defined(OS_AIX)
+ #endif // !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_AIX)
#endif // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
--#if !defined(OS_NACL)
-+#if !defined(OS_NACL) && !defined(OS_BSD)
+-#if !BUILDFLAG(IS_NACL)
++#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD)
const FilePath::CharType kCgroupDirectory[] =
FILE_PATH_LITERAL("/sys/fs/cgroup");
@@ -23,8 +23,8 @@
namespace internal {
namespace {
--#if !defined(OS_NACL)
-+#if !defined(OS_NACL) && !defined(OS_BSD)
+-#if !BUILDFLAG(IS_NACL)
++#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD)
const struct sched_param kRealTimePrio = {8};
#endif
} // namespace
@@ -32,8 +32,8 @@
};
bool CanSetThreadPriorityToRealtimeAudio() {
--#if !defined(OS_NACL)
-+#if !defined(OS_NACL) && !defined(OS_BSD)
+-#if !BUILDFLAG(IS_NACL)
++#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD)
// A non-zero soft-limit on RLIMIT_RTPRIO is required to be allowed to invoke
// pthread_setschedparam in SetCurrentThreadPriorityForPlatform().
struct rlimit rlim;
@@ -41,8 +41,8 @@
}
bool SetCurrentThreadPriorityForPlatform(ThreadPriority priority) {
--#if !defined(OS_NACL)
-+#if !defined(OS_NACL) && !defined(OS_BSD)
+-#if !BUILDFLAG(IS_NACL)
++#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD)
// For legacy schedtune interface
SetThreadCgroupsForThreadPriority(PlatformThread::CurrentId(), priority);
@@ -50,8 +50,8 @@
}
absl::optional<ThreadPriority> GetCurrentThreadPriorityForPlatform() {
--#if !defined(OS_NACL)
-+#if !defined(OS_NACL) && !defined(OS_BSD)
+-#if !BUILDFLAG(IS_NACL)
++#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD)
int maybe_sched_rr = 0;
struct sched_param maybe_realtime_prio = {0};
if (pthread_getschedparam(pthread_self(), &maybe_sched_rr,
@@ -59,8 +59,8 @@
void PlatformThread::SetName(const std::string& name) {
ThreadIdNameManager::GetInstance()->SetName(name);
--#if !defined(OS_NACL) && !defined(OS_AIX)
-+#if !defined(OS_NACL) && !defined(OS_AIX) && !defined(OS_BSD)
+-#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_AIX)
++#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_AIX) && !BUILDFLAG(IS_BSD)
// 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
@@ -68,7 +68,7 @@
// priority.
CHECK_NE(thread_id, process_id);
-+#if !defined(OS_BSD)
++#if !BUILDFLAG(IS_BSD)
// For legacy schedtune interface
SetThreadCgroupsForThreadPriority(thread_id, priority);
+#endif
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 071a25201e45..3eda63205158 100644
--- a/www/chromium/files/patch-base_threading_platform__thread__posix.cc
+++ b/www/chromium/files/patch-base_threading_platform__thread__posix.cc
@@ -1,21 +1,21 @@
---- base/threading/platform_thread_posix.cc.orig 2022-02-07 13:39:41 UTC
+--- base/threading/platform_thread_posix.cc.orig 2022-02-28 16:54:41 UTC
+++ base/threading/platform_thread_posix.cc
-@@ -74,7 +74,7 @@ void* ThreadFunc(void* params) {
+@@ -75,7 +75,7 @@ void* ThreadFunc(void* params) {
if (!thread_params->joinable)
base::DisallowSingleton();
--#if !defined(OS_NACL)
-+#if !defined(OS_NACL) && !defined(OS_BSD)
+-#if !BUILDFLAG(IS_NACL)
++#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD)
#if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC)
internal::PCScan::NotifyThreadCreated(internal::GetStackPointer());
#endif
-@@ -333,6 +333,9 @@ bool PlatformThread::CanChangeThreadPriority(ThreadPri
+@@ -362,6 +362,9 @@ bool PlatformThread::CanChangeThreadPriority(ThreadPri
// static
void PlatformThread::SetCurrentThreadPriorityImpl(ThreadPriority priority) {
- #if defined(OS_NACL)
+ #if BUILDFLAG(IS_NACL)
+ NOTIMPLEMENTED();
+// avoid pledge(2) violation
-+#elif defined(OS_BSD)
++#elif BUILDFLAG(IS_BSD)
NOTIMPLEMENTED();
#else
if (internal::SetCurrentThreadPriorityForPlatform(priority))
diff --git a/www/chromium/files/patch-base_threading_platform__thread__unittest.cc b/www/chromium/files/patch-base_threading_platform__thread__unittest.cc
new file mode 100644
index 000000000000..ddb1bc00ca9f
--- /dev/null
+++ b/www/chromium/files/patch-base_threading_platform__thread__unittest.cc
@@ -0,0 +1,47 @@
+--- base/threading/platform_thread_unittest.cc.orig 2022-02-28 16:54:41 UTC
++++ base/threading/platform_thread_unittest.cc
+@@ -30,7 +30,7 @@
+ #include "base/time/time.h"
+ #endif
+
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ #include <pthread.h>
+ #include <sys/syscall.h>
+ #include <sys/types.h>
+@@ -319,7 +319,7 @@ TEST(PlatformThreadTest,
+ // and hardcodes what we know. Please inform scheduler-dev@chromium.org if this
+ // proprerty changes for a given platform.
+ TEST(PlatformThreadTest, CanChangeThreadPriority) {
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ // On Ubuntu, RLIMIT_NICE and RLIMIT_RTPRIO are 0 by default, so we won't be
+ // able to increase priority to any level.
+ constexpr bool kCanIncreasePriority = false;
+@@ -417,7 +417,7 @@ TEST(PlatformThreadTest, SetHugeThreadName) {
+ TEST(PlatformThreadTest, GetDefaultThreadStackSize) {
+ size_t stack_size = PlatformThread::GetDefaultThreadStackSize();
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_FUCHSIA) || \
+- ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \
++ ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && \
+ !defined(THREAD_SANITIZER)) || \
+ (BUILDFLAG(IS_ANDROID) && !defined(ADDRESS_SANITIZER))
+ EXPECT_EQ(0u, stack_size);
+@@ -578,12 +578,16 @@ INSTANTIATE_TEST_SUITE_P(
+
+ #endif // BUILDFLAG(IS_APPLE)
+
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+
+ namespace {
+
+ bool IsTidCacheCorrect() {
++#if BUILDFLAG(IS_BSD)
++ return PlatformThread::CurrentId() == reinterpret_cast<int64_t>(pthread_self());
++#else
+ return PlatformThread::CurrentId() == syscall(__NR_gettid);
++#endif
+ }
+
+ void* CheckTidCacheCorrectWrapper(void*) {
diff --git a/www/chromium/files/patch-base_threading_thread__local__storage__unittest.cc b/www/chromium/files/patch-base_threading_thread__local__storage__unittest.cc
new file mode 100644
index 000000000000..6ea93f8745fd
--- /dev/null
+++ b/www/chromium/files/patch-base_threading_thread__local__storage__unittest.cc
@@ -0,0 +1,11 @@
+--- base/threading/thread_local_storage_unittest.cc.orig 2022-02-28 16:54:41 UTC
++++ base/threading/thread_local_storage_unittest.cc
+@@ -90,7 +90,7 @@ class ThreadLocalStorageRunner : public DelegateSimple
+ void ThreadLocalStorageCleanup(void *value) {
+ int *ptr = reinterpret_cast<int*>(value);
+ // Destructors should never be called with a NULL.
+- ASSERT_NE(reinterpret_cast<int*>(NULL), ptr);
++ ASSERT_NE(NULL, ptr);
+ if (*ptr == kFinalTlsValue)
+ return; // We've been called enough times.
+ ASSERT_LT(kFinalTlsValue, *ptr);
diff --git a/www/chromium/files/patch-base_time_time.cc b/www/chromium/files/patch-base_time_time.cc
index b2f0f148e1a8..de90c9b11c34 100644
--- a/www/chromium/files/patch-base_time_time.cc
+++ b/www/chromium/files/patch-base_time_time.cc
@@ -1,11 +1,11 @@
---- base/time/time.cc.orig 2022-02-07 13:39:41 UTC
+--- base/time/time.cc.orig 2022-02-28 16:54:41 UTC
+++ base/time/time.cc
-@@ -4,7 +4,7 @@
+@@ -6,7 +6,7 @@
- #include "base/time/time.h"
+ #include "build/build_config.h"
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// time.h is a widely included header and its size impacts build time.
// Try not to raise this limit unless necessary. See
// https://chromium.googlesource.com/chromium/src/+/HEAD/docs/wmax_tokens.md
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 0ccf72a1fbf6..42b6b8e0f162 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,17 +1,17 @@
---- base/trace_event/malloc_dump_provider.cc.orig 2021-12-14 11:44:55 UTC
+--- base/trace_event/malloc_dump_provider.cc.orig 2022-02-28 16:54:41 UTC
+++ base/trace_event/malloc_dump_provider.cc
@@ -23,6 +23,8 @@
- #if defined(OS_APPLE)
+ #if BUILDFLAG(IS_APPLE)
#include <malloc/malloc.h>
+#elif defined(OS_BSD)
+#include <stdlib.h>
#else
#include <malloc.h>
#endif
-@@ -217,6 +219,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump
+@@ -220,6 +222,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump
&allocated_objects_count);
- #elif defined(OS_FUCHSIA)
+ #elif BUILDFLAG(IS_FUCHSIA)
// TODO(fuchsia): Port, see https://crbug.com/706592.
+#elif defined(OS_BSD)
+ total_virtual_size = 0;
diff --git a/www/chromium/files/patch-base_trace__event_process__memory__dump.cc b/www/chromium/files/patch-base_trace__event_process__memory__dump.cc
index dc76336b3bc7..d31975d16574 100644
--- a/www/chromium/files/patch-base_trace__event_process__memory__dump.cc
+++ b/www/chromium/files/patch-base_trace__event_process__memory__dump.cc
@@ -1,20 +1,20 @@
---- base/trace_event/process_memory_dump.cc.orig 2022-02-07 13:39:41 UTC
+--- base/trace_event/process_memory_dump.cc.orig 2022-02-28 16:54:41 UTC
+++ base/trace_event/process_memory_dump.cc
@@ -105,7 +105,7 @@ absl::optional<size_t> ProcessMemoryDump::CountResiden
- #if defined(OS_WIN)
+ #if BUILDFLAG(IS_WIN)
std::unique_ptr<PSAPI_WORKING_SET_EX_INFORMATION[]> vec(
new PSAPI_WORKING_SET_EX_INFORMATION[max_vec_size]);
--#elif defined(OS_APPLE)
-+#elif defined(OS_APPLE) || defined(OS_BSD)
+-#elif BUILDFLAG(IS_APPLE)
++#elif BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD)
std::unique_ptr<char[]> vec(new char[max_vec_size]);
- #elif defined(OS_POSIX) || defined(OS_FUCHSIA)
+ #elif BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA)
std::unique_ptr<unsigned char[]> vec(new unsigned char[max_vec_size]);
-@@ -127,7 +127,7 @@ absl::optional<size_t> ProcessMemoryDump::CountResiden
+@@ -130,7 +130,7 @@ absl::optional<size_t> ProcessMemoryDump::CountResiden
for (size_t i = 0; i < page_count; i++)
resident_page_count += vec[i].VirtualAttributes.Valid;
--#elif defined(OS_FUCHSIA)
-+#elif defined(OS_FUCHSIA) | defined(OS_BSD)
+-#elif BUILDFLAG(IS_FUCHSIA)
++#elif BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
// TODO(fuchsia): Port, see https://crbug.com/706592.
- ALLOW_UNUSED_LOCAL(chunk_start);
- ALLOW_UNUSED_LOCAL(page_count);
+ #elif BUILDFLAG(IS_APPLE)
+ // mincore in MAC does not fail with EAGAIN.
diff --git a/www/chromium/files/patch-base_tracing_trace__time.cc b/www/chromium/files/patch-base_tracing_trace__time.cc
index b391966234ab..36c6113518f4 100644
--- a/www/chromium/files/patch-base_tracing_trace__time.cc
+++ b/www/chromium/files/patch-base_tracing_trace__time.cc
@@ -1,10 +1,10 @@
---- base/tracing/trace_time.cc.orig 2022-02-07 13:39:41 UTC
+--- base/tracing/trace_time.cc.orig 2022-02-28 16:54:41 UTC
+++ base/tracing/trace_time.cc
@@ -8,13 +8,17 @@
#include "build/build_config.h"
#include "third_party/perfetto/include/perfetto/base/time.h"
-+#if defined(OS_FREEBSD)
++#if BUILDFLAG(IS_FREEBSD)
+#define CLOCK_BOOTTIME CLOCK_UPTIME
+#endif
+
@@ -13,9 +13,9 @@
int64_t TraceBootTicksNow() {
// On Windows and Mac, TRACE_TIME_TICKS_NOW() behaves like boottime already.
- #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \
-- defined(OS_FUCHSIA)
-+ defined(OS_FUCHSIA) || defined(OS_BSD)
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
+- BUILDFLAG(IS_FUCHSIA)
++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
struct timespec ts;
int res = clock_gettime(CLOCK_BOOTTIME, &ts);
if (res != -1)
diff --git a/www/chromium/files/patch-base_tracing_trace__time.h b/www/chromium/files/patch-base_tracing_trace__time.h
index 670469229ceb..0394e382ee6e 100644
--- a/www/chromium/files/patch-base_tracing_trace__time.h
+++ b/www/chromium/files/patch-base_tracing_trace__time.h
@@ -1,11 +1,11 @@
---- base/tracing/trace_time.h.orig 2022-02-07 13:39:41 UTC
+--- base/tracing/trace_time.h.orig 2022-02-28 16:54:41 UTC
+++ base/tracing/trace_time.h
@@ -12,7 +12,7 @@ namespace base {
namespace tracing {
- #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \
-- defined(OS_FUCHSIA)
-+ defined(OS_FUCHSIA) || defined(OS_BSD)
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
+- BUILDFLAG(IS_FUCHSIA)
++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
// Linux, Android, and Fuchsia all use CLOCK_MONOTONIC. See crbug.com/166153
// about efforts to unify base::TimeTicks across all platforms.
constexpr perfetto::protos::pbzero::BuiltinClock kTraceClockId =
diff --git a/www/chromium/files/patch-build_config_BUILD.gn b/www/chromium/files/patch-build_config_BUILD.gn
index 2f3841e1bb68..13b50eb433dd 100644
--- a/www/chromium/files/patch-build_config_BUILD.gn
+++ b/www/chromium/files/patch-build_config_BUILD.gn
@@ -1,6 +1,6 @@
---- build/config/BUILD.gn.orig 2022-02-07 13:39:41 UTC
+--- build/config/BUILD.gn.orig 2022-02-28 16:54:41 UTC
+++ build/config/BUILD.gn
-@@ -222,13 +222,17 @@ config("default_libs") {
+@@ -218,13 +218,17 @@ config("default_libs") {
"CoreText.framework",
"Foundation.framework",
]
diff --git a/www/chromium/files/patch-build_config_compiler_BUILD.gn b/www/chromium/files/patch-build_config_compiler_BUILD.gn
index b2cb7fa98158..1c9d854a4148 100644
--- a/www/chromium/files/patch-build_config_compiler_BUILD.gn
+++ b/www/chromium/files/patch-build_config_compiler_BUILD.gn
@@ -1,4 +1,4 @@
---- build/config/compiler/BUILD.gn.orig 2022-02-07 13:39:41 UTC
+--- build/config/compiler/BUILD.gn.orig 2022-02-28 16:54:41 UTC
+++ build/config/compiler/BUILD.gn
@@ -236,13 +236,16 @@ config("default_include_dirs") {
# Compiler instrumentation can introduce dependencies in DSOs to symbols in
@@ -38,7 +38,7 @@
cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ]
# TODO(hans): Remove this once Clang generates better optimized debug info
-@@ -903,7 +910,7 @@ config("compiler_cpu_abi") {
+@@ -902,7 +909,7 @@ config("compiler_cpu_abi") {
]
}
} else if (current_cpu == "arm") {
@@ -47,7 +47,7 @@
cflags += [ "--target=arm-linux-gnueabihf" ]
ldflags += [ "--target=arm-linux-gnueabihf" ]
}
-@@ -917,7 +924,7 @@ config("compiler_cpu_abi") {
+@@ -916,7 +923,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" ]
}
-@@ -1238,7 +1245,7 @@ config("compiler_deterministic") {
+@@ -1237,7 +1244,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",
-@@ -1525,7 +1532,7 @@ config("default_warnings") {
+@@ -1524,7 +1531,7 @@ config("default_warnings") {
"-Wno-ignored-pragma-optimize",
]
@@ -74,7 +74,7 @@
# TODO(https://crbug.com/1016945): Re-enable once ChromeOS toolchain is up to date
cflags += [ "-Wno-builtin-assume-aligned-alignment" ]
}
-@@ -1676,7 +1683,7 @@ config("no_chromium_code") {
+@@ -1709,7 +1716,7 @@ config("no_chromium_code") {
# third-party libraries.
"-Wno-c++11-narrowing",
]
@@ -83,7 +83,7 @@
cflags += [
# Disabled for similar reasons as -Wunused-variable.
"-Wno-unused-but-set-variable",
-@@ -2191,7 +2198,7 @@ config("afdo_optimize_size") {
+@@ -2224,7 +2231,7 @@ config("afdo_optimize_size") {
# between //base/allocator:tcmalloc and AFDO on GCC), so we provide a separate
# config to allow AFDO to be disabled per-target.
config("afdo") {
@@ -92,7 +92,7 @@
cflags = []
if (clang_emit_debug_info_for_profiling) {
# Add the following flags to generate debug info for profiling.
-@@ -2207,7 +2214,7 @@ config("afdo") {
+@@ -2240,7 +2247,7 @@ config("afdo") {
cflags += [ "-fprofile-sample-use=${rebased_clang_sample_profile}" ]
inputs = [ _clang_sample_profile ]
}
@@ -101,7 +101,7 @@
cflags = [ "-fauto-profile=${auto_profile_path}" ]
inputs = [ auto_profile_path ]
}
-@@ -2346,7 +2353,8 @@ config("symbols") {
+@@ -2379,7 +2386,8 @@ config("symbols") {
}
}
diff --git a/www/chromium/files/patch-build_linux_chrome.map b/www/chromium/files/patch-build_linux_chrome.map
index 8e8c35005efb..992585036b7b 100644
--- a/www/chromium/files/patch-build_linux_chrome.map
+++ b/www/chromium/files/patch-build_linux_chrome.map
@@ -1,4 +1,4 @@
---- build/linux/chrome.map.orig 2022-02-07 13:39:41 UTC
+--- build/linux/chrome.map.orig 2022-02-28 16:54:41 UTC
+++ build/linux/chrome.map
@@ -20,6 +20,10 @@ global:
# Program entry point.
@@ -10,4 +10,4 @@
+
# Memory allocation symbols. We want chrome and any libraries to
# share the same heap, so it is correct to export these symbols.
- calloc;
+ aligned_alloc;
diff --git a/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni b/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni
index b440c70df873..4d018d8b2dee 100644
--- a/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni
+++ b/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni
@@ -1,6 +1,6 @@
---- build/toolchain/gcc_toolchain.gni.orig 2022-02-07 13:39:41 UTC
+--- build/toolchain/gcc_toolchain.gni.orig 2022-02-28 16:54:41 UTC
+++ build/toolchain/gcc_toolchain.gni
-@@ -49,6 +49,12 @@ if (enable_resource_allowlist_generation) {
+@@ -53,6 +53,12 @@ if (enable_resource_allowlist_generation) {
"enable_resource_allowlist_generation=true does not work for target_os=$target_os")
}
@@ -13,7 +13,7 @@
# This template defines a toolchain for something that works like gcc
# (including clang).
#
-@@ -737,13 +743,17 @@ template("gcc_toolchain") {
+@@ -747,13 +753,17 @@ template("gcc_toolchain") {
# use_gold too.
template("clang_toolchain") {
gcc_toolchain(target_name) {
diff --git a/www/chromium/files/patch-cc_BUILD.gn b/www/chromium/files/patch-cc_BUILD.gn
index 80e9e0adb0a0..88c78da6873d 100644
--- a/www/chromium/files/patch-cc_BUILD.gn
+++ b/www/chromium/files/patch-cc_BUILD.gn
@@ -1,6 +1,6 @@
---- cc/BUILD.gn.orig 2022-02-07 13:39:41 UTC
+--- cc/BUILD.gn.orig 2022-02-28 16:54:41 UTC
+++ cc/BUILD.gn
-@@ -659,7 +659,7 @@ cc_test_static_library("test_support") {
+@@ -660,7 +660,7 @@ cc_test_static_library("test_support") {
if (enable_vulkan) {
deps += [ "//gpu/vulkan/init" ]
}
@@ -9,11 +9,11 @@
data_deps = [ "//third_party/mesa_headers" ]
}
}
-@@ -884,7 +884,6 @@ cc_test("cc_unittests") {
- ]
+@@ -886,7 +886,6 @@ cc_test("cc_unittests") {
+ data = [ "//components/viz/test/data/" ]
data_deps = [
"//testing/buildbot/filters:cc_unittests_filters",
- "//third_party/mesa_headers",
]
- if (is_fuchsia) {
+ if (is_android && enable_chrome_android_internal) {
diff --git a/www/chromium/files/patch-chrome_app_chrome__command__ids.h b/www/chromium/files/patch-chrome_app_chrome__command__ids.h
index 87bae79ebd41..34fe446304f1 100644
--- a/www/chromium/files/patch-chrome_app_chrome__command__ids.h
+++ b/www/chromium/files/patch-chrome_app_chrome__command__ids.h
@@ -1,11 +1,11 @@
---- chrome/app/chrome_command_ids.h.orig 2021-07-19 18:45:06 UTC
+--- chrome/app/chrome_command_ids.h.orig 2022-02-28 16:54:41 UTC
+++ chrome/app/chrome_command_ids.h
@@ -66,7 +66,7 @@
#define IDC_NAME_WINDOW 34049
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch of lacros-chrome is complete.
--#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
#define IDC_USE_SYSTEM_TITLE_BAR 34051
#define IDC_RESTORE_WINDOW 34052
#endif
diff --git a/www/chromium/files/patch-chrome_app_chrome__main.cc b/www/chromium/files/patch-chrome_app_chrome__main.cc
index 25aa85dc6643..6dcdad77169d 100644
--- a/www/chromium/files/patch-chrome_app_chrome__main.cc
+++ b/www/chromium/files/patch-chrome_app_chrome__main.cc
@@ -1,20 +1,20 @@
---- chrome/app/chrome_main.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/app/chrome_main.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/app/chrome_main.cc
-@@ -26,7 +26,7 @@
+@@ -25,7 +25,7 @@
#include "chrome/app/notification_metrics.h"
#endif
--#if defined(OS_WIN) || defined(OS_LINUX)
-+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
#include "base/base_switches.h"
#endif
-@@ -147,7 +147,7 @@ int ChromeMain(int argc, const char** argv) {
+@@ -146,7 +146,7 @@ int ChromeMain(int argc, const char** argv) {
headless::SetUpCommandLine(command_line);
} else {
- #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \
-- defined(OS_WIN)
-+ defined(OS_WIN) || defined(OS_BSD)
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
+- BUILDFLAG(IS_WIN)
++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
if (command_line->HasSwitch(switches::kHeadless)) {
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
command_line->AppendSwitch(::headless::switches::kEnableCrashReporter);
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 97abda5f5a89..9935801ef7b3 100644
--- a/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc
+++ b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc
@@ -1,107 +1,107 @@
---- chrome/app/chrome_main_delegate.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/app/chrome_main_delegate.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/app/chrome_main_delegate.cc
-@@ -112,7 +112,7 @@
+@@ -113,7 +113,7 @@
#include "chrome/app/chrome_crash_reporter_client.h"
#endif
--#if BUILDFLAG(ENABLE_NACL) && (defined(OS_LINUX) || defined(OS_CHROMEOS))
-+#if BUILDFLAG(ENABLE_NACL) && (defined(OS_LINUX) || defined(OS_CHROMEOS)) && !defined(OS_BSD)
+-#if BUILDFLAG(ENABLE_NACL) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))
++#if BUILDFLAG(ENABLE_NACL) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_BSD)
#include "components/nacl/common/nacl_paths.h"
#include "components/nacl/zygote/nacl_fork_delegate_linux.h"
#endif
-@@ -156,12 +156,12 @@
+@@ -157,12 +157,12 @@
#include "v8/include/v8.h"
#endif
--#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
#include "base/environment.h"
#endif
- #if defined(OS_MAC) || defined(OS_WIN) || defined(OS_ANDROID) || \
-- defined(OS_LINUX) || defined(OS_CHROMEOS)
-+ defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+ #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || \
+- BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++ BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
#include "chrome/browser/policy/policy_path_parser.h"
#include "components/crash/core/app/crashpad.h"
#endif
-@@ -309,7 +309,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty
+@@ -310,7 +310,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty
// and resources loaded.
bool SubprocessNeedsResourceBundle(const std::string& process_type) {
return
--#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
// The zygote process opens the resources for the renderers.
process_type == switches::kZygoteProcess ||
#endif
-@@ -349,7 +349,7 @@ bool HandleVersionSwitches(const base::CommandLine& co
+@@ -350,7 +350,7 @@ bool HandleVersionSwitches(const base::CommandLine& co
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
--#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
// Show the man page if --help or -h is on the command line.
void HandleHelpSwitches(const base::CommandLine& command_line) {
if (command_line.HasSwitch(switches::kHelp) ||
-@@ -413,7 +413,7 @@ void InitializeUserDataDir(base::CommandLine* command_
+@@ -414,7 +414,7 @@ void InitializeUserDataDir(base::CommandLine* command_
std::string process_type =
command_line->GetSwitchValueASCII(switches::kProcessType);
--#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
// On Linux, Chrome does not support running multiple copies under different
// DISPLAYs, so the profile directory can be specified in the environment to
// support the virtual desktop use-case.
-@@ -497,7 +497,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat
+@@ -498,7 +498,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat
#endif
- #if defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || \
-- defined(OS_CHROMEOS)
-+ defined(OS_CHROMEOS) || defined(OS_BSD)
+ #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \
+- BUILDFLAG(IS_CHROMEOS)
++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
// Record the startup process creation time on supported platforms. On Android
// this is recorded in ChromeMainDelegateAndroid.
startup_metric_utils::RecordStartupProcessCreationTime(
-@@ -685,6 +685,8 @@ void ChromeMainDelegate::PostFieldTrialInitialization(
+@@ -679,6 +679,8 @@ void ChromeMainDelegate::PostFieldTrialInitialization(
// not always enabled on Linux/ChromeOS.
- #if defined(OS_LINUX) || defined(OS_CHROMEOS)
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
bool enable_gwp_asan = crash_reporter::IsCrashpadEnabled();
-+#elif defined(OS_BSD)
++#elif BUILDFLAG(IS_BSD)
+ bool enable_gwp_asan = false;
#else
bool enable_gwp_asan = true;
#endif
-@@ -809,7 +811,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
+@@ -801,7 +803,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
}
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
--#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
// This will directly exit if the user asked for help.
HandleHelpSwitches(command_line);
#endif
-@@ -840,7 +842,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
+@@ -832,7 +834,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
chromeos::dbus_paths::RegisterPathProvider();
#endif
--#if BUILDFLAG(ENABLE_NACL) && (defined(OS_LINUX) || defined(OS_CHROMEOS))
-+#if BUILDFLAG(ENABLE_NACL) && (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD))
+-#if BUILDFLAG(ENABLE_NACL) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))
++#if BUILDFLAG(ENABLE_NACL) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD))
nacl::RegisterPathProvider();
#endif
-@@ -1154,7 +1156,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -1146,7 +1148,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
locale;
}
--#if defined(OS_POSIX) && !defined(OS_MAC)
-+#if defined(OS_POSIX) && !defined(OS_MAC) && !defined(OS_BSD)
+-#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_BSD)
// Zygote needs to call InitCrashReporter() in RunZygote().
if (process_type != switches::kZygoteProcess) {
- #if defined(OS_ANDROID)
-@@ -1237,7 +1239,7 @@ absl::variant<int, content::MainFunctionParams> Chrome
+ #if BUILDFLAG(IS_ANDROID)
+@@ -1222,7 +1224,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.
--#if BUILDFLAG(ENABLE_NACL) && !defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if BUILDFLAG(ENABLE_NACL) && !defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_BSD)
+-#if BUILDFLAG(ENABLE_NACL) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(ENABLE_NACL) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD)
{switches::kNaClLoaderProcess, NaClMain},
#else
{"<invalid>", nullptr}, // To avoid constant array of size 0
diff --git a/www/chromium/files/patch-chrome_app_chromium__strings.grd b/www/chromium/files/patch-chrome_app_chromium__strings.grd
index 7db2405e0ab4..c7410f592b87 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-02-07 13:39:41 UTC
+--- chrome/app/chromium_strings.grd.orig 2022-02-28 16:54:41 UTC
+++ chrome/app/chromium_strings.grd
-@@ -296,7 +296,7 @@ If you update this file, be sure also to update google
+@@ -298,7 +298,7 @@ If you update this file, be sure also to update google
Welcome to Chromium; new browser window opened
</message>
</if>
@@ -9,7 +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>
-@@ -808,7 +808,7 @@ Chromium is unable to recover your settings.
+@@ -810,7 +810,7 @@ Chromium is unable to recover your settings.
</if>
<!-- about:browser-switch strings -->
@@ -18,7 +18,7 @@
<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>
-@@ -934,7 +934,7 @@ Chromium is unable to recover your settings.
+@@ -936,7 +936,7 @@ Chromium is unable to recover your settings.
</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 1603c775fd26..31e633027c98 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-02-07 13:39:41 UTC
+--- chrome/app/generated_resources.grd.orig 2022-02-28 16:54:41 UTC
+++ chrome/app/generated_resources.grd
@@ -2,7 +2,7 @@
@@ -9,7 +9,7 @@
for making strings OS specific. Other platform defines such as use_titlecase
are declared in tools/grit/grit_rule.gni.
-->
-@@ -296,7 +296,7 @@ are declared in tools/grit/grit_rule.gni.
+@@ -298,7 +298,7 @@ are declared in tools/grit/grit_rule.gni.
<part file="profiles_strings.grdp" />
<!-- Web app intent picker strings -->
@@ -18,7 +18,7 @@
<part file="url_handler_intent_picker_strings.grdp" />
</if>
-@@ -2811,7 +2811,7 @@ are declared in tools/grit/grit_rule.gni.
+@@ -2813,7 +2813,7 @@ are declared in tools/grit/grit_rule.gni.
</if>
<!-- Bluetooth Device Credentials (i.e. PIN/Passkey) dialog -->
@@ -27,7 +27,7 @@
<message name="IDS_BLUETOOTH_DEVICE_CREDENTIALS_TITLE" desc="Title of the Bluetooth device credentials prompt dialog.">
Device Credentials
</message>
-@@ -5557,7 +5557,7 @@ Keep your key file in a safe place. You will need it t
+@@ -5568,7 +5568,7 @@ Keep your key file in a safe place. You will need it t
</if>
<!-- chrome://browser-switch strings -->
@@ -36,7 +36,7 @@
<message name="IDS_ABOUT_BROWSER_SWITCH_TITLE" desc="about:browser-switch page title">
Legacy Browser Support
</message>
-@@ -8016,7 +8016,7 @@ Keep your key file in a safe place. You will need it t
+@@ -8043,7 +8043,7 @@ Keep your key file in a safe place. You will need it t
Google Pay
</message>
@@ -45,7 +45,7 @@
<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>
-@@ -9104,7 +9104,7 @@ Please help our engineers fix this problem. Tell us wh
+@@ -9134,7 +9134,7 @@ Please help our engineers fix this problem. Tell us wh
Set as default
</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 f30963321403..c257a13fb957 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-02-07 13:39:41 UTC
+--- chrome/app/google_chrome_strings.grd.orig 2022-02-28 16:54:41 UTC
+++ chrome/app/google_chrome_strings.grd
-@@ -301,7 +301,7 @@ chromium_strings.grd. -->
+@@ -303,7 +303,7 @@ chromium_strings.grd. -->
Welcome to Chrome; new browser window opened
</message>
</if>
@@ -9,7 +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>
-@@ -816,7 +816,7 @@ Google Chrome is unable to recover your settings.
+@@ -818,7 +818,7 @@ Google Chrome is unable to recover your settings.
</if>
<!-- about:browser-switch strings -->
@@ -18,7 +18,7 @@
<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>
-@@ -942,7 +942,7 @@ Google Chrome is unable to recover your settings.
+@@ -944,7 +944,7 @@ Google Chrome is unable to recover your settings.
</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 e0be89211d5f..017a675fc6cd 100644
--- a/www/chromium/files/patch-chrome_app_settings__strings.grdp
+++ b/www/chromium/files/patch-chrome_app_settings__strings.grdp
@@ -1,6 +1,6 @@
---- chrome/app/settings_strings.grdp.orig 2021-10-08 06:25:37 UTC
+--- chrome/app/settings_strings.grdp.orig 2022-02-28 16:54:41 UTC
+++ chrome/app/settings_strings.grdp
-@@ -123,7 +123,7 @@
+@@ -131,7 +131,7 @@
Theme
</message>
</if>
@@ -9,12 +9,12 @@
<message name="IDS_SETTINGS_SYSTEM_THEME" desc="Text of the label describing the system (GTK+) browser theme on Linux">
GTK+
</message>
-@@ -137,7 +137,7 @@
+@@ -145,7 +145,7 @@
Use Classic
</message>
</if>
-- <if expr="not is_linux or chromeos or lacros or is_fuchsia">
-+ <if expr="not is_posix or chromeos or lacros or is_fuchsia">
+- <if expr="not is_linux or chromeos_ash or chromeos_lacros or is_fuchsia">
++ <if expr="not is_posix or chromeos_ash or chromeos_lacros or is_fuchsia">
<message name="IDS_SETTINGS_RESET_TO_DEFAULT_THEME" desc="Name of the control which resets the browser theme back to the default theme.">
Reset to default
</message>
diff --git a/www/chromium/files/patch-chrome_browser_about__flags.cc b/www/chromium/files/patch-chrome_browser_about__flags.cc
index 5cc17e7ac79f..e0474b9664a0 100644
--- a/www/chromium/files/patch-chrome_browser_about__flags.cc
+++ b/www/chromium/files/patch-chrome_browser_about__flags.cc
@@ -1,155 +1,137 @@
---- chrome/browser/about_flags.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/about_flags.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/about_flags.cc
-@@ -203,7 +203,7 @@
+@@ -205,7 +205,7 @@
#include "ui/native_theme/native_theme_features.h"
#include "ui/ui_features.h"
--#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
#include "base/allocator/buildflags.h"
#endif
-@@ -271,7 +271,7 @@
+@@ -273,7 +273,7 @@
#include "chrome/browser/supervised_user/supervised_user_features/supervised_user_features.h"
#endif // ENABLE_SUPERVISED_USERS
--#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
-+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
#include "ui/ozone/buildflags.h"
#include "ui/ozone/public/ozone_switches.h"
- #endif // OS_LINUX || BUILDFLAG(IS_CHROMEOS_ASH)
-@@ -358,7 +358,7 @@ const FeatureEntry::Choice kUseAngleChoicesMac[] = {
+ #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
+@@ -360,7 +360,7 @@ const FeatureEntry::Choice kUseAngleChoicesMac[] = {
gl::kANGLEImplementationMetalName}};
#endif
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
const FeatureEntry::Choice kOzonePlatformHintRuntimeChoices[] = {
{flag_descriptions::kOzonePlatformHintChoiceDefault, "", ""},
{flag_descriptions::kOzonePlatformHintChoiceAuto,
-@@ -941,7 +941,7 @@ const FeatureEntry::FeatureVariation kPageContentAnnot
+@@ -966,7 +966,7 @@ const FeatureEntry::FeatureVariation kPageContentAnnot
};
- #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \
-- defined(OS_WIN) || defined(OS_FUCHSIA)
-+ defined(OS_WIN) || defined(OS_FUCHSIA) || defined(OS_BSD)
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
+- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA)
++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
const FeatureEntry::FeatureParam kOmniboxDocumentProviderServerScoring[] = {
{"DocumentUseServerScore", "true"},
{"DocumentUseClientScore", "false"},
-@@ -2344,7 +2344,7 @@ const FeatureEntry::FeatureVariation kPasswordChangeFe
- nullptr}};
- #endif // defined(OS_ANDROID)
-
--#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
- const FeatureEntry::FeatureParam
- kSendWebUIJavaScriptErrorReportsVariationSendToStaging[] = {
- {features::kSendWebUIJavaScriptErrorReportsSendToProductionVariation,
-@@ -2699,7 +2699,7 @@ const FeatureEntry kFeatureEntries[] = {
- flag_descriptions::kWebKioskEnableLacrosDescription, kOsCrOS,
- FEATURE_VALUE_TYPE(features::kWebKioskEnableLacros)},
- #endif // BUILDFLAG(IS_CHROMEOS_ASH)
--#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
- {"send-webui-javascript-error-reports",
- flag_descriptions::kSendWebUIJavaScriptErrorReportsName,
- flag_descriptions::kSendWebUIJavaScriptErrorReportsDescription,
-@@ -3208,7 +3208,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -3243,7 +3243,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(chromeos::kLacrosTtsSupport)},
- #endif // defined(OS_CHROMEOS)
+ #endif // BUILDFLAG(IS_CHROMEOS)
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
{
"enable-accelerated-video-decode",
flag_descriptions::kAcceleratedVideoDecodeName,
-@@ -3620,7 +3620,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -3648,7 +3648,7 @@ const FeatureEntry kFeatureEntries[] = {
{"enable-login-detection", flag_descriptions::kEnableLoginDetectionName,
flag_descriptions::kEnableLoginDetectionDescription, kOsAll,
FEATURE_VALUE_TYPE(login_detection::kLoginDetection)},
--#if defined(OS_CHROMEOS) || defined(OS_LINUX)
-+#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD)
+-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
{"enable-save-data", flag_descriptions::kEnableSaveDataName,
flag_descriptions::kEnableSaveDataDescription, kOsCrOS | kOsLinux,
SINGLE_VALUE_TYPE(
-@@ -3808,7 +3808,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -3835,7 +3835,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(features::kWebShare)},
- #endif // BUILDFLAG(IS_CHROMEOS_ASH) || OS_WIN || OS_MAC
+ #endif // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
{"ozone-platform-hint", flag_descriptions::kOzonePlatformHintName,
flag_descriptions::kOzonePlatformHintDescription, kOsLinux,
MULTI_VALUE_TYPE(kOzonePlatformHintRuntimeChoices)},
-@@ -4493,7 +4493,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -4518,7 +4518,7 @@ const FeatureEntry kFeatureEntries[] = {
"OmniboxBundledExperimentV1")},
- #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \
-- defined(OS_WIN) || defined(OS_FUCHSIA)
-+ defined(OS_WIN) || defined(OS_FUCHSIA) || defined(OS_BSD)
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
+- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA)
++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
{"omnibox-experimental-keyword-mode",
flag_descriptions::kOmniboxExperimentalKeywordModeName,
flag_descriptions::kOmniboxExperimentalKeywordModeDescription, kOsDesktop,
-@@ -4870,7 +4870,7 @@ const FeatureEntry kFeatureEntries[] = {
- #endif // !defined(OS_ANDROID)
+@@ -4887,7 +4887,7 @@ const FeatureEntry kFeatureEntries[] = {
+ #endif // BUILDFLAG(IS_ANDROID)
- #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
-- defined(OS_CHROMEOS) || defined(OS_FUCHSIA)
-+ defined(OS_CHROMEOS) || defined(OS_FUCHSIA) || defined(OS_BSD)
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
{"webui-feedback", flag_descriptions::kWebuiFeedbackName,
flag_descriptions::kWebuiFeedbackDescription, kOsDesktop,
FEATURE_VALUE_TYPE(features::kWebUIFeedback)},
-@@ -5492,7 +5492,7 @@ const FeatureEntry kFeatureEntries[] = {
- FEATURE_VALUE_TYPE(kSharingSendViaSync)},
-
- #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
-- defined(OS_FUCHSIA)
-+ defined(OS_FUCHSIA) || defined(OS_BSD)
- {"sharing-hub-desktop-app-menu",
- flag_descriptions::kSharingHubDesktopAppMenuName,
- flag_descriptions::kSharingHubDesktopAppMenuDescription, kOsDesktop,
-@@ -5917,7 +5917,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -5897,7 +5897,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(features::kMouseSubframeNoImplicitCapture)},
- #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
-- defined(OS_CHROMEOS) || defined(OS_FUCHSIA)
-+ defined(OS_CHROMEOS) || defined(OS_FUCHSIA) || defined(OS_BSD)
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
{"global-media-controls-modern-ui",
flag_descriptions::kGlobalMediaControlsModernUIName,
flag_descriptions::kGlobalMediaControlsModernUIDescription,
-@@ -6606,7 +6606,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -6607,7 +6607,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif
- #if defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || \
-- defined(OS_CHROMEOS) || defined(OS_FUCHSIA)
-+ defined(OS_CHROMEOS) || defined(OS_FUCHSIA) || defined(OS_BSD)
+ #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \
+- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
{"incognito-brand-consistency-for-desktop",
flag_descriptions::kIncognitoBrandConsistencyForDesktopName,
flag_descriptions::kIncognitoBrandConsistencyForDesktopDescription,
-@@ -6739,7 +6739,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -6740,7 +6740,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif
- #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
-- defined(OS_FUCHSIA)
-+ defined(OS_FUCHSIA) || defined(OS_BSD)
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+- BUILDFLAG(IS_FUCHSIA)
++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
{"commander", flag_descriptions::kCommanderName,
flag_descriptions::kCommanderDescription, kOsDesktop,
FEATURE_VALUE_TYPE(features::kCommander)},
-@@ -6982,7 +6982,7 @@ const FeatureEntry kFeatureEntries[] = {
- FEATURE_VALUE_TYPE(media::kVp9kSVCHWDecoding)},
+@@ -6985,7 +6985,7 @@ const FeatureEntry kFeatureEntries[] = {
- #if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
-- defined(OS_MAC) || defined(OS_FUCHSIA)
-+ defined(OS_MAC) || defined(OS_FUCHSIA) || defined(OS_BSD)
+ #if BUILDFLAG(IS_WIN) || \
+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
+- BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA)
++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
{
"ui-debug-tools",
flag_descriptions::kUIDebugToolsName,
-@@ -7124,7 +7124,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -7129,7 +7129,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif
- #if BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_MAC) || defined(OS_LINUX) || \
-- defined(OS_FUCHSIA)
-+ defined(OS_FUCHSIA) || defined(OS_BSD)
+ #if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+- BUILDFLAG(IS_FUCHSIA)
++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
{"enable-desktop-pwas-app-icon-shortcuts-menu-ui",
flag_descriptions::kDesktopPWAsAppIconShortcutsMenuUIName,
flag_descriptions::kDesktopPWAsAppIconShortcutsMenuUIDescription,
+@@ -7685,7 +7685,7 @@ const FeatureEntry kFeatureEntries[] = {
+ SINGLE_VALUE_TYPE(switches::kPervasiveSystemAccentColor)},
+ #endif
+
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ {"improve-accessibility-tree-using-local-ml",
+ flag_descriptions::kImproveAccessibilityTreeUsingLocalMLName,
+ flag_descriptions::kImproveAccessibilityTreeUsingLocalMLDescription,
diff --git a/www/chromium/files/patch-chrome_browser_after__startup__task__utils.cc b/www/chromium/files/patch-chrome_browser_after__startup__task__utils.cc
index 43dc49863e1b..8ca400175f0c 100644
--- a/www/chromium/files/patch-chrome_browser_after__startup__task__utils.cc
+++ b/www/chromium/files/patch-chrome_browser_after__startup__task__utils.cc
@@ -1,20 +1,20 @@
---- chrome/browser/after_startup_task_utils.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/after_startup_task_utils.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/after_startup_task_utils.cc
@@ -25,7 +25,7 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
--#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
#include "ui/views/linux_ui/linux_ui.h"
#endif
@@ -111,7 +111,7 @@ void SetBrowserStartupIsComplete() {
g_startup_complete_flag.Get().Set();
- #if defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || \
-- defined(OS_CHROMEOS)
-+ defined(OS_CHROMEOS) || defined(OS_BSD)
+ #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \
+- BUILDFLAG(IS_CHROMEOS)
++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
// Process::Current().CreationTime() is not available on all platforms.
const base::Time process_creation_time =
base::Process::Current().CreationTime();
@@ -22,8 +22,8 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
--#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
// Make sure we complete the startup notification sequence, or launchers will
// get confused by not receiving the expected message from the main process.
views::LinuxUI* linux_ui = views::LinuxUI::instance();
diff --git a/www/chromium/files/patch-chrome_browser_apps_platform__apps_api_music__manager__private_device__id__linux.cc b/www/chromium/files/patch-chrome_browser_apps_platform__apps_api_music__manager__private_device__id__linux.cc
index dad818ce9cf0..3b4e28b819a9 100644
--- a/www/chromium/files/patch-chrome_browser_apps_platform__apps_api_music__manager__private_device__id__linux.cc
+++ b/www/chromium/files/patch-chrome_browser_apps_platform__apps_api_music__manager__private_device__id__linux.cc
@@ -1,4 +1,4 @@
---- chrome/browser/apps/platform_apps/api/music_manager_private/device_id_linux.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/apps/platform_apps/api/music_manager_private/device_id_linux.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/apps/platform_apps/api/music_manager_private/device_id_linux.cc
@@ -4,6 +4,15 @@
@@ -16,7 +16,7 @@
#include <ifaddrs.h>
#include <net/if.h>
#include <stddef.h>
-@@ -105,11 +114,33 @@ class MacAddressProcessor {
+@@ -106,11 +115,33 @@ class MacAddressProcessor {
const char* const prefixes[],
size_t prefixes_count) {
const int MAC_LENGTH = 6;
@@ -51,7 +51,7 @@
int sd = socket(AF_INET, SOCK_DGRAM, 0);
int result = ioctl(sd, SIOCGIFHWADDR, &ifinfo);
close(sd);
-@@ -119,11 +150,17 @@ class MacAddressProcessor {
+@@ -120,11 +151,17 @@ class MacAddressProcessor {
const char* mac_address =
static_cast<const char*>(ifinfo.ifr_hwaddr.sa_data);
diff --git a/www/chromium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.cc b/www/chromium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.cc
index 8567bb517f11..914a8f443f2c 100644
--- a/www/chromium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.cc
+++ b/www/chromium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.cc
@@ -1,20 +1,20 @@
---- chrome/browser/apps/platform_apps/platform_app_launch.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/apps/platform_apps/platform_app_launch.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/apps/platform_apps/platform_app_launch.cc
-@@ -17,7 +17,7 @@
+@@ -18,7 +18,7 @@
#include "extensions/common/constants.h"
#include "extensions/common/extension.h"
--#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX)
-+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD)
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_navigator.h"
#include "chrome/browser/ui/browser_window.h"
-@@ -122,7 +122,7 @@ bool OpenExtensionApplicationTab(Profile* profile, con
+@@ -121,7 +121,7 @@ bool OpenExtensionApplicationTab(Profile* profile, con
return app_tab != nullptr;
}
--#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX)
-+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD)
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
bool OpenDeprecatedApplicationPrompt(Profile* profile,
const std::string& app_id) {
if (!extensions::IsExtensionUnsupportedDeprecatedApp(profile, app_id))
diff --git a/www/chromium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.h b/www/chromium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.h
index a133bcabdb34..393b6f62495b 100644
--- a/www/chromium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.h
+++ b/www/chromium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.h
@@ -1,11 +1,11 @@
---- chrome/browser/apps/platform_apps/platform_app_launch.h.orig 2021-09-24 18:17:59 UTC
+--- chrome/browser/apps/platform_apps/platform_app_launch.h.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/apps/platform_apps/platform_app_launch.h
@@ -36,7 +36,7 @@ bool OpenExtensionApplicationWindow(Profile* profile,
// and false otherwise.
bool OpenExtensionApplicationTab(Profile* profile, const std::string& app_id);
--#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX)
-+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD)
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// Opens the deprecated Chrome Apps flow if |app_id| refers to a Chrome App and
// Chrome Apps are deprecated on the |profile|. Returns true if that was the
// case, or false otherwise.
diff --git a/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 d6aa299207f8..7d62b3c9c226 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,11 +1,11 @@
---- chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc
@@ -89,7 +89,7 @@ ChromeAutocompleteSchemeClassifier::GetInputTypeForSch
return metrics::OmniboxInputType::QUERY;
case ExternalProtocolHandler::UNKNOWN: {
--#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
// Linux impl of GetApplicationNameForProtocol doesn't distinguish
// between URL schemes with handers and those without. This will
// make the default behaviour be search on Linux.
diff --git a/www/chromium/files/patch-chrome_browser_background_background__mode__manager.cc b/www/chromium/files/patch-chrome_browser_background_background__mode__manager.cc
index 8d3f48160b1a..c3e6446c375d 100644
--- a/www/chromium/files/patch-chrome_browser_background_background__mode__manager.cc
+++ b/www/chromium/files/patch-chrome_browser_background_background__mode__manager.cc
@@ -1,11 +1,11 @@
---- chrome/browser/background/background_mode_manager.cc.orig 2021-09-24 04:25:58 UTC
+--- chrome/browser/background/background_mode_manager.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/background/background_mode_manager.cc
@@ -892,7 +892,7 @@ gfx::ImageSkia GetStatusTrayIcon() {
return gfx::ImageSkia();
return family->CreateExact(size).AsImageSkia();
--#elif defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
return *ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
IDR_PRODUCT_LOGO_128);
- #elif defined(OS_MAC)
+ #elif BUILDFLAG(IS_MAC)
diff --git a/www/chromium/files/patch-chrome_browser_background_background__mode__optimizer.cc b/www/chromium/files/patch-chrome_browser_background_background__mode__optimizer.cc
index 28a83f9c9559..37083840f5bd 100644
--- a/www/chromium/files/patch-chrome_browser_background_background__mode__optimizer.cc
+++ b/www/chromium/files/patch-chrome_browser_background_background__mode__optimizer.cc
@@ -1,11 +1,11 @@
---- chrome/browser/background/background_mode_optimizer.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/background/background_mode_optimizer.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/background/background_mode_optimizer.cc
@@ -31,7 +31,7 @@ std::unique_ptr<BackgroundModeOptimizer> BackgroundMod
switches::kKeepAliveForTest))
return nullptr;
--#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
if (base::FeatureList::IsEnabled(features::kBackgroundModeAllowRestart))
return base::WrapUnique(new BackgroundModeOptimizer());
- #endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS)
+ #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
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 512a65dad887..88bf739e9f2e 100644
--- a/www/chromium/files/patch-chrome_browser_browser__process__impl.cc
+++ b/www/chromium/files/patch-chrome_browser_browser__process__impl.cc
@@ -1,29 +1,29 @@
---- chrome/browser/browser_process_impl.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/browser_process_impl.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/browser_process_impl.cc
-@@ -208,7 +208,7 @@
+@@ -209,7 +209,7 @@
#include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h"
#endif
--#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
#include "chrome/browser/error_reporting/chrome_js_error_report_processor.h" // nogncheck
#endif
-@@ -1160,7 +1160,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() {
+@@ -1157,7 +1157,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() {
+
ApplyMetricsReportingPolicy();
- #endif
--#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
ChromeJsErrorReportProcessor::Create();
#endif
-@@ -1420,7 +1420,7 @@ void BrowserProcessImpl::Unpin() {
+@@ -1418,7 +1418,7 @@ void BrowserProcessImpl::Unpin() {
// Mac is currently not supported.
// TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
// complete.
--#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
-+#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD)
+-#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
++#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD)
bool BrowserProcessImpl::IsRunningInBackground() const {
// Check if browser is in the background.
diff --git a/www/chromium/files/patch-chrome_browser_browser__process__impl.h b/www/chromium/files/patch-chrome_browser_browser__process__impl.h
index 9ede1407b876..14ccde8270cd 100644
--- a/www/chromium/files/patch-chrome_browser_browser__process__impl.h
+++ b/www/chromium/files/patch-chrome_browser_browser__process__impl.h
@@ -1,11 +1,11 @@
---- chrome/browser/browser_process_impl.h.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/browser_process_impl.h.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/browser_process_impl.h
@@ -373,7 +373,7 @@ class BrowserProcessImpl : public BrowserProcess,
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
--#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
-+#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD)
+-#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
++#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD)
base::RepeatingTimer autoupdate_timer_;
// Gets called by autoupdate timer to see if browser needs restart and can be
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 ed429a3889e5..1d3a0cb745bf 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,56 +1,56 @@
---- chrome/browser/chrome_browser_interface_binders.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/chrome_browser_interface_binders.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/chrome_browser_interface_binders.cc
@@ -97,7 +97,7 @@
#endif // BUILDFLAG(FULL_SAFE_BROWSING)
- #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS_ASH)
-+ BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_BSD)
++ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
#include "chrome/browser/ui/webui/connectors_internals/connectors_internals.mojom.h"
#include "chrome/browser/ui/webui/connectors_internals/connectors_internals_ui.h"
#endif
@@ -165,7 +165,7 @@
- #endif // defined(OS_ANDROID)
+ #endif // BUILDFLAG(IS_ANDROID)
- #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
-- defined(OS_CHROMEOS)
-+ defined(OS_CHROMEOS) || defined(OS_BSD)
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+- BUILDFLAG(IS_CHROMEOS)
++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
#include "chrome/browser/ui/webui/discards/discards.mojom.h"
#include "chrome/browser/ui/webui/discards/discards_ui.h"
#include "chrome/browser/ui/webui/discards/site_data.mojom.h"
-@@ -654,7 +654,7 @@ void PopulateChromeFrameBinders(
+@@ -658,7 +658,7 @@ void PopulateChromeFrameBinders(
#endif
- #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
-- defined(OS_CHROMEOS)
-+ defined(OS_CHROMEOS) || defined(OS_BSD)
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+- BUILDFLAG(IS_CHROMEOS)
++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
if (!render_frame_host->GetParent()) {
map->Add<chrome::mojom::DraggableRegions>(
base::BindRepeating(&DraggableRegionsHostImpl::CreateIfAllowed));
-@@ -662,7 +662,7 @@ void PopulateChromeFrameBinders(
+@@ -666,7 +666,7 @@ void PopulateChromeFrameBinders(
#endif
- #if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_MAC) || \
-- defined(OS_WIN)
-+ defined(OS_WIN) || defined(OS_BSD)
+ #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
+- BUILDFLAG(IS_WIN)
++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
if (base::FeatureList::IsEnabled(blink::features::kDesktopPWAsSubApps) &&
!render_frame_host->GetParent()) {
- map->Add<blink::mojom::SubAppsProvider>(
-@@ -702,7 +702,7 @@ void PopulateChromeWebUIFrameBinders(
+ map->Add<blink::mojom::SubAppsService>(
+@@ -706,7 +706,7 @@ void PopulateChromeWebUIFrameBinders(
SegmentationInternalsUI>(map);
- #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS_ASH)
-+ BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_BSD)
++ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
RegisterWebUIControllerInterfaceBinder<
connectors_internals::mojom::PageHandler,
enterprise_connectors::ConnectorsInternalsUI>(map);
-@@ -1003,7 +1003,7 @@ void PopulateChromeWebUIFrameBinders(
+@@ -1013,7 +1013,7 @@ void PopulateChromeWebUIFrameBinders(
#endif
- #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
-- defined(OS_CHROMEOS)
-+ defined(OS_CHROMEOS) || defined(OS_BSD)
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+- BUILDFLAG(IS_CHROMEOS)
++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
RegisterWebUIControllerInterfaceBinder<discards::mojom::DetailsProvider,
DiscardsUI>(map);
diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc
index 995770294b88..ee6b20867dee 100644
--- a/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc
+++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc
@@ -1,52 +1,52 @@
---- chrome/browser/chrome_browser_main.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/chrome_browser_main.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/chrome_browser_main.cc
-@@ -224,11 +224,11 @@
+@@ -228,11 +228,11 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
--#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
#include "chrome/browser/first_run/upgrade_util_linux.h"
- #endif // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
+ #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
--#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
#include "components/crash/core/app/breakpad_linux.h"
#include "components/crash/core/app/crashpad.h"
#endif
-@@ -263,7 +263,7 @@
+@@ -267,7 +267,7 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
--#if defined(OS_WIN) || defined(OS_MAC) || \
-+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) || \
- (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \
+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
#include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h"
#include "chrome/browser/metrics/desktop_session_duration/touch_mode_stats_tracker.h"
-@@ -949,7 +949,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
+@@ -1007,7 +1007,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
AddFirstRunNewTabs(browser_creator_.get(), master_prefs_->new_tabs);
}
--#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
// Create directory for user-level Native Messaging manifest files. This
// makes it less likely that the directory will be created by third-party
// software with incorrect owner or permission. See crbug.com/725513 .
-@@ -962,7 +962,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
+@@ -1020,7 +1020,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
}
- #endif // !defined(OS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH)
+ #endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH)
--#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_OPENBSD)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OPENBSD)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
// Set the product channel for crash reports.
if (!crash_reporter::IsCrashpadEnabled()) {
breakpad::SetChannelCrashKey(
-@@ -982,7 +982,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
+@@ -1041,7 +1041,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
--#if defined(OS_WIN) || defined(OS_MAC) || \
-+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) || \
- (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \
+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
metrics::DesktopSessionDurationTracker::Initialize();
ProfileActivityMetricsRecorder::Initialize();
diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__main__extra__parts__linux.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__main__extra__parts__linux.cc
index bfe5cf2b7ccc..009b0cbbe1e2 100644
--- a/www/chromium/files/patch-chrome_browser_chrome__browser__main__extra__parts__linux.cc
+++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main__extra__parts__linux.cc
@@ -1,11 +1,11 @@
---- chrome/browser/chrome_browser_main_extra_parts_linux.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/chrome_browser_main_extra_parts_linux.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/chrome_browser_main_extra_parts_linux.cc
@@ -120,7 +120,7 @@ ChromeBrowserMainExtraPartsLinux::ChromeBrowserMainExt
ChromeBrowserMainExtraPartsLinux::~ChromeBrowserMainExtraPartsLinux() = default;
void ChromeBrowserMainExtraPartsLinux::PreEarlyInitialization() {
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// On the desktop, we fix the platform name if necessary.
// See https://crbug.com/1246928.
auto* const command_line = base::CommandLine::ForCurrentProcess();
diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc
index fa6f25a6beab..711142efa19a 100644
--- a/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc
+++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc
@@ -1,6 +1,6 @@
---- chrome/browser/chrome_browser_main_linux.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/chrome_browser_main_linux.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/chrome_browser_main_linux.cc
-@@ -86,7 +86,7 @@ void ChromeBrowserMainPartsLinux::PreProfileInit() {
+@@ -57,7 +57,7 @@ ChromeBrowserMainPartsLinux::~ChromeBrowserMainPartsLi
}
void ChromeBrowserMainPartsLinux::PostCreateMainMessageLoop() {
@@ -9,8 +9,8 @@
// No-op: Ash and Lacros Bluetooth DBusManager initialization depend on
// FeatureList, and is done elsewhere.
#else
-@@ -115,7 +115,7 @@ void ChromeBrowserMainPartsLinux::PostBrowserStart() {
- #endif // defined(USE_DBUS) && !defined(OS_CHROMEOS)
+@@ -122,7 +122,7 @@ void ChromeBrowserMainPartsLinux::PostBrowserStart() {
+ #endif // defined(USE_DBUS) && !BUILDFLAG(IS_CHROMEOS)
void ChromeBrowserMainPartsLinux::PostDestroyThreads() {
-#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc
index f1af0f25cc94..78f929dfa12f 100644
--- a/www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc
+++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc
@@ -1,11 +1,11 @@
---- chrome/browser/chrome_browser_main_posix.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/chrome_browser_main_posix.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/chrome_browser_main_posix.cc
@@ -72,7 +72,7 @@ void ExitHandler::ExitWhenPossibleOnUIThread(int signa
} else {
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
--#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
switch (signal) {
case SIGINT:
case SIGHUP:
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 20ddbcd0d54d..e7e35569e08c 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,136 +1,136 @@
---- chrome/browser/chrome_content_browser_client.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/chrome_content_browser_client.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/chrome_content_browser_client.cc
@@ -373,7 +373,7 @@
- #include "components/user_manager/user_manager.h"
#include "services/service_manager/public/mojom/interface_provider_spec.mojom.h"
#include "storage/browser/file_system/external_mount_points.h"
--#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
+ #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"
- #elif defined(OS_ANDROID)
+ #elif BUILDFLAG(IS_ANDROID)
#include "base/android/application_status_listener.h"
-@@ -437,17 +437,17 @@
+@@ -442,17 +442,17 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
--#if defined(OS_WIN) || defined(OS_MAC) || \
-+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) || \
- (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \
+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
#include "chrome/browser/browser_switcher/browser_switcher_navigation_throttle.h"
#endif
--#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
#include "components/crash/core/app/crash_switches.h"
#include "components/crash/core/app/crashpad.h"
#endif
--#if defined(OS_POSIX) && !defined(OS_MAC)
-+#if defined(OS_POSIX) && !defined(OS_MAC) && !defined(OS_BSD)
- #if !defined(OS_ANDROID)
+-#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_BSD)
+ #if !BUILDFLAG(IS_ANDROID)
#include "base/debug/leak_annotations.h"
#include "components/crash/core/app/breakpad_linux.h"
-@@ -456,7 +456,7 @@
+@@ -461,7 +461,7 @@
#endif
- #if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) || \
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
- BUILDFLAG(IS_CHROMEOS_ASH)
-+ BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_BSD)
++ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
#include "chrome/browser/enterprise/connectors/device_trust/navigation_throttle.h"
- #endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) ||
+ #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ||
// BUILDFLAG(IS_CHROMEOS_ASH)
-@@ -478,11 +478,11 @@
+@@ -483,11 +483,11 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
--#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
#include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h"
#endif
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
#include "chrome/browser/chrome_browser_main_extra_parts_linux.h"
#elif defined(USE_OZONE)
#include "chrome/browser/chrome_browser_main_extra_parts_ozone.h"
-@@ -866,7 +866,7 @@ blink::mojom::AutoplayPolicy GetAutoplayPolicyForWebCo
+@@ -870,7 +870,7 @@ blink::mojom::AutoplayPolicy GetAutoplayPolicyForWebCo
int GetCrashSignalFD(const base::CommandLine& command_line) {
return crashpad::CrashHandlerHost::Get()->GetDeathSignalSocket();
}
--#elif defined(OS_POSIX) && !defined(OS_MAC)
-+#elif defined(OS_POSIX) && !defined(OS_MAC) && !defined(OS_BSD)
+-#elif BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC)
++#elif BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_BSD)
breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost(
const std::string& process_type) {
base::FilePath dumps_path;
-@@ -1361,7 +1361,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(
+@@ -1370,7 +1370,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(
#elif BUILDFLAG(IS_CHROMEOS_LACROS)
main_parts = std::make_unique<ChromeBrowserMainPartsLacros>(
std::move(parameters), &startup_data_);
--#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
+-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
main_parts = std::make_unique<ChromeBrowserMainPartsLinux>(
std::move(parameters), &startup_data_);
- #elif defined(OS_ANDROID)
-@@ -1395,7 +1395,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(
+ #elif BUILDFLAG(IS_ANDROID)
+@@ -1404,7 +1404,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(
std::make_unique<ChromeBrowserMainExtraPartsViewsLacros>());
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
--#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
+-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
main_parts->AddParts(
std::make_unique<ChromeBrowserMainExtraPartsViewsLinux>());
#else
-@@ -1412,7 +1412,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(
+@@ -1421,7 +1421,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLacros>());
#endif
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLinux>());
#elif defined(USE_OZONE)
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsOzone>());
-@@ -2184,6 +2184,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
- #elif defined(OS_POSIX)
- #if defined(OS_ANDROID)
+@@ -2161,6 +2161,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
+ #elif BUILDFLAG(IS_POSIX)
+ #if BUILDFLAG(IS_ANDROID)
bool enable_crash_reporter = true;
-+#elif defined(OS_BSD)
++#elif BUILDFLAG(IS_BSD)
+ bool enable_crash_reporter = false;
#else
bool enable_crash_reporter = false;
if (crash_reporter::IsCrashpadEnabled()) {
-@@ -2497,7 +2499,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
+@@ -2474,7 +2476,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
ThreadProfilerConfiguration::Get()->AppendCommandLineSwitchForChildProcess(
command_line);
--#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
// 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)) {
-@@ -3858,7 +3860,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
+@@ -3846,7 +3848,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
}
}
--#if defined(OS_POSIX) && !defined(OS_MAC)
-+#if defined(OS_POSIX) && !defined(OS_MAC) && !defined(OS_BSD)
+-#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_BSD)
void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
const base::CommandLine& command_line,
int child_process_id,
-@@ -4266,7 +4268,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
+@@ -4258,7 +4260,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
}
- #if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) || \
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
- BUILDFLAG(IS_CHROMEOS_ASH)
-+ BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_BSD)
++ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle::
MaybeCreateThrottleFor(handle),
&throttles);
-@@ -4299,7 +4301,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
+@@ -4291,7 +4293,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
--#if defined(OS_WIN) || defined(OS_MAC) || \
-+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) || \
- (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \
+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle::
MaybeCreateThrottleFor(handle),
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 4c3aff5fb455..ff16b8c5387c 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,11 +1,11 @@
---- chrome/browser/chrome_content_browser_client.h.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/chrome_content_browser_client.h.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/chrome_content_browser_client.h
-@@ -412,7 +412,7 @@ class ChromeContentBrowserClient : public content::Con
+@@ -410,7 +410,7 @@ class ChromeContentBrowserClient : public content::Con
void OverridePageVisibilityState(
content::RenderFrameHost* render_frame_host,
content::PageVisibilityState* visibility_state) override;
--#if defined(OS_POSIX) && !defined(OS_MAC)
-+#if defined(OS_POSIX) && !defined(OS_MAC) && !defined(OS_BSD)
+-#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_BSD)
void GetAdditionalMappedFilesForChildProcess(
const base::CommandLine& command_line,
int child_process_id,
diff --git a/www/chromium/files/patch-chrome_browser_crash__upload__list_crash__upload__list.cc b/www/chromium/files/patch-chrome_browser_crash__upload__list_crash__upload__list.cc
index 63fec6929287..a7fe163ba2e5 100644
--- a/www/chromium/files/patch-chrome_browser_crash__upload__list_crash__upload__list.cc
+++ b/www/chromium/files/patch-chrome_browser_crash__upload__list_crash__upload__list.cc
@@ -1,11 +1,11 @@
---- chrome/browser/crash_upload_list/crash_upload_list.cc.orig 2021-09-24 04:25:58 UTC
+--- chrome/browser/crash_upload_list/crash_upload_list.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/crash_upload_list/crash_upload_list.cc
@@ -52,7 +52,7 @@ scoped_refptr<UploadList> CreateCrashUploadList() {
// to log uploads in CrashUploadList::kReporterLogFilename.
// Linux is handled below.
#if !(BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) || \
-- defined(OS_LINUX))
-+ defined(OS_LINUX) || defined(OS_BSD))
+- BUILDFLAG(IS_LINUX))
++ BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD))
if (crash_reporter::IsCrashpadEnabled()) {
return new CrashUploadListCrashpad();
}
diff --git a/www/chromium/files/patch-chrome_browser_custom__handlers_chrome__protocol__handler__registry__delegate.cc b/www/chromium/files/patch-chrome_browser_custom__handlers_chrome__protocol__handler__registry__delegate.cc
index 89bbf2da0605..8b9b9115d38e 100644
--- a/www/chromium/files/patch-chrome_browser_custom__handlers_chrome__protocol__handler__registry__delegate.cc
+++ b/www/chromium/files/patch-chrome_browser_custom__handlers_chrome__protocol__handler__registry__delegate.cc
@@ -1,11 +1,11 @@
---- chrome/browser/custom_handlers/chrome_protocol_handler_registry_delegate.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/custom_handlers/chrome_protocol_handler_registry_delegate.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/custom_handlers/chrome_protocol_handler_registry_delegate.cc
@@ -69,7 +69,7 @@ void ChromeProtocolHandlerRegistryDelegate::CheckDefau
// If true default protocol handlers will be removed if the OS level
// registration for a protocol is no longer Chrome.
bool ChromeProtocolHandlerRegistryDelegate::ShouldRemoveHandlersNotInOS() {
--#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
// We don't do this on Linux as the OS registration there is not reliable,
// and Chrome OS doesn't have any notion of OS registration.
// TODO(benwells): When Linux support is more reliable remove this
diff --git a/www/chromium/files/patch-chrome_browser_defaults.cc b/www/chromium/files/patch-chrome_browser_defaults.cc
index 8ccc3075788f..f7270b716bdd 100644
--- a/www/chromium/files/patch-chrome_browser_defaults.cc
+++ b/www/chromium/files/patch-chrome_browser_defaults.cc
@@ -1,11 +1,11 @@
---- chrome/browser/defaults.cc.orig 2021-12-14 11:44:58 UTC
+--- chrome/browser/defaults.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/defaults.cc
@@ -50,7 +50,7 @@ const bool kSyncAutoStarts = false;
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
--#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
const bool kScrollEventChangesTab = true;
#else
const bool kScrollEventChangesTab = false;
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 c15238834196..4b0f3ecbf844 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,8 +1,8 @@
---- chrome/browser/dev_ui_browser_resources.grd.orig 2021-05-12 22:05:43 UTC
+--- chrome/browser/dev_ui_browser_resources.grd.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/dev_ui_browser_resources.grd
-@@ -47,7 +47,7 @@ This file specifies browser resources for developer-fa
- <include name="IDR_MEDIA_SESSION_MOJOM_LITE_JS" file="${root_gen_dir}\services\media_session\public\mojom\media_session.mojom-lite.js" use_base_dir="false" type="BINDATA" />
- <include name="IDR_UI_GEOMETRY_MOJOM_LITE_JS" file="${root_gen_dir}\ui\gfx\geometry\mojom\geometry.mojom-lite.js" use_base_dir="false" type="BINDATA" />
+@@ -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" />
+ <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">
+ <if expr="is_android or is_posix">
diff --git a/www/chromium/files/patch-chrome_browser_device__identity_device__oauth2__token__service__factory.cc b/www/chromium/files/patch-chrome_browser_device__identity_device__oauth2__token__service__factory.cc
index e3a763d30322..e5e00061d6ab 100644
--- a/www/chromium/files/patch-chrome_browser_device__identity_device__oauth2__token__service__factory.cc
+++ b/www/chromium/files/patch-chrome_browser_device__identity_device__oauth2__token__service__factory.cc
@@ -1,11 +1,11 @@
---- chrome/browser/device_identity/device_oauth2_token_service_factory.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/device_identity/device_oauth2_token_service_factory.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/device_identity/device_oauth2_token_service_factory.cc
@@ -28,7 +28,7 @@ std::unique_ptr<DeviceOAuth2TokenStore> CreatePlatform
return std::make_unique<chromeos::DeviceOAuth2TokenStoreChromeOS>(
local_state);
- #elif defined(OS_WIN) || defined(OS_MAC) || defined(OS_FUCHSIA) || \
-- (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
-+ (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD)
+ #elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) || \
+- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
++ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD)
return std::make_unique<DeviceOAuth2TokenStoreDesktop>(local_state);
#else
NOTREACHED();
diff --git a/www/chromium/files/patch-chrome_browser_devtools_devtools__eye__dropper.cc b/www/chromium/files/patch-chrome_browser_devtools_devtools__eye__dropper.cc
index a4fdabda91cb..6b9f8c54bad4 100644
--- a/www/chromium/files/patch-chrome_browser_devtools_devtools__eye__dropper.cc
+++ b/www/chromium/files/patch-chrome_browser_devtools_devtools__eye__dropper.cc
@@ -1,11 +1,11 @@
---- chrome/browser/devtools/devtools_eye_dropper.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/devtools/devtools_eye_dropper.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/devtools/devtools_eye_dropper.cc
@@ -186,7 +186,7 @@ void DevToolsEyeDropper::UpdateCursor() {
// magnified projection only with centered hotspot.
// Mac Retina requires cursor to be > 120px in order to render smoothly.
--#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
const float kCursorSize = 63;
const float kDiameter = 63;
const float kHotspotOffset = 32;
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 2fe459b66614..e50b9ab03679 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,47 +1,47 @@
---- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/download/chrome_download_manager_delegate.cc
@@ -1539,7 +1539,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
target_info->is_filetype_handled_safely)
DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true);
--#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
if (item->GetOriginalMimeType() == "application/x-x509-user-cert")
DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true);
#endif
@@ -1608,7 +1608,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferreredForFile(
const base::FilePath& path) {
- #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \
-- defined(OS_MAC)
-+ defined(OS_MAC) || defined(OS_BSD)
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
+- BUILDFLAG(IS_MAC)
++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
if (path.MatchesExtension(FILE_PATH_LITERAL(".pdf"))) {
return !download_prefs_->ShouldOpenPdfInSystemReader();
}
@@ -1716,7 +1716,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow
content::CheckDownloadAllowedCallback check_download_allowed_cb) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
- #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \
-- defined(OS_MAC)
-+ defined(OS_MAC) || defined(OS_BSD)
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
+- BUILDFLAG(IS_MAC)
++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
// Don't download pdf if it is a file URL, as that might cause an infinite
// download loop if Chrome is not the system pdf viewer.
if (url.SchemeIsFile() && download_prefs_->ShouldOpenPdfInSystemReader()) {
@@ -1758,7 +1758,7 @@ std::unique_ptr<download::DownloadItemRenameHandler>
ChromeDownloadManagerDelegate::GetRenameHandlerForDownload(
download::DownloadItem* download_item) {
- #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \
-- defined(OS_MAC)
-+ defined(OS_MAC) || defined(OS_BSD)
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
+- BUILDFLAG(IS_MAC)
++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
return enterprise_connectors::FileSystemRenameHandler::CreateIfNeeded(
download_item);
#else
@@ -1774,7 +1774,7 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAl
DCHECK(download_item->IsSavePackageDownload());
- #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \
-- defined(OS_MAC)
-+ defined(OS_MAC) || defined(OS_BSD)
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
+- BUILDFLAG(IS_MAC)
++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
if (!base::FeatureList::IsEnabled(
download::features::kAllowSavePackageScanning)) {
std::move(callback).Run(true);
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 450356c57c46..7322bb2b635c 100644
--- a/www/chromium/files/patch-chrome_browser_download_download__commands.cc
+++ b/www/chromium/files/patch-chrome_browser_download_download__commands.cc
@@ -1,20 +1,20 @@
---- chrome/browser/download/download_commands.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/download/download_commands.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/download/download_commands.cc
@@ -27,7 +27,7 @@
#include "ui/base/clipboard/scoped_clipboard_writer.h"
- #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \
-- defined(OS_MAC) || defined(OS_FUCHSIA)
-+ defined(OS_MAC) || defined(OS_FUCHSIA) || defined(OS_BSD)
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
+- BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA)
++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_finder.h"
#include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
@@ -168,7 +168,7 @@ void DownloadCommands::ExecuteCommand(Command command)
}
- #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
-- defined(OS_CHROMEOS) || defined(OS_FUCHSIA)
-+ defined(OS_CHROMEOS) || defined(OS_FUCHSIA) || defined(OS_BSD)
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
Browser* DownloadCommands::GetBrowser() const {
if (!model_)
diff --git a/www/chromium/files/patch-chrome_browser_download_download__commands.h b/www/chromium/files/patch-chrome_browser_download_download__commands.h
index de608693e66a..b06c4d936816 100644
--- a/www/chromium/files/patch-chrome_browser_download_download__commands.h
+++ b/www/chromium/files/patch-chrome_browser_download_download__commands.h
@@ -1,11 +1,11 @@
---- chrome/browser/download/download_commands.h.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/download/download_commands.h.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/download/download_commands.h
@@ -54,7 +54,7 @@ class DownloadCommands {
void ExecuteCommand(Command command);
- #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \
-- defined(OS_MAC) || defined(OS_FUCHSIA)
-+ defined(OS_MAC) || defined(OS_FUCHSIA) || defined(OS_BSD)
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
+- BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA)
++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
bool IsDownloadPdf() const;
bool CanOpenPdfInSystemViewer() const;
Browser* GetBrowser() const;
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 a3f2e3a5db43..de6f03b8595d 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,20 +1,20 @@
---- chrome/browser/download/download_item_model.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/download/download_item_model.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/download/download_item_model.cc
-@@ -635,7 +635,7 @@ bool DownloadItemModel::IsCommandChecked(
+@@ -636,7 +636,7 @@ bool DownloadItemModel::IsCommandChecked(
download_crx_util::IsExtensionDownload(*download_);
case DownloadCommands::ALWAYS_OPEN_TYPE:
- #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \
-- defined(OS_MAC)
-+ defined(OS_MAC) || defined(OS_BSD)
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
+- BUILDFLAG(IS_MAC)
++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
if (download_commands->CanOpenPdfInSystemViewer()) {
DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile());
return prefs->ShouldOpenPdfInSystemReader();
-@@ -676,7 +676,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand
+@@ -677,7 +677,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand
DownloadCommands::ALWAYS_OPEN_TYPE);
DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile());
- #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \
-- defined(OS_MAC)
-+ defined(OS_MAC) || defined(OS_BSD)
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
+- BUILDFLAG(IS_MAC)
++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
if (download_commands->CanOpenPdfInSystemViewer()) {
prefs->SetShouldOpenPdfInSystemReader(!is_checked);
SetShouldPreferOpeningInBrowser(is_checked);
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 09000d57351d..9dbb2956cd6f 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-02-07 13:39:41 UTC
+--- chrome/browser/download/download_prefs.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/download/download_prefs.cc
@@ -13,6 +13,7 @@
#include "base/callback_helpers.h"
@@ -21,66 +21,66 @@
// Consider downloads 'dangerous' if they go to the home directory on Linux and
// to the desktop on any platform.
bool DownloadPathIsDangerous(const base::FilePath& download_path) {
--#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
base::FilePath home_dir = base::GetHomeDir();
if (download_path == home_dir) {
return true;
@@ -168,7 +171,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profi
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
- #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \
-- defined(OS_MAC)
-+ defined(OS_MAC) || defined(OS_BSD)
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
+- BUILDFLAG(IS_MAC)
++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
should_open_pdf_in_system_reader_ =
prefs->GetBoolean(prefs::kOpenPdfDownloadInSystemReader);
#endif
@@ -287,7 +290,7 @@ void DownloadPrefs::RegisterProfilePrefs(
registry->RegisterFilePathPref(prefs::kSaveFileDefaultDirectory,
default_download_path);
- #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \
-- defined(OS_MAC)
-+ defined(OS_MAC) || defined(OS_BSD)
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
+- BUILDFLAG(IS_MAC)
++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
registry->RegisterBooleanPref(prefs::kOpenPdfDownloadInSystemReader, false);
#endif
- #if defined(OS_ANDROID)
+ #if BUILDFLAG(IS_ANDROID)
@@ -421,7 +424,7 @@ bool DownloadPrefs::IsDownloadPathManaged() const {
bool DownloadPrefs::IsAutoOpenByUserUsed() const {
- #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \
-- defined(OS_MAC)
-+ defined(OS_MAC) || defined(OS_BSD)
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
+- BUILDFLAG(IS_MAC)
++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
if (ShouldOpenPdfInSystemReader())
return true;
#endif
@@ -436,7 +439,7 @@ bool DownloadPrefs::IsAutoOpenEnabled(const GURL& url,
DCHECK(extension[0] == base::FilePath::kExtensionSeparator);
extension.erase(0, 1);
- #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \
-- defined(OS_MAC)
-+ defined(OS_MAC) || defined(OS_BSD)
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
+- BUILDFLAG(IS_MAC)
++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
if (base::FilePath::CompareEqualIgnoreCase(extension,
FILE_PATH_LITERAL("pdf")) &&
ShouldOpenPdfInSystemReader())
@@ -491,7 +494,7 @@ void DownloadPrefs::DisableAutoOpenByUserBasedOnExtens
}
- #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \
-- defined(OS_MAC)
-+ defined(OS_MAC) || defined(OS_BSD)
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
+- BUILDFLAG(IS_MAC)
++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
void DownloadPrefs::SetShouldOpenPdfInSystemReader(bool should_open) {
if (should_open_pdf_in_system_reader_ == should_open)
return;
@@ -513,7 +516,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons
void DownloadPrefs::ResetAutoOpenByUser() {
- #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \
-- defined(OS_MAC)
-+ defined(OS_MAC) || defined(OS_BSD)
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
+- BUILDFLAG(IS_MAC)
++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
SetShouldOpenPdfInSystemReader(false);
#endif
auto_open_by_user_.clear();
-@@ -630,9 +633,13 @@ base::FilePath DownloadPrefs::SanitizeDownloadTargetPa
+@@ -651,9 +654,13 @@ base::FilePath DownloadPrefs::SanitizeDownloadTargetPa
// Fall back to the default download directory for all other paths.
return GetDefaultDownloadDirectoryForProfile();
#else
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 9dfc3dcb070d..7ad6d7876c19 100644
--- a/www/chromium/files/patch-chrome_browser_download_download__prefs.h
+++ b/www/chromium/files/patch-chrome_browser_download_download__prefs.h
@@ -1,20 +1,20 @@
---- chrome/browser/download/download_prefs.h.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/download/download_prefs.h.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/download/download_prefs.h
@@ -122,7 +122,7 @@ class DownloadPrefs {
void DisableAutoOpenByUserBasedOnExtension(const base::FilePath& file_name);
- #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \
-- defined(OS_MAC)
-+ defined(OS_MAC) || defined(OS_BSD)
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
+- BUILDFLAG(IS_MAC)
++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
// Store the user preference to disk. If |should_open| is true, also disable
// the built-in PDF plugin. If |should_open| is false, enable the PDF plugin.
void SetShouldOpenPdfInSystemReader(bool should_open);
@@ -181,7 +181,7 @@ class DownloadPrefs {
std::unique_ptr<policy::URLBlocklist> auto_open_allowed_by_urls_;
- #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \
-- defined(OS_MAC)
-+ defined(OS_MAC) || defined(OS_BSD)
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
+- BUILDFLAG(IS_MAC)
++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
bool should_open_pdf_in_system_reader_;
#endif
diff --git a/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc b/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc
index d9ebefbbd7f4..4bef52efb9e8 100644
--- a/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc
+++ b/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc
@@ -1,11 +1,11 @@
---- chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.cc
@@ -12,7 +12,7 @@
#include "components/keyed_service/content/browser_context_dependency_manager.h"
#include "components/keyed_service/core/keyed_service.h"
--#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC)
-+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
#include "chrome/browser/browser_process.h"
#include "chrome/browser/enterprise/connectors/device_trust/browser/browser_device_trust_connector_service.h"
#include "chrome/browser/policy/chrome_browser_policy_connector.h"
@@ -13,8 +13,8 @@
bool DeviceTrustConnectorServiceFactory::ServiceIsCreatedWithBrowserContext()
const {
--#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC)
-+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
return IsDeviceTrustConnectorFeatureEnabled();
#else
return false;
@@ -22,8 +22,8 @@
DeviceTrustConnectorService* service = nullptr;
--#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC)
-+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
if (IsDeviceTrustConnectorFeatureEnabled()) {
auto* key_manager = g_browser_process->browser_policy_connector()
->chrome_browser_cloud_management_controller()
diff --git a/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc b/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc
index c8de763196d0..62f759813b08 100644
--- a/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc
+++ b/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc
@@ -1,11 +1,11 @@
---- chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc
@@ -21,7 +21,7 @@
#include "components/policy/content/policy_blocklist_service.h"
#include "content/public/browser/browser_context.h"
--#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC)
-+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
#include "chrome/browser/browser_process.h"
#include "chrome/browser/enterprise/connectors/device_trust/attestation/desktop/desktop_attestation_service.h"
#include "chrome/browser/policy/chrome_browser_policy_connector.h"
diff --git a/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_key__management_core_persistence_key__persistence__delegate__factory.cc b/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_key__management_core_persistence_key__persistence__delegate__factory.cc
index bdaa9bca00f1..8268b3ffef16 100644
--- a/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_key__management_core_persistence_key__persistence__delegate__factory.cc
+++ b/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_key__management_core_persistence_key__persistence__delegate__factory.cc
@@ -1,20 +1,20 @@
---- chrome/browser/enterprise/connectors/device_trust/key_management/core/persistence/key_persistence_delegate_factory.cc.orig 2022-01-21 13:09:59 UTC
+--- chrome/browser/enterprise/connectors/device_trust/key_management/core/persistence/key_persistence_delegate_factory.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/enterprise/connectors/device_trust/key_management/core/persistence/key_persistence_delegate_factory.cc
@@ -13,7 +13,7 @@
#include "chrome/browser/enterprise/connectors/device_trust/key_management/core/persistence/win_key_persistence_delegate.h"
- #elif defined(OS_MAC)
+ #elif BUILDFLAG(IS_MAC)
#include "chrome/browser/enterprise/connectors/device_trust/key_management/core/persistence/mac_key_persistence_delegate.h"
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
#include "chrome/browser/enterprise/connectors/device_trust/key_management/core/persistence/linux_key_persistence_delegate.h"
#endif
@@ -44,7 +44,7 @@ KeyPersistenceDelegateFactory::CreateKeyPersistenceDel
return std::make_unique<WinKeyPersistenceDelegate>();
- #elif defined(OS_MAC)
+ #elif BUILDFLAG(IS_MAC)
return std::make_unique<MacKeyPersistenceDelegate>();
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
return std::make_unique<LinuxKeyPersistenceDelegate>();
#else
NOTREACHED();
diff --git a/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc b/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc
index 8c2c05f45f9a..e7c6c5dfc77e 100644
--- a/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc
+++ b/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc
@@ -1,11 +1,11 @@
---- chrome/browser/enterprise/connectors/device_trust/signals/signals_service_factory.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/enterprise/connectors/device_trust/signals/signals_service_factory.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/enterprise/connectors/device_trust/signals/signals_service_factory.cc
@@ -14,7 +14,7 @@
#include "chrome/browser/enterprise/connectors/device_trust/signals/signals_service_impl.h"
#include "chrome/browser/profiles/profile.h"
--#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC)
-+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
#include "base/check.h"
#include "chrome/browser/enterprise/connectors/device_trust/signals/decorators/browser/browser_signals_decorator.h"
#include "chrome/browser/policy/chrome_browser_policy_connector.h"
@@ -13,8 +13,8 @@
decorators.push_back(
std::make_unique<ContentSignalsDecorator>(policy_blocklist_service));
--#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC)
-+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
policy::ChromeBrowserPolicyConnector* browser_policy_connector =
g_browser_process->browser_policy_connector();
DCHECK(browser_policy_connector);
diff --git a/www/chromium/files/patch-chrome_browser_enterprise_remote__commands_cbcm__remote__commands__factory.cc b/www/chromium/files/patch-chrome_browser_enterprise_remote__commands_cbcm__remote__commands__factory.cc
new file mode 100644
index 000000000000..255d96a1e284
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_enterprise_remote__commands_cbcm__remote__commands__factory.cc
@@ -0,0 +1,20 @@
+--- chrome/browser/enterprise/remote_commands/cbcm_remote_commands_factory.cc.orig 2022-02-28 16:54:41 UTC
++++ chrome/browser/enterprise/remote_commands/cbcm_remote_commands_factory.cc
+@@ -11,7 +11,7 @@
+ #include "chrome/browser/profiles/profile_manager.h"
+ #include "components/policy/core/common/remote_commands/remote_command_job.h"
+
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+ #include "chrome/browser/enterprise/connectors/device_trust/device_trust_features.h"
+ #include "chrome/browser/enterprise/remote_commands/rotate_attestation_credential_job.h"
+ #include "chrome/browser/policy/chrome_browser_policy_connector.h"
+@@ -31,7 +31,7 @@ CBCMRemoteCommandsFactory::BuildJobForType(
+ g_browser_process->profile_manager());
+ }
+
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+ if (enterprise_connectors::IsDeviceTrustConnectorFeatureEnabled() &&
+ type == enterprise_management::
+ RemoteCommand_Type_BROWSER_ROTATE_ATTESTATION_CREDENTIAL) {
diff --git a/www/chromium/files/patch-chrome_browser_enterprise_signals_device__info__fetcher.cc b/www/chromium/files/patch-chrome_browser_enterprise_signals_device__info__fetcher.cc
index f47f4f273fd5..cef049635caf 100644
--- a/www/chromium/files/patch-chrome_browser_enterprise_signals_device__info__fetcher.cc
+++ b/www/chromium/files/patch-chrome_browser_enterprise_signals_device__info__fetcher.cc
@@ -1,20 +1,20 @@
---- chrome/browser/enterprise/signals/device_info_fetcher.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/enterprise/signals/device_info_fetcher.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/enterprise/signals/device_info_fetcher.cc
@@ -10,7 +10,7 @@
#include "chrome/browser/enterprise/signals/device_info_fetcher_mac.h"
- #elif defined(OS_WIN)
+ #elif BUILDFLAG(IS_WIN)
#include "chrome/browser/enterprise/signals/device_info_fetcher_win.h"
--#elif defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
#include "chrome/browser/enterprise/signals/device_info_fetcher_linux.h"
#endif
@@ -70,7 +70,7 @@ std::unique_ptr<DeviceInfoFetcher> DeviceInfoFetcher::
return std::make_unique<DeviceInfoFetcherMac>();
- #elif defined(OS_WIN)
+ #elif BUILDFLAG(IS_WIN)
return std::make_unique<DeviceInfoFetcherWin>();
--#elif defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
return std::make_unique<DeviceInfoFetcherLinux>();
#else
return std::make_unique<StubDeviceFetcher>();
diff --git a/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn b/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn
index d76569f1c6aa..c415a0336962 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-02-07 13:39:41 UTC
+--- chrome/browser/extensions/BUILD.gn.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/extensions/BUILD.gn
-@@ -1303,6 +1303,10 @@ static_library("extensions") {
+@@ -1298,6 +1298,10 @@ static_library("extensions") {
deps += [ "//chrome/services/printing/public/mojom" ]
}
diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_chrome__desktop__report__request__helper.cc b/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_chrome__desktop__report__request__helper.cc
index 184921c28f0b..59e2bb1525d0 100644
--- a/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_chrome__desktop__report__request__helper.cc
+++ b/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_chrome__desktop__report__request__helper.cc
@@ -1,29 +1,29 @@
---- chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc
-@@ -23,7 +23,7 @@
+@@ -24,7 +24,7 @@
#include "base/win/registry.h"
#endif
--#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
#include "base/environment.h"
#include "base/nix/xdg_util.h"
#endif
-@@ -228,7 +228,7 @@ base::FilePath GetEndpointVerificationDir() {
+@@ -208,7 +208,7 @@ base::FilePath GetEndpointVerificationDir() {
bool got_path = false;
- #if defined(OS_WIN)
+ #if BUILDFLAG(IS_WIN)
got_path = base::PathService::Get(base::DIR_LOCAL_APP_DATA, &path);
--#elif defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
std::unique_ptr<base::Environment> env(base::Environment::Create());
path = base::nix::GetXDGDirectory(env.get(), base::nix::kXdgConfigHomeEnvVar,
base::nix::kDotConfigDir);
-@@ -239,7 +239,7 @@ base::FilePath GetEndpointVerificationDir() {
+@@ -219,7 +219,7 @@ base::FilePath GetEndpointVerificationDir() {
if (!got_path)
return path;
--#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
path = path.AppendASCII("google");
#else
path = path.AppendASCII("Google");
diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc b/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc
index 318ce33580c5..a88036a55cae 100644
--- a/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc
+++ b/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc
@@ -1,11 +1,11 @@
---- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc
@@ -155,7 +155,7 @@ EnterpriseReportingPrivateGetDeviceIdFunction::
// getPersistentSecret
--#if !defined(OS_LINUX)
-+#if !defined(OS_LINUX) && !defined(OS_BSD)
+-#if !BUILDFLAG(IS_LINUX)
++#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
EnterpriseReportingPrivateGetPersistentSecretFunction::
EnterpriseReportingPrivateGetPersistentSecretFunction() = default;
diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.h b/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.h
index 6428727febf6..885f7e4d295e 100644
--- a/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.h
+++ b/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.h
@@ -1,11 +1,11 @@
---- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.h.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.h.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.h
@@ -45,7 +45,7 @@ class EnterpriseReportingPrivateGetDeviceIdFunction :
~EnterpriseReportingPrivateGetDeviceIdFunction() override;
};
--#if !defined(OS_LINUX)
-+#if !defined(OS_LINUX) && !defined(OS_BSD)
+-#if !BUILDFLAG(IS_LINUX)
++#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
class EnterpriseReportingPrivateGetPersistentSecretFunction
: public ExtensionFunction {
diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_messaging_native__process__launcher__posix.cc b/www/chromium/files/patch-chrome_browser_extensions_api_messaging_native__process__launcher__posix.cc
index e760b5589021..657717257a26 100644
--- a/www/chromium/files/patch-chrome_browser_extensions_api_messaging_native__process__launcher__posix.cc
+++ b/www/chromium/files/patch-chrome_browser_extensions_api_messaging_native__process__launcher__posix.cc
@@ -1,11 +1,11 @@
---- chrome/browser/extensions/api/messaging/native_process_launcher_posix.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/extensions/api/messaging/native_process_launcher_posix.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/extensions/api/messaging/native_process_launcher_posix.cc
@@ -82,7 +82,7 @@ bool NativeProcessLauncher::LaunchNativeProcess(
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
--#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
// Don't use no_new_privs mode, e.g. in case the host needs to use sudo.
options.allow_new_privs = true;
#endif
diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc b/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc
index c8ea0be62458..5e1c8a8a0917 100644
--- a/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc
+++ b/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc
@@ -1,20 +1,20 @@
---- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2021-09-14 01:51:50 UTC
+--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/extensions/api/settings_private/prefs_util.cc
-@@ -182,7 +182,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
+@@ -181,7 +181,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
--#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
(*s_allowlist)[::prefs::kUseCustomChromeFrame] =
settings_api::PrefType::PREF_TYPE_BOOLEAN;
#endif
-@@ -196,7 +196,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
+@@ -195,7 +195,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
settings_api::PrefType::PREF_TYPE_NUMBER;
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
--#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
(*s_allowlist)[::prefs::kUsesSystemTheme] =
settings_api::PrefType::PREF_TYPE_BOOLEAN;
#endif
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 1150bf672f0d..8e814e8a9a64 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,11 +1,11 @@
---- chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc.orig 2022-02-07 13:39:41 UTC
+--- 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
@@ -30,7 +30,7 @@
#include "extensions/browser/process_manager.h"
#include "extensions/common/error_utils.h"
--#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
#include "extensions/common/permissions/permissions_data.h"
#endif
@@ -13,8 +13,8 @@
bool CanEnableAudioDebugRecordingsFromExtension(
const extensions::Extension* extension) {
bool enabled_by_permissions = false;
--#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
if (extension) {
enabled_by_permissions =
extension->permissions_data()->active_permissions().HasAPIPermission(
@@ -22,8 +22,8 @@
ExtensionFunction::ResponseAction
WebrtcLoggingPrivateGetLogsDirectoryFunction::Run() {
--#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
// Unlike other WebrtcLoggingPrivate functions that take a RequestInfo object,
// this function shouldn't be called by a component extension on behalf of
// some web code. It returns a DirectoryEntry for use directly in the calling
diff --git a/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 132a4b35a2ba..ccfb84227366 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,20 +1,20 @@
---- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig 2022-02-07 13:39:41 UTC
+--- 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
-@@ -53,7 +53,7 @@
+@@ -52,7 +52,7 @@
#include "extensions/browser/api/networking_private/networking_private_delegate_factory.h"
#include "ppapi/buildflags/buildflags.h"
--#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN)
-+#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
#include "chrome/browser/extensions/api/system_indicator/system_indicator_manager_factory.h"
#endif
-@@ -126,7 +126,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt()
+@@ -124,7 +124,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt()
extensions::SettingsPrivateEventRouterFactory::GetInstance();
extensions::SettingsOverridesAPI::GetFactoryInstance();
extensions::SignedInDevicesManager::GetFactoryInstance();
--#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN)
-+#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
extensions::SystemIndicatorManagerFactory::GetInstance();
#endif
extensions::TabGroupsEventRouterFactory::GetInstance();
diff --git a/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc b/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc
index 20346cba311a..ef8769083bb5 100644
--- a/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc
+++ b/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc
@@ -1,20 +1,20 @@
---- chrome/browser/extensions/external_provider_impl.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/extensions/external_provider_impl.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/extensions/external_provider_impl.cc
-@@ -815,7 +815,7 @@ void ExternalProviderImpl::CreateExternalProviders(
+@@ -816,7 +816,7 @@ void ExternalProviderImpl::CreateExternalProviders(
if (!profile->GetPrefs()->GetBoolean(pref_names::kBlockExternalExtensions)) {
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
--#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
provider_list->push_back(std::make_unique<ExternalProviderImpl>(
service,
base::MakeRefCounted<ExternalPrefLoader>(
-@@ -843,7 +843,7 @@ void ExternalProviderImpl::CreateExternalProviders(
+@@ -844,7 +844,7 @@ void ExternalProviderImpl::CreateExternalProviders(
bundled_extension_creation_flags));
// Define a per-user source of external extensions.
--#if defined(OS_MAC) || ((defined(OS_LINUX) || defined(OS_CHROMEOS)) && \
-+#if defined(OS_MAC) || ((defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && \
- BUILDFLAG(CHROMIUM_BRANDING))
+-#if BUILDFLAG(IS_MAC) || ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \
++#if BUILDFLAG(IS_MAC) || ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && \
+ BUILDFLAG(CHROMIUM_BRANDING))
provider_list->push_back(std::make_unique<ExternalProviderImpl>(
service,
diff --git a/www/chromium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc b/www/chromium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc
index b03f80a4a3b9..ebbdbd6295d6 100644
--- a/www/chromium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc
+++ b/www/chromium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc
@@ -1,11 +1,11 @@
---- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
-@@ -216,7 +216,7 @@ const struct {
+@@ -217,7 +217,7 @@ const struct {
{base::DIR_HOME, FILE_PATH_LITERAL("Library/Mobile Documents"),
kDontBlockChildren},
#endif
--#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
// On Linux also block access to devices via /dev, as well as security
// sensitive data in /sys and /proc.
{kNoBasePathKey, FILE_PATH_LITERAL("/dev"), kBlockAllChildren},
diff --git a/www/chromium/files/patch-chrome_browser_first__run_first__run__dialog.h b/www/chromium/files/patch-chrome_browser_first__run_first__run__dialog.h
index d0700ee0815a..3accb34d0e25 100644
--- a/www/chromium/files/patch-chrome_browser_first__run_first__run__dialog.h
+++ b/www/chromium/files/patch-chrome_browser_first__run_first__run__dialog.h
@@ -1,11 +1,11 @@
---- chrome/browser/first_run/first_run_dialog.h.orig 2021-04-14 18:40:53 UTC
+--- chrome/browser/first_run/first_run_dialog.h.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/first_run/first_run_dialog.h
@@ -12,7 +12,7 @@
// Hide this function on platforms where the dialog does not exist.
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
--#if defined(OS_MAC) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
-+#if defined(OS_MAC) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD)
+-#if BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
++#if BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD)
class Profile;
diff --git a/www/chromium/files/patch-chrome_browser_first__run_first__run__internal.h b/www/chromium/files/patch-chrome_browser_first__run_first__run__internal.h
index 14310d4cb9ac..e354427b6e15 100644
--- a/www/chromium/files/patch-chrome_browser_first__run_first__run__internal.h
+++ b/www/chromium/files/patch-chrome_browser_first__run_first__run__internal.h
@@ -1,11 +1,11 @@
---- chrome/browser/first_run/first_run_internal.h.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/first_run/first_run_internal.h.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/first_run/first_run_internal.h
@@ -58,7 +58,7 @@ FirstRunState DetermineFirstRunState(bool has_sentinel
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
--#if defined(OS_MAC) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
-+#if defined(OS_MAC) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD)
+-#if BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
++#if BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD)
// For testing, forces the first run dialog to either be shown or not. If not
// called, the decision to show the dialog or not will be made by Chrome based
// on a number of factors (such as install type, whether it's a Chrome-branded
diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc
index 161dfa92d8e6..6338e2b7acaa 100644
--- a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc
+++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc
@@ -1,47 +1,56 @@
---- chrome/browser/flag_descriptions.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/flag_descriptions.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/flag_descriptions.cc
-@@ -5314,7 +5314,7 @@ const char kDownloadShelfWebUIDescription[] =
+@@ -5323,7 +5323,7 @@ const char kDownloadShelfWebUIDescription[] =
// Random platform combinations -----------------------------------------------
- #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
-- defined(OS_CHROMEOS) || defined(OS_FUCHSIA)
-+ defined(OS_CHROMEOS) || defined(OS_FUCHSIA) || defined(OS_BSD)
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
const char kWebUIBrandingUpdateName[] = "WebUI Branding Update";
const char kWebUIBrandingUpdateDescription[] =
-@@ -5329,7 +5329,7 @@ const char kWebuiFeedbackDescription[] =
- // defined(OS_CHROMEOS) || defined(OS_FUCHSIA)
+@@ -5338,7 +5338,7 @@ const char kWebuiFeedbackDescription[] =
+ // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
- #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
-- defined(OS_FUCHSIA)
-+ defined(OS_FUCHSIA) || defined(OS_BSD)
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+- BUILDFLAG(IS_FUCHSIA)
++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
const char kCommanderName[] = "Commander";
const char kCommanderDescription[] =
-@@ -5348,7 +5348,7 @@ const char kDesktopDetailedLanguageSettingsDescription
- #endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) ||
- // defined(OS_FUCHSIA)
-
--#if defined(OS_CHROMEOS) || defined(OS_LINUX)
-+#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD)
- #if BUILDFLAG(USE_TCMALLOC)
- const char kDynamicTcmallocName[] = "Dynamic Tcmalloc Tuning";
- const char kDynamicTcmallocDescription[] =
-@@ -5364,7 +5364,7 @@ const char kWebShareDescription[] =
+@@ -5357,7 +5357,7 @@ const char kDesktopDetailedLanguageSettingsDescription
+ #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
+ // BUILDFLAG(IS_FUCHSIA)
+
+-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ const char kImproveAccessibilityTreeUsingLocalMLName[] =
+ "Enable improving accessibility tree using local machine learning library.";
+ const char kImproveAccessibilityTreeUsingLocalMLDescription[] =
+@@ -5372,7 +5372,7 @@ const char kWebShareDescription[] =
"platforms.";
- #endif // defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_MAC)
+ #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
++#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)) || BUILDFLAG(IS_BSD)
const char kOzonePlatformHintChoiceDefault[] = "Default";
const char kOzonePlatformHintChoiceAuto[] = "Auto";
const char kOzonePlatformHintChoiceX11[] = "X11";
-@@ -5482,7 +5482,7 @@ const char kElasticOverscrollDescription[] =
- #endif // defined(OS_WIN) || defined(OS_ANDROID)
+@@ -5384,7 +5384,7 @@ const char kOzonePlatformHintDescription[] =
+ "\"X11\". \"Auto\" selects Wayland if possible, X11 otherwise. ";
+ #endif // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ const char kCleanUndecryptablePasswordsLinuxName[] =
+ "Cleanup local undecryptable passwords during initial sync flow";
+ const char kCleanUndecryptablePasswordsLinuxDescription[] =
+@@ -5500,7 +5500,7 @@ const char kElasticOverscrollDescription[] =
- #if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
-- defined(OS_MAC) || defined(OS_FUCHSIA)
-+ defined(OS_MAC) || defined(OS_FUCHSIA) || defined(OS_BSD)
+ #if BUILDFLAG(IS_WIN) || \
+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
+- BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA)
++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
const char kUIDebugToolsName[] = "Debugging tools for UI";
const char kUIDebugToolsDescription[] =
"Enables additional keyboard shortcuts to help debugging.";
diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.h b/www/chromium/files/patch-chrome_browser_flag__descriptions.h
index b7b8292e6415..0772dee1e296 100644
--- a/www/chromium/files/patch-chrome_browser_flag__descriptions.h
+++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.h
@@ -1,56 +1,47 @@
---- chrome/browser/flag_descriptions.h.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/flag_descriptions.h.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/flag_descriptions.h
-@@ -22,7 +22,7 @@
- #include "printing/buildflags/buildflags.h"
- #include "third_party/blink/public/common/buildflags.h"
-
--#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
- #include "base/allocator/buildflags.h"
- #endif // defined(OS_LINUX) || defined(OS_CHROMEOS)
-
-@@ -3081,7 +3081,7 @@ extern const char kDownloadShelfWebUIDescription[];
+@@ -3070,7 +3070,7 @@ extern const char kDownloadShelfWebUIDescription[];
// Random platform combinations -----------------------------------------------
- #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
-- defined(OS_CHROMEOS) || defined(OS_FUCHSIA)
-+ defined(OS_CHROMEOS) || defined(OS_FUCHSIA) || defined(OS_BSD)
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
extern const char kWebUIBrandingUpdateName[];
extern const char kWebUIBrandingUpdateDescription[];
-@@ -3093,7 +3093,7 @@ extern const char kWebuiFeedbackDescription[];
- // defined(OS_CHROMEOS) || defined(OS_FUCHSIA)
+@@ -3082,7 +3082,7 @@ extern const char kWebuiFeedbackDescription[];
+ // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
- #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
-- defined(OS_FUCHSIA)
-+ defined(OS_FUCHSIA) || defined(OS_BSD)
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+- BUILDFLAG(IS_FUCHSIA)
++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
extern const char kCommanderName[];
extern const char kCommanderDescription[];
-@@ -3107,7 +3107,7 @@ extern const char kDesktopDetailedLanguageSettingsDesc
- #endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined
- // (OS_FUCHSIA)
-
--#if defined(OS_CHROMEOS) || defined(OS_LINUX)
-+#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD)
- #if BUILDFLAG(USE_TCMALLOC)
- extern const char kDynamicTcmallocName[];
- extern const char kDynamicTcmallocDescription[];
-@@ -3119,7 +3119,7 @@ extern const char kWebShareName[];
+@@ -3096,7 +3096,7 @@ extern const char kDesktopDetailedLanguageSettingsDesc
+ #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
+ // defined (OS_FUCHSIA)
+
+-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+
+ extern const char kImproveAccessibilityTreeUsingLocalMLName[];
+ extern const char kImproveAccessibilityTreeUsingLocalMLDescription[];
+@@ -3107,7 +3107,7 @@ extern const char kWebShareName[];
extern const char kWebShareDescription[];
- #endif // defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_MAC)
+ #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
extern const char kOzonePlatformHintChoiceDefault[];
extern const char kOzonePlatformHintChoiceAuto[];
extern const char kOzonePlatformHintChoiceX11[];
-@@ -3201,7 +3201,7 @@ extern const char kElasticOverscrollDescription[];
- #endif // defined(OS_WIN) || defined(OS_ANDROID)
+@@ -3197,7 +3197,7 @@ extern const char kElasticOverscrollDescription[];
- #if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
-- defined(OS_MAC) || defined(OS_FUCHSIA)
-+ defined(OS_MAC) || defined(OS_FUCHSIA) || defined(OS_BSD)
+ #if BUILDFLAG(IS_WIN) || \
+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
+- BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA)
++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
extern const char kUIDebugToolsName[];
extern const char kUIDebugToolsDescription[];
#endif
diff --git a/www/chromium/files/patch-chrome_browser_headless_headless__mode__util.cc b/www/chromium/files/patch-chrome_browser_headless_headless__mode__util.cc
index 212403f82033..dd8f461c2568 100644
--- a/www/chromium/files/patch-chrome_browser_headless_headless__mode__util.cc
+++ b/www/chromium/files/patch-chrome_browser_headless_headless__mode__util.cc
@@ -1,11 +1,11 @@
---- chrome/browser/headless/headless_mode_util.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/headless/headless_mode_util.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/headless/headless_mode_util.cc
@@ -9,7 +9,7 @@
// Native headless is currently available only on Linux and Windows platforms.
// More platforms will be added later, so avoid function level clutter by
// providing stub implementations at the end of the file.
--#if defined(OS_LINUX) || defined(OS_WIN)
-+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
#include <cstdlib>
#include <vector>
@@ -13,17 +13,17 @@
#include "base/base_switches.h"
#include "ui/gfx/switches.h"
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
#include "ui/ozone/public/ozone_switches.h"
- #endif // defined(OS_LINUX)
+ #endif // BUILDFLAG(IS_LINUX)
@@ -51,7 +51,7 @@ void SetUpCommandLine(const base::CommandLine* command
base::CommandLine::ForCurrentProcess()->AppendSwitch(
::switches::kNoErrorDialogs);
}
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// Native headless chrome on Linux relies on ozone/headless platform.
base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
::switches::kOzonePlatform, switches::kHeadless);
diff --git a/www/chromium/files/patch-chrome_browser_intranet__redirect__detector.h b/www/chromium/files/patch-chrome_browser_intranet__redirect__detector.h
index 3e6bbefc0095..cb20abe773a3 100644
--- a/www/chromium/files/patch-chrome_browser_intranet__redirect__detector.h
+++ b/www/chromium/files/patch-chrome_browser_intranet__redirect__detector.h
@@ -1,11 +1,11 @@
---- chrome/browser/intranet_redirect_detector.h.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/intranet_redirect_detector.h.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/intranet_redirect_detector.h
@@ -27,7 +27,7 @@ class SimpleURLLoader;
class PrefRegistrySimple;
- #if !(defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || \
-- defined(OS_CHROMEOS) || defined(OS_FUCHSIA))
-+ defined(OS_CHROMEOS) || defined(OS_FUCHSIA) || defined(OS_BSD))
+ #if !(BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \
+- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA))
++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD))
#error "IntranetRedirectDetector should only be built on Desktop platforms."
#endif
diff --git a/www/chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc b/www/chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc
index 1ba9df1cf86a..b3fb3adedf5e 100644
--- a/www/chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc
+++ b/www/chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc
@@ -1,6 +1,6 @@
---- chrome/browser/media_galleries/media_file_system_registry.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/media_galleries/media_file_system_registry.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/media_galleries/media_file_system_registry.cc
-@@ -743,7 +743,12 @@ class MediaFileSystemRegistry::MediaFileSystemContextI
+@@ -744,7 +744,12 @@ class MediaFileSystemRegistry::MediaFileSystemContextI
// Constructor in 'private' section because depends on private class definition.
MediaFileSystemRegistry::MediaFileSystemRegistry()
: file_system_context_(new MediaFileSystemContextImpl) {
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 3810e1791dac..be8233631306 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,20 +1,20 @@
---- chrome/browser/media/audio_service_util.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/media/audio_service_util.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/media/audio_service_util.cc
-@@ -20,7 +20,7 @@
+@@ -21,7 +21,7 @@
namespace {
--#if defined(OS_WIN) || defined(OS_MAC) || \
-+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) || \
- (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS))
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \
+ (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS))
bool GetPolicyOrFeature(const char* policy_name, const base::Feature& feature) {
const policy::PolicyMap& policies =
-@@ -40,7 +40,7 @@ bool GetPolicyOrFeature(const char* policy_name, const
+@@ -41,7 +41,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.
--#if defined(OS_WIN) || defined(OS_MAC) || \
-+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) || \
- (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS))
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \
+ (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS))
return GetPolicyOrFeature(policy::key::kAudioSandboxEnabled,
features::kAudioServiceSandbox);
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
new file mode 100644
index 000000000000..2d1225b3ad1a
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_media_router_discovery_BUILD.gn
@@ -0,0 +1,11 @@
+--- chrome/browser/media/router/discovery/BUILD.gn.orig 2022-02-28 16:54:41 UTC
++++ chrome/browser/media/router/discovery/BUILD.gn
+@@ -93,7 +93,7 @@ static_library("discovery") {
+ "media_sink_discovery_metrics.h",
+ ]
+
+- if (is_linux || is_chromeos) {
++ if ((is_linux || is_chromeos) && !is_bsd) {
+ sources += [ "discovery_network_list_wifi_linux.cc" ]
+ }
+
diff --git a/www/chromium/files/patch-chrome_browser_media_router_discovery_discovery__network__list__posix.cc b/www/chromium/files/patch-chrome_browser_media_router_discovery_discovery__network__list__posix.cc
index de533cff8cd7..71650219d44a 100644
--- a/www/chromium/files/patch-chrome_browser_media_router_discovery_discovery__network__list__posix.cc
+++ b/www/chromium/files/patch-chrome_browser_media_router_discovery_discovery__network__list__posix.cc
@@ -1,4 +1,4 @@
---- chrome/browser/media/router/discovery/discovery_network_list_posix.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/media/router/discovery/discovery_network_list_posix.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/media/router/discovery/discovery_network_list_posix.cc
@@ -5,11 +5,12 @@
#include "chrome/browser/media/router/discovery/discovery_network_list.h"
@@ -19,8 +19,8 @@
#include "chrome/browser/media/router/discovery/discovery_network_list_wifi.h"
#include "net/base/net_errors.h"
--#if !defined(OS_MAC)
-+#if !defined(OS_MAC) && !defined(OS_BSD)
+-#if !BUILDFLAG(IS_MAC)
++#if !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_BSD)
#include <netpacket/packet.h>
#else
#include <net/if_dl.h>
@@ -28,8 +28,21 @@
namespace media_router {
namespace {
--#if !defined(OS_MAC)
-+#if !defined(OS_MAC) && !defined(OS_BSD)
+-#if !BUILDFLAG(IS_MAC)
++#if !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_BSD)
using sll = struct sockaddr_ll;
#define SOCKET_ARP_TYPE(s) ((s)->sll_hatype)
#define SOCKET_ADDRESS_LEN(s) ((s)->sll_halen)
+@@ -38,6 +39,12 @@ using sll = struct sockaddr_dl;
+ #define SOCKET_ARP_TYPE(s) ((s)->sdl_type)
+ #define SOCKET_ADDRESS_LEN(s) ((s)->sdl_alen)
+ #define SOCKET_ADDRESS(s) (LLADDR(s))
++#endif
++
++#if BUILDFLAG(IS_BSD)
++bool MaybeGetWifiSSID(const std::string& if_name, std::string* ssid_out) {
++ return false;
++}
+ #endif
+
+ void GetDiscoveryNetworkInfoListImpl(
diff --git a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__event__log__uploader.cc b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__event__log__uploader.cc
index 23421173ffa6..5e7159774a61 100644
--- a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__event__log__uploader.cc
+++ b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__event__log__uploader.cc
@@ -1,11 +1,11 @@
---- chrome/browser/media/webrtc/webrtc_event_log_uploader.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/media/webrtc/webrtc_event_log_uploader.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/media/webrtc/webrtc_event_log_uploader.cc
@@ -40,7 +40,7 @@ const char kProduct[] = "Chrome";
const char kProduct[] = "Chrome_Mac";
#elif BUILDFLAG(IS_CHROMEOS_ASH)
const char kProduct[] = "Chrome_ChromeOS";
--#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
+-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
const char kProduct[] = "Chrome_Linux";
- #elif defined(OS_ANDROID)
+ #elif BUILDFLAG(IS_ANDROID)
const char kProduct[] = "Chrome_Android";
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 3955e908aa1c..0d84ec44ea96 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,8 +1,8 @@
---- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/media/webrtc/webrtc_log_uploader.cc
@@ -363,6 +363,10 @@ void WebRtcLogUploader::SetupMultipart(
const char product[] = "Chrome_ChromeOS";
- #elif defined(OS_FUCHSIA)
+ #elif BUILDFLAG(IS_FUCHSIA)
const char product[] = "Chrome_Fuchsia";
+#elif defined(OS_OPENBSD)
+ const char product[] = "Chrome_OpenBSD";
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 ce1a69947c1d..5266ccb476a1 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,33 +1,33 @@
---- chrome/browser/media/webrtc/webrtc_logging_controller.cc.orig 2021-12-14 11:44:58 UTC
+--- chrome/browser/media/webrtc/webrtc_logging_controller.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/media/webrtc/webrtc_logging_controller.cc
-@@ -24,10 +24,10 @@
+@@ -25,10 +25,10 @@
#include "content/public/browser/browser_context.h"
#include "content/public/browser/render_process_host.h"
--#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
#include "content/public/browser/child_process_security_policy.h"
#include "storage/browser/file_system/isolated_context.h"
--#endif // defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
using webrtc_event_logging::WebRtcEventLogManager;
-@@ -281,7 +281,7 @@ void WebRtcLoggingController::StartEventLogging(
+@@ -282,7 +282,7 @@ void WebRtcLoggingController::StartEventLogging(
web_app_id, callback);
}
--#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
void WebRtcLoggingController::GetLogsDirectory(
LogsDirectoryCallback callback,
LogsDirectoryErrorCallback error_callback) {
-@@ -327,7 +327,7 @@ void WebRtcLoggingController::GrantLogsDirectoryAccess
+@@ -328,7 +328,7 @@ void WebRtcLoggingController::GrantLogsDirectoryAccess
FROM_HERE,
base::BindOnce(std::move(callback), file_system.id(), registered_name));
}
--#endif // defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
void WebRtcLoggingController::OnRtpPacket(
std::unique_ptr<uint8_t[]> packet_header,
diff --git a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.h b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.h
index 13788e46d8a8..9232d0b58ff7 100644
--- a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.h
+++ b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.h
@@ -1,11 +1,11 @@
---- chrome/browser/media/webrtc/webrtc_logging_controller.h.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/media/webrtc/webrtc_logging_controller.h.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/media/webrtc/webrtc_logging_controller.h
@@ -132,7 +132,7 @@ class WebRtcLoggingController
size_t web_app_id,
const StartEventLoggingCallback& callback);
--#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
// Ensures that the WebRTC Logs directory exists and then grants render
// process access to the 'WebRTC Logs' directory, and invokes |callback| with
// the ids necessary to create a DirectoryEntry object.
@@ -13,8 +13,8 @@
bool success,
const std::string& error_message);
--#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
// Grants the render process access to the 'WebRTC Logs' directory, and
// invokes |callback| with the ids necessary to create a DirectoryEntry
// object. If the |logs_path| couldn't be created or found, |error_callback|
diff --git a/www/chromium/files/patch-chrome_browser_memory__details.cc b/www/chromium/files/patch-chrome_browser_memory__details.cc
index f89d5faa9ab3..18dd4eaf463f 100644
--- a/www/chromium/files/patch-chrome_browser_memory__details.cc
+++ b/www/chromium/files/patch-chrome_browser_memory__details.cc
@@ -1,20 +1,20 @@
---- chrome/browser/memory_details.cc.orig 2021-12-31 00:57:23 UTC
+--- chrome/browser/memory_details.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/memory_details.cc
-@@ -37,7 +37,7 @@
+@@ -38,7 +38,7 @@
#include "services/resource_coordinator/public/cpp/memory_instrumentation/memory_instrumentation.h"
#include "ui/base/l10n/l10n_util.h"
--#if defined(OS_POSIX) && !defined(OS_MAC) && !defined(OS_ANDROID)
-+#if defined(OS_POSIX) && !defined(OS_MAC) && !defined(OS_ANDROID) && !defined(OS_BSD)
+-#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_ANDROID)
++#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_BSD)
#include "content/public/browser/zygote_host/zygote_host_linux.h"
#endif
-@@ -325,7 +325,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() {
+@@ -329,7 +329,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() {
std::ref(process)));
}
--#if defined(OS_POSIX) && !defined(OS_MAC) && !defined(OS_ANDROID)
-+#if defined(OS_POSIX) && !defined(OS_MAC) && !defined(OS_ANDROID) && !defined(OS_BSD)
+-#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_ANDROID)
++#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_BSD)
if (content::ZygoteHost::GetInstance()->IsZygotePid(process.pid)) {
process.process_type = content::PROCESS_TYPE_ZYGOTE;
}
diff --git a/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc b/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc
index 74704b2e05ee..e1174816f336 100644
--- a/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc
+++ b/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc
@@ -1,33 +1,23 @@
---- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
-@@ -61,8 +61,10 @@
+@@ -58,8 +58,10 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
--#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
-+#if !defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
++#if !BUILDFLAG(IS_BSD)
#include <gnu/libc-version.h>
+#endif
#include "base/linux_util.h"
#include "base/strings/string_split.h"
-@@ -223,15 +225,18 @@ void RecordStartupMetrics() {
- base::UmaHistogramBoolean("Windows.ApplockerRunning", IsApplockerRunning());
- #endif // defined(OS_WIN)
-
-+#if !defined(OS_BSD)
- // TODO(crbug.com/1216328) Remove logging.
- LOG(ERROR) << "START: ReportBluetoothAvailability(). "
- "If you don't see the END: message, this is crbug.com/1216328.";
- bluetooth_utility::ReportBluetoothAvailability();
- LOG(ERROR) << "END: ReportBluetoothAvailability()";
-+#endif
+@@ -224,7 +226,7 @@ void RecordStartupMetrics() {
// Record whether Chrome is the default browser or not.
// Disabled on Linux due to hanging browser tests, see crbug.com/1216328.
- #if !BUILDFLAG(IS_LINUX)
-+#error out
- LOG(ERROR) << "START: GetDefaultBrowser(). "
- "If you don't see the END: message, this is crbug.com/1216328.";
+-#if !BUILDFLAG(IS_LINUX)
++#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
shell_integration::DefaultWebClientState default_state =
+ shell_integration::GetDefaultBrowser();
+ base::UmaHistogramEnumeration("DefaultBrowser.State", default_state,
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 45aa8736a957..ec09b0349062 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,29 +1,29 @@
---- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/metrics/chrome_metrics_service_client.cc
-@@ -742,7 +742,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
+@@ -752,7 +752,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
--#if defined(OS_WIN) || defined(OS_MAC) || \
-+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) || \
- (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \
+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
metrics_service_->RegisterMetricsProvider(
std::make_unique<DesktopPlatformFeaturesMetricsProvider>());
-@@ -838,7 +838,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
+@@ -848,7 +848,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
std::make_unique<PowerMetricsProvider>());
#endif
--#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX)
-+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD)
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
metrics_service_->RegisterMetricsProvider(
metrics::CreateDesktopSessionMetricsProvider());
- #endif // defined(OS_WIN) || defined(OS_MAC) || (defined(OS_LINUX)
-@@ -1014,7 +1014,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve
+ #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX)
+@@ -1024,7 +1024,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve
#endif
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
--#if defined(OS_WIN) || defined(OS_MAC) || \
-+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) || \
- (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \
+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
// This creates the DesktopProfileSessionDurationsServices if it didn't exist
// already.
diff --git a/www/chromium/files/patch-chrome_browser_metrics_perf_cpu__identity.cc b/www/chromium/files/patch-chrome_browser_metrics_perf_cpu__identity.cc
index 1458181621b2..804cc8cb640a 100644
--- a/www/chromium/files/patch-chrome_browser_metrics_perf_cpu__identity.cc
+++ b/www/chromium/files/patch-chrome_browser_metrics_perf_cpu__identity.cc
@@ -1,11 +1,11 @@
---- chrome/browser/metrics/perf/cpu_identity.cc.orig 2021-07-28 07:40:29 UTC
+--- chrome/browser/metrics/perf/cpu_identity.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/metrics/perf/cpu_identity.cc
@@ -106,7 +106,7 @@ CPUIdentity GetCPUIdentity() {
result.release =
#if BUILDFLAG(IS_CHROMEOS_ASH)
base::SysInfo::KernelVersion();
--#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
+-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
base::SysInfo::OperatingSystemVersion();
#else
#error "Unsupported configuration"
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 5f63460fb5ac..58b38715d304 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,47 +1,38 @@
---- chrome/browser/net/system_network_context_manager.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/net/system_network_context_manager.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/net/system_network_context_manager.cc
@@ -84,7 +84,7 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
--#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
#include "chrome/common/chrome_paths_internal.h"
#include "chrome/grit/chromium_strings.h"
#include "ui/base/l10n/l10n_util.h"
-@@ -139,7 +139,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
+@@ -137,7 +137,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
auth_dynamic_params->basic_over_http_enabled =
local_state->GetBoolean(prefs::kBasicAuthOverHttpEnabled);
--#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
auth_dynamic_params->delegate_by_kdc_policy =
local_state->GetBoolean(prefs::kAuthNegotiateDelegateByKdcPolicy);
- #endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS)
-@@ -370,7 +370,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
+ #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
+@@ -369,7 +369,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
pref_change_registrar_.Add(prefs::kBasicAuthOverHttpEnabled,
auth_pref_callback);
--#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
pref_change_registrar_.Add(prefs::kAuthNegotiateDelegateByKdcPolicy,
auth_pref_callback);
- #endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS)
-@@ -428,7 +428,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
+ #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
+@@ -427,7 +427,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
registry->RegisterStringPref(prefs::kAuthServerAllowlist, std::string());
registry->RegisterStringPref(prefs::kAuthNegotiateDelegateAllowlist,
std::string());
--#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
registry->RegisterBooleanPref(prefs::kAuthNegotiateDelegateByKdcPolicy,
false);
- #endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS)
-@@ -575,7 +575,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea
-
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
- const base::CommandLine& command_line =
- *base::CommandLine::ForCurrentProcess();
-
+ #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
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 8c5b62eaca96..d57ebf908539 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,11 +1,11 @@
---- chrome/browser/notifications/notification_display_service_impl.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/notifications/notification_display_service_impl.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/notifications/notification_display_service_impl.cc
@@ -31,7 +31,7 @@
#endif
- #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \
-- defined(OS_WIN) || defined(OS_FUCHSIA)
-+ defined(OS_WIN) || defined(OS_FUCHSIA) || defined(OS_BSD)
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
+- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA)
++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
#include "chrome/browser/send_tab_to_self/desktop_notification_handler.h"
#include "chrome/browser/sharing/sharing_notification_handler.h"
#endif
@@ -13,26 +13,26 @@
// static
void NotificationDisplayServiceImpl::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
registry->RegisterBooleanPref(prefs::kAllowNativeNotifications, true);
registry->RegisterBooleanPref(prefs::kAllowSystemNotifications, true);
#endif
@@ -81,7 +81,7 @@ NotificationDisplayServiceImpl::NotificationDisplaySer
std::make_unique<PersistentNotificationHandler>());
- #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \
-- defined(OS_WIN)
-+ defined(OS_WIN) || defined(OS_BSD)
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
+- BUILDFLAG(IS_WIN)
++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
AddNotificationHandler(
NotificationHandler::Type::SEND_TAB_TO_SELF,
std::make_unique<send_tab_to_self::DesktopNotificationHandler>(
@@ -89,7 +89,7 @@ NotificationDisplayServiceImpl::NotificationDisplaySer
#endif
- #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \
-- defined(OS_WIN)
-+ defined(OS_WIN) || defined(OS_BSD)
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
+- BUILDFLAG(IS_WIN)
++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
AddNotificationHandler(
NotificationHandler::Type::TAILORED_SECURITY,
std::make_unique<safe_browsing::TailoredSecurityNotificationHandler>());
diff --git a/www/chromium/files/patch-chrome_browser_notifications_notification__platform__bridge__delegator.cc b/www/chromium/files/patch-chrome_browser_notifications_notification__platform__bridge__delegator.cc
index 9826c93c7a70..1d138c9c3cb0 100644
--- a/www/chromium/files/patch-chrome_browser_notifications_notification__platform__bridge__delegator.cc
+++ b/www/chromium/files/patch-chrome_browser_notifications_notification__platform__bridge__delegator.cc
@@ -1,11 +1,11 @@
---- chrome/browser/notifications/notification_platform_bridge_delegator.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/notifications/notification_platform_bridge_delegator.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/notifications/notification_platform_bridge_delegator.cc
@@ -57,7 +57,7 @@ bool SystemNotificationsEnabled(Profile* profile) {
- #elif defined(OS_WIN)
+ #elif BUILDFLAG(IS_WIN)
return NotificationPlatformBridgeWin::SystemNotificationEnabled();
#else
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
if (profile) {
// Prefs take precedence over flags.
PrefService* prefs = profile->GetPrefs();
diff --git a/www/chromium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc b/www/chromium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc
index dcccaeaa5380..5800a8f3fd1a 100644
--- a/www/chromium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc
+++ b/www/chromium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc
@@ -1,11 +1,11 @@
---- chrome/browser/password_manager/password_reuse_manager_factory.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/password_manager/password_reuse_manager_factory.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/password_manager/password_reuse_manager_factory.cc
@@ -94,7 +94,7 @@ KeyedService* PasswordReuseManagerFactory::BuildServic
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
- #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS_LACROS)
-+ BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
++ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
std::unique_ptr<password_manager::PasswordStoreSigninNotifier> notifier =
std::make_unique<password_manager::PasswordStoreSigninNotifierImpl>(
IdentityManagerFactory::GetForProfile(profile));
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 a809c0a6f185..b76fb7634ea3 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,11 +1,11 @@
---- chrome/browser/performance_manager/policies/high_pmf_discard_policy.cc.orig 2021-09-24 18:27:13 UTC
+--- 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
@@ -17,7 +17,7 @@
#include "content/public/browser/browser_task_traits.h"
#include "content/public/browser/browser_thread.h"
--#if !defined(OS_LINUX)
-+#if !defined(OS_LINUX) && !defined(OS_BSD)
+-#if !BUILDFLAG(IS_LINUX)
++#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
#include "base/memory/memory_pressure_monitor.h"
#endif
@@ -13,8 +13,8 @@
if (should_discard) {
discard_attempt_in_progress_ = true;
--#if !defined(OS_LINUX)
-+#if !defined(OS_LINUX) && !defined(OS_BSD)
+-#if !BUILDFLAG(IS_LINUX)
++#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
// Record the memory pressure level before discarding a tab.
content::GetUIThreadTaskRunner({})->PostTask(
FROM_HERE, base::BindOnce([]() {
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 1772808f5a58..a70e5774afa5 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-02-07 13:39:41 UTC
+--- chrome/browser/performance_monitor/process_metrics_recorder_util.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/performance_monitor/process_metrics_recorder_util.cc
@@ -42,7 +42,7 @@ void RecordProcessHistograms(const char* histogram_suf
metrics.cpu_usage * kCPUUsageFactor, kCPUUsageHistogramMin,
kCPUUsageHistogramMax, kCPUUsageHistogramBucketCount);
- #if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \
-- defined(OS_AIX)
-+ defined(OS_AIX) || defined(OS_BSD)
+ #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},
""),
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 0849e8e1662f..a5d771754212 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,11 +1,11 @@
---- chrome/browser/performance_monitor/process_monitor.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/performance_monitor/process_monitor.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/performance_monitor/process_monitor.cc
-@@ -80,7 +80,7 @@ ProcessMonitor::Metrics& operator+=(ProcessMonitor::Me
+@@ -82,7 +82,7 @@ ProcessMonitor::Metrics& operator+=(ProcessMonitor::Me
lhs.cpu_usage += rhs.cpu_usage;
- #if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \
-- defined(OS_AIX)
-+ defined(OS_AIX) || defined(OS_BSD)
+ #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
+- BUILDFLAG(IS_AIX)
++ BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD)
lhs.idle_wakeups += rhs.idle_wakeups;
#endif
diff --git a/www/chromium/files/patch-chrome_browser_performance__monitor_process__monitor.h b/www/chromium/files/patch-chrome_browser_performance__monitor_process__monitor.h
index 7420e47f1360..d3867265beed 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,11 +1,11 @@
---- chrome/browser/performance_monitor/process_monitor.h.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/performance_monitor/process_monitor.h.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/performance_monitor/process_monitor.h
@@ -56,7 +56,7 @@ class ProcessMonitor {
double cpu_usage = 0.0;
- #if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \
-- defined(OS_AIX)
-+ defined(OS_AIX) || defined(OS_BSD)
+ #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
+- BUILDFLAG(IS_AIX)
++ BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD)
// Returns the number of average idle cpu wakeups per second since the last
// time the metric was sampled.
int idle_wakeups = 0;
diff --git a/www/chromium/files/patch-chrome_browser_platform__util__linux.cc b/www/chromium/files/patch-chrome_browser_platform__util__linux.cc
index 0ca2e07e3e4b..6c677548e70d 100644
--- a/www/chromium/files/patch-chrome_browser_platform__util__linux.cc
+++ b/www/chromium/files/patch-chrome_browser_platform__util__linux.cc
@@ -1,6 +1,6 @@
---- chrome/browser/platform_util_linux.cc.orig 2021-09-14 01:51:50 UTC
+--- chrome/browser/platform_util_linux.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/platform_util_linux.cc
-@@ -297,7 +297,9 @@ void RunCommand(const std::string& command,
+@@ -298,7 +298,9 @@ void RunCommand(const std::string& command,
base::LaunchOptions options;
options.current_directory = working_directory;
diff --git a/www/chromium/files/patch-chrome_browser_plugins_plugins__resource__service.cc b/www/chromium/files/patch-chrome_browser_plugins_plugins__resource__service.cc
index c741db0784ac..6762dc97c10f 100644
--- a/www/chromium/files/patch-chrome_browser_plugins_plugins__resource__service.cc
+++ b/www/chromium/files/patch-chrome_browser_plugins_plugins__resource__service.cc
@@ -1,11 +1,11 @@
---- chrome/browser/plugins/plugins_resource_service.cc.orig 2021-04-14 18:40:54 UTC
+--- chrome/browser/plugins/plugins_resource_service.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/plugins/plugins_resource_service.cc
@@ -62,7 +62,7 @@ GURL GetPluginsServerURL() {
filename = "plugins_win.json";
#elif BUILDFLAG(IS_CHROMEOS_ASH)
filename = "plugins_chromeos.json";
--#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
+-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
filename = "plugins_linux.json";
- #elif defined(OS_MAC)
+ #elif BUILDFLAG(IS_MAC)
filename = "plugins_mac.json";
diff --git a/www/chromium/files/patch-chrome_browser_policy_browser__signin__policy__handler.cc b/www/chromium/files/patch-chrome_browser_policy_browser__signin__policy__handler.cc
index 259f40114c52..53796a9dfae2 100644
--- a/www/chromium/files/patch-chrome_browser_policy_browser__signin__policy__handler.cc
+++ b/www/chromium/files/patch-chrome_browser_policy_browser__signin__policy__handler.cc
@@ -1,11 +1,11 @@
---- chrome/browser/policy/browser_signin_policy_handler.cc.orig 2021-09-14 01:51:50 UTC
+--- chrome/browser/policy/browser_signin_policy_handler.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/policy/browser_signin_policy_handler.cc
@@ -43,7 +43,7 @@ void BrowserSigninPolicyHandler::ApplyPolicySettings(c
const base::Value* value = policies.GetValue(policy_name());
switch (static_cast<BrowserSigninMode>(value->GetInt())) {
case BrowserSigninMode::kForced:
--#if !defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if !defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_BSD)
+-#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
++#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD)
prefs->SetValue(prefs::kForceBrowserSignin, base::Value(true));
#endif
- FALLTHROUGH;
+ [[fallthrough]];
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 01e01264b438..15c89668c143 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,38 +1,38 @@
---- chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc.orig 2022-02-07 13:39:41 UTC
+--- 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
@@ -46,7 +46,7 @@
#include "chrome/browser/policy/browser_dm_token_storage_mac.h"
- #endif // defined(OS_MAC)
+ #endif // BUILDFLAG(IS_MAC)
--#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
#include "chrome/browser/policy/browser_dm_token_storage_linux.h"
- #endif // defined(OS_LINUX) || defined(OS_CHROMEOS)
+ #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
@@ -55,7 +55,7 @@
#include "chrome/install_static/install_util.h"
- #endif // defined(OS_WIN)
+ #endif // BUILDFLAG(IS_WIN)
--#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MAC)
-+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MAC) || defined(OS_BSD)
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
#include "chrome/browser/enterprise/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::
- #if defined(OS_MAC)
+ #if BUILDFLAG(IS_MAC)
storage_delegate = std::make_unique<BrowserDMTokenStorageMac>();
--#elif defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
storage_delegate = std::make_unique<BrowserDMTokenStorageLinux>();
- #elif defined(OS_WIN)
+ #elif BUILDFLAG(IS_WIN)
storage_delegate = std::make_unique<BrowserDMTokenStorageWin>();
@@ -243,7 +243,7 @@ ChromeBrowserCloudManagementControllerDesktop::CreateC
std::unique_ptr<enterprise_connectors::DeviceTrustKeyManager>
ChromeBrowserCloudManagementControllerDesktop::CreateDeviceTrustKeyManager() {
--#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MAC)
-+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MAC) || defined(OS_BSD)
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
if (enterprise_connectors::IsDeviceTrustConnectorFeatureEnabled()) {
auto key_rotation_launcher =
enterprise_connectors::KeyRotationLauncher::Create(
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 c77867ed9e8e..17638cef1e0f 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,47 +1,47 @@
---- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/policy/configuration_policy_handler_list_factory.cc
-@@ -1432,7 +1432,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
+@@ -1443,7 +1443,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::BOOLEAN },
- #endif // !defined(OS_MAC) && !defined(OS_CHROMEOS)
+ #endif // !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_CHROMEOS)
--#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
{ key::kAuthNegotiateDelegateByKdcPolicy,
prefs::kAuthNegotiateDelegateByKdcPolicy,
base::Value::Type::BOOLEAN },
-@@ -1541,7 +1541,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
+@@ -1552,7 +1552,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::BOOLEAN },
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
--#if BUILDFLAG(ENABLE_EXTENSIONS) && (defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX))
-+#if BUILDFLAG(ENABLE_EXTENSIONS) && (defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD))
+-#if BUILDFLAG(ENABLE_EXTENSIONS) && (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX))
++#if BUILDFLAG(ENABLE_EXTENSIONS) && (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD))
{ key::kChromeAppsEnabled,
extensions::pref_names::kChromeAppsEnabled,
base::Value::Type::BOOLEAN },
-@@ -1828,7 +1828,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
- #endif // defined(OS_ANDROID)
+@@ -1848,7 +1848,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+ #endif // BUILDFLAG(IS_ANDROID)
- #if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) || \
-- defined(OS_CHROMEOS) || defined(OS_FUCHSIA)
-+ defined(OS_CHROMEOS) || defined(OS_FUCHSIA) || defined(OS_BSD)
+ #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>(
-@@ -2193,7 +2193,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+@@ -2213,7 +2213,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
SimpleSchemaValidatingPolicyHandler::MANDATORY_ALLOWED));
- #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
-- defined(OS_FUCHSIA)
-+ defined(OS_FUCHSIA) || defined(OS_BSD)
+ #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,
-@@ -2224,7 +2224,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+@@ -2244,7 +2244,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
policy::key::kSpellcheckLanguageBlocklist));
#endif // BUILDFLAG(ENABLE_SPELLCHECK)
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
handlers->AddHandler(std::make_unique<SimpleDeprecatingPolicyHandler>(
std::make_unique<SimplePolicyHandler>(key::kAllowNativeNotifications,
prefs::kAllowNativeNotifications,
diff --git a/www/chromium/files/patch-chrome_browser_policy_device__management__service__configuration.cc b/www/chromium/files/patch-chrome_browser_policy_device__management__service__configuration.cc
index ecc41e4e4b39..56bc422f9731 100644
--- a/www/chromium/files/patch-chrome_browser_policy_device__management__service__configuration.cc
+++ b/www/chromium/files/patch-chrome_browser_policy_device__management__service__configuration.cc
@@ -1,20 +1,20 @@
---- chrome/browser/policy/device_management_service_configuration.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/policy/device_management_service_configuration.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/policy/device_management_service_configuration.cc
-@@ -19,7 +19,7 @@
- #include "chromeos/system/statistics_provider.h"
- #endif
+@@ -21,7 +21,7 @@
--#if defined(OS_WIN) || defined(OS_MAC) || \
-+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) || \
- ((defined(OS_LINUX) || defined(OS_CHROMEOS)) && !defined(OS_ANDROID))
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
+ ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \
+- !BUILDFLAG(IS_ANDROID))
++ !BUILDFLAG(IS_ANDROID)) || BUILDFLAG(IS_BSD)
#include "chrome/browser/enterprise/connectors/common.h"
#include "chrome/browser/enterprise/connectors/connectors_service.h"
-@@ -97,7 +97,7 @@ DeviceManagementServiceConfiguration::GetEncryptedRepo
- std::string
- DeviceManagementServiceConfiguration::GetReportingConnectorServerUrl(
+ #endif
+@@ -100,7 +100,7 @@ DeviceManagementServiceConfiguration::GetReportingConn
content::BrowserContext* context) const {
--#if defined(OS_WIN) || defined(OS_MAC) || \
-+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) || \
- ((defined(OS_LINUX) || defined(OS_CHROMEOS)) && !defined(OS_ANDROID))
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
+ ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \
+- !BUILDFLAG(IS_ANDROID))
++ !BUILDFLAG(IS_ANDROID)) || BUILDFLAG(IS_BSD)
auto* service =
enterprise_connectors::ConnectorsServiceFactory::GetForBrowserContext(
+ context);
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 5090d1971a8d..765d014c725f 100644
--- a/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc
+++ b/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc
@@ -1,46 +1,46 @@
---- chrome/browser/prefs/browser_prefs.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/prefs/browser_prefs.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/prefs/browser_prefs.cc
-@@ -415,14 +415,14 @@
+@@ -418,14 +418,14 @@
#include "components/os_crypt/os_crypt.h"
#endif
--#if defined(OS_WIN) || defined(OS_MAC) || \
-+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) || \
- (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS))
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \
+ (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS))
#include "chrome/browser/web_applications/url_handler_prefs.h"
#endif
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
--#if defined(OS_WIN) || defined(OS_MAC) || \
-+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) || \
- (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \
+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
#include "chrome/browser/browser_switcher/browser_switcher_prefs.h"
#endif
-@@ -1069,7 +1069,7 @@ void RegisterLocalState(PrefRegistrySimple* registry)
+@@ -1133,7 +1133,7 @@ void RegisterLocalState(PrefRegistrySimple* registry)
// TODO(crbug/1169547) Remove `BUILDFLAG(IS_CHROMEOS_LACROS)` once the
// migration is complete.
- #if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) || \
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
- BUILDFLAG(IS_CHROMEOS_LACROS)
-+ BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
++ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
enterprise_connectors::RegisterLocalPrefs(registry);
- #endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN)
+ #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-@@ -1101,7 +1101,7 @@ void RegisterLocalState(PrefRegistrySimple* registry)
+@@ -1165,7 +1165,7 @@ void RegisterLocalState(PrefRegistrySimple* registry)
#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)
- #endif // defined(OS_WIN)
+ #endif // BUILDFLAG(IS_WIN)
--#if defined(OS_WIN) || defined(OS_MAC) || \
-+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) || \
- (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS))
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \
+ (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS))
web_app::url_handler_prefs::RegisterLocalStatePrefs(registry);
#endif
-@@ -1396,7 +1396,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
+@@ -1462,7 +1462,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
--#if defined(OS_WIN) || defined(OS_MAC) || \
-+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) || \
- (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \
+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
browser_switcher::BrowserSwitcherPrefs::RegisterProfilePrefs(registry);
#endif
diff --git a/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc b/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc
index d7e49d174568..832e4f781f80 100644
--- a/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc
+++ b/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc
@@ -1,11 +1,11 @@
---- chrome/browser/prefs/pref_service_incognito_allowlist.cc.orig 2021-09-14 01:51:50 UTC
+--- chrome/browser/prefs/pref_service_incognito_allowlist.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/prefs/pref_service_incognito_allowlist.cc
@@ -139,7 +139,7 @@ const char* const kPersistentPrefNames[] = {
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
--#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
// Toggleing custom frames affects all open windows in the profile, hence
// should be written to the regular profile when changed in incognito mode.
prefs::kUseCustomChromeFrame,
diff --git a/www/chromium/files/patch-chrome_browser_printing_print__job__worker.cc b/www/chromium/files/patch-chrome_browser_printing_print__job__worker.cc
index c6418795ec69..fbf6389c8630 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,11 +1,11 @@
---- chrome/browser/printing/print_job_worker.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/printing/print_job_worker.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/printing/print_job_worker.cc
-@@ -231,7 +231,7 @@ void PrintJobWorker::UpdatePrintSettings(base::Value n
+@@ -225,7 +225,7 @@ void PrintJobWorker::UpdatePrintSettings(base::Value n
crash_key = std::make_unique<crash_keys::ScopedPrinterInfo>(
print_backend->GetPrinterDriverInfo(printer_name));
--#if defined(OS_LINUX) && defined(USE_CUPS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_CUPS)
+-#if BUILDFLAG(IS_LINUX) && defined(USE_CUPS)
++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(USE_CUPS)
PrinterBasicInfo basic_info;
if (print_backend->GetPrinterBasicInfo(printer_name, &basic_info) ==
mojom::ResultCode::kSuccess) {
diff --git a/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc b/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc
index 13496fa7614a..66ce87c56787 100644
--- a/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc
+++ b/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc
@@ -1,17 +1,17 @@
---- chrome/browser/process_singleton_posix.cc.orig 2021-12-14 11:44:58 UTC
+--- chrome/browser/process_singleton_posix.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/process_singleton_posix.cc
@@ -97,12 +97,12 @@
#include "net/base/network_interfaces.h"
#include "ui/base/l10n/l10n_util.h"
--#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
#include "chrome/browser/ui/process_singleton_dialog_linux.h"
#endif
#if defined(TOOLKIT_VIEWS) && \
-- (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
-+ (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD))
+- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
++ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD))
#include "ui/views/linux_ui/linux_ui.h"
#endif
@@ -19,8 +19,8 @@
if (g_disable_prompt)
return g_user_opted_unlock_in_use_profile;
--#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
std::u16string relaunch_button_text =
l10n_util::GetStringUTF16(IDS_PROFILE_IN_USE_LINUX_RELAUNCH);
return ShowProcessSingletonDialog(error, relaunch_button_text);
@@ -28,8 +28,8 @@
return PROCESS_NONE;
} else if (strncmp(buf, kACKToken, base::size(kACKToken) - 1) == 0) {
#if defined(TOOLKIT_VIEWS) && \
-- (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
-+ (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD))
+- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
++ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD))
// Likely NULL in unit tests.
views::LinuxUI* linux_ui = views::LinuxUI::instance();
if (linux_ui)
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 56f01d1a7bbc..83a59c11089e 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,11 +1,11 @@
---- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
-@@ -384,7 +384,7 @@ void ChromeBrowserMainExtraPartsProfiles::
+@@ -385,7 +385,7 @@ void ChromeBrowserMainExtraPartsProfiles::
#endif
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
--#if defined(OS_WIN) || defined(OS_MAC) || \
-+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) || \
- (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \
+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
metrics::DesktopProfileSessionDurationsServiceFactory::GetInstance();
#endif
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 ba2d9b1e4223..eedb1286b9ff 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-02-07 13:39:41 UTC
+--- chrome/browser/profiles/profile_impl.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/profiles/profile_impl.cc
-@@ -181,6 +181,7 @@
+@@ -182,6 +182,7 @@
#include "services/preferences/public/mojom/preferences.mojom.h"
#include "services/preferences/public/mojom/tracked_preference_validation_delegate.mojom.h"
#include "services/service_manager/public/cpp/service.h"
@@ -8,7 +8,7 @@
#include "ui/base/l10n/l10n_util.h"
#if BUILDFLAG(IS_CHROMEOS_ASH)
-@@ -846,7 +847,13 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode)
+@@ -850,7 +851,13 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode)
}
base::FilePath ProfileImpl::last_selected_directory() {
diff --git a/www/chromium/files/patch-chrome_browser_profiles_profiles__state.cc b/www/chromium/files/patch-chrome_browser_profiles_profiles__state.cc
index a413ea0d2112..497ec10d4120 100644
--- a/www/chromium/files/patch-chrome_browser_profiles_profiles__state.cc
+++ b/www/chromium/files/patch-chrome_browser_profiles_profiles__state.cc
@@ -1,11 +1,11 @@
---- chrome/browser/profiles/profiles_state.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/profiles/profiles_state.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/profiles/profiles_state.cc
@@ -176,7 +176,7 @@ bool IsGuestModeRequested(const base::CommandLine& com
PrefService* local_state,
bool show_warning) {
- #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) || \
-- defined(OS_MAC)
-+ defined(OS_MAC) || defined(OS_BSD)
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \
+- BUILDFLAG(IS_MAC)
++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
DCHECK(local_state);
// Check if guest mode enforcement commandline switch or policy are provided.
diff --git a/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc b/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc
index d676169653ed..b85855ca3911 100644
--- a/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc
+++ b/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc
@@ -1,11 +1,11 @@
---- chrome/browser/renderer_preferences_util.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/renderer_preferences_util.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/renderer_preferences_util.cc
@@ -41,7 +41,7 @@
#include "ui/base/cocoa/defaults_utils.h"
#endif
--#if defined(USE_AURA) && (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
-+#if defined(USE_AURA) && (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD))
+-#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
++#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD))
#include "chrome/browser/themes/theme_service.h"
#include "chrome/browser/themes/theme_service_factory.h"
#include "ui/views/linux_ui/linux_ui.h"
@@ -13,17 +13,17 @@
prefs->caret_blink_interval = interval;
#endif
--#if defined(USE_AURA) && (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
-+#if defined(USE_AURA) && (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD))
+-#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
++#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD))
views::LinuxUI* linux_ui = views::LinuxUI::instance();
if (linux_ui) {
if (ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme()) {
@@ -189,7 +189,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc
#endif
- #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \
-- defined(OS_WIN)
-+ defined(OS_WIN) || defined(OS_BSD)
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
+- BUILDFLAG(IS_WIN)
++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
content::UpdateFontRendererPreferencesFromSystemSettings(prefs);
#endif
diff --git a/www/chromium/files/patch-chrome_browser_resources_new__tab__page_new__tab__page.js b/www/chromium/files/patch-chrome_browser_resources_new__tab__page_new__tab__page.js
index 4808ad2f96b9..e82d989ae51f 100644
--- a/www/chromium/files/patch-chrome_browser_resources_new__tab__page_new__tab__page.js
+++ b/www/chromium/files/patch-chrome_browser_resources_new__tab__page_new__tab__page.js
@@ -1,13 +1,13 @@
---- chrome/browser/resources/new_tab_page/new_tab_page.js.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/resources/new_tab_page/new_tab_page.js.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/resources/new_tab_page/new_tab_page.js
@@ -21,10 +21,6 @@ export {chromeCartDescriptor as chromeCartV2Descriptor
export {DriveProxy} from './modules/drive/drive_module_proxy.js';
export {driveDescriptor} from './modules/drive/module.js';
export {driveDescriptor as driveV2Descriptor} from './modules/drive_v2/module.js';
-// <if expr="not is_official_build">
--export {FooProxy} from './modules/dummy/foo_proxy.js';
--export {dummyDescriptor} from './modules/dummy/module.js';
+-export {FooProxy} from './modules/dummy_v2/foo_proxy.js';
+-export {dummyV2Descriptor} from './modules/dummy_v2/module.js';
-// </if>
export {InfoDialogElement} from './modules/info_dialog.js';
- export {InitializeModuleCallback, Module, ModuleDescriptor} from './modules/module_descriptor.js';
+ export {InitializeModuleCallback, Module, ModuleDescriptor, ModuleDescriptorV2, ModuleHeight} from './modules/module_descriptor.js';
export {ModuleHeaderElement} from './modules/module_header.js';
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 aa0737875900..522102aa1e38 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,11 +1,11 @@
---- chrome/browser/resources/settings/appearance_page/appearance_page.html.orig 2021-09-14 01:51:51 UTC
+--- 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
@@ -27,7 +27,7 @@
<cr-link-row class="first" hidden="[[!pageVisibility.setTheme]]"
label="$i18n{themes}" sub-label="[[themeSublabel_]]"
on-click="openThemeUrl_" external></cr-link-row>
--<if expr="not is_linux or chromeos or lacros">
-+<if expr="not is_posix or chromeos or lacros">
+-<if expr="not is_linux or chromeos_ash or chromeos_lacros">
++<if expr="not is_posix or chromeos_ash or chromeos_lacros">
<template is="dom-if" if="[[prefs.extensions.theme.id.value]]">
<div class="separator"></div>
<cr-button id="useDefault" on-click="onUseDefaultTap_">
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 f3d9de0b7d11..e928508bc496 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-02-07 13:39:41 UTC
+--- chrome/browser/resources/settings/appearance_page/appearance_page.ts.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/resources/settings/appearance_page/appearance_page.ts
@@ -145,7 +145,7 @@ export class SettingsAppearancePageElement extends
'prefs.autogenerated.theme.policy.color.controlledBy)',
},
- // <if expr="is_linux and not chromeos and not lacros">
-+ // <if expr="is_bsd and not chromeos and not lacros">
++ // <if expr="is_posix and not chromeos and not lacros">
/**
* Whether to show the "Custom Chrome Frame" setting.
*/
@@ -14,7 +14,7 @@
'prefs.extensions.theme.id.value, useSystemTheme_, isForcedTheme_)',
- // <if expr="is_linux and not chromeos">
-+ // <if expr="is_bsd and not chromeos">
++ // <if expr="is_posix and not chromeos">
// NOTE: this pref only exists on Linux.
'useSystemThemePrefChanged_(prefs.extensions.theme.use_system.value)',
// </if>
@@ -23,7 +23,7 @@
private isForcedTheme_: boolean;
- // <if expr="is_linux and not chromeos and not lacros">
-+ // <if expr="is_bsd and not chromeos and not lacros">
++ // <if expr="is_posix and not chromeos and not lacros">
private showCustomChromeFrame_: boolean;
// </if>
@@ -32,7 +32,7 @@
}
- // <if expr="is_linux and not chromeos">
-+ // <if expr="is_bsd and not chromeos">
++ // <if expr="is_posix and not chromeos">
private useSystemThemePrefChanged_(useSystemTheme: boolean) {
this.useSystemTheme_ = useSystemTheme;
}
@@ -41,11 +41,11 @@
let i18nId;
- // <if expr="is_linux and not chromeos and not lacros">
-+ // <if expr="is_bsd and not chromeos and not lacros">
++ // <if expr="is_posix and not chromeos and not lacros">
i18nId = useSystemTheme ? 'systemTheme' : 'classicTheme';
// </if>
-- // <if expr="not is_linux or chromeos or lacros">
-+ // <if expr="not is_bsd or chromeos or lacros">
+- // <if expr="not is_linux or chromeos_ash or chromeos_lacros">
++ // <if expr="not is_posix or chromeos_ash or chromeos_lacros">
i18nId = 'chooseFromWebStore';
// </if>
this.themeSublabel_ = this.i18n(i18nId);
diff --git a/www/chromium/files/patch-chrome_browser_resources_settings_autofill__page_passwords__shared__css.html b/www/chromium/files/patch-chrome_browser_resources_settings_autofill__page_passwords__shared__css.html
index 93eb51ca53d2..86eb435f271b 100644
--- a/www/chromium/files/patch-chrome_browser_resources_settings_autofill__page_passwords__shared__css.html
+++ b/www/chromium/files/patch-chrome_browser_resources_settings_autofill__page_passwords__shared__css.html
@@ -1,11 +1,11 @@
---- chrome/browser/resources/settings/autofill_page/passwords_shared_css.html.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/resources/settings/autofill_page/passwords_shared_css.html.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/resources/settings/autofill_page/passwords_shared_css.html
@@ -64,7 +64,7 @@
* necessary to prevent Chrome from using the operating system's font
* instead of the Material Design font.
* TODO(dbeam): why not font: inherit? */
--<if expr="chromeos or lacros or is_linux">
-+<if expr="chromeos or lacros or is_posix">
+-<if expr="chromeos_ash or chromeos_lacros or is_linux">
++<if expr="chromeos_ash or chromeos_lacros or is_posix">
font-family: 'DejaVu Sans Mono', monospace;
</if>
<if expr="is_win">
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 9b5c0cbb5dac..239ee4522709 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-02-07 13:39:41 UTC
+--- chrome/browser/resources/settings/route.ts.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/resources/settings/route.ts
-@@ -177,7 +177,7 @@ function createBrowserSettingsRoutes(): SettingsRoutes
+@@ -179,7 +179,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 f0ae727beba1..2fa19a4b6262 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,29 +1,29 @@
---- chrome/browser/safe_browsing/download_protection/file_analyzer.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/safe_browsing/download_protection/file_analyzer.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/safe_browsing/download_protection/file_analyzer.cc
-@@ -19,7 +19,7 @@
+@@ -20,7 +20,7 @@
#include "components/safe_browsing/core/common/features.h"
#include "content/public/browser/browser_thread.h"
--#if defined(OS_LINUX) || defined(OS_WIN)
-+#if defined(OS_LINUX) || defined(OS_WIN) | defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) | BUILDFLAG(IS_BSD)
#include "chrome/browser/safe_browsing/download_protection/document_analysis_service.h"
#endif
-@@ -100,7 +100,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 defined(OS_LINUX) || defined(OS_WIN)
-+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
+-#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) {
-@@ -284,7 +284,7 @@ void FileAnalyzer::OnDmgAnalysisFinished(
+@@ -285,7 +285,7 @@ void FileAnalyzer::OnDmgAnalysisFinished(
}
- #endif // defined(OS_MAC)
+ #endif // BUILDFLAG(IS_MAC)
--#if defined(OS_LINUX) || defined(OS_WIN)
-+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
void FileAnalyzer::StartExtractDocumentFeatures() {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
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 493f4618ae0e..10862fcee8b9 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,11 +1,11 @@
---- chrome/browser/safe_browsing/download_protection/file_analyzer.h.orig 2022-02-07 13:39:41 UTC
+--- 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
@@ -16,7 +16,7 @@
#include "components/safe_browsing/core/common/proto/csd.pb.h"
#include "third_party/protobuf/src/google/protobuf/repeated_field.h"
--#if defined(OS_LINUX) || defined(OS_WIN)
-+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
#include "chrome/services/file_util/public/cpp/sandboxed_document_analyzer.h"
#endif
@@ -13,8 +13,8 @@
const safe_browsing::ArchiveAnalyzerResults& archive_results);
#endif
--#if defined(OS_LINUX) || defined(OS_WIN)
-+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
void StartExtractDocumentFeatures();
void OnDocumentAnalysisFinished(
const DocumentAnalyzerResults& document_results);
@@ -22,8 +22,8 @@
scoped_refptr<SandboxedDMGAnalyzer> dmg_analyzer_;
#endif
--#if defined(OS_LINUX) || defined(OS_WIN)
-+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
scoped_refptr<SandboxedDocumentAnalyzer> document_analyzer_;
base::TimeTicks document_analysis_start_time_;
#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 758731442ab7..a49548e1d673 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,11 +1,11 @@
---- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc
@@ -709,7 +709,7 @@ void IncidentReportingService::OnEnvironmentDataCollec
// Process::Current().CreationTime() is missing on some platforms.
- #if defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || \
-- defined(OS_CHROMEOS)
-+ defined(OS_CHROMEOS) || defined(OS_BSD)
+ #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \
+- BUILDFLAG(IS_CHROMEOS)
++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
base::TimeDelta uptime =
first_incident_time_ - base::Process::Current().CreationTime();
environment_data->mutable_process()->set_uptime_msec(uptime.InMilliseconds());
diff --git a/www/chromium/files/patch-chrome_browser_send__tab__to__self_receiving__ui__handler__registry.cc b/www/chromium/files/patch-chrome_browser_send__tab__to__self_receiving__ui__handler__registry.cc
index 2c5912c7d673..aab704eb461e 100644
--- a/www/chromium/files/patch-chrome_browser_send__tab__to__self_receiving__ui__handler__registry.cc
+++ b/www/chromium/files/patch-chrome_browser_send__tab__to__self_receiving__ui__handler__registry.cc
@@ -1,29 +1,20 @@
---- chrome/browser/send_tab_to_self/receiving_ui_handler_registry.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/send_tab_to_self/receiving_ui_handler_registry.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/send_tab_to_self/receiving_ui_handler_registry.cc
@@ -16,7 +16,7 @@
#include "components/send_tab_to_self/features.h"
- #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \
-- defined(OS_WIN) || defined(OS_FUCHSIA)
-+ defined(OS_WIN) || defined(OS_FUCHSIA) || defined(OS_BSD)
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
+- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA)
++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
#include "chrome/browser/send_tab_to_self/desktop_notification_handler.h"
#include "chrome/browser/ui/send_tab_to_self/send_tab_to_self_toolbar_icon_controller.h"
#endif
-@@ -39,7 +39,7 @@ ReceivingUiHandlerRegistry* ReceivingUiHandlerRegistry
- void ReceivingUiHandlerRegistry::InstantiatePlatformSpecificHandlers(
- Profile* profile) {
- #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \
-- defined(OS_WIN) || defined(OS_FUCHSIA)
-+ defined(OS_WIN) || defined(OS_FUCHSIA) || defined(OS_BSD)
-
- // If STTS 2.0 is enabled the handler will be created when the toolbar
- // button registers itself as the delegate.
-@@ -59,7 +59,7 @@ SendTabToSelfToolbarIconController*
+@@ -48,7 +48,7 @@ SendTabToSelfToolbarIconController*
ReceivingUiHandlerRegistry::GetToolbarButtonControllerForProfile(
Profile* profile) {
- #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \
-- defined(OS_WIN) || defined(OS_FUCHSIA)
-+ defined(OS_WIN) || defined(OS_FUCHSIA) || defined(OS_BSD)
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
+- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA)
++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
for (const std::unique_ptr<ReceivingUiHandler>& handler :
applicable_handlers_) {
auto* button_controller =
diff --git a/www/chromium/files/patch-chrome_browser_send__tab__to__self_send__tab__to__self__client__service.cc b/www/chromium/files/patch-chrome_browser_send__tab__to__self_send__tab__to__self__client__service.cc
index c0db6c411453..5e174e544e28 100644
--- a/www/chromium/files/patch-chrome_browser_send__tab__to__self_send__tab__to__self__client__service.cc
+++ b/www/chromium/files/patch-chrome_browser_send__tab__to__self_send__tab__to__self__client__service.cc
@@ -1,20 +1,20 @@
---- chrome/browser/send_tab_to_self/send_tab_to_self_client_service.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/send_tab_to_self/send_tab_to_self_client_service.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/send_tab_to_self/send_tab_to_self_client_service.cc
@@ -17,7 +17,7 @@
#include "components/send_tab_to_self/send_tab_to_self_model.h"
- #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \
-- defined(OS_WIN)
-+ defined(OS_WIN) || defined(OS_BSD)
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
+- BUILDFLAG(IS_WIN)
++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
#include "chrome/browser/ui/send_tab_to_self/send_tab_to_self_toolbar_icon_controller.h"
#endif
@@ -51,7 +51,7 @@ void SendTabToSelfClientService::EntriesAddedRemotely(
const std::vector<const SendTabToSelfEntry*>& new_entries) {
for (const std::unique_ptr<ReceivingUiHandler>& handler : GetHandlers()) {
- #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \
-- defined(OS_WIN)
-+ defined(OS_WIN) || defined(OS_BSD)
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
+- BUILDFLAG(IS_WIN)
++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
// Only respond to notifications corresponding to this service's profile
// for these OSes; mobile does not have a Profile.
// Cast note: on desktop, handlers are guaranteed to be the derived class
diff --git a/www/chromium/files/patch-chrome_browser_sharing_sharing__device__registration.cc b/www/chromium/files/patch-chrome_browser_sharing_sharing__device__registration.cc
index bbe47111dd05..e838c9848c9e 100644
--- a/www/chromium/files/patch-chrome_browser_sharing_sharing__device__registration.cc
+++ b/www/chromium/files/patch-chrome_browser_sharing_sharing__device__registration.cc
@@ -1,11 +1,11 @@
---- chrome/browser/sharing/sharing_device_registration.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/sharing/sharing_device_registration.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/sharing/sharing_device_registration.cc
@@ -327,7 +327,7 @@ bool SharingDeviceRegistration::IsSmsFetcherSupported(
bool SharingDeviceRegistration::IsRemoteCopySupported() const {
- #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
-- defined(OS_CHROMEOS)
-+ defined(OS_CHROMEOS) || defined(OS_BSD)
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+- BUILDFLAG(IS_CHROMEOS)
++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
return true;
#else
return false;
diff --git a/www/chromium/files/patch-chrome_browser_sharing_sharing__handler__registry__impl.cc b/www/chromium/files/patch-chrome_browser_sharing_sharing__handler__registry__impl.cc
index c0258fd9f5a5..391bddbfef9b 100644
--- a/www/chromium/files/patch-chrome_browser_sharing_sharing__handler__registry__impl.cc
+++ b/www/chromium/files/patch-chrome_browser_sharing_sharing__handler__registry__impl.cc
@@ -1,20 +1,20 @@
---- chrome/browser/sharing/sharing_handler_registry_impl.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/sharing/sharing_handler_registry_impl.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/sharing/sharing_handler_registry_impl.cc
@@ -24,7 +24,7 @@
- #endif // defined(OS_ANDROID)
+ #endif // BUILDFLAG(IS_ANDROID)
- #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
-- defined(OS_CHROMEOS)
-+ defined(OS_CHROMEOS) || defined(OS_BSD)
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+- BUILDFLAG(IS_CHROMEOS)
++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
#include "chrome/browser/sharing/shared_clipboard/remote_copy_message_handler.h"
- #endif // defined(OS_WIN) || defined(OS_MAC) || (defined(OS_LINUX) ||
- // BUILDFLAG(IS_CHROMEOS_LACROS)) defined(OS_CHROMEOS)
+ #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) ||
+ // BUILDFLAG(IS_CHROMEOS_LACROS)) BUILDFLAG(IS_CHROMEOS)
@@ -77,7 +77,7 @@ SharingHandlerRegistryImpl::SharingHandlerRegistryImpl
}
- #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
-- defined(OS_CHROMEOS)
-+ defined(OS_CHROMEOS) || defined(OS_BSD)
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+- BUILDFLAG(IS_CHROMEOS)
++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
if (sharing_device_registration->IsRemoteCopySupported()) {
AddSharingHandler(
std::make_unique<RemoteCopyMessageHandler>(profile),
diff --git a/www/chromium/files/patch-chrome_browser_signin_signin__util.cc b/www/chromium/files/patch-chrome_browser_signin_signin__util.cc
index 1248d5d3f5e9..7498200c5c59 100644
--- a/www/chromium/files/patch-chrome_browser_signin_signin__util.cc
+++ b/www/chromium/files/patch-chrome_browser_signin_signin__util.cc
@@ -1,11 +1,11 @@
---- chrome/browser/signin/signin_util.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/signin/signin_util.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/signin/signin_util.cc
-@@ -40,7 +40,7 @@
+@@ -41,7 +41,7 @@
#include "ui/base/l10n/l10n_util.h"
- #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \
-- defined(OS_MAC)
-+ defined(OS_MAC) || defined(OS_BSD)
+ #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 b71d1abb2a1d..e2c334970d8b 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,11 +1,11 @@
---- chrome/browser/sync/chrome_sync_client.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/sync/chrome_sync_client.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/sync/chrome_sync_client.cc
-@@ -462,7 +462,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy
+@@ -420,7 +420,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.
--#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
// Dictionary sync is enabled by default.
- if (!disabled_types.Has(syncer::DICTIONARY) &&
- GetPrefService()->GetBoolean(spellcheck::prefs::kSpellCheckEnable)) {
+ if (GetPrefService()->GetBoolean(spellcheck::prefs::kSpellCheckEnable)) {
+ controllers.push_back(
diff --git a/www/chromium/files/patch-chrome_browser_sync_device__info__sync__client__impl.cc b/www/chromium/files/patch-chrome_browser_sync_device__info__sync__client__impl.cc
index cecf948ecc81..8b124e3d21f9 100644
--- a/www/chromium/files/patch-chrome_browser_sync_device__info__sync__client__impl.cc
+++ b/www/chromium/files/patch-chrome_browser_sync_device__info__sync__client__impl.cc
@@ -1,11 +1,11 @@
---- chrome/browser/sync/device_info_sync_client_impl.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/sync/device_info_sync_client_impl.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/sync/device_info_sync_client_impl.cc
@@ -38,7 +38,7 @@ std::string DeviceInfoSyncClientImpl::GetSigninScopedD
// in lacros-chrome once build flag switch of lacros-chrome is
// complete.
- #if defined(OS_WIN) || defined(OS_MAC) || \
-- (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
-+ (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD))
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
+- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
++ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD))
syncer::SyncPrefs prefs(profile_->GetPrefs());
if (prefs.IsLocalSyncEnabled()) {
return "local_device";
diff --git a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc
index 154ce10da646..2079cf64a819 100644
--- a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc
+++ b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc
@@ -1,38 +1,38 @@
---- chrome/browser/task_manager/sampling/task_group.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/task_manager/sampling/task_group.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/task_manager/sampling/task_group.cc
@@ -37,7 +37,7 @@ const int kBackgroundRefreshTypesMask =
- #if defined(OS_WIN)
+ #if BUILDFLAG(IS_WIN)
REFRESH_TYPE_START_TIME | REFRESH_TYPE_CPU_TIME |
- #endif // defined(OS_WIN)
--#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD)
+ #endif // BUILDFLAG(IS_WIN)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
REFRESH_TYPE_FD_COUNT |
- #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC)
+ #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
#if BUILDFLAG(ENABLE_NACL)
@@ -122,7 +122,7 @@ TaskGroup::TaskGroup(
#if BUILDFLAG(ENABLE_NACL)
nacl_debug_stub_port_(nacl::kGdbDebugStubPortUnknown),
#endif // BUILDFLAG(ENABLE_NACL)
--#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
open_fd_count_(-1),
- #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC)
+ #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
idle_wakeups_per_second_(-1),
@@ -141,7 +141,7 @@ TaskGroup::TaskGroup(
weak_ptr_factory_.GetWeakPtr()),
base::BindRepeating(&TaskGroup::OnIdleWakeupsRefreshDone,
weak_ptr_factory_.GetWeakPtr()),
--#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
base::BindRepeating(&TaskGroup::OnOpenFdCountRefreshDone,
weak_ptr_factory_.GetWeakPtr()),
- #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC)
+ #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
@@ -321,7 +321,7 @@ void TaskGroup::OnRefreshNaClDebugStubPortDone(int nac
}
#endif // BUILDFLAG(ENABLE_NACL)
--#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
void TaskGroup::OnOpenFdCountRefreshDone(int open_fd_count) {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
diff --git a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h
index 0a9b5ee942cf..0cc1453db2f4 100644
--- a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h
+++ b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h
@@ -1,11 +1,11 @@
---- chrome/browser/task_manager/sampling/task_group.h.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/task_manager/sampling/task_group.h.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/task_manager/sampling/task_group.h
@@ -42,7 +42,7 @@ constexpr int kUnsupportedVMRefreshFlags =
REFRESH_TYPE_WEBCACHE_STATS | REFRESH_TYPE_NETWORK_USAGE |
REFRESH_TYPE_NACL | REFRESH_TYPE_IDLE_WAKEUPS | REFRESH_TYPE_HANDLES |
REFRESH_TYPE_START_TIME | REFRESH_TYPE_CPU_TIME | REFRESH_TYPE_PRIORITY |
--#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
REFRESH_TYPE_FD_COUNT |
#endif
REFRESH_TYPE_HARD_FAULTS;
@@ -13,26 +13,26 @@
}
#endif // BUILDFLAG(ENABLE_NACL)
--#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
int open_fd_count() const { return open_fd_count_; }
void set_open_fd_count(int open_fd_count) { open_fd_count_ = open_fd_count; }
- #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC)
+ #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
@@ -168,7 +168,7 @@ class TaskGroup {
void RefreshNaClDebugStubPort(int child_process_unique_id);
void OnRefreshNaClDebugStubPortDone(int port);
#endif
--#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
void OnOpenFdCountRefreshDone(int open_fd_count);
- #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC)
+ #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
@@ -240,7 +240,7 @@ class TaskGroup {
#if BUILDFLAG(ENABLE_NACL)
int nacl_debug_stub_port_;
#endif // BUILDFLAG(ENABLE_NACL)
--#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
// The number of file descriptors currently open by the process.
int open_fd_count_;
- #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC)
+ #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
diff --git a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc
index 9b8b00b548d9..df5a800d54e6 100644
--- a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc
+++ b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc
@@ -1,38 +1,38 @@
---- chrome/browser/task_manager/sampling/task_group_sampler.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/task_manager/sampling/task_group_sampler.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/task_manager/sampling/task_group_sampler.cc
@@ -44,7 +44,7 @@ TaskGroupSampler::TaskGroupSampler(
const OnCpuRefreshCallback& on_cpu_refresh,
const OnSwappedMemRefreshCallback& on_swapped_mem_refresh,
const OnIdleWakeupsCallback& on_idle_wakeups,
--#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
const OnOpenFdCountCallback& on_open_fd_count,
- #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC)
+ #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
const OnProcessPriorityCallback& on_process_priority)
@@ -54,7 +54,7 @@ TaskGroupSampler::TaskGroupSampler(
on_cpu_refresh_callback_(on_cpu_refresh),
on_swapped_mem_refresh_callback_(on_swapped_mem_refresh),
on_idle_wakeups_callback_(on_idle_wakeups),
--#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
on_open_fd_count_callback_(on_open_fd_count),
- #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC)
+ #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
on_process_priority_callback_(on_process_priority) {
@@ -86,7 +86,7 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags)
base::BindOnce(on_swapped_mem_refresh_callback_));
}
--#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
if (TaskManagerObserver::IsResourceRefreshEnabled(REFRESH_TYPE_IDLE_WAKEUPS,
refresh_flags)) {
base::PostTaskAndReplyWithResult(
@@ -96,7 +96,7 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags)
}
- #endif // defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS)
+ #endif // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
--#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
if (TaskManagerObserver::IsResourceRefreshEnabled(REFRESH_TYPE_FD_COUNT,
refresh_flags)) {
base::PostTaskAndReplyWithResult(
@@ -40,8 +40,8 @@
return process_metrics_->GetIdleWakeupsPerSecond();
}
--#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
int TaskGroupSampler::RefreshOpenFdCount() {
DCHECK(worker_pool_sequenced_checker_.CalledOnValidSequence());
diff --git a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.h b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.h
index 52c1318c6878..d1a7fe6608f4 100644
--- a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.h
+++ b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.h
@@ -1,38 +1,38 @@
---- chrome/browser/task_manager/sampling/task_group_sampler.h.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/task_manager/sampling/task_group_sampler.h.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/task_manager/sampling/task_group_sampler.h
@@ -31,7 +31,7 @@ class TaskGroupSampler : public base::RefCountedThread
using OnCpuRefreshCallback = base::RepeatingCallback<void(double)>;
using OnSwappedMemRefreshCallback = base::RepeatingCallback<void(int64_t)>;
using OnIdleWakeupsCallback = base::RepeatingCallback<void(int)>;
--#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
using OnOpenFdCountCallback = base::RepeatingCallback<void(int)>;
- #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC)
+ #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
using OnProcessPriorityCallback = base::RepeatingCallback<void(bool)>;
@@ -42,7 +42,7 @@ class TaskGroupSampler : public base::RefCountedThread
const OnCpuRefreshCallback& on_cpu_refresh,
const OnSwappedMemRefreshCallback& on_memory_refresh,
const OnIdleWakeupsCallback& on_idle_wakeups,
--#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
const OnOpenFdCountCallback& on_open_fd_count,
- #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC)
+ #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
const OnProcessPriorityCallback& on_process_priority);
@@ -62,7 +62,7 @@ class TaskGroupSampler : public base::RefCountedThread
double RefreshCpuUsage();
int64_t RefreshSwappedMem();
int RefreshIdleWakeupsPerSecond();
--#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
int RefreshOpenFdCount();
- #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC)
+ #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
bool RefreshProcessPriority();
@@ -86,7 +86,7 @@ class TaskGroupSampler : public base::RefCountedThread
const OnCpuRefreshCallback on_cpu_refresh_callback_;
const OnSwappedMemRefreshCallback on_swapped_mem_refresh_callback_;
const OnIdleWakeupsCallback on_idle_wakeups_callback_;
--#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
const OnOpenFdCountCallback on_open_fd_count_callback_;
- #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC)
+ #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
const OnProcessPriorityCallback on_process_priority_callback_;
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 f3ff05f393d8..7f1052143a43 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,11 +1,11 @@
---- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig 2022-02-07 13:39:41 UTC
+--- 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
@@ -217,7 +217,7 @@ void TaskManagerImpl::GetUSERHandles(TaskId task_id,
}
int TaskManagerImpl::GetOpenFdCount(TaskId task_id) const {
--#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
return GetTaskGroupByTaskId(task_id)->open_fd_count();
#else
return -1;
diff --git a/www/chromium/files/patch-chrome_browser_task__manager_task__manager__observer.h b/www/chromium/files/patch-chrome_browser_task__manager_task__manager__observer.h
index 78d46e3bc6e2..a2f4e51049f7 100644
--- a/www/chromium/files/patch-chrome_browser_task__manager_task__manager__observer.h
+++ b/www/chromium/files/patch-chrome_browser_task__manager_task__manager__observer.h
@@ -1,11 +1,11 @@
---- chrome/browser/task_manager/task_manager_observer.h.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/task_manager/task_manager_observer.h.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/task_manager/task_manager_observer.h
@@ -47,7 +47,7 @@ enum RefreshType {
// or backgrounded.
REFRESH_TYPE_PRIORITY = 1 << 13,
--#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
// For observers interested in getting the number of open file descriptors of
// processes.
REFRESH_TYPE_FD_COUNT = 1 << 14,
diff --git a/www/chromium/files/patch-chrome_browser_themes_theme__helper.cc b/www/chromium/files/patch-chrome_browser_themes_theme__helper.cc
index dd9309404c97..d54f4fe80196 100644
--- a/www/chromium/files/patch-chrome_browser_themes_theme__helper.cc
+++ b/www/chromium/files/patch-chrome_browser_themes_theme__helper.cc
@@ -1,11 +1,11 @@
---- chrome/browser/themes/theme_helper.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/themes/theme_helper.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/themes/theme_helper.cc
@@ -334,7 +334,7 @@ bool ThemeHelper::ShouldUseIncreasedContrastThemeSuppl
ui::NativeTheme* native_theme) const {
// TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
// complete.
--#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
// On Linux the GTK system theme provides the high contrast colors,
// so don't use the IncreasedContrastThemeSupplier.
return false;
diff --git a/www/chromium/files/patch-chrome_browser_themes_theme__service__factory.cc b/www/chromium/files/patch-chrome_browser_themes_theme__service__factory.cc
index 196a58b27779..90d412db52c8 100644
--- a/www/chromium/files/patch-chrome_browser_themes_theme__service__factory.cc
+++ b/www/chromium/files/patch-chrome_browser_themes_theme__service__factory.cc
@@ -1,11 +1,11 @@
---- chrome/browser/themes/theme_service_factory.cc.orig 2021-04-14 18:40:55 UTC
+--- chrome/browser/themes/theme_service_factory.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/themes/theme_service_factory.cc
@@ -25,7 +25,7 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
--#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
#include "chrome/browser/themes/theme_service_aura_linux.h"
#include "ui/views/linux_ui/linux_ui.h"
#endif
@@ -13,8 +13,8 @@
content::BrowserContext* profile) const {
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
--#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
using ThemeService = ThemeServiceAuraLinux;
#endif
@@ -22,8 +22,8 @@
user_prefs::PrefRegistrySyncable* registry) {
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
--#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
bool default_uses_system_theme = false;
const views::LinuxUI* linux_ui = views::LinuxUI::instance();
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 e9a74790cccf..c7a539c74fcd 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,11 +1,11 @@
---- chrome/browser/ui/browser_command_controller.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/ui/browser_command_controller.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/ui/browser_command_controller.cc
@@ -88,7 +88,7 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
--#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
#include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h"
#endif
@@ -13,8 +13,8 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
--#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
// If this key was registered by the user as a content editing hotkey, then
// it is not reserved.
ui::TextEditKeyBindingsDelegateAuraLinux* delegate =
@@ -22,8 +22,8 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
--#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
case IDC_MINIMIZE_WINDOW:
browser_->window()->Minimize();
break;
@@ -31,8 +31,8 @@
#endif
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
--#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
command_updater_.UpdateCommandEnabled(IDC_MINIMIZE_WINDOW, true);
command_updater_.UpdateCommandEnabled(IDC_MAXIMIZE_WINDOW, true);
command_updater_.UpdateCommandEnabled(IDC_RESTORE_WINDOW, true);
diff --git a/www/chromium/files/patch-chrome_browser_ui_browser__dialogs.h b/www/chromium/files/patch-chrome_browser_ui_browser__dialogs.h
index 06c2732ddbd7..1480cab7017a 100644
--- a/www/chromium/files/patch-chrome_browser_ui_browser__dialogs.h
+++ b/www/chromium/files/patch-chrome_browser_ui_browser__dialogs.h
@@ -1,29 +1,29 @@
---- chrome/browser/ui/browser_dialogs.h.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/ui/browser_dialogs.h.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/ui/browser_dialogs.h
@@ -26,7 +26,7 @@
#include "ui/base/models/dialog_model.h"
#include "ui/gfx/native_widget_types.h"
--#if defined(OS_WIN) || defined(OS_MAC) || \
-+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) || \
- (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS))
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \
+ (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS))
#include "chrome/browser/web_applications/web_app_id.h"
#endif
@@ -80,7 +80,7 @@ class WebDialogDelegate;
struct SelectedFileInfo;
} // namespace ui
--#if defined(OS_WIN) || defined(OS_MAC) || \
-+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) || \
- (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS))
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \
+ (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS))
namespace web_app {
struct UrlHandlerLaunchParams;
@@ -207,7 +207,7 @@ void ShowWebAppFileLaunchDialog(const std::vector<base
WebAppLaunchAcceptanceCallback close_callback);
- #endif // !defined(OS_ANDROID)
+ #endif // !BUILDFLAG(IS_ANDROID)
--#if defined(OS_WIN) || defined(OS_MAC) || \
-+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) || \
- (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS))
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \
+ (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS))
// Callback that runs when the Web App URL Handler Intent Picker dialog is
// closed. `accepted` is true when the dialog is accepted, false otherwise.
diff --git a/www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc b/www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc
index d841ee810a45..d2d058b53690 100644
--- a/www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc
@@ -1,11 +1,11 @@
---- chrome/browser/ui/browser_view_prefs.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/ui/browser_view_prefs.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/ui/browser_view_prefs.cc
@@ -17,7 +17,7 @@ namespace {
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
--#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
bool GetCustomFramePrefDefault() {
#if defined(USE_OZONE)
return ui::OzonePlatform::GetInstance()
@@ -13,8 +13,8 @@
user_prefs::PrefRegistrySyncable* registry) {
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
--#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
registry->RegisterBooleanPref(prefs::kUseCustomChromeFrame,
GetCustomFramePrefDefault());
- #endif // (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) &&
+ #endif
diff --git a/www/chromium/files/patch-chrome_browser_ui_exclusive__access_exclusive__access__bubble.cc b/www/chromium/files/patch-chrome_browser_ui_exclusive__access_exclusive__access__bubble.cc
index 3afbc76c8d7d..fb0ba06d6b5e 100644
--- a/www/chromium/files/patch-chrome_browser_ui_exclusive__access_exclusive__access__bubble.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_exclusive__access_exclusive__access__bubble.cc
@@ -1,11 +1,11 @@
---- chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc.orig 2021-04-14 18:40:55 UTC
+--- chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc
@@ -16,7 +16,7 @@
// NOTE(koz): Linux doesn't use the thick shadowed border, so we add padding
// here.
--#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
const int ExclusiveAccessBubble::kPaddingPx = 8;
#else
const int ExclusiveAccessBubble::kPaddingPx = 15;
diff --git a/www/chromium/files/patch-chrome_browser_ui_sad__tab.cc b/www/chromium/files/patch-chrome_browser_ui_sad__tab.cc
index ad34cd323688..8b4620cbf1c5 100644
--- a/www/chromium/files/patch-chrome_browser_ui_sad__tab.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_sad__tab.cc
@@ -1,11 +1,11 @@
---- chrome/browser/ui/sad_tab.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/ui/sad_tab.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/ui/sad_tab.cc
@@ -188,7 +188,7 @@ std::vector<int> SadTab::GetSubMessages() {
// Only show Incognito suggestion if not already in Incognito mode.
if (!web_contents_->GetBrowserContext()->IsOffTheRecord())
message_ids.insert(message_ids.begin(), IDS_SAD_TAB_RELOAD_INCOGNITO);
--#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
// Note: on macOS, Linux and ChromeOS, the first bullet is either one of
// IDS_SAD_TAB_RELOAD_CLOSE_TABS or IDS_SAD_TAB_RELOAD_CLOSE_NOTABS
// followed by one of the above suggestions.
diff --git a/www/chromium/files/patch-chrome_browser_ui_signin__view__controller.cc b/www/chromium/files/patch-chrome_browser_ui_signin__view__controller.cc
index ab2b61434e96..ee0af9eba9ff 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,11 +1,11 @@
---- chrome/browser/ui/signin_view_controller.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/ui/signin_view_controller.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/ui/signin_view_controller.cc
-@@ -242,7 +242,7 @@ void SigninViewController::ShowModalEnterpriseConfirma
+@@ -253,7 +253,7 @@ void SigninViewController::ShowModalEnterpriseConfirma
SkColor profile_color,
base::OnceCallback<void(bool)> callback) {
- #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS_LACROS)
-+ BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
++ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
CloseModalSignin();
- // The delegate will delete itself on request of the UI code when the widget
- // is closed.
+ dialog_ = std::make_unique<SigninModalDialogImpl>(
+ SigninViewControllerDelegate::CreateEnterpriseConfirmationDelegate(
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 0a9d2af20c45..576db126de2e 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,11 +1,11 @@
---- chrome/browser/ui/signin_view_controller_delegate.h.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/ui/signin_view_controller_delegate.h.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/ui/signin_view_controller_delegate.h
-@@ -64,7 +64,7 @@ class SigninViewControllerDelegate {
- signin_metrics::ReauthAccessPoint access_point);
+@@ -74,7 +74,7 @@ class SigninViewControllerDelegate {
+ #endif // BUILDFLAG(ENABLE_DICE_SUPPORT)
- #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS_LACROS)
-+ BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
++ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
// Returns a platform-specific SigninViewContolllerDelegate instance that
// displays the enterprise confirmation modal dialog. The returned object
// should delete itself when the window it's managing is closed.
diff --git a/www/chromium/files/patch-chrome_browser_ui_signin_dice__web__signin__interceptor__delegate.cc b/www/chromium/files/patch-chrome_browser_ui_signin_dice__web__signin__interceptor__delegate.cc
index c893c28b27e7..8b528e8d6035 100644
--- a/www/chromium/files/patch-chrome_browser_ui_signin_dice__web__signin__interceptor__delegate.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_signin_dice__web__signin__interceptor__delegate.cc
@@ -1,11 +1,11 @@
---- chrome/browser/ui/signin/dice_web_signin_interceptor_delegate.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/ui/signin/dice_web_signin_interceptor_delegate.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/ui/signin/dice_web_signin_interceptor_delegate.cc
-@@ -59,7 +59,7 @@ class ForcedEnterpriseSigninInterceptionHandle
+@@ -66,7 +66,7 @@ class ForcedEnterpriseSigninInterceptionHandle
void ShowEnterpriseProfileInterceptionDialog(const AccountInfo& account_info,
SkColor profile_color) {
- #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS_LACROS)
-+ BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
++ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
if (base::FeatureList::IsEnabled(kAccountPoliciesLoadedWithoutSync)) {
browser_->signin_view_controller()->ShowModalEnterpriseConfirmationDialog(
account_info, profile_color,
diff --git a/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc b/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc
index 57b20c95a293..0d83620f6d3c 100644
--- a/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc
@@ -1,11 +1,11 @@
---- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2021-09-24 04:26:00 UTC
+--- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/ui/startup/bad_flags_prompt.cc
-@@ -95,7 +95,7 @@ static const char* kBadFlags[] = {
+@@ -90,7 +90,7 @@ static const char* kBadFlags[] = {
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
--#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
// Speech dispatcher is buggy, it can crash and it can make Chrome freeze.
// http://crbug.com/327295
switches::kEnableSpeechDispatcher,
diff --git a/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 7e5f7f79e3ad..2ab25d68304d 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,38 +1,53 @@
---- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/ui/startup/startup_browser_creator.cc
-@@ -124,7 +124,7 @@
+@@ -124,12 +124,12 @@
#endif // BUILDFLAG(ENABLE_PRINT_PREVIEW)
- #endif // defined(OS_WIN)
+ #endif // BUILDFLAG(IS_WIN)
--#if defined(OS_WIN) || defined(OS_MAC) || \
-+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) || \
- (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS))
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \
+ (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS))
#include "chrome/browser/ui/startup/web_app_url_handling_startup_utils.h"
#endif
-@@ -403,7 +403,7 @@ bool MaybeLaunchAppShortcutWindow(const base::CommandL
+
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ #include "chrome/browser/ui/startup/web_app_info_recorder_utils.h"
+ #endif
+
+@@ -414,7 +414,7 @@ bool MaybeLaunchAppShortcutWindow(const base::CommandL
return false;
}
--#if defined(OS_WIN) || (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS))
-+#if defined(OS_WIN) || (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD)
+-#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS))
++#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD)
bool MaybeLaunchUrlHandlerWebAppFromCmd(
const base::CommandLine& command_line,
const base::FilePath& cur_dir,
-@@ -1038,7 +1038,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
+@@ -908,7 +908,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
+ silent_launch = true;
+ }
+
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ // Writes open and installed web apps to the specified file without
+ // launching a new browser window or tab.
+ if (base::FeatureList::IsEnabled(features::kListWebAppsSwitch) &&
+@@ -1057,7 +1057,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
if (command_line.HasSwitch(switches::kAppId)) {
std::string app_id = command_line.GetSwitchValueASCII(switches::kAppId);
--#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX)
-+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD)
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// If Chrome Apps are deprecated and |app_id| is a Chrome App, display the
// deprecation UI instead of launching the app.
if (apps::OpenDeprecatedApplicationPrompt(privacy_safe_profile, app_id))
-@@ -1074,7 +1074,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
+@@ -1094,7 +1094,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
web_app::startup::MaybeHandleWebAppLaunch(
command_line, cur_dir, privacy_safe_profile, is_first_run);
--#if defined(OS_WIN) || (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS))
-+#if defined(OS_WIN) || (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD)
+-#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS))
++#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD)
handled_as_app = handled_as_app ||
// Give web apps a chance to handle a URL.
MaybeLaunchUrlHandlerWebAppFromCmd(
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 349c592b4498..cbc3b83a1620 100644
--- a/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc
@@ -1,36 +1,36 @@
---- chrome/browser/ui/tab_helpers.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/ui/tab_helpers.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/ui/tab_helpers.cc
-@@ -175,7 +175,7 @@
+@@ -178,7 +178,7 @@
#endif
- #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
-- defined(OS_CHROMEOS) || defined(OS_FUCHSIA)
-+ defined(OS_CHROMEOS) || defined(OS_FUCHSIA) || defined(OS_BSD)
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
#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"
-@@ -479,13 +479,13 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
+@@ -495,13 +495,13 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
--#if defined(OS_WIN) || defined(OS_MAC) || \
-+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) || \
- (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \
+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
metrics::DesktopSessionDurationObserver::CreateForWebContents(web_contents);
#endif
- #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
-- defined(OS_CHROMEOS)
-+ defined(OS_CHROMEOS) || defined(OS_BSD)
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+- BUILDFLAG(IS_CHROMEOS)
++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
if (base::FeatureList::IsEnabled(
features::kHappinessTrackingSurveysForDesktopDemo) ||
base::FeatureList::IsEnabled(features::kTrustSafetySentimentSurvey) ||
-@@ -496,7 +496,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
+@@ -512,7 +512,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
#endif
- #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
-- defined(OS_CHROMEOS)
-+ defined(OS_CHROMEOS) || defined(OS_BSD)
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+- BUILDFLAG(IS_CHROMEOS)
++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
if (Browser* browser = chrome::FindBrowserWithProfile(profile)) {
SharedHighlightingPromo::CreateForWebContents(web_contents, browser);
}
diff --git a/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__columns.cc b/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__columns.cc
index 7156c0165491..2c0f824455ce 100644
--- a/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__columns.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__columns.cc
@@ -1,11 +1,11 @@
---- chrome/browser/ui/task_manager/task_manager_columns.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/ui/task_manager/task_manager_columns.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/ui/task_manager/task_manager_columns.cc
@@ -94,7 +94,7 @@ const TableColumnData kColumns[] = {
base::size("100000") * kCharWidth, -1, true, false, false},
#endif
--#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
{IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN, ui::TableColumn::RIGHT, -1, 0,
base::size("999") * kCharWidth, -1, true, false, false},
- #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC)
+ #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
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 ddcb60da4e16..010f9d21e664 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,11 +1,11 @@
---- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig 2022-02-07 13:39:41 UTC
+--- 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
@@ -451,7 +451,7 @@ std::u16string TaskManagerTableModel::GetText(int row,
? stringifier_->backgrounded_string()
: stringifier_->foregrounded_string();
--#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN: {
const int fd_count = observed_task_manager()->GetOpenFdCount(tasks_[row]);
return fd_count >= 0 ? base::FormatNumber(fd_count)
@@ -13,8 +13,8 @@
return BooleanCompare(is_proc1_bg, is_proc2_bg);
}
--#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN: {
const int proc1_fd_count =
observed_task_manager()->GetOpenFdCount(tasks_[row1]);
@@ -22,8 +22,8 @@
type = REFRESH_TYPE_KEEPALIVE_COUNT;
break;
--#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN:
type = REFRESH_TYPE_FD_COUNT;
break;
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc b/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc
index 3f196e28de4d..d72fbed5d990 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,11 +1,11 @@
---- chrome/browser/ui/views/accelerator_table.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/ui/views/accelerator_table.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/ui/views/accelerator_table.cc
@@ -62,7 +62,7 @@ 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.
--#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#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},
{ui::VKEY_NEXT, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, IDC_MOVE_TAB_NEXT},
@@ -13,8 +13,8 @@
{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.
--#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
{ui::VKEY_1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0},
{ui::VKEY_NUMPAD1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0},
{ui::VKEY_2, ui::EF_ALT_DOWN, IDC_SELECT_TAB_1},
@@ -22,8 +22,8 @@
IDC_SHOW_AVATAR_MENU},
// Platform-specific key maps.
--#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
{ui::VKEY_BROWSER_BACK, ui::EF_NONE, IDC_BACK},
{ui::VKEY_BROWSER_FORWARD, ui::EF_NONE, IDC_FORWARD},
{ui::VKEY_BROWSER_HOME, ui::EF_NONE, IDC_HOME},
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc b/www/chromium/files/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc
index 63b43df7d09c..05f95bde60a2 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc
@@ -1,11 +1,11 @@
---- chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc
@@ -19,7 +19,7 @@
#include "ui/gfx/image/image_skia.h"
#include "ui/views/widget/widget.h"
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
#include "chrome/browser/shell_integration_linux.h"
#endif
@@ -13,8 +13,8 @@
const AppWindow::CreateParams& create_params,
views::Widget::InitParams* init_params,
views::Widget* widget) {
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
std::string app_name =
web_app::GenerateApplicationNameFromAppId(app_window()->extension_id());
// Set up a custom WM_CLASS for app windows. This allows task switchers in
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc b/www/chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc
index b76ad95e95bd..8bd455d0e7f3 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc
@@ -1,11 +1,11 @@
---- chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc
@@ -41,7 +41,7 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
--#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
#include <sys/stat.h>
#include <sys/types.h>
#include <unistd.h>
@@ -13,8 +13,8 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
--#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
// On the Linux desktop, we want to prevent the user from logging in as root,
// so that we don't destroy the profile. Now that we have some minimal ui
// initialized, check to see if we're running as root and bail if we are.
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h b/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h
index 7d5a3e2e2a9d..384e3fabd16e 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h
+++ b/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h
@@ -1,11 +1,11 @@
---- chrome/browser/ui/views/chrome_views_delegate.h.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/ui/views/chrome_views_delegate.h.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/ui/views/chrome_views_delegate.h
-@@ -52,7 +52,7 @@ class ChromeViewsDelegate : public views::ViewsDelegat
+@@ -51,7 +51,7 @@ class ChromeViewsDelegate : public views::ViewsDelegat
base::OnceClosure callback) override;
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
--#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
+-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
gfx::ImageSkia* GetDefaultWindowIcon() const override;
bool WindowManagerProvidesTitleBar(bool maximized) override;
#endif
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_download_download__item__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_download_download__item__view.cc
index 325476f1c690..52bc71a149c4 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_download_download__item__view.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_download_download__item__view.cc
@@ -1,11 +1,11 @@
---- chrome/browser/ui/views/download/download_item_view.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/ui/views/download/download_item_view.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/ui/views/download/download_item_view.cc
@@ -195,7 +195,7 @@ bool UseNewWarnings() {
}
int GetFilenameStyle(const views::Label& label) {
--#if !defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if !defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_BSD)
+-#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
++#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD)
if (UseNewWarnings())
return STYLE_EMPHASIZED;
#endif
@@ -13,8 +13,8 @@
}
int GetFilenameStyle(const views::StyledLabel& label) {
--#if !defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if !defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_BSD)
+-#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
++#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD)
if (UseNewWarnings())
return STYLE_EMPHASIZED;
#endif
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_eye__dropper_eye__dropper__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_eye__dropper_eye__dropper__view.cc
index a61fc484d48b..11c440c6a76c 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_eye__dropper_eye__dropper__view.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_eye__dropper_eye__dropper__view.cc
@@ -1,11 +1,11 @@
---- chrome/browser/ui/views/eye_dropper/eye_dropper_view.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/ui/views/eye_dropper/eye_dropper_view.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/ui/views/eye_dropper/eye_dropper_view.cc
@@ -155,7 +155,7 @@ EyeDropperView::EyeDropperView(content::RenderFrameHos
// EyeDropper/WidgetDelegate.
set_owned_by_client();
SetPreferredSize(GetSize());
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// Use TYPE_MENU for Linux to ensure that the eye dropper view is displayed
// above the color picker.
views::Widget::InitParams params(views::Widget::InitParams::TYPE_MENU);
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 e6c9534e5088..ebbe59d763bb 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,11 +1,11 @@
---- chrome/browser/ui/views/eye_dropper/eye_dropper_view_aura.cc.orig 2022-02-07 13:39:41 UTC
+--- 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
@@ -81,7 +81,7 @@ void EyeDropperView::MoveViewToFront() {
}
void EyeDropperView::CaptureInputIfNeeded() {
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// The eye dropper needs to capture input since it is not activated
// in order to avoid dismissing the color picker.
GetWidget()->GetNativeWindow()->SetCapture();
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_first__run__dialog.cc b/www/chromium/files/patch-chrome_browser_ui_views_first__run__dialog.cc
index 89a6cb88de14..4e75ddb2b7d9 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_first__run__dialog.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_first__run__dialog.cc
@@ -1,20 +1,20 @@
---- chrome/browser/ui/views/first_run_dialog.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/ui/views/first_run_dialog.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/ui/views/first_run_dialog.cc
@@ -38,7 +38,7 @@
namespace {
--#if !defined(OS_MAC)
-+#if !defined(OS_MAC) && !defined(OS_BSD)
+-#if !BUILDFLAG(IS_MAC)
++#if !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_BSD)
void InitCrashReporterIfEnabled(bool enabled) {
if (!crash_reporter::IsCrashpadEnabled() && enabled)
breakpad::InitCrashReporter(std::string());
@@ -122,7 +122,7 @@ bool FirstRunDialog::Accept() {
- #if defined(OS_MAC)
+ #if BUILDFLAG(IS_MAC)
ChangeMetricsReportingState(report_crashes_->GetChecked());
-#else
-+#elif !defined(OS_BSD)
++#elif !BUILDFLAG(IS_BSD)
#if BUILDFLAG(IS_CHROMEOS_ASH)
metrics::structured::NeutrinoDevicesLog(
metrics::structured::NeutrinoDevicesLocation::kFirstRunDialog);
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__desktop__window__tree__host__linux.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__desktop__window__tree__host__linux.cc
index c5972b933a71..ac49ba40e61b 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__desktop__window__tree__host__linux.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__desktop__window__tree__host__linux.cc
@@ -1,11 +1,11 @@
---- chrome/browser/ui/views/frame/browser_desktop_window_tree_host_linux.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/ui/views/frame/browser_desktop_window_tree_host_linux.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/ui/views/frame/browser_desktop_window_tree_host_linux.cc
@@ -146,7 +146,7 @@ bool BrowserDesktopWindowTreeHostLinux::SupportsClient
}
void BrowserDesktopWindowTreeHostLinux::UpdateFrameHints() {
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
auto* view = static_cast<BrowserFrameViewLinux*>(
native_frame_->browser_frame()->GetFrameView());
auto* layout = view->layout();
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__desktop__window__tree__host__linux.h b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__desktop__window__tree__host__linux.h
index 574e1d37632a..8b456b44c4f1 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__desktop__window__tree__host__linux.h
+++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__desktop__window__tree__host__linux.h
@@ -1,11 +1,11 @@
---- chrome/browser/ui/views/frame/browser_desktop_window_tree_host_linux.h.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/ui/views/frame/browser_desktop_window_tree_host_linux.h.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/ui/views/frame/browser_desktop_window_tree_host_linux.h
@@ -95,7 +95,7 @@ class BrowserDesktopWindowTreeHostLinux
// browser_desktop_window_tree_host_lacros.cc.
#if BUILDFLAG(IS_CHROMEOS_LACROS)
using DesktopBrowserFrameAuraPlatform = DesktopBrowserFrameLacros;
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
using DesktopBrowserFrameAuraPlatform = DesktopBrowserFrameAuraLinux;
#else
#error Unknown platform
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc
index 359cbcd74f69..09d242c51b33 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc
@@ -1,16 +1,16 @@
---- chrome/browser/ui/views/frame/browser_frame.cc.orig 2021-12-14 11:44:59 UTC
+--- chrome/browser/ui/views/frame/browser_frame.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/ui/views/frame/browser_frame.cc
@@ -48,11 +48,11 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
--#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
#include "ui/display/screen.h"
#endif
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
#include "ui/views/linux_ui/linux_ui.h"
#endif
@@ -18,8 +18,8 @@
bool IsUsingGtkTheme(Profile* profile) {
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
--#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
return ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme();
#else
return false;
@@ -27,8 +27,8 @@
IsVisibleOnAllWorkspaces());
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
--#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
// If the window was sent to a different workspace, prioritize it if
// it was sent to the current workspace and deprioritize it
// otherwise. This is done by MoveBrowsersInWorkspaceToFront()
@@ -36,8 +36,8 @@
}
}
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
const views::LinuxUI* linux_ui = views::LinuxUI::instance();
// Ignore GTK+ for web apps with window-controls-overlay as the
// display_override so the web contents can blend with the overlay by using
@@ -45,8 +45,8 @@
bool need_regenerate = false;
// TODO(crbug.com/1052397): Revisit the macro expression once build flag
// switch of lacros-chrome is complete.
--#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
// GTK and user theme changes can both change frame buttons, so the frame
// always needs to be regenerated on Linux.
need_regenerate = true;
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc
index 1c36b5278920..acec7ddb493f 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc
@@ -1,11 +1,11 @@
---- chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc.orig 2021-12-14 11:44:59 UTC
+--- chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc
@@ -15,7 +15,7 @@
#include "chrome/browser/ui/views/frame/glass_browser_frame_view.h"
#endif
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
#include "chrome/browser/ui/views/frame/browser_frame_view_layout_linux.h"
#include "chrome/browser/ui/views/frame/browser_frame_view_layout_linux_native.h"
#include "chrome/browser/ui/views/frame/browser_frame_view_linux.h"
@@ -13,8 +13,8 @@
std::unique_ptr<OpaqueBrowserFrameView> CreateOpaqueBrowserFrameView(
BrowserFrame* frame,
BrowserView* browser_view) {
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
auto* linux_ui = views::LinuxUI::instance();
auto* profile = browser_view->browser()->profile();
auto* theme_service_factory = ThemeServiceFactory::GetForProfile(profile);
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 c436b4c06217..df9a5321a462 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,11 +1,11 @@
---- chrome/browser/ui/views/frame/browser_view.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/ui/views/frame/browser_view.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/ui/views/frame/browser_view.cc
-@@ -1748,7 +1748,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra
+@@ -1750,7 +1750,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.
--#if !(defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
-+#if !(defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD))
+-#if !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
++#if !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD))
contents_web_view_->SetFastResize(is_dragging);
if (!is_dragging) {
// When tab dragging is ended, we need to make sure the web contents get
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 d0c788912539..98befea058f7 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,11 +1,11 @@
---- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2022-02-07 13:39:41 UTC
+--- 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
@@ -53,7 +53,7 @@
#include "ui/views/window/vector_icons/vector_icons.h"
#include "ui/views/window/window_shape.h"
--#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
#include "ui/views/controls/menu/menu_runner.h"
#endif
@@ -13,8 +13,8 @@
OpaqueBrowserFrameView::GetFrameButtonStyle() const {
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
--#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
return FrameButtonStyle::kMdButton;
#else
return FrameButtonStyle::kImageButton;
@@ -22,8 +22,8 @@
}
void OpaqueBrowserFrameView::WindowIconPressed() {
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// Chrome OS doesn't show the window icon, and Windows handles this on its own
// due to the hit test being HTSYSMENU.
menu_runner_ = std::make_unique<views::MenuRunner>(
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.h b/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.h
index a01fa72f0fbe..83585943ccc7 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.h
+++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.h
@@ -1,11 +1,11 @@
---- chrome/browser/ui/views/frame/opaque_browser_frame_view.h.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/ui/views/frame/opaque_browser_frame_view.h.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/ui/views/frame/opaque_browser_frame_view.h
@@ -224,7 +224,7 @@ class OpaqueBrowserFrameView : public BrowserNonClient
// Background painter for the window frame.
std::unique_ptr<views::FrameBackground> frame_background_;
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
std::unique_ptr<views::MenuRunner> menu_runner_;
#endif
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc
index 37f8582b4110..8afa8e836fff 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc
@@ -1,11 +1,11 @@
---- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/ui/views/frame/system_menu_model_builder.cc
@@ -77,7 +77,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser
ui::SimpleMenuModel* model) {
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
--#if defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !BUILDFLAG(IS_CHROMEOS_LACROS)
+-#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)
++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMEOS_LACROS)
model->AddItemWithStringId(IDC_MINIMIZE_WINDOW, IDS_MINIMIZE_WINDOW_MENU);
model->AddItemWithStringId(IDC_MAXIMIZE_WINDOW, IDS_MAXIMIZE_WINDOW_MENU);
model->AddItemWithStringId(IDC_RESTORE_WINDOW, IDS_RESTORE_WINDOW_MENU);
@@ -13,8 +13,8 @@
}
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
--#if defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !BUILDFLAG(IS_CHROMEOS_LACROS)
+-#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)
++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMEOS_LACROS)
model->AddSeparator(ui::NORMAL_SEPARATOR);
bool supports_server_side_decorations = true;
#if defined(USE_OZONE) && \
@@ -22,8 +22,8 @@
}
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
--#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
model->AddSeparator(ui::NORMAL_SEPARATOR);
model->AddItemWithStringId(IDC_CLOSE_WINDOW, IDS_CLOSE);
#endif
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc
index 93ffd454516c..f53f1ecaf5b6 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc
@@ -1,11 +1,11 @@
---- chrome/browser/ui/views/frame/system_menu_model_delegate.cc.orig 2021-12-14 11:44:59 UTC
+--- chrome/browser/ui/views/frame/system_menu_model_delegate.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/ui/views/frame/system_menu_model_delegate.cc
@@ -23,7 +23,7 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
--#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
#include "chrome/common/pref_names.h"
#include "components/prefs/pref_service.h"
#endif
@@ -13,8 +13,8 @@
bool SystemMenuModelDelegate::IsCommandIdChecked(int command_id) const {
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
--#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
if (command_id == IDC_USE_SYSTEM_TITLE_BAR) {
PrefService* prefs = browser_->profile()->GetPrefs();
return !prefs->GetBoolean(prefs::kUseCustomChromeFrame);
@@ -22,8 +22,8 @@
bool SystemMenuModelDelegate::IsCommandIdVisible(int command_id) const {
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
--#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
bool is_maximized = browser_->window()->IsMaximized();
switch (command_id) {
case IDC_MAXIMIZE_WINDOW:
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc
index d3446ac08e38..5c4323c49c43 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc
@@ -1,11 +1,11 @@
---- chrome/browser/ui/views/hung_renderer_view.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/ui/views/hung_renderer_view.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/ui/views/hung_renderer_view.cc
@@ -403,7 +403,7 @@ void HungRendererDialogView::ForceCrashHungRenderer()
content::RenderProcessHost* rph =
hung_pages_table_model_->GetRenderWidgetHost()->GetProcess();
if (rph) {
--#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
// A generic |CrashDumpHungChildProcess()| is not implemented for Linux.
// Instead we send an explicit IPC to crash on the renderer's IO thread.
rph->ForceCrash();
diff --git a/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 00eb29867dc0..d24d754243c8 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,11 +1,11 @@
---- chrome/browser/ui/views/profiles/profile_menu_view_base.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/ui/views/profiles/profile_menu_view_base.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/ui/views/profiles/profile_menu_view_base.cc
@@ -612,7 +612,7 @@ void ProfileMenuViewBase::SetProfileIdentityInfo(
// TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
// complete.
--#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
// crbug.com/1161166: Orca does not read the accessible window title of the
// bubble, so we duplicate it in the top-level menu item. To be revisited
// after considering other options, including fixes on the AT side.
diff --git a/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 b31ba90d8738..addcc9063f22 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,20 +1,20 @@
---- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc
-@@ -82,7 +82,7 @@ SigninViewControllerDelegateViews::CreateReauthConfirm
- }
+@@ -117,7 +117,7 @@ SigninViewControllerDelegateViews::CreateProfileCustom
+ #endif // BUILDFLAG(ENABLE_DICE_SUPPORT)
- #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS_LACROS)
-+ BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
++ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
// static
std::unique_ptr<views::WebView>
SigninViewControllerDelegateViews::CreateEnterpriseConfirmationWebView(
-@@ -341,7 +341,7 @@ SigninViewControllerDelegate::CreateReauthConfirmation
- }
+@@ -392,7 +392,7 @@ SigninViewControllerDelegate::CreateProfileCustomizati
+ #endif // BUILDFLAG(ENABLE_DICE_SUPPORT)
- #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS_LACROS)
-+ BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
++ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
// static
SigninViewControllerDelegate*
SigninViewControllerDelegate::CreateEnterpriseConfirmationDelegate(
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 38cbde268fa8..6fcdbb7001d8 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,11 +1,11 @@
---- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h.orig 2022-02-07 13:39:41 UTC
+--- 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
-@@ -64,7 +64,7 @@ class SigninViewControllerDelegateViews
- signin_metrics::ReauthAccessPoint);
+@@ -71,7 +71,7 @@ class SigninViewControllerDelegateViews
+ #endif // BUILDFLAG(ENABLE_DICE_SUPPORT)
- #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS_LACROS)
-+ BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
++ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
static std::unique_ptr<views::WebView> CreateEnterpriseConfirmationWebView(
Browser* browser,
const AccountInfo& account_info,
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tabs_new__tab__button.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_new__tab__button.cc
index 778a83ee2768..2edc92cd28d5 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_new__tab__button.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_new__tab__button.cc
@@ -1,11 +1,11 @@
---- chrome/browser/ui/views/tabs/new_tab_button.cc.orig 2021-12-31 00:57:25 UTC
+--- chrome/browser/ui/views/tabs/new_tab_button.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/ui/views/tabs/new_tab_button.cc
@@ -59,7 +59,7 @@ NewTabButton::NewTabButton(TabStrip* tab_strip, Presse
SetAnimateOnStateChange(true);
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
--#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
SetTriggerableEventFlags(GetTriggerableEventFlags() |
ui::EF_MIDDLE_MOUSE_BUTTON);
#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 663831637fbc..801819e17c4e 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,11 +1,11 @@
---- chrome/browser/ui/views/tabs/tab.cc.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/ui/views/tabs/tab.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/ui/views/tabs/tab.cc