From acb795dbcabdf3d26fb9f8255c6aff527bb59aaf Mon Sep 17 00:00:00 2001
From: Matthias Wolf <matthias@rheinwolf.de>
Date: Wed, 24 Mar 2021 20:52:00 +0100
Subject: [PATCH 1/6] WIP: Upgrade to v89.0.4389.90 - debug build works

---
 www/chromium/Makefile                         |  37 ++-
 www/chromium/distinfo                         |  10 +-
 www/chromium/files/audio_manager_openbsd.cc   |   8 +-
 ...ra-patch-build_config_compiler_pgo_pgo.gni |  14 +-
 ...ocator_page__allocator__internals__posix.h |   2 +-
 www/chromium/files/patch-BUILD.gn             |  22 +-
 ...apps_app__restore__service__browsertest.cc |   2 +-
 ...-apps_ui_views_app__window__frame__view.cc |   4 +-
 ...-ash_display_mirror__window__controller.cc |   2 +-
 www/chromium/files/patch-base_BUILD.gn        |  44 +--
 .../files/patch-base_allocator_allocator.gni  |  11 +
 ...tor__shim__default__dispatch__to__glibc.cc |   2 +-
 ...allocator__shim__override__libc__symbols.h |   2 +-
 ...ase_allocator_allocator__shim__unittest.cc |  12 +-
 ...ition__allocator_address__pool__manager.cc |  31 ++
 ...ocator_page__allocator__internals__posix.h |  51 +++-
 ...r_partition__allocator_partition__alloc.cc |  17 +-
 ...n__allocator_partition__alloc__unittest.cc |  38 ++-
 ..._partition__allocator_partition__bucket.cc |  36 +++
 ...or_partition__allocator_spinning__mutex.cc |  49 ++++
 ...tor_partition__allocator_spinning__mutex.h |  33 +++
 .../files/patch-base_base__switches.cc        |  16 +-
 .../files/patch-base_base__switches.h         |  16 +-
 www/chromium/files/patch-base_cpu.cc          |  20 +-
 www/chromium/files/patch-base_cpu.h           |   6 +-
 .../files/patch-base_debug_debugger__posix.cc |   2 +-
 .../files/patch-base_debug_elf__reader.cc     |   2 +-
 .../patch-base_debug_proc__maps__linux.cc     |  26 +-
 .../files/patch-base_debug_stack__trace.cc    |   2 +-
 .../files/patch-base_debug_stack__trace.h     |   2 +-
 .../patch-base_debug_stack__trace__posix.cc   |  26 +-
 ...patch-base_debug_stack__trace__unittest.cc |  11 +-
 .../patch-base_files_file__path__unittest.cc  |   2 +-
 ...base_files_file__path__watcher__freebsd.cc |  64 +++++
 ...h-base_files_file__path__watcher__kqueue.h |   2 +-
 ...ch-base_files_file__path__watcher__stub.cc |  53 ----
 ...ase_files_file__path__watcher__unittest.cc |  21 +-
 .../files/patch-base_files_file__util.h       |   6 +-
 .../patch-base_files_file__util__posix.cc     |  32 ++-
 .../patch-base_files_file__util__unittest.cc  |   2 +-
 .../files/patch-base_files_scoped__file.cc    |   2 +-
 .../files/patch-base_i18n_icu__util.cc        |   2 +-
 www/chromium/files/patch-base_linux__util.cc  |   8 +-
 .../files/patch-base_location__unittest.cc    |   2 +-
 .../files/patch-base_logging__unittest.cc     |   6 +-
 .../patch-base_memory_discardable__memory.cc  |   2 +-
 ...ase_memory_discardable__memory__internal.h |   2 +-
 ..._madv__free__discardable__memory__posix.cc |   2 +-
 ..._memory_platform__shared__memory__region.h |   2 +-
 ...platform__shared__memory__region__posix.cc |  88 +++++-
 ...memory_shared__memory__region__unittest.cc |   2 +-
 ...-base_message__loop_message__pump__glib.cc |   2 +-
 .../patch-base_native__library__posix.cc      |   2 +-
 .../patch-base_native__library__unittest.cc   |   2 +-
 ...h-base_numerics_safe__math__shared__impl.h |   2 +-
 .../patch-base_path__service__unittest.cc     |   2 +-
 .../patch-base_posix_can__lower__nice__to.cc  |   2 +-
 .../patch-base_posix_unix__domain__socket.cc  |   2 +-
 ...se_posix_unix__domain__socket__unittest.cc |   2 +-
 .../patch-base_process_internal__linux.cc     |   2 +-
 .../patch-base_process_internal__linux.h      |   2 +-
 www/chromium/files/patch-base_process_kill.h  |   2 +-
 .../files/patch-base_process_kill__posix.cc   |   2 +-
 .../files/patch-base_process_launch.cc        |   2 +-
 .../files/patch-base_process_launch.h         |   8 +-
 .../files/patch-base_process_launch__posix.cc |  47 +++-
 .../files/patch-base_process_memory.cc        |   2 +-
 .../files/patch-base_process_memory.h         |   2 +-
 .../patch-base_process_memory__unittest.cc    |   2 +-
 .../patch-base_process_process__handle.cc     |   2 +-
 .../patch-base_process_process__handle.h      |   2 +-
 ...h-base_process_process__handle__freebsd.cc |   2 +-
 ...base_process_process__iterator__freebsd.cc |   2 +-
 .../patch-base_process_process__linux.cc      |  10 +-
 .../patch-base_process_process__metrics.cc    |  10 +-
 .../patch-base_process_process__metrics.h     |   6 +-
 ...-base_process_process__metrics__freebsd.cc |   2 +-
 ...ch-base_process_process__metrics__posix.cc |   2 +-
 .../patch-base_process_process__unittest.cc   |   4 +-
 ...ch-base_process_process__util__unittest.cc |   2 +-
 .../patch-base_profiler_register__context.h   |   2 +-
 ...filer_sampling__profiler__thread__token.cc |   2 +-
 ...ofiler_sampling__profiler__thread__token.h |   2 +-
 ...tch-base_profiler_stack__copier__signal.cc |   8 +-
 ...r_stack__sampling__profiler__test__util.cc |   2 +-
 ...ler_stack__sampling__profiler__unittest.cc |   2 +-
 ...h-base_profiler_thread__delegate__posix.cc |   2 +-
 ...heap__profiler_sampling__heap__profiler.cc |   2 +-
 .../files/patch-base_security__unittest.cc    |   2 +-
 ...ings_sys__string__conversions__unittest.cc |   2 +-
 .../patch-base_synchronization_lock__impl.h   |   2 +-
 .../files/patch-base_syslog__logging.cc       |   2 +-
 .../files/patch-base_system_sys__info.cc      |   6 +-
 .../files/patch-base_system_sys__info.h       |   6 +-
 .../patch-base_system_sys__info__freebsd.cc   |   2 +-
 .../patch-base_system_sys__info__posix.cc     |  16 +-
 .../patch-base_system_sys__info__unittest.cc  |  12 +-
 ...ead__pool_environment__config__unittest.cc |   2 +-
 www/chromium/files/patch-base_test_BUILD.gn   |   4 +-
 ...patch-base_test_launcher_test__launcher.cc |   8 +-
 ...patch-base_test_test__file__util__posix.cc |   2 +-
 .../files/patch-base_test_test__suite.cc      |   2 +-
 .../patch-base_third__party_libevent_BUILD.gn |   2 +-
 .../patch-base_threading_platform__thread.h   |   4 +-
 ...eading_platform__thread__internal__posix.h |   2 +-
 ...-base_threading_platform__thread__linux.cc |   8 +-
 ...-base_threading_platform__thread__posix.cc |   6 +-
 ...se_threading_platform__thread__unittest.cc |   2 +-
 ...eading_scoped__blocking__call__unittest.cc |   2 +-
 ..._threading_thread__task__runner__handle.cc |  20 +-
 .../files/patch-base_time_time__unittest.cc   |   2 +-
 ..._profiler__allocation__context__tracker.cc |  38 +++
 ...ase_trace__event_malloc__dump__provider.cc |   4 +-
 ...base_trace__event_process__memory__dump.cc |   4 +-
 ...-base_trace__event_process__memory__dump.h |  11 -
 ...ure_system__memory__pressure__evaluator.cc |  22 +-
 .../files/patch-build_config_BUILD.gn         |   4 +-
 .../files/patch-build_config_BUILDCONFIG.gn   |   8 +-
 .../patch-build_config_compiler_BUILD.gn      |  53 ++--
 .../patch-build_config_compiler_compiler.gni  |  16 +-
 .../files/patch-build_config_features.gni     |   2 +-
 .../patch-build_config_freetype_freetype.gni  |   2 +-
 .../files/patch-build_config_linux_BUILD.gn   |   6 +-
 .../patch-build_config_linux_pkg-config.py    |   2 +-
 .../files/patch-build_config_ozone.gni        |   6 +-
 .../files/patch-build_config_sysroot.gni      |   2 +-
 .../files/patch-build_detect__host__arch.py   |   2 +-
 .../files/patch-build_gn__run__binary.py      |   2 +-
 .../files/patch-build_linux_chrome.map        |   8 +-
 .../files/patch-build_linux_libpci_BUILD.gn   |   2 +-
 .../patch-build_linux_unbundle_libusb.gn      |   2 +-
 ...build_linux_unbundle_replace__gn__files.py |   2 +-
 .../patch-build_toolchain_gcc__toolchain.gni  |   6 +-
 ...-build_toolchain_get__concurrent__links.py |   2 +-
 .../patch-build_toolchain_linux_BUILD.gn      |   2 +-
 www/chromium/files/patch-cc_BUILD.gn          |   6 +-
 ...-cc_layers_scrollbar__layer__impl__base.cc |   2 +-
 .../files/patch-cc_test_layer__tree__test.cc  |   4 +-
 .../files/patch-cc_test_pixel__test.cc        |   2 +-
 .../patch-cc_trees_frame__rate__estimator.cc  |   2 +-
 .../files/patch-cc_trees_property__tree.cc    |   4 +-
 www/chromium/files/patch-chrome_BUILD.gn      |   6 +-
 www/chromium/files/patch-chrome_app_BUILD.gn  |   2 +-
 .../patch-chrome_app_chrome__command__ids.h   |  10 +-
 .../files/patch-chrome_app_chrome__main.cc    |   4 +-
 ...patch-chrome_app_chrome__main__delegate.cc |  75 +++--
 .../patch-chrome_app_chromium__strings.grd    |   8 +-
 .../patch-chrome_app_generated__resources.grd |  16 +-
 ...tch-chrome_app_google__chrome__strings.grd |   8 +-
 .../patch-chrome_app_profiles__strings.grdp   |   2 +-
 .../patch-chrome_app_settings__strings.grdp   |  14 +-
 ...e_app_shutdown__signal__handlers__posix.cc |   2 +-
 ..._app_theme_chrome__unscaled__resources.grd |   2 +-
 ...atch-chrome_app_theme_theme__resources.grd |   2 +-
 .../files/patch-chrome_browser_BUILD.gn       |   4 +-
 .../patch-chrome_browser_about__flags.cc      |  84 +++---
 ...ome_browser_after__startup__task__utils.cc |  26 +-
 ...ia__galleries_media__galleries__apitest.cc |  20 ++
 ...leries_media__galleries__watch__apitest.cc |  11 +
 ...sic__manager__private_device__id__linux.cc |   2 +-
 ...hrome__autocomplete__scheme__classifier.cc |   2 +-
 ...er_background_background__mode__manager.cc |   4 +-
 ..._background_background__mode__optimizer.cc |   2 +-
 ...atch-chrome_browser_browser__resources.grd |   4 +-
 ...ser_chrome__browser__interface__binders.cc |  10 +-
 ...ch-chrome_browser_chrome__browser__main.cc |  32 +--
 ...me_browser_chrome__browser__main__linux.cc |  16 +-
 ...me_browser_chrome__browser__main__posix.cc |  12 +-
 ...rowser_chrome__content__browser__client.cc |  86 +++---
 ...browser_chrome__content__browser__client.h |   4 +-
 ...crash__upload__list_crash__upload__list.cc |   8 +-
 ...oad__list_crash__upload__list__crashpad.cc |   2 +-
 ...m__handlers_protocol__handler__registry.cc |   4 +-
 .../files/patch-chrome_browser_defaults.cc    |  12 +-
 ...me_browser_dev__ui__browser__resources.grd |   8 +-
 ...device__oauth2__token__service__factory.cc |  10 +-
 ...browser_devtools_devtools__eye__dropper.cc |   2 +-
 ..._browser_diagnostics_diagnostics__writer.h |   2 +-
 ...oad_chrome__download__manager__delegate.cc |   8 +-
 ...ome_browser_download_download__commands.cc |   2 +-
 ...rome_browser_download_download__commands.h |   2 +-
 ..._browser_download_download__item__model.cc |   2 +-
 ...chrome_browser_download_download__prefs.cc |  18 +-
 ...-chrome_browser_download_download__prefs.h |   2 +-
 ...chrome_browser_download_download__query.cc |   2 +-
 ...download_download__shelf__context__menu.cc |   2 +-
 ...h-chrome_browser_error__reporting_BUILD.gn |  10 +-
 .../patch-chrome_browser_extensions_BUILD.gn  |   6 +-
 ..._extensions_activity__log_activity__log.cc |   2 +-
 ...eporting__private_device__info__fetcher.cc |   2 +-
 ...g__private_device__info__fetcher__linux.cc |   2 +-
 ...rp_chrome_desktop_report_request_helper.cc |   2 +-
 ...tion_browser__action__interactive__test.cc |   4 +-
 ...r__private_removable__storage__provider.cc |   2 +-
 ..._runtime_chrome__runtime__api__delegate.cc |   4 +-
 ...sions_api_settings__private_prefs__util.cc |  22 +-
 ...__private_webrtc__logging__private__api.cc |   2 +-
 ...ser__context__keyed__service__factories.cc |   4 +-
 ...ser_extensions_external__provider__impl.cc |  14 +-
 ...e__system__access__permission__context.cc} |   6 +-
 ...me_browser_first__run_first__run__dialog.h |  12 +-
 ..._browser_first__run_first__run__internal.h |  17 +-
 ..._first__run_first__run__internal__posix.cc |  14 +-
 ...patch-chrome_browser_flag__descriptions.cc |  38 +--
 .../patch-chrome_browser_flag__descriptions.h |  40 +--
 ...ome_browser_intranet__redirect__detector.h |   2 +-
 ...eries_fileapi_mtp__device__map__service.cc |   6 +-
 ...galleries_media__file__system__registry.cc |   4 +-
 ...rome_browser_media_audio__service__util.cc |  11 +
 ...scovery_discovery__network__list__posix.cc |   2 +-
 ...y_discovery__network__list__wifi__linux.cc |   2 +-
 ..._wired__display__media__route__provider.cc |   6 +-
 ...dia_webrtc_webrtc__event__log__uploader.cc |   6 +-
 ...wser_media_webrtc_webrtc__log__uploader.cc |   6 +-
 ...edia_webrtc_webrtc__logging__controller.cc |   2 +-
 ...media_webrtc_webrtc__logging__controller.h |   2 +-
 .../patch-chrome_browser_memory__details.cc   |   2 +-
 ...h-chrome_browser_memory__details__linux.cc |   4 +-
 ...e__browser__main__extra__parts__metrics.cc |  14 +-
 ...etrics_chrome__metrics__service__client.cc |  29 +-
 ...trics_process__memory__metrics__emitter.cc |   6 +-
 ...r_net_system__network__context__manager.cc |  32 +--
 ...ns_notification__display__service__impl.cc |  16 +-
 ...tification__platform__bridge__delegator.cc |   8 +-
 ...nager_chrome__password__manager__client.cc |  26 +-
 ...sword__manager_password__store__factory.cc |  12 +-
 ...chrome_browser_pdf_pdf__extension__test.cc |  21 +-
 ...ance__manager_policies_policy__features.cc |   2 +-
 ...ance__monitor_process__metrics__history.cc |   2 +-
 ...mance__monitor_process__metrics__history.h |   2 +-
 ...rowser_plugins_plugin__info__host__impl.cc |   4 +-
 ...wser_plugins_plugins__resource__service.cc |   8 +-
 ...policy_browser__signin__policy__handler.cc |   2 +-
 ..._cloud__management__controller__desktop.cc |   2 +-
 ...uration__policy__handler__list__factory.cc |  22 +-
 ...ice__management__service__configuration.cc |  18 +-
 ...tch-chrome_browser_prefs_browser__prefs.cc |  22 +-
 ...efs_pref__service__incognito__allowlist.cc |  10 +-
 ...ome_browser_printing_print__job__worker.cc |  16 +-
 ...hrome_browser_process__singleton__posix.cc |  19 +-
 ...__browser__main__extra__parts__profiles.cc |  12 +-
 .../patch-chrome_browser_profiles_profile.cc  |  12 +-
 ...ser_profiles_profile__attributes__entry.cc |   4 +-
 ...chrome_browser_profiles_profiles__state.cc |   4 +-
 ...ntext__menu_render__view__context__menu.cc |   4 +-
 ...ome_browser_renderer__preferences__util.cc |  16 +-
 ...arance__page_appearance__browser__proxy.js |   2 +-
 ...ngs_appearance__page_appearance__page.html |  16 +-
 ...tings_appearance__page_appearance__page.js |  10 +-
 ...dent__reporting_incident__handler__util.cc |   2 +-
 ..._reporting_incident__reporting__service.cc |   2 +-
 ...earch__suggest_search__suggest__service.cc |   2 +-
 ...__self_receiving__ui__handler__registry.cc |   2 +-
 ...lf_send__tab__to__self__client__service.cc |   2 +-
 ...haring_shared__clipboard_feature__flags.cc |   2 +-
 ...sharing_shared__clipboard_feature__flags.h |   2 +-
 ...r_sharing_sharing__device__registration.cc |   4 +-
 ...haring_sharing__handler__registry__impl.cc |  12 +-
 ...atch-chrome_browser_signin_signin__util.cc |   4 +-
 ...hrome_browser_sync_chrome__sync__client.cc |   8 +-
 ...nc_device__info__sync__service__factory.cc |  20 +-
 ...er_sync_profile__sync__service__factory.cc |  22 +-
 ...wser_task__manager_sampling_task__group.cc |  10 +-
 ...owser_task__manager_sampling_task__group.h |  10 +-
 ...__manager_sampling_task__group__sampler.cc |  14 +-
 ...k__manager_sampling_task__group__sampler.h |   2 +-
 ...k__manager_sampling_task__manager__impl.cc |   4 +-
 ...er_task__manager_task__manager__observer.h |   2 +-
 ..._browser_themes_theme__service__factory.cc |  32 +--
 ...rowser_tracing_crash__service__uploader.cc |   4 +-
 .../files/patch-chrome_browser_ui_BUILD.gn    |   4 +-
 ...browser_ui_browser__command__controller.cc |  42 +--
 ...-chrome_browser_ui_browser__view__prefs.cc |  28 +-
 ...usive__access_exclusive__access__bubble.cc |   2 +-
 .../files/patch-chrome_browser_ui_sad__tab.cc |   2 +-
 ...e_browser_ui_startup_bad__flags__prompt.cc |  12 +-
 .../patch-chrome_browser_ui_tab__helpers.cc   |  14 +-
 ...ui_task__manager_task__manager__columns.cc |   4 +-
 ...sk__manager_task__manager__table__model.cc |   2 +-
 ...e_browser_ui_test_test__browser__dialog.cc |  12 +-
 ...hrome_browser_ui_test_test__browser__ui.cc |  32 +--
 ...ome_browser_ui_views_accelerator__table.cc |  30 +-
 ...hrome__native__app__window__views__aura.cc |  28 +-
 ...ews_bookmarks_bookmark__bar__view__test.cc |   4 +-
 ...ome__browser__main__extra__parts__views.cc |  34 +--
 ...browser_ui_views_chrome__views__delegate.h |  12 +-
 ..._ui_views_download_download__item__view.cc |  13 +-
 ...ome_browser_ui_views_first__run__dialog.cc |  14 -
 ...e_browser_ui_views_frame_browser__frame.cc |  33 +--
 ...on__client__frame__view__factory__views.cc |  22 +-
 ...me_browser_ui_views_frame_browser__view.cc |  22 +-
 ...iews_frame_opaque__browser__frame__view.cc |  16 +-
 ...rowser__frame__view__platform__specific.cc |   2 +-
 ...iews_frame_system__menu__model__builder.cc |  32 +--
 ...ews_frame_system__menu__model__delegate.cc |  32 +--
 ...e_browser_ui_views_hung__renderer__view.cc |   4 +-
 ...iews_profiles_profile__menu__view__base.cc |  11 +
 ..._browser_ui_views_tabs_new__tab__button.cc |  12 +-
 .../patch-chrome_browser_ui_views_tabs_tab.cc |   4 +-
 ...ser_ui_views_tabs_tab__drag__controller.cc |  24 +-
 ...b__apps_pwa__confirmation__bubble__view.cc |  11 -
 ...patch-chrome_browser_ui_webui_about__ui.cc |   6 +-
 ...ui_chrome__web__ui__controller__factory.cc |  32 ++-
 ...r_ui_webui_settings_appearance__handler.cc |  22 +-
 ...er_ui_webui_settings_appearance__handler.h |  12 +-
 ..._settings__localized__strings__provider.cc |  21 +-
 ...i_webui__js__error_webui__js__error__ui.cc |  11 +
 ...ts_web__app__file__handler__registration.h |   2 +-
 ...components_web__app__run__on__os__login.cc |  11 +
 ...lications_components_web__app__shortcut.cc |   2 +-
 ...ensions_bookmark__app__finalizer__utils.cc |  12 +-
 .../files/patch-chrome_common_BUILD.gn        |   6 +-
 .../files/patch-chrome_common_channel__info.h |  12 +-
 ...atch-chrome_common_channel__info__posix.cc |  18 +-
 .../patch-chrome_common_chrome__features.cc   |  22 +-
 .../patch-chrome_common_chrome__features.h    |  22 +-
 .../patch-chrome_common_chrome__paths.cc      |  32 ++-
 .../files/patch-chrome_common_chrome__paths.h |  28 +-
 ...ch-chrome_common_chrome__paths__internal.h |   2 +-
 .../patch-chrome_common_chrome__switches.cc   |   4 +-
 .../patch-chrome_common_chrome__switches.h    |   4 +-
 .../patch-chrome_common_extensions_command.cc |  10 +-
 .../files/patch-chrome_common_features.gni    |   6 +-
 .../files/patch-chrome_common_pref__names.cc  |  36 +--
 .../files/patch-chrome_common_pref__names.h   |  36 +--
 ...tch-chrome_common_webui__url__constants.cc |  28 +-
 ...atch-chrome_common_webui__url__constants.h |  22 +-
 ...derer_chrome__content__renderer__client.cc |   4 +-
 ..._pepper_pepper__flash__font__file__host.cc |   2 +-
 ...r_pepper_pepper__flash__font__file__host.h |   2 +-
 ...rome_service_cloud__print_print__system.cc |   2 +-
 www/chromium/files/patch-chrome_test_BUILD.gn |   4 +-
 ...chrome_test_base_chrome__test__launcher.cc |  38 ---
 ...me_test_base_in__process__browser__test.cc |   8 +-
 ..._test_base_interactive__ui__tests__main.cc |  14 +-
 ...h-chrome_test_base_test__browser__window.h |   2 +-
 ...rome_test_base_testing__browser__process.h |  13 -
 ...rome_test_chromedriver_chrome__launcher.cc |   2 +-
 ...test_chromedriver_chrome_chrome__finder.cc |   2 +-
 ...t_chromedriver_key__converter__unittest.cc |   2 +-
 ...hromedriver_server_chromedriver__server.cc |   4 +-
 .../files/patch-chrome_utility_services.cc    |  29 ++
 ...tch-chromecast_app_cast__main__delegate.cc |  11 +
 ...cast_browser_cast__browser__main__parts.cc |  20 +-
 ...ecast_browser_cast__browser__main__parts.h |  11 +
 ..._browser_cast__content__browser__client.cc |   6 +-
 ...nt__browser__client__receiver__bindings.cc |  20 ++
 ..._browser_metrics_cast__browser__metrics.cc |  87 ++++++
 ...t_browser_metrics_cast__browser__metrics.h |  15 +
 ..._mojo_public_cpp_external__mojo__broker.cc |   8 +-
 ...st_media_base_default__monotonic__clock.cc |   2 +-
 ...enderer_cast__content__renderer__client.cc |   2 +-
 www/chromium/files/patch-components_BUILD.gn  |   4 +-
 ...derer_password__form__conversion__utils.cc |   2 +-
 ...re_browser_autofill__external__delegate.cc |   4 +-
 ...ll_core_browser_personal__data__manager.cc |  20 +-
 ...ore_common_autofill__payments__features.cc |  12 +-
 ...nts_autofill_core_common_autofill__util.cc |   2 +-
 ...ore_browser_website__settings__registry.cc |  12 +-
 ...ents_cookie__config_cookie__store__util.cc |   2 +-
 ...-components_crash_content_browser_BUILD.gn |   6 +-
 ..._content_browser_error__reporting_BUILD.gn |   2 +-
 .../patch-components_crash_core_app_BUILD.gn  |   2 +-
 ...atch-components_crash_core_common_BUILD.gn |   2 +-
 ...ce_discardable__shared__memory__manager.cc |  11 +-
 ...nts_download_internal_common_base__file.cc |   2 +-
 ...ure__engagement_public_event__constants.cc |   8 +-
 ...ture__engagement_public_event__constants.h |   8 +-
 ...gagement_public_feature__configurations.cc |   2 +-
 ...e__engagement_public_feature__constants.cc |   2 +-
 ...re__engagement_public_feature__constants.h |   2 +-
 ...eature__engagement_public_feature__list.cc |   6 +-
 ...feature__engagement_public_feature__list.h |  10 +-
 ...ents_feed_core_proto_v2_wire_version.proto |   2 +-
 ...ponents_feed_core_proto_wire_version.proto |   2 +-
 ...tch-components_feed_core_v2_proto__util.cc |   2 +-
 ...patch-components_flags__ui_flags__state.cc |  12 +-
 ...patch-components_gcm__driver_gcm__client.h |   2 +-
 ...omponents_gcm__driver_gcm__client__impl.cc |   2 +-
 .../files/patch-components_gwp__asan_BUILD.gn |   2 +-
 ...nvalidation_impl_invalidation__switches.cc |   2 +-
 ...ervice_core_dependency__graph__unittest.cc |   2 +-
 .../files/patch-components_metrics_BUILD.gn   |   4 +-
 ...metrics_drive__metrics__provider__linux.cc |   2 +-
 .../patch-components_metrics_metrics__log.cc  |   8 +-
 ...-components_neterror_resources_neterror.js |   2 +-
 ..._browser_network__session__configurator.cc |   2 +-
 ...components_new__or__sad__tab__strings.grdp |   2 +-
 .../patch-components_os__crypt_os__crypt.h    |  53 ++--
 ...omponents_os__crypt_os__crypt__unittest.cc |  12 +-
 ...on__service_prediction__service__common.cc |   8 +-
 ...ts_plugins_renderer_plugin__placeholder.cc |   2 +-
 ...ore_browser_policy__pref__mapping__test.cc |   6 +-
 ...y_core_common_cloud_cloud__policy__util.cc |  57 ++--
 ...ch-components_policy_core_common_schema.cc |   2 +-
 ...ts_policy_resources_policy__templates.json |  20 +-
 ...s_policy_tools_generate__policy__source.py |   2 +-
 ...onents_previews_core_previews__features.cc |   4 +-
 ...ore_realtime_url__lookup__service__base.cc |   8 +-
 ...g_core_resources_gen__file__type__proto.py |   2 +-
 ...content_captive__portal__blocking__page.cc |   2 +-
 ...s_security__interstitials_content_utils.cc |   4 +-
 ...__preview__compositor__collection__impl.cc |   2 +-
 ...t__preview__compositor__collection__impl.h |   2 +-
 ...patch-components_storage__monitor_BUILD.gn |   4 +-
 ...e__monitor_removable__device__constants.cc |   2 +-
 ...ge__monitor_removable__device__constants.h |   2 +-
 ...rage__monitor_storage__monitor__freebsd.cc |   2 +-
 ...orage__monitor_storage__monitor__freebsd.h |   2 +-
 ..._device__info_local__device__info__util.cc |  10 +-
 ...__info_local__device__info__util__linux.cc |   6 +-
 ...ts_update__client_update__query__params.cc |   4 +-
 ...atter_spoof__checks_idn__spoof__checker.cc |   4 +-
 ...onents_url__matcher_regex__set__matcher.cc |   2 +-
 ...ents_url__matcher_url__matcher__factory.cc |   2 +-
 .../patch-components_viz_common_features.cc   |  12 +-
 ..._viz_common_gpu_dawn__context__provider.cc |   2 +-
 ...mponents_viz_host_host__display__client.cc |  12 +-
 ...omponents_viz_host_host__display__client.h |  12 +-
 ...lay__embedder_software__output__surface.cc |  22 +-
 ...play__embedder_software__output__surface.h |  22 +-
 ...nks_root__compositor__frame__sink__impl.cc |  22 +-
 ...inks_root__compositor__frame__sink__impl.h |  12 +-
 ...mponents_viz_test_fake__output__surface.cc |  12 +-
 ...omponents_viz_test_fake__output__surface.h |  12 +-
 ...omponents_viz_test_mock__display__client.h |  12 +-
 ...ents_webcrypto_algorithms_test__helpers.cc |   2 +-
 .../files/patch-content_app_content__main.cc  |   2 +-
 ...content_app_content__main__runner__impl.cc |  16 +-
 .../files/patch-content_browser_BUILD.gn      |   6 +-
 ...tch-content_browser_browser__main__loop.cc |  16 +-
 ...child__process__launcher__helper__linux.cc |   2 +-
 ...ositor_viz__process__transport__factory.cc |  12 +-
 ...devtools_protocol_system__info__handler.cc |  14 +-
 ...rowser_download_download__manager__impl.cc |   8 +-
 ...er_font__access_font__enumeration__cache.h |   2 +-
 ...ch-content_browser_gpu_compositor__util.cc |  16 +-
 ...-content_browser_gpu_gpu__process__host.cc |  16 +-
 ...mory_swap__metrics__driver__impl__linux.cc |   2 +-
 ...nt_browser_ppapi__plugin__process__host.cc |   4 +-
 ...ugin__process__host__receiver__bindings.cc |   2 +-
 ...r_renderer__host_delegated__frame__host.cc |   4 +-
 ...t_input_input__device__change__observer.cc |   2 +-
 ...rer__host_pepper_pepper__file__io__host.cc |   2 +-
 ..._renderer__host_render__message__filter.cc |   2 +-
 ...r_renderer__host_render__message__filter.h |   2 +-
 ...derer__host_render__process__host__impl.cc |  18 +-
 ...renderer__host_render__view__host__impl.cc |   4 +-
 ...__host_render__widget__host__view__aura.cc |   8 +-
 ...der__widget__host__view__event__handler.cc |   4 +-
 ...uler_responsiveness_jank__monitor__impl.cc |   8 +-
 ..._responsiveness_native__event__observer.cc |   2 +-
 ...r_responsiveness_native__event__observer.h |   2 +-
 ...-content_browser_utility__process__host.cc |  13 +-
 ...lity__process__host__receiver__bindings.cc |   2 +-
 ...tch-content_browser_v8__snapshot__files.cc |   2 +-
 ...web__contents_web__contents__view__aura.cc |  22 +-
 ...er_webui_web__ui__main__frame__observer.cc |  28 --
 ...ser_webui_web__ui__main__frame__observer.h |  20 --
 ..._zygote__host_zygote__host__impl__linux.cc |   2 +-
 ...r_zygote__host_zygote__host__impl__linux.h |   2 +-
 .../patch-content_child_child__process.cc     |   2 +-
 .../files/patch-content_common_BUILD.gn       |   8 +-
 ..._common_common__sandbox__support__linux.cc |   2 +-
 ...ent_common_mojo__core__library__support.cc |   2 +-
 .../files/patch-content_common_user__agent.cc |   2 +-
 www/chromium/files/patch-content_gpu_BUILD.gn |   8 +-
 .../files/patch-content_gpu_gpu__main.cc      |   6 +-
 ...h-content_gpu_gpu__sandbox__hook__linux.cc |   6 +-
 ...pi__plugin_ppapi__blink__platform__impl.cc |   2 +-
 ...api__plugin_ppapi__blink__platform__impl.h |   2 +-
 ...tent_public_app_content__main__delegate.cc |   2 +-
 ...ntent_public_app_content__main__delegate.h |   2 +-
 ...ent_public_browser_font__access__context.h |  11 +
 ...browser_zygote__host_zygote__host__linux.h |   2 +-
 ...ntent_public_common_child__process__host.h |   2 +-
 ...lic_common_common__param__traits__macros.h |   6 +-
 ...ontent_public_common_content__constants.cc |   2 +-
 ...content_public_common_content__constants.h |   2 +-
 ...content_public_common_content__features.cc |  24 +-
 ...content_public_common_content__switches.cc |  21 +-
 ...-content_public_common_content__switches.h |  16 +-
 ...blic_common_use__zoom__for__dsf__policy.cc |   2 +-
 ...-content_public_common_zygote_features.gni |   2 +-
 ...content_public_test_browser__test__base.cc |   4 +-
 ...tent_public_test_content__browser__test.cc |  32 +--
 ...ontent_public_test_mock__render__thread.cc |   2 +-
 ...-content_renderer_render__process__impl.cc |   4 +-
 ...h-content_renderer_render__thread__impl.cc |  26 +-
 ...enderer_renderer__blink__platform__impl.cc |  12 +-
 ...renderer_renderer__blink__platform__impl.h |  15 +-
 ...nderer__main__platform__delegate__linux.cc |   2 +-
 .../files/patch-content_shell_BUILD.gn        |  12 +-
 ...content_shell_app_shell__main__delegate.cc |   2 +-
 ...t_shell_browser_shell__browser__context.cc |   2 +-
 ...ell_browser_shell__browser__main__parts.cc |  16 +-
 .../files/patch-content_test_BUILD.gn         |   8 +-
 ...patch-content_test_content__test__suite.cc |   2 +-
 .../files/patch-content_utility_BUILD.gn      |   4 +-
 ..._platform__with__sandbox__support__impl.cc |   2 +-
 ...__platform__with__sandbox__support__impl.h |   2 +-
 .../patch-content_zygote_zygote__linux.cc     |   4 +-
 ...atch-content_zygote_zygote__main__linux.cc |   2 +-
 .../files/patch-device_bluetooth_BUILD.gn     |   6 +-
 .../patch-device_gamepad_gamepad__provider.cc |   2 +-
 ...patch-device_gamepad_hid__writer__linux.cc |   2 +-
 ...larative__webrequest_webrequest__action.cc |   2 +-
 ..._browser_api_messaging_message__service.cc |   2 +-
 ..._networking__private__delegate__factory.cc |   2 +-
 ...ser_api_web__request_form__data__parser.cc |   2 +-
 ...ser__context__keyed__service__factories.cc |   4 +-
 ...ons_common_api___permission__features.json |   2 +-
 .../patch-extensions_common_api_runtime.json  |   2 +-
 ...patch-extensions_common_feature__switch.cc |   2 +-
 ...atch-extensions_common_features_feature.cc |   2 +-
 .../patch-extensions_common_image__util.cc    |   2 +-
 .../patch-extensions_common_stack__frame.cc   |   2 +-
 ...ns_renderer_bindings_api__binding__util.cc |   2 +-
 .../files/patch-extensions_shell_BUILD.gn     |   4 +-
 ...ensions_shell_app_shell__main__delegate.cc |   6 +-
 ...i_runtime_shell__runtime__api__delegate.cc |   4 +-
 ..._browser_shell__extensions__api__client.cc |   2 +-
 ...l_browser_shell__extensions__api__client.h |   2 +-
 ...gle__apis_gcm_engine_heartbeat__manager.cc |  26 +-
 ...fer_common_gpu__memory__buffer__support.cc |   2 +-
 ...and__buffer_service_external__semaphore.cc |   2 +-
 ...er_service_external__vk__image__backing.cc |   8 +-
 ...ommand__buffer_service_program__manager.cc |   2 +-
 ...d__buffer_service_webgpu__decoder__impl.cc |   4 +-
 ...s_gl__copy__texture__CHROMIUM__unittest.cc |   2 +-
 ...u_command__buffer_tests_gl__test__utils.cc |   2 +-
 ...pu_command__buffer_tests_gl__test__utils.h |   2 +-
 ...-gpu_command__buffer_tests_webgpu__test.cc |   2 +-
 .../patch-gpu_config_gpu__control__list.cc    |   4 +-
 .../patch-gpu_config_gpu__test__config.cc     |   4 +-
 ...ipc_common_gpu__memory__buffer__support.cc |   2 +-
 ..._ipc_common_gpu__memory__buffer__support.h |   2 +-
 .../files/patch-gpu_ipc_service_gpu__init.cc  |  50 ++--
 ...pc_service_gpu__memory__buffer__factory.cc |   2 +-
 ...h-gpu_ipc_service_gpu__watchdog__thread.cc |  12 +-
 ...ch-gpu_ipc_service_gpu__watchdog__thread.h |   6 +-
 ...h-gpu_vulkan_vulkan__function__pointers.cc |  28 +-
 ...ch-gpu_vulkan_vulkan__function__pointers.h |  41 ++-
 .../files/patch-gpu_vulkan_vulkan__image.cc   |  11 +
 .../files/patch-gpu_vulkan_vulkan__image.h    |  20 ++
 www/chromium/files/patch-headless_BUILD.gn    |   8 +-
 ...b_browser_headless__browser__main__parts.h |   4 +-
 ...r_headless__browser__main__parts__linux.cc |   8 +-
 ...wser_headless__content__browser__client.cc |   4 +-
 ...ser_headless__request__context__manager.cc |  37 +--
 ...s_lib_headless__content__main__delegate.cc |   2 +-
 .../patch-headless_lib_headless__macros.h     |   2 +-
 www/chromium/files/patch-ipc_ipc__channel.h   |   2 +-
 .../files/patch-ipc_ipc__channel__common.cc   |   2 +-
 .../files/patch-ipc_ipc__channel__mojo.cc     |   2 +-
 .../files/patch-ipc_ipc__message__utils.cc    |   2 +-
 .../files/patch-ipc_ipc__message__utils.h     |   2 +-
 www/chromium/files/patch-media_BUILD.gn       |   2 +-
 www/chromium/files/patch-media_audio_BUILD.gn |   2 +-
 ...h-media_audio_alsa_audio__manager__alsa.cc |   2 +-
 .../patch-media_audio_audio__features.cc      |   2 +-
 .../patch-media_audio_audio__input__device.cc |   2 +-
 .../files/patch-media_audio_audio__manager.cc |   2 +-
 .../files/patch-media_audio_audio__manager.h  |   2 +-
 ...ia_audio_audio__output__proxy__unittest.cc |   2 +-
 .../files/patch-media_base_audio__latency.cc  |   2 +-
 .../files/patch-media_base_media__switches.cc |  10 +-
 .../files/patch-media_base_scopedfd__helper.h |   2 +-
 www/chromium/files/patch-media_base_status.cc |  12 -
 .../files/patch-media_base_vector__math.cc    |  11 +
 .../files/patch-media_base_video__frame.cc    |  16 +-
 .../files/patch-media_base_video__frame.h     |   4 +-
 ...create__video__capture__device__factory.cc |  14 +-
 ...o_fake__video__capture__device__factory.cc |   2 +-
 ...o_file__video__capture__device__factory.cc |   2 +-
 ...ure_video_linux_v4l2__capture__delegate.cc |   2 +-
 ...ideo_video__capture__buffer__pool__impl.cc |   2 +-
 ...re_video_video__capture__device__client.cc |   2 +-
 .../files/patch-media_filters_vp9__parser.h   |   2 +-
 ...edia_formats_common_offset__byte__queue.cc |   2 +-
 ...media_formats_common_offset__byte__queue.h |   2 +-
 ...tch-media_formats_mp2t_es__parser__adts.cc |   2 +-
 ...dia_formats_mp2t_es__parser__mpeg1audio.cc |   2 +-
 .../patch-media_gpu_buffer__validation.cc     |   2 +-
 .../files/patch-media_media__options.gni      |   2 +-
 ...lients_mojo__video__encode__accelerator.cc |   2 +-
 ..._mojo_mojom_video__frame__mojom__traits.cc |   2 +-
 ..._mojo_services_gpu__mojo__media__client.cc |   6 +-
 ...h-media_video_fake__gpu__memory__buffer.cc |   2 +-
 ...gpu__memory__buffer__video__frame__pool.cc |   4 +-
 ...deo_video__encode__accelerator__adapter.cc |  20 +-
 ...deo__encode__accelerator__adapter__test.cc |  11 +
 .../patch-mojo_public_c_system_thunks.cc      |   2 +-
 ...jo_public_js_mojo__bindings__resources.grd |   6 +-
 www/chromium/files/patch-net_BUILD.gn         |  16 +-
 .../patch-net_base_address__tracker__linux.cc |  20 +-
 .../patch-net_base_address__tracker__linux.h  |   2 +-
 ..._base_address__tracker__linux__unittest.cc |   2 +-
 ...atch-net_base_network__change__notifier.cc |  30 +-
 ...t_base_network__change__notifier__posix.cc |  11 +
 ...tch-net_base_network__interfaces__posix.cc |  17 ++
 ...atch-net_base_network__interfaces__posix.h |  11 -
 .../files/patch-net_cert_cert__verifier.cc    |   2 +-
 .../patch-net_cert_cert__verify__proc.cc      |   2 +-
 .../files/patch-net_cert_cert__verify__proc.h |   2 +-
 .../files/patch-net_cert_test__root__certs.h  |   2 +-
 ...h-net_disk__cache_blockfile_disk__format.h |   2 +-
 .../patch-net_dns_address__sorter__posix.cc   |   2 +-
 ...s_dns__config__service__posix__unittest.cc |   2 +-
 .../files/patch-net_dns_dns__reloader.cc      |   2 +-
 www/chromium/files/patch-net_dns_dns__util.cc |   2 +-
 .../patch-net_dns_host__resolver__proc.cc     |   2 +-
 ...atch-net_http_http__auth__gssapi__posix.cc |   2 +-
 ...patch-net_http_http__auth__gssapi__posix.h |   2 +-
 ...tch-net_nqe_network__quality__estimator.cc |   4 +-
 ...e_network__quality__estimator__unittest.cc |  16 +-
 ..._configured__proxy__resolution__service.cc |  28 +-
 ...esolution_proxy__config__service__linux.cc |   2 +-
 .../files/patch-net_socket_socket__posix.cc   |   2 +-
 ...patch-net_socket_socks5__client__socket.cc |   2 +-
 .../patch-net_socket_tcp__socket__posix.cc    |   2 +-
 .../patch-net_socket_udp__socket__posix.cc    |  10 +-
 .../patch-net_socket_udp__socket__posix.h     |   2 +-
 ...ket_unix__domain__client__socket__posix.cc |   2 +-
 ...s_cert__verify__tool_cert__verify__tool.cc |   2 +-
 ...t_tools_quic_quic__http__proxy__backend.cc |   2 +-
 ..._annotation_network__traffic__annotation.h |  16 +-
 .../patch-net_url__request_url__fetcher.cc    |  12 +-
 .../patch-net_url__request_url__fetcher.h     |  16 +-
 ...-net_url__request_url__request__context.cc |  12 +-
 ...h-net_url__request_url__request__context.h |  12 +-
 ..._request_url__request__context__builder.cc |   6 +-
 .../files/patch-pdf_pdfium_pdfium__engine.cc  |  14 +-
 .../patch-ppapi_proxy_file__io__resource.cc   |   2 +-
 .../patch-printing_cups__config__helper.py    |   2 +-
 .../files/patch-printing_print__settings.cc   |   4 +-
 .../files/patch-printing_print__settings.h    |   6 +-
 ...ch-printing_print__settings__conversion.cc |  25 +-
 .../patch-printing_printing__features.cc      |   2 +-
 .../files/patch-printing_printing__features.h |   2 +-
 .../patch-remoting_base_chromoting__event.cc  |   6 +-
 ...atch-remoting_client_display_sys__opengl.h |   2 +-
 ...oting_codec_webrtc__video__encoder__vpx.cc |  16 ++
 ...h-remoting_host_desktop__resizer__ozone.cc |   2 +-
 ...atch-remoting_host_evaluate__capability.cc |   4 +-
 .../patch-remoting_host_heartbeat__sender.cc  |  12 +-
 .../patch-remoting_host_host__attributes.cc   |   2 +-
 .../patch-remoting_host_host__details.cc      |  12 +-
 .../files/patch-remoting_host_host__main.cc   |  21 +-
 ...me_it2me__native__messaging__host__main.cc |   8 +-
 ...moting_host_me2me__desktop__environment.cc |   2 +-
 ...tch-remoting_host_remoting__me2me__host.cc |  22 +-
 .../files/patch-remoting_host_switches.cc     |   2 +-
 .../files/patch-remoting_host_switches.h      |   2 +-
 ...h-remoting_resources_remoting__strings.grd |   6 +-
 ...h-remoting_test_it2me__standalone__host.cc |   2 +-
 ...ting_test_it2me__standalone__host__main.cc |   2 +-
 www/chromium/files/patch-sandbox_BUILD.gn     |   2 +-
 www/chromium/files/patch-sandbox_features.gni |   2 +-
 .../files/patch-sandbox_linux_BUILD.gn        |   2 +-
 ...ox_linux_services_init__process__reaper.cc |   2 +-
 ...andbox_linux_services_libc__interceptor.cc |   2 +-
 .../files/patch-sandbox_policy_BUILD.gn       |   2 +-
 .../files/patch-sandbox_policy_switches.cc    |   2 +-
 .../files/patch-sandbox_policy_switches.h     |   2 +-
 .../files/patch-services_audio_BUILD.gn       |   2 +-
 ...device_geolocation_location__arbitrator.cc |   2 +-
 .../files/patch-services_device_hid_BUILD.gn  |   4 +-
 ...ces_device_hid_hid__connection__freebsd.cc |   9 +-
 ...ices_device_hid_hid__connection__freebsd.h |   7 +-
 .../patch-services_device_hid_hid__service.cc |   6 +-
 ...rvices_device_hid_hid__service__freebsd.cc |  17 +-
 ...ervices_device_hid_hid__service__freebsd.h |   5 +-
 .../patch-services_device_serial_BUILD.gn     |   2 +-
 ...evice_serial_serial__device__enumerator.cc |   2 +-
 ...evice_serial_serial__io__handler__posix.cc |   2 +-
 ...one__monitor_time__zone__monitor__linux.cc |   2 +-
 .../files/patch-services_device_usb_BUILD.gn  |   2 +-
 .../files/patch-services_network_BUILD.gn     |   6 +-
 ...patch-services_network_network__context.cc |  11 -
 ...s_network_network__sandbox__hook__linux.cc |   2 +-
 ...patch-services_network_network__service.cc |  14 +-
 .../patch-services_network_network__service.h |   6 +-
 ...cert__verifier_cert__verifier__creation.cc |   2 +-
 ...rumentation_queued__request__dispatcher.cc |   2 +-
 ..._cpp_memory__instrumentation_os__metrics.h |   2 +-
 ...ory__instrumentation_os__metrics__linux.cc |   2 +-
 .../patch-services_service__manager_BUILD.gn  |   2 +-
 ...er_public_cpp_service__executable_BUILD.gn |   2 +-
 ...tracing_public_cpp_perfetto_trace__time.cc |   2 +-
 ...ck__sampling_tracing__sampler__profiler.cc |   2 +-
 ...s_video__capture_broadcasting__receiver.cc |   2 +-
 .../patch-skia_ext_SkMemory__new__handler.cpp |   2 +-
 .../files/patch-third__party_angle_BUILD.gn   |  39 +--
 ...atch-third__party_angle_src_common_debug.h |  11 +
 ...src_gpu__info__util_SystemInfo__internal.h |   2 +-
 ...src_gpu__info__util_SystemInfo__libpci.cpp |   2 +-
 ..._src_gpu__info__util_SystemInfo__linux.cpp |   2 +-
 ...le_src_gpu__info__util_SystemInfo__x11.cpp |   2 +-
 ...hird__party_angle_src_libANGLE_Display.cpp |   4 +-
 ...le_src_libANGLE_renderer_driver__utils.cpp |   2 +-
 ...ngle_src_libANGLE_renderer_driver__utils.h |   2 +-
 ..._libANGLE_renderer_vulkan_DisplayVk__api.h |  10 +-
 ...n-loader_src_loader_vk__loader__platform.h |  11 -
 ...es_renderer__preferences__mojom__traits.cc |   2 +-
 ...derer__preferences_renderer__preferences.h |   2 +-
 ...ces_renderer__preferences__mojom__traits.h |   2 +-
 ...rd__party_blink_public_platform_platform.h |  11 +
 ...patch-third__party_blink_renderer_BUILD.gn |  18 +-
 ...indings_scripts_bind__gen_style__format.py |   2 +-
 ..._renderer_controller_blink__initializer.cc |   8 +-
 ...ontroller_memory__usage__monitor__posix.cc |   2 +-
 ...controller_memory__usage__monitor__posix.h |   2 +-
 ...nderer_core_clipboard_system__clipboard.cc |  12 +-
 ...renderer_core_editing_editing__behavior.cc |   2 +-
 ..._renderer_core_exported_web__view__impl.cc |   4 +-
 ...tml_canvas_canvas__async__blob__creator.cc |   2 +-
 ...r_core_html_forms_internal__popup__menu.cc |   2 +-
 ...core_inspector_inspector__memory__agent.cc |   2 +-
 ...blink_renderer_core_layout_layout__view.cc |   2 +-
 ..._blink_renderer_core_paint_paint__layer.cc |   2 +-
 ...erer_core_scroll_scrollbar__theme__aura.cc |   2 +-
 ...media_audio_web__audio__device__factory.cc |   4 +-
 ...astream_processed__local__audio__source.cc |   6 +-
 ...onnection_webrtc__audio__renderer__test.cc |   6 +-
 ...s_webaudio_audio__worklet__thread__test.cc |   4 +-
 ...es_webgl_webgl__webcodecs__video__frame.cc |  11 +
 ...rd__party_blink_renderer_platform_BUILD.gn |   4 +-
 ...ink_renderer_platform_fonts_font__cache.cc |   2 +-
 ...link_renderer_platform_fonts_font__cache.h |   2 +-
 ...nderer_platform_fonts_font__description.cc |   2 +-
 ...k_renderer_platform_fonts_font__metrics.cc |   2 +-
 ...atform_fonts_font__unique__name__lookup.cc |   2 +-
 ...rm_fonts_shaping_harfbuzz__shaper__test.cc |   2 +-
 ...r_platform_fonts_skia_font__cache__skia.cc |   2 +-
 ..._graphics_image__frame__generator__test.cc |   2 +-
 ...atform_graphics_video__frame__submitter.cc |   2 +-
 ...nderer_platform_scheduler_common_thread.cc |  11 +
 ...erer_platform_wtf_container__annotations.h |   2 +-
 ...blink_renderer_platform_wtf_stack__util.cc |   2 +-
 ...nderer_platform_wtf_threading__pthreads.cc |   2 +-
 ...y_boringssl_src_crypto_cpu-aarch64-linux.c |   2 +-
 ...ird__party_boringssl_src_crypto_ex__data.c |   2 +-
 ...ad_src_common_simple__string__dictionary.h |   2 +-
 ...d__party_crashpad_crashpad_client_BUILD.gn |   2 +-
 ...crashpad_client_crashpad__client__posix.cc |   2 +-
 ...pad_crashpad_util_posix_close__multiple.cc |   2 +-
 ...ty_crashpad_crashpad_util_posix_signals.cc |   2 +-
 ...c32c_src_src_crc32c__arm64__linux__check.h |   2 +-
 .../patch-third__party_ffmpeg_libavutil_mem.c |   2 +-
 ...letest_include_gtest_internal_gtest-port.h |   2 +-
 ...oogletest_src_googletest_src_gtest-port.cc |   2 +-
 ...rty_googletest_src_googletest_src_gtest.cc |   2 +-
 ...atch-third__party_harfbuzz-ng_harfbuzz.gni |   2 +-
 ...hird__party_leveldatabase_env__chromium.cc |   4 +-
 .../patch-third__party_libXNVCtrl_NVCtrl.c    |   2 +-
 ...p_src_phonenumbers_base_memory_singleton.h |   2 +-
 ...c_phonenumbers_base_synchronization_lock.h |   2 +-
 ...pp_src_phonenumbers_base_thread__checker.h |   2 +-
 .../patch-third__party_libpng_pnglibconf.h    |   2 +-
 ...h-third__party_libyuv_include_libyuv_row.h |   2 +-
 ...ch-third__party_nasm_config_config-linux.h |   2 +-
 .../files/patch-third__party_node_node.py     |   2 +-
 ...en_src_platform_impl_udp__socket__posix.cc |   2 +-
 ..._party_pdfium_core_fxcrt_cfx__datetime.cpp |   2 +-
 ...party_pdfium_core_fxge_cfx__fontmapper.cpp |   2 +-
 ...__party_pdfium_core_fxge_fx__ge__linux.cpp |   2 +-
 ...__party_pdfium_fxjs_cjs__publicmethods.cpp |   2 +-
 ...d__party_pdfium_fxjs_fx__date__helpers.cpp |   2 +-
 .../patch-third__party_perfetto_gn_BUILD.gn   |  19 ++
 ...etto_include_perfetto_base_build__config.h |   4 +-
 ...etto_include_perfetto_base_thread__utils.h |   2 +-
 ...arty_perfetto_include_perfetto_base_time.h |   6 +-
 ...etto_include_perfetto_ext_base_event__fd.h |  13 -
 ..._include_perfetto_ext_base_thread__utils.h |  24 +-
 ...arty_perfetto_src_base_ctrl__c__handler.cc |  12 +
 ...rd__party_perfetto_src_base_file__utils.cc |  14 +
 ...ird__party_perfetto_src_base_subprocess.cc |  24 --
 ...rty_perfetto_src_base_subprocess__posix.cc |  37 +++
 ..._perfetto_src_base_thread__task__runner.cc |  11 -
 ...d__party_perfetto_src_base_unix__socket.cc |  25 +-
 ...ch-third__party_perfetto_src_base_utils.cc |  34 +++
 ...party_perfetto_src_base_watchdog__posix.cc |  14 +
 ...rfetto_src_trace__processor_read__trace.cc |  12 +
 ...race__processor_trace__processor__shell.cc |  22 ++
 ...rty_perfetto_src_traced_service_service.cc |  12 +
 ...src_tracing_core_tracing__service__impl.cc |  14 +-
 ...erfetto_src_tracing_ipc_default__socket.cc |  12 +
 ...d__party_perfetto_src_tracing_ipc_memfd.cc |  16 ++
 ...o_src_tracing_ipc_posix__shared__memory.cc |  18 ++
 ...to_src_tracing_ipc_posix__shared__memory.h |  19 ++
 ...ty_perfetto_src_tracing_platform__posix.cc |  28 ++
 ...fetto_tools_busy__threads_busy__threads.cc |  12 +
 ...c_google_protobuf_stubs_platform__macros.h |   2 +-
 ...patch-third__party_skia_src_core_SkCpu.cpp |   4 +-
 ...d__party_skia_src_gpu_GrAutoLocaleSetter.h |   2 +-
 ...d__party_skia_src_images_SkJpegEncoder.cpp |   2 +-
 ...__party_skia_src_ports_SkOSFile__stdio.cpp |   2 +-
 ...ch-third__party_skia_src_sksl_SkSLString.h |   2 +-
 .../files/patch-third__party_sqlite_BUILD.gn  |   2 +-
 .../patch-third__party_swiftshader_BUILD.gn   |   6 +-
 ...arty_swiftshader_include_vulkan_vulkan.hpp |   2 +-
 ...ty_swiftshader_src_Common_Configurator.cpp |   2 +-
 ...party_swiftshader_src_Common_MutexLock.hpp |   2 +-
 ...y_swiftshader_src_Common_SharedLibrary.hpp |   2 +-
 ...party_swiftshader_src_Main_SwiftConfig.cpp |   2 +-
 ..._swiftshader_src_OpenGL_libEGL_Display.cpp |   2 +-
 ..._swiftshader_src_OpenGL_libEGL_Surface.cpp |   2 +-
 ...y_swiftshader_src_OpenGL_libEGL_libEGL.cpp |   2 +-
 ...y_swiftshader_src_OpenGL_libEGL_libEGL.hpp |   2 +-
 ...der_src_OpenGL_libGLES__CM_libGLES__CM.hpp |   2 +-
 ...tshader_src_OpenGL_libGLESv2_libGLESv2.hpp |   2 +-
 ...d__party_swiftshader_src_Reactor_Debug.cpp |   2 +-
 ...rd__party_swiftshader_src_System_Debug.cpp |   2 +-
 ...configs_linux_include_llvm_Config_config.h |   2 +-
 ...o_build_Linux_include_llvm_Config_config.h |   2 +-
 ..._llvm-subzero_lib_Support_Unix_Process.inc |   2 +-
 ...rd__party_vulkan-deps_glslang_src_BUILD.gn |  15 +
 ...an-deps_vulkan-loader_src_loader_loader.c} |   4 +-
 ...n-loader_src_loader_vk__loader__platform.h |  42 +++
 ...-layers_src_layers_vk__loader__platform.h} |   4 +-
 .../files/patch-third__party_webrtc_BUILD.gn  |   4 +-
 ...arty_webrtc_modules_audio__device_BUILD.gn |   2 +-
 ..._rtcp_source_forward__error__correction.cc |   2 +-
 ...hird__party_webrtc_rtc__base_byte__order.h |   2 +-
 ...arty_webrtc_rtc__base_ifaddrs__converter.h |   2 +-
 ...ird__party_webrtc_rtc__base_ip__address.cc |   2 +-
 ...hird__party_webrtc_rtc__base_ip__address.h |   2 +-
 ...h-third__party_webrtc_rtc__base_network.cc |   2 +-
 ...ch-third__party_webrtc_rtc__base_network.h |   2 +-
 ...brtc_rtc__base_physical__socket__server.cc |   4 +-
 ...ebrtc_rtc__base_physical__socket__server.h |   2 +-
 ...ebrtc_rtc__base_platform__thread__types.cc |   2 +-
 ...c_rtc__base_third__party_sigslot_sigslot.h |   2 +-
 ...rd__party_webrtc_system__wrappers_BUILD.gn |   2 +-
 .../files/patch-third__party_zlib_BUILD.gn    |  11 -
 .../patch-third__party_zlib_cpu__features.c   |   3 +-
 .../files/patch-tools_gn_build_gen.py         |   2 +-
 ...tch-tools_gn_src_base_files_file__posix.cc |   2 +-
 ...ch-tools_gn_src_base_files_scoped__file.cc |  11 +
 .../patch-tools_gn_src_gn_exec__process.cc    |   2 +-
 ..._src_gn_function__write__file__unittest.cc |   2 +-
 .../files/patch-tools_gn_src_gn_version.h     |   2 +-
 .../patch-tools_gn_src_util_sys__info.cc      |   6 +-
 ...son__schema__compiler_feature__compiler.py |   4 +-
 ...atch-tools_json__schema__compiler_model.py |   4 +-
 ...ols_perf_chrome__telemetry__build_BUILD.gn |   4 +-
 ...tools_variations_fieldtrial__to__struct.py |   6 +-
 .../patch-ui_aura_test_aura__test__helper.cc  |   6 +-
 .../patch-ui_aura_test_ui__controls__ozone.cc |   4 +-
 ...-ui_base_clipboard_clipboard__constants.cc |   2 +-
 ...h-ui_base_clipboard_clipboard__constants.h |   2 +-
 ...atch-ui_base_clipboard_clipboard__ozone.cc |  14 +-
 ...ransfer__policy_data__transfer__endpoint.h |  14 -
 ...se_dragdrop_os__exchange__data__provider.h |   2 +-
 ...p_os__exchange__data__provider__factory.cc |   2 +-
 ...__exchange__data__provider__non__backed.cc |   6 +-
 ...s__exchange__data__provider__non__backed.h |   4 +-
 ...ase_ime_init_input__method__initializer.cc |  32 +--
 ...patch-ui_base_resource_resource__bundle.cc |   6 +-
 ...base_resource_resource__bundle__freebsd.cc |   2 +-
 ...ch-ui_base_test_skia__gold__pixel__diff.cc |  12 +-
 .../files/patch-ui_base_ui__base__features.cc |  29 +-
 .../files/patch-ui_base_ui__base__features.h  |   4 +-
 .../patch-ui_base_webui_web__ui__util.cc      |  12 +-
 .../patch-ui_base_x_x11__shm__image__pool.cc  |   6 +-
 .../files/patch-ui_compositor_compositor.cc   |  12 +-
 .../files/patch-ui_compositor_compositor.h    |  12 +-
 ...patch-ui_compositor_compositor__observer.h |  12 +-
 ..._devices_x11_device__data__manager__x11.cc |   6 +-
 www/chromium/files/patch-ui_events_event.cc   |   4 +-
 .../files/patch-ui_events_event__switches.cc  |   2 +-
 .../files/patch-ui_events_event__switches.h   |   2 +-
 ..._events_keycodes_dom_keycode__converter.cc |   2 +-
 ...h-ui_events_ozone_keyboard__hook__ozone.cc |   2 +-
 www/chromium/files/patch-ui_gfx_BUILD.gn      |   4 +-
 .../files/patch-ui_gfx_canvas__skia.cc        |   4 +-
 .../files/patch-ui_gfx_codec_jpeg__codec.cc   |   2 +-
 .../patch-ui_gfx_font__fallback__linux.cc     |   2 +-
 www/chromium/files/patch-ui_gfx_font__list.cc |   2 +-
 .../patch-ui_gfx_font__names__testing.cc      |   2 +-
 .../files/patch-ui_gfx_font__render__params.h |   2 +-
 www/chromium/files/patch-ui_gfx_font__util.cc |   2 +-
 .../files/patch-ui_gfx_gpu__memory__buffer.cc |   2 +-
 .../files/patch-ui_gfx_gpu__memory__buffer.h  |  10 +-
 ...ch-ui_gfx_ipc_gfx__param__traits__macros.h |   2 +-
 ...fx_linux_client__native__pixmap__dmabuf.cc |   4 +-
 ..._gfx_mojom_buffer__types__mojom__traits.cc |   2 +-
 ...om_native__handle__types__mojom__traits.cc |   2 +-
 ...jom_native__handle__types__mojom__traits.h |   2 +-
 .../patch-ui_gfx_native__pixmap__handle.cc    |   2 +-
 .../patch-ui_gfx_native__pixmap__handle.h     |   2 +-
 .../patch-ui_gfx_native__widget__types.h      |  22 +-
 .../files/patch-ui_gfx_render__text.cc        |   4 +-
 www/chromium/files/patch-ui_gl_BUILD.gn       |   4 +-
 .../files/patch-ui_gl_generate__bindings.py   |   2 +-
 ...ch-ui_gl_gl__bindings__api__autogen__glx.h |   2 +-
 .../patch-ui_gl_gl__bindings__autogen__glx.cc |   2 +-
 .../patch-ui_gl_gl__bindings__autogen__glx.h  |   2 +-
 .../files/patch-ui_gl_gl__features.cc         |  14 +-
 www/chromium/files/patch-ui_gl_gl__fence.cc   |   2 +-
 ...ch-ui_gl_sync__control__vsync__provider.cc |   2 +-
 ...tch-ui_gl_sync__control__vsync__provider.h |   2 +-
 ...atch-ui_gtk_printing_print__dialog__gtk.cc |   2 +-
 ...sage__center_views_message__popup__view.cc |  12 +-
 .../patch-ui_native__theme_native__theme.h    |  12 +-
 ...ch-ui_native__theme_native__theme__base.cc |  12 +-
 ...indow_platform__window__init__properties.h |   2 +-
 ...patch-ui_strings_app__locale__settings.grd |   6 +-
 .../files/patch-ui_views_controls_label.cc    |  22 +-
 ...h-ui_views_controls_textfield_textfield.cc |  56 ++--
 .../patch-ui_views_corewm_tooltip__aura.cc    |  12 +-
 ...patch-ui_views_examples_widget__example.cc |   2 +-
 .../patch-ui_views_focus_focus__manager.cc    |  22 +-
 .../patch-ui_views_selection__controller.cc   |  12 +-
 .../patch-ui_views_style_platform__style.cc   |  14 +-
 .../files/patch-ui_views_views__delegate.cc   |   8 +-
 .../files/patch-ui_views_views__delegate.h    |   8 +-
 ...et_desktop__aura_desktop__screen__ozone.cc |   2 +-
 ...a_desktop__window__tree__host__platform.cc |   4 +-
 ...ch-ui_views_widget_native__widget__aura.cc |   8 +-
 ...tch-ui_views_window_custom__frame__view.cc |  12 +-
 .../patch-ui_views_window_dialog__delegate.cc |   4 +-
 ...patch-ui_views_window_frame__background.cc |   2 +-
 .../files/patch-ui_webui_resources_js_cr.js   |   2 +-
 www/chromium/files/patch-v8_BUILD.gn          |   6 +-
 .../files/patch-v8_include_v8config.h         |   8 +-
 www/chromium/files/patch-v8_src_api_api.cc    |   4 +-
 www/chromium/files/patch-v8_src_base_cpu.cc   |   6 +-
 ...h-v8_src_base_platform_platform-freebsd.cc |   2 +-
 ...tch-v8_src_base_platform_platform-posix.cc |   2 +-
 www/chromium/files/patch-v8_src_d8_d8.cc      |  12 +-
 www/chromium/files/patch-weblayer_BUILD.gn    |   4 +-
 ...layer_app_content__main__delegate__impl.cc |  10 +-
 ...ayer_browser_browser__main__parts__impl.cc |  14 +-
 ..._browser_content__browser__client__impl.cc |  12 +-
 ...r_browser_content__browser__client__impl.h |  17 --
 ...owser_system__network__context__manager.cc |  10 +-
 .../patch-weblayer_common_weblayer__paths.cc  |  10 +-
 www/chromium/files/sndio_input.cc             |   2 +-
 www/chromium/files/sndio_output.cc            |   2 +-
 www/chromium/pkg-plist                        | 264 ++++++++++++------
 942 files changed, 4616 insertions(+), 3407 deletions(-)
 create mode 100644 www/chromium/files/patch-base_allocator_allocator.gni
 create mode 100644 www/chromium/files/patch-base_allocator_partition__allocator_address__pool__manager.cc
 create mode 100644 www/chromium/files/patch-base_allocator_partition__allocator_partition__bucket.cc
 create mode 100644 www/chromium/files/patch-base_allocator_partition__allocator_spinning__mutex.cc
 create mode 100644 www/chromium/files/patch-base_allocator_partition__allocator_spinning__mutex.h
 create mode 100644 www/chromium/files/patch-base_files_file__path__watcher__freebsd.cc
 delete mode 100644 www/chromium/files/patch-base_files_file__path__watcher__stub.cc
 create mode 100644 www/chromium/files/patch-base_trace__event_heap__profiler__allocation__context__tracker.cc
 delete mode 100644 www/chromium/files/patch-base_trace__event_process__memory__dump.h
 create mode 100644 www/chromium/files/patch-chrome_browser_apps_platform__apps_api_media__galleries_media__galleries__apitest.cc
 create mode 100644 www/chromium/files/patch-chrome_browser_apps_platform__apps_api_media__galleries_media__galleries__watch__apitest.cc
 rename www/chromium/files/{patch-chrome_browser_native__file__system_chrome__native__file__system__permission__context.cc => patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc} (68%)
 create mode 100644 www/chromium/files/patch-chrome_browser_media_audio__service__util.cc
 delete mode 100644 www/chromium/files/patch-chrome_browser_ui_views_first__run__dialog.cc
 create mode 100644 www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc
 delete mode 100644 www/chromium/files/patch-chrome_browser_ui_views_web__apps_pwa__confirmation__bubble__view.cc
 create mode 100644 www/chromium/files/patch-chrome_browser_ui_webui_webui__js__error_webui__js__error__ui.cc
 create mode 100644 www/chromium/files/patch-chrome_browser_web__applications_components_web__app__run__on__os__login.cc
 delete mode 100644 www/chromium/files/patch-chrome_test_base_chrome__test__launcher.cc
 delete mode 100644 www/chromium/files/patch-chrome_test_base_testing__browser__process.h
 create mode 100644 www/chromium/files/patch-chrome_utility_services.cc
 create mode 100644 www/chromium/files/patch-chromecast_app_cast__main__delegate.cc
 create mode 100644 www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.h
 create mode 100644 www/chromium/files/patch-chromecast_browser_cast__content__browser__client__receiver__bindings.cc
 create mode 100644 www/chromium/files/patch-chromecast_browser_metrics_cast__browser__metrics.cc
 create mode 100644 www/chromium/files/patch-chromecast_browser_metrics_cast__browser__metrics.h
 delete mode 100644 www/chromium/files/patch-content_browser_webui_web__ui__main__frame__observer.cc
 delete mode 100644 www/chromium/files/patch-content_browser_webui_web__ui__main__frame__observer.h
 create mode 100644 www/chromium/files/patch-content_public_browser_font__access__context.h
 create mode 100644 www/chromium/files/patch-gpu_vulkan_vulkan__image.cc
 create mode 100644 www/chromium/files/patch-gpu_vulkan_vulkan__image.h
 delete mode 100644 www/chromium/files/patch-media_base_status.cc
 create mode 100644 www/chromium/files/patch-media_base_vector__math.cc
 create mode 100644 www/chromium/files/patch-media_video_video__encode__accelerator__adapter__test.cc
 create mode 100644 www/chromium/files/patch-net_base_network__change__notifier__posix.cc
 create mode 100644 www/chromium/files/patch-net_base_network__interfaces__posix.cc
 delete mode 100644 www/chromium/files/patch-net_base_network__interfaces__posix.h
 create mode 100644 www/chromium/files/patch-remoting_codec_webrtc__video__encoder__vpx.cc
 delete mode 100644 www/chromium/files/patch-services_network_network__context.cc
 create mode 100644 www/chromium/files/patch-third__party_angle_src_common_debug.h
 delete mode 100644 www/chromium/files/patch-third__party_angle_third__party_vulkan-loader_src_loader_vk__loader__platform.h
 create mode 100644 www/chromium/files/patch-third__party_blink_public_platform_platform.h
 create mode 100644 www/chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__webcodecs__video__frame.cc
 create mode 100644 www/chromium/files/patch-third__party_blink_renderer_platform_scheduler_common_thread.cc
 create mode 100644 www/chromium/files/patch-third__party_perfetto_gn_BUILD.gn
 delete mode 100644 www/chromium/files/patch-third__party_perfetto_include_perfetto_ext_base_event__fd.h
 create mode 100644 www/chromium/files/patch-third__party_perfetto_src_base_ctrl__c__handler.cc
 create mode 100644 www/chromium/files/patch-third__party_perfetto_src_base_file__utils.cc
 delete mode 100644 www/chromium/files/patch-third__party_perfetto_src_base_subprocess.cc
 create mode 100644 www/chromium/files/patch-third__party_perfetto_src_base_subprocess__posix.cc
 delete mode 100644 www/chromium/files/patch-third__party_perfetto_src_base_thread__task__runner.cc
 create mode 100644 www/chromium/files/patch-third__party_perfetto_src_base_utils.cc
 create mode 100644 www/chromium/files/patch-third__party_perfetto_src_base_watchdog__posix.cc
 create mode 100644 www/chromium/files/patch-third__party_perfetto_src_trace__processor_read__trace.cc
 create mode 100644 www/chromium/files/patch-third__party_perfetto_src_trace__processor_trace__processor__shell.cc
 create mode 100644 www/chromium/files/patch-third__party_perfetto_src_traced_service_service.cc
 create mode 100644 www/chromium/files/patch-third__party_perfetto_src_tracing_ipc_default__socket.cc
 create mode 100644 www/chromium/files/patch-third__party_perfetto_src_tracing_ipc_memfd.cc
 create mode 100644 www/chromium/files/patch-third__party_perfetto_src_tracing_ipc_posix__shared__memory.cc
 create mode 100644 www/chromium/files/patch-third__party_perfetto_src_tracing_ipc_posix__shared__memory.h
 create mode 100644 www/chromium/files/patch-third__party_perfetto_src_tracing_platform__posix.cc
 create mode 100644 www/chromium/files/patch-third__party_perfetto_tools_busy__threads_busy__threads.cc
 create mode 100644 www/chromium/files/patch-third__party_vulkan-deps_glslang_src_BUILD.gn
 rename www/chromium/files/{patch-third__party_angle_third__party_vulkan-loader_src_loader_loader.c => patch-third__party_vulkan-deps_vulkan-loader_src_loader_loader.c} (69%)
 create mode 100644 www/chromium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_vk__loader__platform.h
 rename www/chromium/files/{patch-third__party_angle_third__party_vulkan-validation-layers_src_layers_vk__loader__platform.h => patch-third__party_vulkan-deps_vulkan-validation-layers_src_layers_vk__loader__platform.h} (53%)
 delete mode 100644 www/chromium/files/patch-third__party_zlib_BUILD.gn
 create mode 100644 www/chromium/files/patch-tools_gn_src_base_files_scoped__file.cc
 delete mode 100644 www/chromium/files/patch-ui_base_data__transfer__policy_data__transfer__endpoint.h
 delete mode 100644 www/chromium/files/patch-weblayer_browser_content__browser__client__impl.h

diff --git a/www/chromium/Makefile b/www/chromium/Makefile
index 88c67d2f..8e63c5db 100644
--- a/www/chromium/Makefile
+++ b/www/chromium/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD: head/www/chromium/Makefile 563913 2021-02-03 19:46:35Z sunpoet $
 
 PORTNAME=	chromium
-PORTVERSION=	88.0.4324.150
+PORTVERSION=	89.0.4389.90
 CATEGORIES=	www java
 MASTER_SITES=	https://commondatastorage.googleapis.com/chromium-browser-official/ \
 		LOCAL/rene/chromium/:fonts
@@ -121,18 +121,25 @@ GN_BOOTSTRAP_FLAGS=	--no-clean --no-rebuild --skip-generate-buildfiles
 # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
 # Note: these are for FreeBSD use ONLY. For your own distribution,
 # please get your own set of keys.
-GN_ARGS+=	google_api_key="AIzaSyBsp9n41JLW8jCokwn7vhoaMejDFRd1mp8" \
-		google_default_client_id="996322985003.apps.googleusercontent.com" \
-		google_default_client_secret="IR1za9-1VK0zZ0f_O8MVFicn"
+GN_ARGS+=	google_api_key="AIzaSyBsp9n41JLW8jCokwn7vhoaMejDFRd1mp8"
+
 SUB_FILES=	chromium-browser.desktop chrome
 SUB_LIST+=	COMMENT="${COMMENT}"
 
-OPTIONS_DEFINE=	CODECS CUPS DEBUG DRIVER KERBEROS TEST
+OPTIONS_DEFINE=	CODECS CUPS DEBUG DRIVER KERBEROS LTO TEST
 CODECS_DESC=	Compile and enable patented codecs like H.264
 DRIVER_DESC=	Install chromedriver
 OPTIONS_GROUP=		AUDIO
 OPTIONS_GROUP_AUDIO=	ALSA PULSEAUDIO SNDIO
 
+OPTIONS_RADIO=		KERBEROS
+OPTIONS_RADIO_KERBEROS=	HEIMDAL HEIMDAL_BASE MIT
+HEIMDAL_DESC=		Heimdal Kerberos (security/heimdal)
+HEIMDAL_BASE_DESC=	Heimdal Kerberos (base)
+MIT_DESC=		MIT Kerberos (security/krb5)
+HEIMDAL_LIB_DEPENDS=	libkrb.so.26:security/heimdal
+MIT_LIB_DEPENDS=	libkrb.so.3:security/krb5
+
 OPTIONS_DEFAULT=	CODECS CUPS DRIVER KERBEROS SNDIO
 OPTIONS_SUB=		yes
 
@@ -156,19 +163,23 @@ DEBUG_VARS=		BUILDTYPE=Debug \
 			GN_ARGS+=is_component_build=false \
 			GN_ARGS+=symbol_level=1 \
 			GN_BOOTSTRAP_FLAGS+=--debug \
-			WANTSPACE="lots of free disk space (~ 13GB)"
+			WANTSPACE="13 GB"
 DEBUG_VARS_OFF=		BUILDTYPE=Release \
 			GN_ARGS+=blink_symbol_level=0 \
 			GN_ARGS+=is_debug=false \
 			GN_ARGS+=is_official_build=true \
 			GN_ARGS+=symbol_level=0 \
-			WANTSPACE="a fair amount of free disk space (~ 6.5GB)"
+			WANTSPACE="6.5 GB"
 
 DRIVER_MAKE_ARGS=	chromedriver
 
 KERBEROS_VARS=		GN_ARGS+=use_kerberos=true
 KERBEROS_VARS_OFF=	GN_ARGS+=use_kerberos=false
 
+LTO_VARS=		GN_ARGS+=use_thin_lto=true \
+			GN_ARGS+=thin_lto_enable_optimizations=true \
+			WANTSPACE="14 GB"
+
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_VARS=	GN_ARGS+=use_pulseaudio=true
 PULSEAUDIO_VARS_OFF=	GN_ARGS+=use_pulseaudio=false
@@ -188,8 +199,16 @@ TEST_DISTFILES=		${PORTNAME}-${DISTVERSION}-testdata${EXTRACT_SUFX} \
 
 .include <bsd.port.options.mk>
 
+.if ${PORT_OPTIONS:MHEIMDAL_BASE} && !exists(/usr/lib/libkrb5.so)
+IGNORE=		you have selected HEIMDAL_BASE but do not have Heimdal installed in base
+.endif
+
 .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1300000
 EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-build_config_compiler_pgo_pgo.gni
+
+.if ${PORT_OPTIONS:MLTO}
+BROKEN+=	does not build with LTO on FreeBSD < 13, needs LLVM 11+
+.endif
 .endif
 
 # swiftshader/lib/{libEGL.so,libGLESv2.so} is x86 only
@@ -215,7 +234,7 @@ MAKE_ENV+=	C_INCLUDE_PATH=${LOCALBASE}/include \
 pre-everything::
 	@${ECHO_MSG}
 	@${ECHO_MSG} "To build Chromium, you should have around 2GB of memory"
-	@${ECHO_MSG} "and ${WANTSPACE}."
+	@${ECHO_MSG} "and around ${WANTSPACE} of free disk space."
 	@${ECHO_MSG}
 
 post-extract-TEST-on:
@@ -324,6 +343,8 @@ 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/distinfo b/www/chromium/distinfo
index 6acd3f5b..853ae86b 100644
--- a/www/chromium/distinfo
+++ b/www/chromium/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1612555606
-SHA256 (chromium-88.0.4324.150.tar.xz) = ae12e94392986c6b8ea4413356a49bae0a19356ffe2ea95495303cf2decb38c3
-SIZE (chromium-88.0.4324.150.tar.xz) = 857377456
-SHA256 (chromium-88.0.4324.150-testdata.tar.xz) = 9b9be53ed5259f32e38ae5e03e960b96fa6933de8094213bfff632b5635ce7e7
-SIZE (chromium-88.0.4324.150-testdata.tar.xz) = 257453172
+TIMESTAMP = 1615805841
+SHA256 (chromium-89.0.4389.90.tar.xz) = 11c6089c5fdd921216aa4eb34b52818a9b091cad655a24aed0982d29e65b279a
+SIZE (chromium-89.0.4389.90.tar.xz) = 890844888
+SHA256 (chromium-89.0.4389.90-testdata.tar.xz) = d5c2ac5a11f23ae8d28925dce5875baf370feed30319fab0875f65c80be10d2d
+SIZE (chromium-89.0.4389.90-testdata.tar.xz) = 257730924
 SHA256 (test_fonts-85.tar.xz) = f22b61b3639acb147c98ec2e2305d8b96f0b55c8c74c40e2ea696402fae8cef9
 SIZE (test_fonts-85.tar.xz) = 9511984
diff --git a/www/chromium/files/audio_manager_openbsd.cc b/www/chromium/files/audio_manager_openbsd.cc
index ee293b9d..05219308 100644
--- a/www/chromium/files/audio_manager_openbsd.cc
+++ b/www/chromium/files/audio_manager_openbsd.cc
@@ -80,7 +80,7 @@ AudioManagerOpenBSD::AudioManagerOpenBSD(std::unique_ptr<AudioThread> audio_thre
                                          AudioLogFactory* audio_log_factory)
     : AudioManagerBase(std::move(audio_thread),
                        audio_log_factory) {
-  DLOG(WARNING) << "AudioManagerOpenBSD";
+  DLOG(INFO) << "AudioManagerOpenBSD";
   SetMaxOutputStreamsAllowed(kMaxOutputStreams);
 }
 
@@ -147,14 +147,14 @@ AudioParameters AudioManagerOpenBSD::GetPreferredOutputStreamParameters(
 
 AudioInputStream* AudioManagerOpenBSD::MakeInputStream(
     const AudioParameters& params) {
-  DLOG(WARNING) << "MakeInputStream";
+  DLOG(INFO) << "MakeInputStream";
   return new SndioAudioInputStream(this,
              AudioDeviceDescription::kDefaultDeviceId, params);
 }
 
 AudioOutputStream* AudioManagerOpenBSD::MakeOutputStream(
     const AudioParameters& params) {
-  DLOG(WARNING) << "MakeOutputStream";
+  DLOG(INFO) << "MakeOutputStream";
   return new SndioAudioOutputStream(params, this);
 }
 #endif
@@ -162,7 +162,7 @@ AudioOutputStream* AudioManagerOpenBSD::MakeOutputStream(
 std::unique_ptr<media::AudioManager> CreateAudioManager(
     std::unique_ptr<AudioThread> audio_thread,
     AudioLogFactory* audio_log_factory) {
-  DLOG(WARNING) << "CreateAudioManager";
+  DLOG(INFO) << "CreateAudioManager";
 #if defined(USE_SNDIO)
   UMA_HISTOGRAM_ENUMERATION("Media.OpenBSDAudioIO", kSndio, kAudioIOMax + 1);
   return std::make_unique<AudioManagerOpenBSD>(std::move(audio_thread),
diff --git a/www/chromium/files/extra-patch-build_config_compiler_pgo_pgo.gni b/www/chromium/files/extra-patch-build_config_compiler_pgo_pgo.gni
index 1d59abc7..4c4f7d14 100644
--- a/www/chromium/files/extra-patch-build_config_compiler_pgo_pgo.gni
+++ b/www/chromium/files/extra-patch-build_config_compiler_pgo_pgo.gni
@@ -1,11 +1,11 @@
---- build/config/compiler/pgo/pgo.gni.orig	2021-01-18 21:28:45 UTC
+--- build/config/compiler/pgo/pgo.gni.orig	2021-03-12 23:57:15 UTC
 +++ build/config/compiler/pgo/pgo.gni
-@@ -13,7 +13,7 @@ declare_args() {
-   #     2 : Used during the PGO (optimization) phase.
-   chrome_pgo_phase = 0
-   if (is_official_build &&
--      (is_win || is_mac || (is_linux && !chromeos_is_browser_only && !is_chromecast))) {
-+      (is_win || is_mac || (is_linux && !chromeos_is_browser_only && !is_chromecast && !is_bsd))) {
+@@ -16,7 +16,7 @@ declare_args() {
+       # TODO(crbug.com/1052397): Remove chromeos_is_browser_only once
+       # target_os switch for lacros-chrome is completed.
+       (is_win || is_mac ||
+-       (is_linux && !chromeos_is_browser_only && !is_chromecast))) {
++       (is_linux && !chromeos_is_browser_only && !is_chromecast && !is_bsd))) {
      chrome_pgo_phase = 2
    }
  
diff --git a/www/chromium/files/patch-3p-pdfium_3p_base_allocator_partition__allocator_page__allocator__internals__posix.h b/www/chromium/files/patch-3p-pdfium_3p_base_allocator_partition__allocator_page__allocator__internals__posix.h
index fa954c72..500335ed 100644
--- a/www/chromium/files/patch-3p-pdfium_3p_base_allocator_partition__allocator_page__allocator__internals__posix.h
+++ b/www/chromium/files/patch-3p-pdfium_3p_base_allocator_partition__allocator_page__allocator__internals__posix.h
@@ -1,4 +1,4 @@
---- third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator_internals_posix.h.orig	2021-01-18 21:31:51 UTC
+--- third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator_internals_posix.h.orig	2021-03-13 00:03:39 UTC
 +++ third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator_internals_posix.h
 @@ -16,7 +16,7 @@
  #if defined(OS_ANDROID)
diff --git a/www/chromium/files/patch-BUILD.gn b/www/chromium/files/patch-BUILD.gn
index 65c3f3f3..7c65f041 100644
--- a/www/chromium/files/patch-BUILD.gn
+++ b/www/chromium/files/patch-BUILD.gn
@@ -1,6 +1,6 @@
---- BUILD.gn.orig	2021-01-18 21:28:44 UTC
+--- BUILD.gn.orig	2021-03-12 23:57:14 UTC
 +++ BUILD.gn
-@@ -424,7 +424,7 @@ group("gn_all") {
+@@ -421,7 +421,7 @@ group("gn_all") {
      ]
    }
  
@@ -9,7 +9,7 @@
      deps += [
        "//third_party/breakpad:breakpad_unittests",
        "//third_party/breakpad:core-2-minidump",
-@@ -467,8 +467,6 @@ group("gn_all") {
+@@ -464,8 +464,6 @@ group("gn_all") {
        "//net:disk_cache_memory_test",
        "//net:quic_client",
        "//net:quic_server",
@@ -18,7 +18,7 @@
        "//testing:empty_main",
      ]
  
-@@ -523,10 +521,6 @@ group("gn_all") {
+@@ -520,10 +518,6 @@ group("gn_all") {
          "//chrome/test:load_library_perf_tests",
          "//chrome/test:sync_performance_tests",
          "//chrome/test/chromedriver:chromedriver",
@@ -29,7 +29,7 @@
          "//media/cast:generate_barcode_video",
          "//media/cast:generate_timecode_audio",
          "//net:crash_cache",
-@@ -586,10 +580,6 @@ group("gn_all") {
+@@ -582,10 +576,6 @@ group("gn_all") {
        "//mojo:mojo_perftests",
        "//services/service_manager/public/cpp",
        "//testing/gmock:gmock_main",
@@ -40,7 +40,7 @@
      ]
  
      if (!is_android) {
-@@ -667,7 +657,7 @@ group("gn_all") {
+@@ -663,7 +653,7 @@ group("gn_all") {
          host_os == "win") {
        deps += [ "//chrome/test/mini_installer:mini_installer_tests" ]
      }
@@ -49,7 +49,7 @@
      deps += [ "//third_party/breakpad:symupload($host_toolchain)" ]
    }
  
-@@ -682,7 +672,7 @@ group("gn_all") {
+@@ -678,7 +668,7 @@ group("gn_all") {
      }
    }
  
@@ -58,7 +58,7 @@
      deps += [
        "//third_party/crashpad/crashpad:crashpad_tests",
        "//third_party/crashpad/crashpad/handler:crashpad_handler",
-@@ -802,7 +792,6 @@ group("gn_all") {
+@@ -790,7 +780,6 @@ group("gn_all") {
        "//chrome/browser/vr:vr_common_perftests",
        "//chrome/browser/vr:vr_common_unittests",
        "//chrome/browser/vr:vr_pixeltests",
@@ -66,7 +66,7 @@
      ]
      if (is_android) {
        deps += [ "//chrome/browser/android/vr:vr_android_unittests" ]
-@@ -1090,7 +1079,7 @@ if (!is_ios) {
+@@ -1081,7 +1070,7 @@ if (!is_ios) {
        data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ]
      }
  
@@ -75,7 +75,7 @@
        data_deps +=
            [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ]
      }
-@@ -1099,7 +1088,7 @@ if (!is_ios) {
+@@ -1090,7 +1079,7 @@ if (!is_ios) {
        data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
      }
  
@@ -84,7 +84,7 @@
        data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
      }
  
-@@ -1320,9 +1309,6 @@ group("chromium_builder_perf") {
+@@ -1315,9 +1304,6 @@ group("chromium_builder_perf") {
  
      if (is_win) {
        data_deps += [ "//chrome/installer/mini_installer:mini_installer" ]
diff --git a/www/chromium/files/patch-apps_app__restore__service__browsertest.cc b/www/chromium/files/patch-apps_app__restore__service__browsertest.cc
index 7ae62153..6ce01dd4 100644
--- a/www/chromium/files/patch-apps_app__restore__service__browsertest.cc
+++ b/www/chromium/files/patch-apps_app__restore__service__browsertest.cc
@@ -1,4 +1,4 @@
---- apps/app_restore_service_browsertest.cc.orig	2020-11-13 06:36:34 UTC
+--- apps/app_restore_service_browsertest.cc.orig	2021-03-12 23:57:14 UTC
 +++ apps/app_restore_service_browsertest.cc
 @@ -148,7 +148,7 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, FileAcc
  }
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 3d880b5a..62d53b5a 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,6 +1,6 @@
---- apps/ui/views/app_window_frame_view.cc.orig	2021-01-18 21:28:44 UTC
+--- apps/ui/views/app_window_frame_view.cc.orig	2021-03-12 23:57:14 UTC
 +++ apps/ui/views/app_window_frame_view.cc
-@@ -139,7 +139,7 @@ gfx::Rect AppWindowFrameView::GetWindowBoundsForClient
+@@ -137,7 +137,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.
diff --git a/www/chromium/files/patch-ash_display_mirror__window__controller.cc b/www/chromium/files/patch-ash_display_mirror__window__controller.cc
index 181a4bb2..ec171e5a 100644
--- a/www/chromium/files/patch-ash_display_mirror__window__controller.cc
+++ b/www/chromium/files/patch-ash_display_mirror__window__controller.cc
@@ -1,4 +1,4 @@
---- ash/display/mirror_window_controller.cc.orig	2021-01-18 21:28:44 UTC
+--- ash/display/mirror_window_controller.cc.orig	2021-03-12 23:57:14 UTC
 +++ ash/display/mirror_window_controller.cc
 @@ -286,7 +286,11 @@ void MirrorWindowController::UpdateWindow(
                           return info.id() == iter->first;
diff --git a/www/chromium/files/patch-base_BUILD.gn b/www/chromium/files/patch-base_BUILD.gn
index c5c95ee5..9f17ec07 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	2021-01-18 21:28:44 UTC
+--- base/BUILD.gn.orig	2021-03-12 23:57:15 UTC
 +++ base/BUILD.gn
-@@ -873,7 +873,7 @@ component("base") {
+@@ -885,7 +885,7 @@ component("base") {
        "timer/hi_res_timer_manager_posix.cc",
      ]
  
@@ -9,7 +9,7 @@
        sources += [
          "cpu_affinity_posix.cc",
          "cpu_affinity_posix.h",
-@@ -884,6 +884,11 @@ component("base") {
+@@ -896,6 +896,11 @@ component("base") {
          "profiler/thread_delegate_posix.h",
        ]
      }
@@ -21,7 +21,7 @@
    }
  
    if (is_win) {
-@@ -1293,7 +1298,7 @@ component("base") {
+@@ -1301,7 +1306,7 @@ component("base") {
    # building inside the cros_sdk environment - use host_toolchain as a
    # more robust check for this.
    if (!use_sysroot &&
@@ -30,7 +30,7 @@
        host_toolchain != "//build/toolchain/cros:host") {
      libs += [ "atomic" ]
    }
-@@ -1343,7 +1348,7 @@ component("base") {
+@@ -1351,7 +1356,7 @@ component("base") {
            "allocator/allocator_shim_default_dispatch_to_mac_zoned_malloc.cc",
          ]
        }
@@ -39,7 +39,7 @@
          sources += [ "allocator/allocator_shim_default_dispatch_to_glibc.cc" ]
        }
        if (is_win) {
-@@ -1969,6 +1974,34 @@ component("base") {
+@@ -1978,6 +1983,34 @@ component("base") {
      }
    }
  
@@ -54,9 +54,9 @@
 +      "system/sys_info_linux.cc"
 +    ]
 +    sources += [
++      "files/file_path_watcher_freebsd.cc",
 +      "files/file_path_watcher_kqueue.cc",
 +      "files/file_path_watcher_kqueue.h",
-+      "files/file_path_watcher_stub.cc",
 +      "process/memory_stubs.cc",
 +      "process/process_handle_freebsd.cc",
 +      "process/process_iterator_freebsd.cc",
@@ -74,21 +74,21 @@
    # iOS
    if (is_ios) {
      sources -= [
-@@ -3111,7 +3144,7 @@ test("base_unittests") {
+@@ -3130,7 +3163,7 @@ if (build_base_unittests) {
+       }
      }
-   }
  
--  if (is_linux || is_chromeos) {
-+  if ((is_linux || is_chromeos) && !is_bsd) {
-     sources += [ "debug/proc_maps_linux_unittest.cc" ]
-   }
+-    if (is_linux || is_chromeos) {
++    if ((is_linux || is_chromeos) && !is_bsd) {
+       sources += [ "debug/proc_maps_linux_unittest.cc" ]
+     }
  
-@@ -3152,7 +3185,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",
+@@ -3171,7 +3204,7 @@ if (build_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",
diff --git a/www/chromium/files/patch-base_allocator_allocator.gni b/www/chromium/files/patch-base_allocator_allocator.gni
new file mode 100644
index 00000000..7db05a57
--- /dev/null
+++ b/www/chromium/files/patch-base_allocator_allocator.gni
@@ -0,0 +1,11 @@
+--- base/allocator/allocator.gni.orig	2021-03-12 23:57:15 UTC
++++ base/allocator/allocator.gni
+@@ -58,7 +58,7 @@ declare_args() {
+   # not, and redesign or remove the flag accordingly.  We may want to assert a
+   # possible conflict between |use_allocator = "partition"| and
+   # |use_partition_alloc = true| rather than prioritizing use_partition_alloc.
+-  use_partition_alloc = !is_ios  # Never use PartitionAlloc on iOS.
++  use_partition_alloc = !is_ios # Never use PartitionAlloc on iOS.
+ }
+ 
+ if (!use_partition_alloc && use_allocator == "partition") {
diff --git a/www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc b/www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc
index d8774004..be08a20e 100644
--- a/www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc
+++ b/www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc
@@ -1,4 +1,4 @@
---- base/allocator/allocator_shim_default_dispatch_to_glibc.cc.orig	2020-11-13 06:36:34 UTC
+--- base/allocator/allocator_shim_default_dispatch_to_glibc.cc.orig	2021-03-12 23:57:15 UTC
 +++ base/allocator/allocator_shim_default_dispatch_to_glibc.cc
 @@ -6,18 +6,28 @@
  #include "base/compiler_specific.h"
diff --git a/www/chromium/files/patch-base_allocator_allocator__shim__override__libc__symbols.h b/www/chromium/files/patch-base_allocator_allocator__shim__override__libc__symbols.h
index b5135ca5..8a09d964 100644
--- a/www/chromium/files/patch-base_allocator_allocator__shim__override__libc__symbols.h
+++ b/www/chromium/files/patch-base_allocator_allocator__shim__override__libc__symbols.h
@@ -1,4 +1,4 @@
---- base/allocator/allocator_shim_override_libc_symbols.h.orig	2021-01-18 21:28:44 UTC
+--- base/allocator/allocator_shim_override_libc_symbols.h.orig	2021-03-12 23:57:15 UTC
 +++ base/allocator/allocator_shim_override_libc_symbols.h
 @@ -16,6 +16,10 @@
  #include <malloc.h>
diff --git a/www/chromium/files/patch-base_allocator_allocator__shim__unittest.cc b/www/chromium/files/patch-base_allocator_allocator__shim__unittest.cc
index 9a0e6af6..2c53c240 100644
--- a/www/chromium/files/patch-base_allocator_allocator__shim__unittest.cc
+++ b/www/chromium/files/patch-base_allocator_allocator__shim__unittest.cc
@@ -1,6 +1,6 @@
---- base/allocator/allocator_shim_unittest.cc.orig	2021-01-18 21:28:44 UTC
+--- base/allocator/allocator_shim_unittest.cc.orig	2021-03-12 23:57:15 UTC
 +++ base/allocator/allocator_shim_unittest.cc
-@@ -367,7 +367,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) {
+@@ -369,7 +369,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) {
  
  #endif  // !OS_WIN
  
@@ -9,7 +9,7 @@
    void* memalign_ptr = memalign(128, 53);
    ASSERT_NE(nullptr, memalign_ptr);
    ASSERT_EQ(0u, reinterpret_cast<uintptr_t>(memalign_ptr) % 128);
-@@ -383,7 +383,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) {
+@@ -385,7 +385,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) {
    ASSERT_GE(aligned_allocs_intercepted_by_size[kPageSize], 1u);
  #endif  // !defined(OS_ANDROID)
  
@@ -18,7 +18,7 @@
  
  // See allocator_shim_override_glibc_weak_symbols.h for why we intercept
  // internal libc symbols.
-@@ -410,7 +410,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) {
+@@ -412,7 +412,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) {
    free(zero_alloc_ptr);
    ASSERT_GE(frees_intercepted_by_addr[Hash(zero_alloc_ptr)], 1u);
  
@@ -27,7 +27,7 @@
    free(memalign_ptr);
    ASSERT_GE(frees_intercepted_by_addr[Hash(memalign_ptr)], 1u);
  
-@@ -419,7 +419,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) {
+@@ -421,7 +421,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) {
    ASSERT_GE(frees_intercepted_by_addr[Hash(pvalloc_ptr)], 1u);
  #endif  // !defined(OS_ANDROID)
  
@@ -36,7 +36,7 @@
  
  #if !defined(OS_WIN)
    free(posix_memalign_ptr);
-@@ -595,7 +595,7 @@ static size_t GetUsableSize(void* ptr) {
+@@ -614,7 +614,7 @@ static size_t GetUsableSize(void* ptr) {
  static size_t GetUsableSize(void* ptr) {
    return malloc_size(ptr);
  }
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_address__pool__manager.cc b/www/chromium/files/patch-base_allocator_partition__allocator_address__pool__manager.cc
new file mode 100644
index 00000000..bbee8be9
--- /dev/null
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_address__pool__manager.cc
@@ -0,0 +1,31 @@
+--- base/allocator/partition_allocator/address_pool_manager.cc.orig	2021-03-12 23:57:15 UTC
++++ base/allocator/partition_allocator/address_pool_manager.cc
+@@ -8,6 +8,13 @@
+ #include <sys/mman.h>
+ #endif
+ 
++#if defined(OS_FREEBSD)
++#include <sys/mman.h>
++#include <fcntl.h>
++
++#include "base/posix/eintr_wrapper.h"
++#endif
++
+ #include <algorithm>
+ #include <limits>
+ 
+@@ -50,6 +57,14 @@ void DecommitPages(void* address, size_t size) {
+   void* ptr = mmap(address, size, PROT_NONE,
+                    MAP_FIXED | MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
+   PA_CHECK(ptr == address);
++#elif defined(OS_FREEBSD)
++  int fd = HANDLE_EINTR(open("/dev/zero", O_RDONLY));
++  PA_CHECK(fd != -1);
++
++  void *ptr = mmap(address, size, PROT_NONE,
++                   MAP_FIXED | MAP_PRIVATE, fd, 0);
++  PA_PCHECK(ptr == address);
++  HANDLE_EINTR(close(fd));
+ #else
+   DecommitSystemPages(address, size, PageUpdatePermissions);
+ #endif
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 e4554498..07f3a708 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,6 +1,6 @@
---- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig	2021-01-18 21:28:44 UTC
+--- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig	2021-03-12 23:57:15 UTC
 +++ base/allocator/partition_allocator/page_allocator_internals_posix.h
-@@ -26,7 +26,7 @@
+@@ -27,12 +27,16 @@
  #if defined(OS_ANDROID)
  #include <sys/prctl.h>
  #endif
@@ -9,3 +9,50 @@
  #include <sys/resource.h>
  
  #include <algorithm>
+ #endif
+ 
++#if defined(OS_FREEBSD)
++#include <fcntl.h>
++#endif
++
+ #include "base/allocator/partition_allocator/page_allocator.h"
+ 
+ #ifndef MAP_ANONYMOUS
+@@ -168,12 +172,19 @@ void* SystemAllocPagesInternal(void* hint,
+   PA_DCHECK(PageTag::kFirst <= page_tag);
+   PA_DCHECK(PageTag::kLast >= page_tag);
+   int fd = VM_MAKE_TAG(static_cast<int>(page_tag));
++#elif defined(OS_FREEBSD)
++  int fd = HANDLE_EINTR(open("/dev/zero", O_RDWR | O_CLOEXEC));
++  PA_PCHECK(fd != -1);
+ #else
+   int fd = -1;
+ #endif
+ 
+   int access_flag = GetAccessFlags(accessibility);
++#if defined(OS_FREEBSD)
++  int map_flags = MAP_PRIVATE;
++#else
+   int map_flags = MAP_ANONYMOUS | MAP_PRIVATE;
++#endif
+ 
+ #if defined(OS_APPLE)
+   // On macOS 10.14 and higher, executables that are code signed with the
+@@ -200,6 +211,8 @@ void* SystemAllocPagesInternal(void* hint,
+     prctl(PR_SET_VMA, PR_SET_VMA_ANON_NAME, ret, length,
+           PageTagToName(page_tag));
+   }
++#elif defined(OS_FREEBSD)
++  HANDLE_EINTR(close(fd));
+ #endif
+ 
+   return ret;
+@@ -294,6 +307,8 @@ void DiscardSystemPagesInternal(void* address, size_t 
+     ret = madvise(address, length, MADV_DONTNEED);
+   }
+   PA_PCHECK(ret == 0);
++#elif defined(OS_FREEBSD)
++  PA_PCHECK(0 == madvise(address, length, MADV_FREE));
+ #else
+   // We have experimented with other flags, but with suboptimal results.
+   //
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.cc b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.cc
index 06b2673b..22f583a2 100644
--- a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.cc
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.cc
@@ -1,12 +1,15 @@
---- base/allocator/partition_allocator/partition_alloc.cc.orig	2021-01-18 21:28:44 UTC
+--- base/allocator/partition_allocator/partition_alloc.cc.orig	2021-03-12 23:57:15 UTC
 +++ base/allocator/partition_allocator/partition_alloc.cc
-@@ -65,6 +65,9 @@ void PartitionAllocGlobalInit(OomFunction on_out_of_me
+@@ -56,7 +56,12 @@ void PartitionAllocGlobalInit(OomFunction on_out_of_me
+       "maximum direct mapped allocation");
+ 
    // Check that some of our zanier calculations worked out as expected.
- #if ENABLE_TAG_FOR_MTE_CHECKED_PTR
-   static_assert(kSmallestBucket >= kAlignment, "generic smallest bucket");
-+#elif defined(__i386__) && defined(OS_FREEBSD)
++#if defined(__i386__) && defined(OS_FREEBSD)
 +  // alignof(std::max_align_t) is only 4 on FreeBSD/i386
 +  static_assert(kSmallestBucket >= kAlignment, "generic smallest bucket");
- #else
++#else
    static_assert(kSmallestBucket == kAlignment, "generic smallest bucket");
- #endif
++#endif
+   static_assert(kMaxBucketed == 983040, "generic max bucketed");
+   STATIC_ASSERT_OR_PA_CHECK(
+       MaxSystemPagesPerSlotSpan() < (1 << 8),
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__unittest.cc b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__unittest.cc
index 4b234571..56007319 100644
--- a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__unittest.cc
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__unittest.cc
@@ -1,26 +1,20 @@
---- base/allocator/partition_allocator/partition_alloc_unittest.cc.orig	2021-01-18 21:28:44 UTC
+--- base/allocator/partition_allocator/partition_alloc_unittest.cc.orig	2021-03-12 23:57:15 UTC
 +++ base/allocator/partition_allocator/partition_alloc_unittest.cc
-@@ -366,9 +366,13 @@ void FreeFullSlotSpan(PartitionRoot<base::internal::Th
-   }
- }
+@@ -1588,7 +1588,7 @@ TEST_F(PartitionAllocTest, LostFreeSlotSpansBug) {
+ // cause flake.
+ #if !defined(OS_WIN) &&            \
+     (!defined(ARCH_CPU_64_BITS) || \
+-     (defined(OS_POSIX) && !(defined(OS_APPLE) || defined(OS_ANDROID))))
++     (defined(OS_POSIX) && !(defined(OS_APPLE) || defined(OS_ANDROID) || defined(OS_BSD))))
  
--#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
- bool CheckPageInCore(void* ptr, bool in_core) {
-+#if defined(OS_BSD)
-+  char ret = 0;
-+#else
-   unsigned char ret = 0;
-+#endif
-   EXPECT_EQ(0, mincore(ptr, SystemPageSize(), &ret));
-   return in_core == (ret & 1);
+ // The following four tests wrap a called function in an expect death statement
+ // to perform their test, because they are non-hermetic. Specifically they are
+@@ -1634,7 +1634,7 @@ TEST_F(PartitionAllocDeathTest, RepeatedTryReallocRetu
  }
-@@ -377,7 +381,7 @@ bool CheckPageInCore(void* ptr, bool in_core) {
-   EXPECT_TRUE(CheckPageInCore(ptr, in_core))
- #else
- #define CHECK_PAGE_IN_CORE(ptr, in_core) (void)(0)
--#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
  
- class MockPartitionStatsDumper : public PartitionStatsDumper {
-  public:
+ #endif  // !defined(ARCH_CPU_64_BITS) || (defined(OS_POSIX) &&
+-        // !(defined(OS_APPLE) || defined(OS_ANDROID)))
++        // !(defined(OS_APPLE) || defined(OS_ANDROID) || defined(OS_BSD)))
+ 
+ // Make sure that malloc(-1) dies.
+ // In the past, we had an integer overflow that would alias malloc(-1) to
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__bucket.cc b/www/chromium/files/patch-base_allocator_partition__allocator_partition__bucket.cc
new file mode 100644
index 00000000..fb0dfd2b
--- /dev/null
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__bucket.cc
@@ -0,0 +1,36 @@
+--- base/allocator/partition_allocator/partition_bucket.cc.orig	2021-03-23 17:09:47 UTC
++++ base/allocator/partition_allocator/partition_bucket.cc
+@@ -66,27 +66,33 @@ PartitionDirectMap(PartitionRoot<thread_safe>* root, i
+   metadata->extent.root = root;
+   // The new structures are all located inside a fresh system page so they
+   // will all be zeroed out. These DCHECKs are for documentation.
++#if !defined(OS_FREEBSD)
+   PA_DCHECK(!metadata->extent.super_page_base);
+   PA_DCHECK(!metadata->extent.super_pages_end);
+   PA_DCHECK(!metadata->extent.next);
++#endif
+   PA_DCHECK(PartitionPage<thread_safe>::FromPointerNoAlignmentCheck(slot) ==
+             &metadata->page);
+ 
+   auto* page = &metadata->page;
++#if !defined(OS_FREEBSD)
+   PA_DCHECK(!page->slot_span_metadata_offset);
+   PA_DCHECK(!page->slot_span_metadata.next_slot_span);
+   PA_DCHECK(!page->slot_span_metadata.num_allocated_slots);
+   PA_DCHECK(!page->slot_span_metadata.num_unprovisioned_slots);
+   PA_DCHECK(!page->slot_span_metadata.empty_cache_index);
++#endif
+   page->slot_span_metadata.bucket = &metadata->bucket;
+   auto* next_entry = new (slot) PartitionFreelistEntry();
+   page->slot_span_metadata.SetFreelistHead(next_entry);
+ 
++#if !defined(OS_FREEBSD)
+   PA_DCHECK(!metadata->bucket.active_slot_spans_head);
+   PA_DCHECK(!metadata->bucket.empty_slot_spans_head);
+   PA_DCHECK(!metadata->bucket.decommitted_slot_spans_head);
+   PA_DCHECK(!metadata->bucket.num_system_pages_per_slot_span);
+   PA_DCHECK(!metadata->bucket.num_full_slot_spans);
++#endif
+   metadata->bucket.slot_size = slot_size;
+ 
+   auto* map_extent = &metadata->direct_map_extent;
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
new file mode 100644
index 00000000..2f293398
--- /dev/null
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_spinning__mutex.cc
@@ -0,0 +1,49 @@
+--- base/allocator/partition_allocator/spinning_mutex.cc.orig	2021-03-12 23:57:15 UTC
++++ base/allocator/partition_allocator/spinning_mutex.cc
+@@ -16,9 +16,16 @@
+ #include <unistd.h>
+ #endif  // defined(PA_HAS_LINUX_KERNEL)
+ 
++#if defined(PA_HAS_FREEBSD_KERNEL)
++#include <errno.h>
++#include <sys/types.h>
++#include <sys/thr.h>
++#include <sys/umtx.h>
++#endif // defined(PA_HAS_FREEBSD_KERNEL)
++
+ namespace base {
+ namespace internal {
+-#if defined(PA_HAS_LINUX_KERNEL)
++#if defined(PA_HAS_LINUX_KERNEL) || defined(PA_HAS_FREEBSD_KERNEL)
+ 
+ void SpinningMutex::FutexWait() {
+   // Save and restore errno.
+@@ -42,8 +49,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.
++#if defined(PA_HAS_LINUX_KERNEL)
+   int err = syscall(SYS_futex, &state_, FUTEX_WAIT | FUTEX_PRIVATE_FLAG,
+                     kLockedContended, nullptr, nullptr, 0);
++#elif defined(PA_HAS_FREEBSD_KERNEL)
++  int err = _umtx_op(&state_, UMTX_OP_WAIT_UINT_PRIVATE,
++		     kLockedContended, nullptr, nullptr);
++#endif
+ 
+   if (err) {
+     // These are programming error, check them.
+@@ -55,8 +67,14 @@ void SpinningMutex::FutexWait() {
+ 
+ void SpinningMutex::FutexWake() {
+   int saved_errno = errno;
++#if defined(PA_HAS_LINUX_KERNEL)
+   long retval = syscall(SYS_futex, &state_, FUTEX_WAKE | FUTEX_PRIVATE_FLAG,
+                         1 /* wake up a single waiter */, nullptr, nullptr, 0);
++#elif defined(PA_HAS_FREEBSD_KERNEL)
++  long retval = _umtx_op(&state_, UMTX_OP_WAKE_PRIVATE,
++                         1 /* wake up a single waiter */, nullptr, nullptr);
++#endif
++		      
+   PA_CHECK(retval != -1);
+   errno = saved_errno;
+ }
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_spinning__mutex.h b/www/chromium/files/patch-base_allocator_partition__allocator_spinning__mutex.h
new file mode 100644
index 00000000..344913dd
--- /dev/null
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_spinning__mutex.h
@@ -0,0 +1,33 @@
+--- base/allocator/partition_allocator/spinning_mutex.h.orig	2021-03-12 23:57:15 UTC
++++ base/allocator/partition_allocator/spinning_mutex.h
+@@ -22,7 +22,11 @@
+ #define PA_HAS_LINUX_KERNEL
+ #endif
+ 
+-#if defined(PA_HAS_LINUX_KERNEL) || defined(OS_WIN)
++#if defined(OS_FREEBSD)
++#define PA_HAS_FREEBSD_KERNEL
++#endif
++
++#if defined(PA_HAS_LINUX_KERNEL) || defined(PA_HAS_FREEBSD_KERNEL) || defined(OS_WIN)
+ #define PA_HAS_SPINNING_MUTEX
+ #endif
+ 
+@@ -66,7 +70,7 @@ class LOCKABLE BASE_EXPORT SpinningMutex {
+   // as the slow path has better characteristics than SpinLocks's.
+   static constexpr int kSpinCount = 1000;
+ 
+-#if defined(PA_HAS_LINUX_KERNEL)
++#if defined(PA_HAS_LINUX_KERNEL) || defined(PA_HAS_FREEBSD_KERNEL)
+   void FutexWait();
+   void FutexWake();
+ 
+@@ -111,7 +115,7 @@ ALWAYS_INLINE void SpinningMutex::Acquire() {
+ 
+ inline constexpr SpinningMutex::SpinningMutex() = default;
+ 
+-#if defined(PA_HAS_LINUX_KERNEL)
++#if defined(PA_HAS_LINUX_KERNEL) || defined(PA_HAS_FREEBSD_KERNEL)
+ 
+ ALWAYS_INLINE bool SpinningMutex::Try() {
+   int expected = kUnlocked;
diff --git a/www/chromium/files/patch-base_base__switches.cc b/www/chromium/files/patch-base_base__switches.cc
index 629e1c6e..7f700892 100644
--- a/www/chromium/files/patch-base_base__switches.cc
+++ b/www/chromium/files/patch-base_base__switches.cc
@@ -1,15 +1,17 @@
---- base/base_switches.cc.orig	2020-11-13 06:36:34 UTC
+--- base/base_switches.cc.orig	2021-03-12 23:57:15 UTC
 +++ base/base_switches.cc
-@@ -117,7 +117,7 @@ const char kDisableHighResTimer[] = "disable-highres-t
- const char kDisableUsbKeyboardDetect[]      = "disable-usb-keyboard-detect";
- #endif
+@@ -120,8 +120,8 @@ const char kDisableUsbKeyboardDetect[]      = "disable
  
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !BUILDFLAG(IS_LACROS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS) && !BUILDFLAG(IS_LACROS)) || defined(OS_BSD)
+ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // of lacros-chrome is complete.
+-#if defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_ASH) && \
+-    !BUILDFLAG(IS_CHROMEOS_LACROS)
++#if defined(OS_BSD) || (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_ASH) && \
++    !BUILDFLAG(IS_CHROMEOS_LACROS))
  // The /dev/shm partition is too small in certain VM environments, causing
  // Chrome to fail or crash (see http://crbug.com/715363). Use this flag to
  // work-around this issue (a temporary directory will always be used to create
-@@ -152,7 +152,7 @@ const char kForceFieldTrialParams[] = "force-fieldtria
+@@ -156,7 +156,7 @@ const char kForceFieldTrialParams[] = "force-fieldtria
  
  #endif
  
diff --git a/www/chromium/files/patch-base_base__switches.h b/www/chromium/files/patch-base_base__switches.h
index e251bbeb..c3627665 100644
--- a/www/chromium/files/patch-base_base__switches.h
+++ b/www/chromium/files/patch-base_base__switches.h
@@ -1,15 +1,17 @@
---- base/base_switches.h.orig	2020-11-13 06:36:34 UTC
+--- base/base_switches.h.orig	2021-03-12 23:57:15 UTC
 +++ base/base_switches.h
-@@ -39,7 +39,7 @@ extern const char kDisableHighResTimer[];
- extern const char kDisableUsbKeyboardDetect[];
- #endif
+@@ -41,8 +41,8 @@ extern const char kDisableUsbKeyboardDetect[];
  
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !BUILDFLAG(IS_LACROS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS) && !BUILDFLAG(IS_LACROS)) || defined(OS_BSD)
+ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // of lacros-chrome is complete.
+-#if defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_ASH) && \
+-    !BUILDFLAG(IS_CHROMEOS_LACROS)
++#if defined(OS_BSD) || (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_ASH) && \
++    !BUILDFLAG(IS_CHROMEOS_LACROS))
  extern const char kDisableDevShmUsage[];
  #endif
  
-@@ -55,7 +55,7 @@ extern const char kEnableIdleTracing[];
+@@ -58,7 +58,7 @@ extern const char kEnableIdleTracing[];
  extern const char kForceFieldTrialParams[];
  #endif
  
diff --git a/www/chromium/files/patch-base_cpu.cc b/www/chromium/files/patch-base_cpu.cc
index 747ffeee..c1e85a57 100644
--- a/www/chromium/files/patch-base_cpu.cc
+++ b/www/chromium/files/patch-base_cpu.cc
@@ -1,4 +1,4 @@
---- base/cpu.cc.orig	2021-01-18 21:28:44 UTC
+--- base/cpu.cc.orig	2021-03-12 23:57:15 UTC
 +++ base/cpu.cc
 @@ -16,7 +16,7 @@
  
@@ -9,9 +9,9 @@
      defined(OS_AIX)
  #include "base/containers/flat_set.h"
  #include "base/files/file_util.h"
-@@ -182,6 +182,14 @@ std::string* CpuInfoBrand() {
+@@ -212,6 +212,14 @@ const ProcCpuInfo& ParseProcCpu() {
  
-   return brand;
+   return *info;
  }
 +#elif defined(OS_BSD)
 +std::string* CpuInfoBrand() {
@@ -24,12 +24,12 @@
  #endif  // defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) ||
          // defined(OS_LINUX) || defined(OS_CHROMEOS))
  
-@@ -305,7 +313,7 @@ void CPU::Initialize() {
-     }
-   }
- #elif defined(ARCH_CPU_ARM_FAMILY)
--#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
-   cpu_brand_ = *CpuInfoBrand();
+@@ -348,6 +356,8 @@ void CPU::Initialize() {
+   has_bti_ = hwcap2 & HWCAP2_BTI;
+ #endif
+ 
++#elif defined(OS_BSD)
++  cpu_brand_ = *CpuInfoBrand();
  #elif defined(OS_WIN)
    // Windows makes high-resolution thread timing information available in
+   // user-space.
diff --git a/www/chromium/files/patch-base_cpu.h b/www/chromium/files/patch-base_cpu.h
index 76db98bf..3a2ac0b7 100644
--- a/www/chromium/files/patch-base_cpu.h
+++ b/www/chromium/files/patch-base_cpu.h
@@ -1,6 +1,6 @@
---- base/cpu.h.orig	2020-11-16 17:24:49 UTC
+--- base/cpu.h.orig	2021-03-12 23:57:15 UTC
 +++ base/cpu.h
-@@ -73,7 +73,7 @@ class BASE_EXPORT CPU final {
+@@ -84,7 +84,7 @@ class BASE_EXPORT CPU final {
    IntelMicroArchitecture GetIntelMicroArchitecture() const;
    const std::string& cpu_brand() const { return cpu_brand_; }
  
@@ -9,7 +9,7 @@
      defined(OS_AIX)
    enum class CoreType {
      kUnknown = 0,
-@@ -124,7 +124,7 @@ class BASE_EXPORT CPU final {
+@@ -135,7 +135,7 @@ class BASE_EXPORT CPU final {
    // cpuidle driver.
    using CoreIdleTimes = std::vector<TimeDelta>;
    static bool GetCumulativeCoreIdleTimes(CoreIdleTimes&);
diff --git a/www/chromium/files/patch-base_debug_debugger__posix.cc b/www/chromium/files/patch-base_debug_debugger__posix.cc
index 56b47676..e2dd3991 100644
--- a/www/chromium/files/patch-base_debug_debugger__posix.cc
+++ b/www/chromium/files/patch-base_debug_debugger__posix.cc
@@ -1,4 +1,4 @@
---- base/debug/debugger_posix.cc.orig	2020-11-13 06:36:34 UTC
+--- base/debug/debugger_posix.cc.orig	2021-03-12 23:57:15 UTC
 +++ base/debug/debugger_posix.cc
 @@ -98,7 +98,7 @@ bool BeingDebugged() {
      KERN_PROC,
diff --git a/www/chromium/files/patch-base_debug_elf__reader.cc b/www/chromium/files/patch-base_debug_elf__reader.cc
index b89af4f1..aa96ca6b 100644
--- a/www/chromium/files/patch-base_debug_elf__reader.cc
+++ b/www/chromium/files/patch-base_debug_elf__reader.cc
@@ -1,4 +1,4 @@
---- base/debug/elf_reader.cc.orig	2020-11-13 06:36:34 UTC
+--- base/debug/elf_reader.cc.orig	2021-03-12 23:57:15 UTC
 +++ base/debug/elf_reader.cc
 @@ -38,7 +38,9 @@ using Nhdr = Elf64_Nhdr;
  using Word = Elf64_Word;
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 71602a3c..5f4e50d8 100644
--- a/www/chromium/files/patch-base_debug_proc__maps__linux.cc
+++ b/www/chromium/files/patch-base_debug_proc__maps__linux.cc
@@ -1,6 +1,6 @@
---- base/debug/proc_maps_linux.cc.orig	2020-11-13 06:36:34 UTC
+--- base/debug/proc_maps_linux.cc.orig	2021-03-12 23:57:15 UTC
 +++ base/debug/proc_maps_linux.cc
-@@ -13,7 +13,7 @@
+@@ -13,13 +13,18 @@
  #include "base/strings/string_split.h"
  #include "build/build_config.h"
  
@@ -9,7 +9,6 @@
  #include <inttypes.h>
  #endif
  
-@@ -29,6 +29,11 @@
  namespace base {
  namespace debug {
  
@@ -21,7 +20,7 @@
  // Scans |proc_maps| starting from |pos| returning true if the gate VMA was
  // found, otherwise returns false.
  static bool ContainsGateVMA(std::string* proc_maps, size_t pos) {
-@@ -44,15 +49,16 @@ static bool ContainsGateVMA(std::string* proc_maps, si
+@@ -35,15 +40,16 @@ static bool ContainsGateVMA(std::string* proc_maps, si
    return false;
  #endif
  }
@@ -40,7 +39,7 @@
      return false;
    }
    proc_maps->clear();
-@@ -66,7 +72,7 @@ bool ReadProcMaps(std::string* proc_maps) {
+@@ -57,7 +63,7 @@ bool ReadProcMaps(std::string* proc_maps) {
  
      ssize_t bytes_read = HANDLE_EINTR(read(fd.get(), buffer, kReadSize));
      if (bytes_read < 0) {
@@ -49,7 +48,7 @@
        proc_maps->clear();
        return false;
      }
-@@ -77,6 +83,7 @@ bool ReadProcMaps(std::string* proc_maps) {
+@@ -68,6 +74,7 @@ bool ReadProcMaps(std::string* proc_maps) {
      if (bytes_read == 0)
        break;
  
@@ -57,7 +56,7 @@
      // The gate VMA is handled as a special case after seq_file has finished
      // iterating through all entries in the virtual memory table.
      //
-@@ -87,6 +94,7 @@ bool ReadProcMaps(std::string* proc_maps) {
+@@ -78,6 +85,7 @@ bool ReadProcMaps(std::string* proc_maps) {
      // Avoid this by searching for the gate VMA and breaking early.
      if (ContainsGateVMA(proc_maps, pos))
        break;
@@ -65,17 +64,18 @@
    }
  
    return true;
-@@ -115,10 +123,32 @@ bool ParseProcMaps(const std::string& input,
+@@ -105,11 +113,32 @@ bool ParseProcMaps(const std::string& input,
+ 
      MappedMemoryRegion region;
      const char* line = lines[i].c_str();
-     char permissions[5] = {'\0'};  // Ensure NUL-terminated string.
+-    char permissions[5] = {'\0'};  // Ensure NUL-terminated string.
++    char permissions[6] = {'\0'};  // Ensure NUL-terminated string.
 +    int path_index = 0;
 +
 +#if defined(OS_BSD)
 +    if (lines[i].empty())
 +      continue;
 +
-+
 +    char cow;
 +
 +    // Format:
@@ -83,7 +83,7 @@
 +    // start    end      resident private_resident obj                perms ref_count shadow_count flags  cow needs_copy type  fullpath cred ruid
 +    // 0x200000 0x202000 2        6                0xfffff80005be9000 r--   3         1            0x1000 COW NC         vnode /bin/cat NCH  -1
 +    //
-+    if (sscanf(line, "%" SCNxPTR " %" SCNxPTR " %*ld %*ld %*llx %3c %*d %*d %*x %c%*s %*s %*s %n",
++    if (sscanf(line, "%" SCNxPTR " %" SCNxPTR " %*ld %*ld %*[^ ] %5[^ ] %*d %*d %*x %c%*s %*s %*s %n",
 +	       &region.start, &region.end, permissions, &cow, &path_index) < 4) {
 +      DPLOG(WARNING) << "sscanf failed for line: " << line;
 +      return false;
@@ -99,7 +99,7 @@
  
      // Sample format from man 5 proc:
      //
-@@ -134,6 +164,7 @@ bool ParseProcMaps(const std::string& input,
+@@ -125,6 +154,7 @@ bool ParseProcMaps(const std::string& input,
        DPLOG(WARNING) << "sscanf failed for line: " << line;
        return false;
      }
@@ -107,7 +107,7 @@
  
      region.permissions = 0;
  
-@@ -152,14 +183,31 @@ bool ParseProcMaps(const std::string& input,
+@@ -143,14 +173,31 @@ bool ParseProcMaps(const std::string& input,
      else if (permissions[2] != '-')
        return false;
  
diff --git a/www/chromium/files/patch-base_debug_stack__trace.cc b/www/chromium/files/patch-base_debug_stack__trace.cc
index 39376795..f1f952c8 100644
--- a/www/chromium/files/patch-base_debug_stack__trace.cc
+++ b/www/chromium/files/patch-base_debug_stack__trace.cc
@@ -1,4 +1,4 @@
---- base/debug/stack_trace.cc.orig	2020-11-13 06:36:34 UTC
+--- base/debug/stack_trace.cc.orig	2021-03-12 23:57:15 UTC
 +++ base/debug/stack_trace.cc
 @@ -15,7 +15,7 @@
  
diff --git a/www/chromium/files/patch-base_debug_stack__trace.h b/www/chromium/files/patch-base_debug_stack__trace.h
index 49002414..00dd078e 100644
--- a/www/chromium/files/patch-base_debug_stack__trace.h
+++ b/www/chromium/files/patch-base_debug_stack__trace.h
@@ -1,4 +1,4 @@
---- base/debug/stack_trace.h.orig	2020-11-13 06:36:34 UTC
+--- base/debug/stack_trace.h.orig	2021-03-12 23:57:15 UTC
 +++ base/debug/stack_trace.h
 @@ -19,6 +19,7 @@
  #if !defined(OS_NACL)
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 962c7386..3522bc09 100644
--- a/www/chromium/files/patch-base_debug_stack__trace__posix.cc
+++ b/www/chromium/files/patch-base_debug_stack__trace__posix.cc
@@ -1,4 +1,4 @@
---- base/debug/stack_trace_posix.cc.orig	2021-01-18 21:28:44 UTC
+--- base/debug/stack_trace_posix.cc.orig	2021-03-12 23:57:15 UTC
 +++ base/debug/stack_trace_posix.cc
 @@ -35,7 +35,7 @@
  #include <AvailabilityMacros.h>
@@ -9,7 +9,29 @@
  #include "base/debug/proc_maps_linux.h"
  #endif
  
-@@ -696,7 +696,11 @@ class SandboxSymbolizeHelper {
+@@ -659,13 +659,21 @@ class SandboxSymbolizeHelper {
+     // Reads /proc/self/maps.
+     std::string contents;
+     if (!ReadProcMaps(&contents)) {
++#if defined(OS_BSD)
++      LOG(ERROR) << "Failed to read /proc/curproc/map";
++#else
+       LOG(ERROR) << "Failed to read /proc/self/maps";
++#endif
+       return false;
+     }
+ 
+     // Parses /proc/self/maps.
+     if (!ParseProcMaps(contents, &regions_)) {
++#if defined(OS_BSD)
++      LOG(ERROR) << "Failed to parse the contents of /proc/curproc/map";
++#else
+       LOG(ERROR) << "Failed to parse the contents of /proc/self/maps";
++#endif
+       return false;
+     }
+ 
+@@ -696,7 +704,11 @@ class SandboxSymbolizeHelper {
            // Skip regions with empty file names.
            continue;
          }
diff --git a/www/chromium/files/patch-base_debug_stack__trace__unittest.cc b/www/chromium/files/patch-base_debug_stack__trace__unittest.cc
index bdbdb57f..908692ed 100644
--- a/www/chromium/files/patch-base_debug_stack__trace__unittest.cc
+++ b/www/chromium/files/patch-base_debug_stack__trace__unittest.cc
@@ -1,4 +1,4 @@
---- base/debug/stack_trace_unittest.cc.orig	2020-11-13 06:36:34 UTC
+--- base/debug/stack_trace_unittest.cc.orig	2021-03-12 23:57:15 UTC
 +++ base/debug/stack_trace_unittest.cc
 @@ -88,6 +88,7 @@ TEST_F(StackTraceTest, OutputToStream) {
              std::string::npos)
@@ -29,3 +29,12 @@
  
  // The test is used for manual testing, e.g., to see the raw output.
  TEST_F(StackTraceTest, DebugOutputToStream) {
+@@ -361,7 +363,7 @@ TEST_F(StackTraceTest, MAYBE_TraceStackFramePointers) 
+ // sometimes we read fp / pc from the place that previously held
+ // uninitialized value.
+ // TODO(crbug.com/1132511): Enable this test on Fuchsia.
+-#if defined(MEMORY_SANITIZER) || defined(OS_FUCHSIA)
++#if defined(MEMORY_SANITIZER) || defined(OS_FUCHSIA) || defined(OS_BSD)
+ #define MAYBE_TraceStackFramePointersFromBuffer \
+   DISABLED_TraceStackFramePointersFromBuffer
+ #else
diff --git a/www/chromium/files/patch-base_files_file__path__unittest.cc b/www/chromium/files/patch-base_files_file__path__unittest.cc
index ca4d131d..ff04f093 100644
--- a/www/chromium/files/patch-base_files_file__path__unittest.cc
+++ b/www/chromium/files/patch-base_files_file__path__unittest.cc
@@ -1,4 +1,4 @@
---- base/files/file_path_unittest.cc.orig	2020-11-13 06:36:34 UTC
+--- base/files/file_path_unittest.cc.orig	2021-03-12 23:57:15 UTC
 +++ base/files/file_path_unittest.cc
 @@ -1149,7 +1149,7 @@ TEST_F(FilePathTest, FromUTF8Unsafe_And_AsUTF8Unsafe) 
        "\xEF\xBC\xA1\xEF\xBC\xA2\xEF\xBC\xA3.txt" },
diff --git a/www/chromium/files/patch-base_files_file__path__watcher__freebsd.cc b/www/chromium/files/patch-base_files_file__path__watcher__freebsd.cc
new file mode 100644
index 00000000..238272c3
--- /dev/null
+++ b/www/chromium/files/patch-base_files_file__path__watcher__freebsd.cc
@@ -0,0 +1,64 @@
+--- base/files/file_path_watcher_freebsd.cc.orig	2021-03-15 11:01:22 UTC
++++ base/files/file_path_watcher_freebsd.cc
+@@ -0,0 +1,61 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++// This file exists for Unix systems which don't have the inotify headers, and
++// thus cannot build file_watcher_inotify.cc
++
++#include <memory>
++
++#include "base/files/file_path_watcher.h"
++#include "base/files/file_path_watcher_kqueue.h"
++
++#include "base/memory/ptr_util.h"
++#include "build/build_config.h"
++
++namespace base {
++
++namespace {
++
++class FilePathWatcherImpl : public FilePathWatcher::PlatformDelegate {
++ public:
++  FilePathWatcherImpl() = default;
++  FilePathWatcherImpl(const FilePathWatcherImpl&) = delete;
++  FilePathWatcherImpl& operator=(const FilePathWatcherImpl&) = delete;
++  ~FilePathWatcherImpl() override = default;
++
++  bool Watch(const FilePath& path,
++             Type type,
++             const FilePathWatcher::Callback& callback) override {
++    DCHECK(!impl_.get());
++
++    if (type == Type::kRecursive) {
++      return false;
++    } else {
++      impl_ = std::make_unique<FilePathWatcherKQueue>();
++    }
++
++    DCHECK(impl_.get());
++
++    return impl_->Watch(path, type, callback);
++  }
++
++  void Cancel() override {
++    if (impl_.get())
++      impl_->Cancel();
++    
++    set_cancelled();
++  }
++
++ private:
++  std::unique_ptr<PlatformDelegate> impl_;
++};
++
++}  // namespace
++
++FilePathWatcher::FilePathWatcher() {
++  sequence_checker_.DetachFromSequence();
++  impl_ = std::make_unique<FilePathWatcherImpl>();
++}
++
++}  // namespace base
diff --git a/www/chromium/files/patch-base_files_file__path__watcher__kqueue.h b/www/chromium/files/patch-base_files_file__path__watcher__kqueue.h
index 94973536..61baa1ec 100644
--- a/www/chromium/files/patch-base_files_file__path__watcher__kqueue.h
+++ b/www/chromium/files/patch-base_files_file__path__watcher__kqueue.h
@@ -1,4 +1,4 @@
---- base/files/file_path_watcher_kqueue.h.orig	2020-11-13 06:36:34 UTC
+--- base/files/file_path_watcher_kqueue.h.orig	2021-03-12 23:57:15 UTC
 +++ base/files/file_path_watcher_kqueue.h
 @@ -5,6 +5,10 @@
  #ifndef BASE_FILES_FILE_PATH_WATCHER_KQUEUE_H_
diff --git a/www/chromium/files/patch-base_files_file__path__watcher__stub.cc b/www/chromium/files/patch-base_files_file__path__watcher__stub.cc
deleted file mode 100644
index c8a9a0b4..00000000
--- a/www/chromium/files/patch-base_files_file__path__watcher__stub.cc
+++ /dev/null
@@ -1,53 +0,0 @@
---- base/files/file_path_watcher_stub.cc.orig	2021-01-18 21:28:44 UTC
-+++ base/files/file_path_watcher_stub.cc
-@@ -1,14 +1,15 @@
--// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Copyright 2014 The Chromium Authors. All rights reserved.
- // Use of this source code is governed by a BSD-style license that can be
- // found in the LICENSE file.
- 
--// This file exists for Unix systems which don't have the inotify headers, and
--// thus cannot build file_watcher_inotify.cc
- 
--#include "base/files/file_path_watcher.h"
-+#include <memory>
- 
-+#include "base/files/file_path_watcher.h"
-+#include "base/files/file_path_watcher_kqueue.h"
- #include "base/macros.h"
- #include "base/memory/ptr_util.h"
-+#include "build/build_config.h"
- 
- namespace base {
- 
-@@ -22,12 +23,29 @@ class FilePathWatcherImpl : public FilePathWatcher::Pl
-   bool Watch(const FilePath& path,
-              Type type,
-              const FilePathWatcher::Callback& callback) override {
-+#if defined(OS_BSD)
-+    DCHECK(!impl_.get());
-+    if (type == Type::kRecursive) {
-+      return false;
-+    } else {
-+      impl_ = std::make_unique<FilePathWatcherKQueue>();
-+    }
-+    DCHECK(impl_.get());
-+    return impl_->Watch(path, type, callback);
-+#else
-     return false;
-+#endif
-   }
- 
--  void Cancel() override {}
-+  void Cancel() override {
-+    if (impl_.get())
-+      impl_->Cancel();
-+    set_cancelled();
-+  }
- 
-  private:
-+  std::unique_ptr<PlatformDelegate> impl_;
-+
-   DISALLOW_COPY_AND_ASSIGN(FilePathWatcherImpl);
- };
- 
diff --git a/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc b/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc
index 0bf19b3d..0de14fe2 100644
--- a/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc
+++ b/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc
@@ -1,6 +1,6 @@
---- base/files/file_path_watcher_unittest.cc.orig	2021-01-18 21:28:44 UTC
+--- base/files/file_path_watcher_unittest.cc.orig	2021-03-12 23:57:15 UTC
 +++ base/files/file_path_watcher_unittest.cc
-@@ -438,12 +438,12 @@ TEST_F(FilePathWatcherTest, WatchDirectory) {
+@@ -444,12 +444,12 @@ TEST_F(FilePathWatcherTest, WatchDirectory) {
    VLOG(1) << "Waiting for file1 creation";
    ASSERT_TRUE(WaitForEvents());
  
@@ -15,16 +15,7 @@
  
    ASSERT_TRUE(base::DeleteFile(file1));
    VLOG(1) << "Waiting for file1 deletion";
-@@ -650,7 +650,7 @@ TEST_F(FilePathWatcherTest, FileAttributesChanged) {
-   ASSERT_TRUE(WaitForEvents());
- }
- 
--#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
- 
- // Verify that creating a symlink is caught.
- TEST_F(FilePathWatcherTest, CreateLink) {
-@@ -816,7 +816,7 @@ TEST_F(FilePathWatcherTest, LinkedDirectoryPart3) {
+@@ -822,7 +822,7 @@ TEST_F(FilePathWatcherTest, LinkedDirectoryPart3) {
    ASSERT_TRUE(WaitForEvents());
  }
  
@@ -33,7 +24,7 @@
  
  enum Permission {
    Read,
-@@ -824,7 +824,7 @@ enum Permission {
+@@ -830,7 +830,7 @@ enum Permission {
    Execute
  };
  
@@ -42,7 +33,7 @@
  bool ChangeFilePermissions(const FilePath& path, Permission perm, bool allow) {
    struct stat stat_buf;
  
-@@ -853,9 +853,9 @@ bool ChangeFilePermissions(const FilePath& path, Permi
+@@ -859,9 +859,9 @@ bool ChangeFilePermissions(const FilePath& path, Permi
    }
    return chmod(path.value().c_str(), stat_buf.st_mode) == 0;
  }
@@ -54,7 +45,7 @@
  // Linux implementation of FilePathWatcher doesn't catch attribute changes.
  // http://crbug.com/78043
  // Windows implementation of FilePathWatcher catches attribute changes that
-@@ -891,7 +891,7 @@ TEST_F(FilePathWatcherTest, DirAttributesChanged) {
+@@ -897,7 +897,7 @@ TEST_F(FilePathWatcherTest, DirAttributesChanged) {
    ASSERT_TRUE(ChangeFilePermissions(test_dir1, Execute, true));
  }
  
diff --git a/www/chromium/files/patch-base_files_file__util.h b/www/chromium/files/patch-base_files_file__util.h
index 9d65358e..ff39cb30 100644
--- a/www/chromium/files/patch-base_files_file__util.h
+++ b/www/chromium/files/patch-base_files_file__util.h
@@ -1,6 +1,6 @@
---- base/files/file_util.h.orig	2021-01-18 21:28:44 UTC
+--- base/files/file_util.h.orig	2021-03-12 23:57:15 UTC
 +++ base/files/file_util.h
-@@ -278,14 +278,14 @@ BASE_EXPORT bool SetPosixFilePermissions(const FilePat
+@@ -284,14 +284,14 @@ BASE_EXPORT bool SetPosixFilePermissions(const FilePat
  BASE_EXPORT bool ExecutableExistsInPath(Environment* env,
                                          const FilePath::StringType& executable);
  
@@ -17,7 +17,7 @@
  
  #endif  // OS_POSIX
  
-@@ -597,7 +597,7 @@ BASE_EXPORT bool VerifyPathControlledByAdmin(const bas
+@@ -603,7 +603,7 @@ BASE_EXPORT bool VerifyPathControlledByAdmin(const bas
  // the directory |path|, in the number of FilePath::CharType, or -1 on failure.
  BASE_EXPORT int GetMaximumPathComponentLength(const base::FilePath& path);
  
diff --git a/www/chromium/files/patch-base_files_file__util__posix.cc b/www/chromium/files/patch-base_files_file__util__posix.cc
index 53e25ed5..d906280b 100644
--- a/www/chromium/files/patch-base_files_file__util__posix.cc
+++ b/www/chromium/files/patch-base_files_file__util__posix.cc
@@ -1,6 +1,6 @@
---- base/files/file_util_posix.cc.orig	2021-01-18 21:28:44 UTC
+--- base/files/file_util_posix.cc.orig	2021-03-12 23:57:15 UTC
 +++ base/files/file_util_posix.cc
-@@ -406,7 +406,7 @@ bool CreatePipe(ScopedFD* read_fd, ScopedFD* write_fd,
+@@ -380,7 +380,7 @@ bool CreatePipe(ScopedFD* read_fd, ScopedFD* write_fd,
  }
  
  bool CreateLocalNonBlockingPipe(int fds[2]) {
@@ -9,7 +9,7 @@
    return pipe2(fds, O_CLOEXEC | O_NONBLOCK) == 0;
  #else
    int raw_fds[2];
-@@ -953,8 +953,12 @@ bool AllocateFileRegion(File* file, int64_t offset, si
+@@ -927,8 +927,12 @@ bool AllocateFileRegion(File* file, int64_t offset, si
    // space. It can fail because the filesystem doesn't support it. In that case,
    // use the manual method below.
  
@@ -23,7 +23,25 @@
      return true;
    DPLOG(ERROR) << "fallocate";
  #elif defined(OS_APPLE)
-@@ -1178,7 +1182,7 @@ PrefetchResult PreReadFile(const FilePath& file_path,
+@@ -1098,7 +1102,7 @@ int GetMaximumPathComponentLength(const FilePath& path
+ #if !defined(OS_ANDROID)
+ // This is implemented in file_util_android.cc for that platform.
+ bool GetShmemTempDir(bool executable, FilePath* path) {
+-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX)
++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX) || defined(OS_BSD)
+   bool disable_dev_shm = false;
+ #if !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_CHROMEOS_LACROS)
+   disable_dev_shm = CommandLine::ForCurrentProcess()->HasSwitch(
+@@ -1114,7 +1118,7 @@ bool GetShmemTempDir(bool executable, FilePath* path) 
+     *path = FilePath("/dev/shm");
+     return true;
+   }
+-#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX)
++#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX) || defined(OS_BSD)
+   return GetTempDir(path);
+ }
+ #endif  // !defined(OS_ANDROID)
+@@ -1152,7 +1156,7 @@ PrefetchResult PreReadFile(const FilePath& file_path,
    // posix_fadvise() is only available in the Android NDK in API 21+. Older
    // versions may have the required kernel support, but don't have enough usage
    // to justify backporting.
@@ -32,7 +50,7 @@
      (defined(OS_ANDROID) && __ANDROID_API__ >= 21)
    File file(file_path, File::FLAG_OPEN | File::FLAG_READ);
    if (!file.IsValid())
-@@ -1214,7 +1218,7 @@ PrefetchResult PreReadFile(const FilePath& file_path,
+@@ -1188,7 +1192,7 @@ PrefetchResult PreReadFile(const FilePath& file_path,
    return internal::PreReadFileSlow(file_path, max_bytes)
               ? PrefetchResult{PrefetchResultCode::kSlowSuccess}
               : PrefetchResult{PrefetchResultCode::kSlowFailed};
@@ -41,7 +59,7 @@
          // __ANDROID_API__ >= 21)
  }
  
-@@ -1249,7 +1253,7 @@ bool MoveUnsafe(const FilePath& from_path, const FileP
+@@ -1223,7 +1227,7 @@ bool MoveUnsafe(const FilePath& from_path, const FileP
  
  #endif  // !defined(OS_NACL_NONSFI)
  
@@ -50,7 +68,7 @@
  BASE_EXPORT bool IsPathExecutable(const FilePath& path) {
    bool result = false;
    FilePath tmp_file_path;
-@@ -1270,6 +1274,6 @@ BASE_EXPORT bool IsPathExecutable(const FilePath& path
+@@ -1244,6 +1248,6 @@ BASE_EXPORT bool IsPathExecutable(const FilePath& path
    }
    return result;
  }
diff --git a/www/chromium/files/patch-base_files_file__util__unittest.cc b/www/chromium/files/patch-base_files_file__util__unittest.cc
index 5c955c9a..b9f00381 100644
--- a/www/chromium/files/patch-base_files_file__util__unittest.cc
+++ b/www/chromium/files/patch-base_files_file__util__unittest.cc
@@ -1,4 +1,4 @@
---- base/files/file_util_unittest.cc.orig	2021-01-18 21:28:44 UTC
+--- base/files/file_util_unittest.cc.orig	2021-03-12 23:57:15 UTC
 +++ base/files/file_util_unittest.cc
 @@ -1638,7 +1638,7 @@ TEST_F(FileUtilTest, DeleteDirRecursiveWithOpenFile) {
  #endif
diff --git a/www/chromium/files/patch-base_files_scoped__file.cc b/www/chromium/files/patch-base_files_scoped__file.cc
index 16f73156..b6c65b08 100644
--- a/www/chromium/files/patch-base_files_scoped__file.cc
+++ b/www/chromium/files/patch-base_files_scoped__file.cc
@@ -1,4 +1,4 @@
---- base/files/scoped_file.cc.orig	2020-11-13 06:36:34 UTC
+--- base/files/scoped_file.cc.orig	2021-03-12 23:57:15 UTC
 +++ base/files/scoped_file.cc
 @@ -30,7 +30,7 @@ void ScopedFDCloseTraits::Free(int fd) {
    // a single open directory would bypass the entire security model.
diff --git a/www/chromium/files/patch-base_i18n_icu__util.cc b/www/chromium/files/patch-base_i18n_icu__util.cc
index 1503462f..42e2785b 100644
--- a/www/chromium/files/patch-base_i18n_icu__util.cc
+++ b/www/chromium/files/patch-base_i18n_icu__util.cc
@@ -1,4 +1,4 @@
---- base/i18n/icu_util.cc.orig	2021-01-18 21:28:44 UTC
+--- base/i18n/icu_util.cc.orig	2021-03-12 23:57:15 UTC
 +++ base/i18n/icu_util.cc
 @@ -48,7 +48,7 @@
  #include "third_party/icu/source/common/unicode/unistr.h"
diff --git a/www/chromium/files/patch-base_linux__util.cc b/www/chromium/files/patch-base_linux__util.cc
index 4bbbf448..8be465fb 100644
--- a/www/chromium/files/patch-base_linux__util.cc
+++ b/www/chromium/files/patch-base_linux__util.cc
@@ -1,4 +1,4 @@
---- base/linux_util.cc.orig	2020-11-13 06:36:34 UTC
+--- base/linux_util.cc.orig	2021-03-12 23:57:15 UTC
 +++ base/linux_util.cc
 @@ -15,6 +15,7 @@
  
@@ -8,7 +8,7 @@
  
  #include "base/files/dir_reader_posix.h"
  #include "base/files/file_util.h"
-@@ -78,6 +79,9 @@ class DistroNameGetter {
+@@ -79,6 +80,9 @@ class DistroNameGetter {
   public:
    DistroNameGetter() {
      static const char* const kFilesToCheck[] = {"/etc/os-release",
@@ -18,7 +18,7 @@
                                                  "/usr/lib/os-release"};
      for (const char* file : kFilesToCheck) {
        if (ReadDistroFromOSReleaseFile(file))
-@@ -134,6 +138,9 @@ void SetLinuxDistro(const std::string& distro) {
+@@ -135,6 +139,9 @@ void SetLinuxDistro(const std::string& distro) {
  }
  
  bool GetThreadsForProcess(pid_t pid, std::vector<pid_t>* tids) {
@@ -28,7 +28,7 @@
    // 25 > strlen("/proc//task") + strlen(std::to_string(INT_MAX)) + 1 = 22
    char buf[25];
    strings::SafeSPrintf(buf, "/proc/%d/task", pid);
-@@ -153,6 +160,7 @@ bool GetThreadsForProcess(pid_t pid, std::vector<pid_t
+@@ -154,6 +161,7 @@ bool GetThreadsForProcess(pid_t pid, std::vector<pid_t
    }
  
    return true;
diff --git a/www/chromium/files/patch-base_location__unittest.cc b/www/chromium/files/patch-base_location__unittest.cc
index 72a47936..77e2ed90 100644
--- a/www/chromium/files/patch-base_location__unittest.cc
+++ b/www/chromium/files/patch-base_location__unittest.cc
@@ -1,4 +1,4 @@
---- base/location_unittest.cc.orig	2020-11-13 06:36:34 UTC
+--- base/location_unittest.cc.orig	2021-03-12 23:57:15 UTC
 +++ base/location_unittest.cc
 @@ -32,7 +32,7 @@ TEST(LocationTest, CurrentYieldsCorrectValue) {
    EXPECT_EQ(here.line_number(), previous_line + 1);
diff --git a/www/chromium/files/patch-base_logging__unittest.cc b/www/chromium/files/patch-base_logging__unittest.cc
index d7b25141..37ae1188 100644
--- a/www/chromium/files/patch-base_logging__unittest.cc
+++ b/www/chromium/files/patch-base_logging__unittest.cc
@@ -1,6 +1,6 @@
---- base/logging_unittest.cc.orig	2020-11-13 06:36:34 UTC
+--- base/logging_unittest.cc.orig	2021-03-12 23:57:15 UTC
 +++ base/logging_unittest.cc
-@@ -29,7 +29,7 @@
+@@ -30,7 +30,7 @@
  #include "base/posix/eintr_wrapper.h"
  #endif  // OS_POSIX
  
@@ -9,7 +9,7 @@
  #include <ucontext.h>
  #endif
  
-@@ -559,7 +559,7 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo
+@@ -560,7 +560,7 @@ 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;
diff --git a/www/chromium/files/patch-base_memory_discardable__memory.cc b/www/chromium/files/patch-base_memory_discardable__memory.cc
index 77084937..b656c7de 100644
--- a/www/chromium/files/patch-base_memory_discardable__memory.cc
+++ b/www/chromium/files/patch-base_memory_discardable__memory.cc
@@ -1,4 +1,4 @@
---- base/memory/discardable_memory.cc.orig	2020-11-13 06:36:34 UTC
+--- base/memory/discardable_memory.cc.orig	2021-03-12 23:57:15 UTC
 +++ base/memory/discardable_memory.cc
 @@ -23,7 +23,7 @@ const base::Feature kMadvFreeDiscardableMemory{
      "MadvFreeDiscardableMemory", base::FEATURE_DISABLED_BY_DEFAULT};
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 bf535550..34969800 100644
--- a/www/chromium/files/patch-base_memory_discardable__memory__internal.h
+++ b/www/chromium/files/patch-base_memory_discardable__memory__internal.h
@@ -1,4 +1,4 @@
---- base/memory/discardable_memory_internal.h.orig	2020-11-13 06:36:34 UTC
+--- base/memory/discardable_memory_internal.h.orig	2021-03-12 23:57:15 UTC
 +++ base/memory/discardable_memory_internal.h
 @@ -10,7 +10,7 @@
  #include "base/metrics/field_trial_params.h"
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 82feab1e..a8fad1c5 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,4 +1,4 @@
---- base/memory/madv_free_discardable_memory_posix.cc.orig	2020-11-13 06:36:34 UTC
+--- base/memory/madv_free_discardable_memory_posix.cc.orig	2021-03-12 23:57:15 UTC
 +++ base/memory/madv_free_discardable_memory_posix.cc
 @@ -292,7 +292,7 @@ void MadvFreeDiscardableMemoryPosix::SetKeepMemoryForT
  
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 abcb85a3..20585a18 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,4 +1,4 @@
---- base/memory/platform_shared_memory_region.h.orig	2020-11-13 06:36:34 UTC
+--- base/memory/platform_shared_memory_region.h.orig	2021-03-12 23:57:15 UTC
 +++ base/memory/platform_shared_memory_region.h
 @@ -27,7 +27,7 @@
  #include "base/files/scoped_file.h"
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 0ad1585f..1348b041 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,6 +1,18 @@
---- base/memory/platform_shared_memory_region_posix.cc.orig	2020-11-13 06:36:34 UTC
+--- base/memory/platform_shared_memory_region_posix.cc.orig	2021-03-12 23:57:15 UTC
 +++ base/memory/platform_shared_memory_region_posix.cc
-@@ -70,7 +70,7 @@ FDPair ScopedFDPair::get() const {
+@@ -23,7 +23,11 @@ struct ScopedPathUnlinkerTraits {
+   static const FilePath* InvalidValue() { return nullptr; }
+ 
+   static void Free(const FilePath* path) {
++#if defined(OS_BSD)
++    if (shm_unlink(path->value().c_str()))
++#else
+     if (unlink(path->value().c_str()))
++#endif
+       PLOG(WARNING) << "unlink";
+   }
+ };
+@@ -70,7 +74,7 @@ FDPair ScopedFDPair::get() const {
    return {fd.get(), readonly_fd.get()};
  }
  
@@ -9,7 +21,7 @@
  // static
  ScopedFD PlatformSharedMemoryRegion::ExecutableRegion::CreateFD(size_t size) {
    PlatformSharedMemoryRegion region =
-@@ -79,7 +79,7 @@ ScopedFD PlatformSharedMemoryRegion::ExecutableRegion:
+@@ -79,7 +83,7 @@ ScopedFD PlatformSharedMemoryRegion::ExecutableRegion:
      return region.PassPlatformHandle().fd;
    return ScopedFD();
  }
@@ -18,7 +30,7 @@
  
  // static
  PlatformSharedMemoryRegion PlatformSharedMemoryRegion::Take(
-@@ -204,7 +204,7 @@ bool PlatformSharedMemoryRegion::MapAtInternal(off_t o
+@@ -204,7 +208,7 @@ bool PlatformSharedMemoryRegion::MapAtInternal(off_t o
  // static
  PlatformSharedMemoryRegion PlatformSharedMemoryRegion::Create(Mode mode,
                                                                size_t size
@@ -27,12 +39,62 @@
                                                                ,
                                                                bool executable
  #endif
-@@ -233,7 +233,7 @@ PlatformSharedMemoryRegion PlatformSharedMemoryRegion:
-   // flag.
-   FilePath directory;
-   if (!GetShmemTempDir(
--#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
-           executable,
- #else
-           false /* executable */,
+@@ -242,6 +246,22 @@ PlatformSharedMemoryRegion PlatformSharedMemoryRegion:
+     return {};
+   }
+ 
++#if defined(OS_BSD)
++  UnguessableToken token = UnguessableToken::Create();
++  FilePath path = directory.Append(token.ToString());
++  ScopedFD fd{HANDLE_EINTR(shm_open(path.value().c_str(), O_CREAT | O_RDWR, 0700))};
++  File shm_file(fd.release());
++
++  if (!shm_file.IsValid()) {
++    PLOG(ERROR) << "Creating shared memory failed";
++    return {};
++  }
++
++  if (HANDLE_EINTR(ftruncate(shm_file.GetPlatformFile(), size)) == -1) {
++    PLOG(ERROR) << "Failed to extend shared memory object to size " << size;
++    return {};
++  }
++#else
+   FilePath path;
+   ScopedFD fd = CreateAndOpenFdForTemporaryFileInDir(directory, &path);
+   File shm_file(fd.release());
+@@ -258,6 +278,7 @@ PlatformSharedMemoryRegion PlatformSharedMemoryRegion:
+     }
+     return {};
+   }
++#endif // OS_BSD
+ 
+   // Deleting the file prevents anyone else from mapping it in (making it
+   // private), and prevents the need for cleanup (once the last fd is
+@@ -267,7 +288,11 @@ PlatformSharedMemoryRegion PlatformSharedMemoryRegion:
+   ScopedFD readonly_fd;
+   if (mode == Mode::kWritable) {
+     // Also open as readonly so that we can ConvertToReadOnly().
++#if defined(OS_BSD)
++    readonly_fd.reset(HANDLE_EINTR(shm_open(path.value().c_str(), O_RDONLY, 0400)));
++#else
+     readonly_fd.reset(HANDLE_EINTR(open(path.value().c_str(), O_RDONLY)));
++#endif
+     if (!readonly_fd.is_valid()) {
+       DPLOG(ERROR) << "open(\"" << path.value() << "\", O_RDONLY) failed";
+       return {};
+@@ -298,9 +323,15 @@ PlatformSharedMemoryRegion PlatformSharedMemoryRegion:
+     }
+   }
+ 
++#if defined(OS_BSD)
+   return PlatformSharedMemoryRegion(
+       {ScopedFD(shm_file.TakePlatformFile()), std::move(readonly_fd)}, mode,
++      size, token);
++#else
++  return PlatformSharedMemoryRegion(
++      {ScopedFD(shm_file.TakePlatformFile()), std::move(readonly_fd)}, mode,
+       size, UnguessableToken::Create());
++#endif  // OS_BSD
+ #endif  // !defined(OS_NACL)
+ }
+ 
diff --git a/www/chromium/files/patch-base_memory_shared__memory__region__unittest.cc b/www/chromium/files/patch-base_memory_shared__memory__region__unittest.cc
index 1a73cb13..e7b126ff 100644
--- a/www/chromium/files/patch-base_memory_shared__memory__region__unittest.cc
+++ b/www/chromium/files/patch-base_memory_shared__memory__region__unittest.cc
@@ -1,4 +1,4 @@
---- base/memory/shared_memory_region_unittest.cc.orig	2020-11-13 06:36:34 UTC
+--- base/memory/shared_memory_region_unittest.cc.orig	2021-03-12 23:57:15 UTC
 +++ base/memory/shared_memory_region_unittest.cc
 @@ -188,10 +188,13 @@ TYPED_TEST(SharedMemoryRegionTest, MapAtNotAlignedOffs
    std::tie(region, rw_mapping) = CreateMappedRegion<TypeParam>(kDataSize);
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 a52248fa..6e3de9a1 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,4 +1,4 @@
---- base/message_loop/message_pump_glib.cc.orig	2020-11-20 15:15:51 UTC
+--- base/message_loop/message_pump_glib.cc.orig	2021-03-12 23:57:15 UTC
 +++ base/message_loop/message_pump_glib.cc
 @@ -8,6 +8,11 @@
  #include <glib.h>
diff --git a/www/chromium/files/patch-base_native__library__posix.cc b/www/chromium/files/patch-base_native__library__posix.cc
index a01e7422..d414a8d5 100644
--- a/www/chromium/files/patch-base_native__library__posix.cc
+++ b/www/chromium/files/patch-base_native__library__posix.cc
@@ -1,4 +1,4 @@
---- base/native_library_posix.cc.orig	2020-11-13 06:36:34 UTC
+--- base/native_library_posix.cc.orig	2021-03-12 23:57:15 UTC
 +++ base/native_library_posix.cc
 @@ -29,7 +29,7 @@ NativeLibrary LoadNativeLibraryWithOptions(const FileP
    // http://crbug.com/17943, http://crbug.com/17557, http://crbug.com/36892,
diff --git a/www/chromium/files/patch-base_native__library__unittest.cc b/www/chromium/files/patch-base_native__library__unittest.cc
index 51a1badf..a0e42603 100644
--- a/www/chromium/files/patch-base_native__library__unittest.cc
+++ b/www/chromium/files/patch-base_native__library__unittest.cc
@@ -1,4 +1,4 @@
---- base/native_library_unittest.cc.orig	2020-11-13 06:36:34 UTC
+--- base/native_library_unittest.cc.orig	2021-03-12 23:57:15 UTC
 +++ base/native_library_unittest.cc
 @@ -118,7 +118,7 @@ TEST(NativeLibraryTest, LoadLibrary) {
  // Android dlopen() requires further investigation, as it might vary across
diff --git a/www/chromium/files/patch-base_numerics_safe__math__shared__impl.h b/www/chromium/files/patch-base_numerics_safe__math__shared__impl.h
index c6b968c4..7776c0cc 100644
--- a/www/chromium/files/patch-base_numerics_safe__math__shared__impl.h
+++ b/www/chromium/files/patch-base_numerics_safe__math__shared__impl.h
@@ -1,4 +1,4 @@
---- base/numerics/safe_math_shared_impl.h.orig	2020-11-13 06:36:34 UTC
+--- base/numerics/safe_math_shared_impl.h.orig	2021-03-12 23:57:15 UTC
 +++ base/numerics/safe_math_shared_impl.h
 @@ -24,8 +24,7 @@
  // Where available use builtin math overflow support on Clang and GCC.
diff --git a/www/chromium/files/patch-base_path__service__unittest.cc b/www/chromium/files/patch-base_path__service__unittest.cc
index de693d8b..236be017 100644
--- a/www/chromium/files/patch-base_path__service__unittest.cc
+++ b/www/chromium/files/patch-base_path__service__unittest.cc
@@ -1,4 +1,4 @@
---- base/path_service_unittest.cc.orig	2020-11-13 06:36:34 UTC
+--- base/path_service_unittest.cc.orig	2021-03-12 23:57:15 UTC
 +++ base/path_service_unittest.cc
 @@ -38,7 +38,7 @@ bool ReturnsValidPath(int dir_type) {
    if (dir_type == DIR_CACHE)
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 c18e8b24..64e3f216 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,4 +1,4 @@
---- base/posix/can_lower_nice_to.cc.orig	2020-11-13 06:36:34 UTC
+--- base/posix/can_lower_nice_to.cc.orig	2021-03-12 23:57:15 UTC
 +++ base/posix/can_lower_nice_to.cc
 @@ -31,6 +31,9 @@ bool CanLowerNiceTo(int nice_value) {
    if (geteuid() == 0)
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 ab63f30e..7d944182 100644
--- a/www/chromium/files/patch-base_posix_unix__domain__socket.cc
+++ b/www/chromium/files/patch-base_posix_unix__domain__socket.cc
@@ -1,4 +1,4 @@
---- base/posix/unix_domain_socket.cc.orig	2020-11-13 06:36:34 UTC
+--- base/posix/unix_domain_socket.cc.orig	2021-03-12 23:57:15 UTC
 +++ base/posix/unix_domain_socket.cc
 @@ -5,7 +5,10 @@
  #include "base/posix/unix_domain_socket.h"
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
index 31ec32eb..b3944551 100644
--- a/www/chromium/files/patch-base_posix_unix__domain__socket__unittest.cc
+++ b/www/chromium/files/patch-base_posix_unix__domain__socket__unittest.cc
@@ -1,4 +1,4 @@
---- base/posix/unix_domain_socket_unittest.cc.orig	2020-11-13 06:36:34 UTC
+--- base/posix/unix_domain_socket_unittest.cc.orig	2021-03-12 23:57:15 UTC
 +++ base/posix/unix_domain_socket_unittest.cc
 @@ -8,6 +8,9 @@
  #include <stdint.h>
diff --git a/www/chromium/files/patch-base_process_internal__linux.cc b/www/chromium/files/patch-base_process_internal__linux.cc
index 78ad2a75..f8e0799d 100644
--- a/www/chromium/files/patch-base_process_internal__linux.cc
+++ b/www/chromium/files/patch-base_process_internal__linux.cc
@@ -1,4 +1,4 @@
---- base/process/internal_linux.cc.orig	2020-11-13 06:36:34 UTC
+--- base/process/internal_linux.cc.orig	2021-03-12 23:57:15 UTC
 +++ base/process/internal_linux.cc
 @@ -30,7 +30,11 @@ namespace internal {
  
diff --git a/www/chromium/files/patch-base_process_internal__linux.h b/www/chromium/files/patch-base_process_internal__linux.h
index 94e172d3..b8a5fa68 100644
--- a/www/chromium/files/patch-base_process_internal__linux.h
+++ b/www/chromium/files/patch-base_process_internal__linux.h
@@ -1,4 +1,4 @@
---- base/process/internal_linux.h.orig	2020-11-13 06:36:34 UTC
+--- base/process/internal_linux.h.orig	2021-03-12 23:57:15 UTC
 +++ base/process/internal_linux.h
 @@ -18,6 +18,8 @@
  #include "base/strings/string_number_conversions.h"
diff --git a/www/chromium/files/patch-base_process_kill.h b/www/chromium/files/patch-base_process_kill.h
index 81a2d289..19725868 100644
--- a/www/chromium/files/patch-base_process_kill.h
+++ b/www/chromium/files/patch-base_process_kill.h
@@ -1,4 +1,4 @@
---- base/process/kill.h.orig	2020-11-13 06:36:34 UTC
+--- base/process/kill.h.orig	2021-03-12 23:57:15 UTC
 +++ base/process/kill.h
 @@ -113,11 +113,11 @@ BASE_EXPORT TerminationStatus GetTerminationStatus(Pro
  BASE_EXPORT TerminationStatus GetKnownDeadTerminationStatus(
diff --git a/www/chromium/files/patch-base_process_kill__posix.cc b/www/chromium/files/patch-base_process_kill__posix.cc
index 975a055c..71f59db8 100644
--- a/www/chromium/files/patch-base_process_kill__posix.cc
+++ b/www/chromium/files/patch-base_process_kill__posix.cc
@@ -1,4 +1,4 @@
---- base/process/kill_posix.cc.orig	2020-11-13 06:36:34 UTC
+--- base/process/kill_posix.cc.orig	2021-03-12 23:57:15 UTC
 +++ base/process/kill_posix.cc
 @@ -160,7 +160,7 @@ void EnsureProcessTerminated(Process process) {
        0, new BackgroundReaper(std::move(process), TimeDelta::FromSeconds(2)));
diff --git a/www/chromium/files/patch-base_process_launch.cc b/www/chromium/files/patch-base_process_launch.cc
index 02727cef..3abc9079 100644
--- a/www/chromium/files/patch-base_process_launch.cc
+++ b/www/chromium/files/patch-base_process_launch.cc
@@ -1,4 +1,4 @@
---- base/process/launch.cc.orig	2020-11-13 06:36:34 UTC
+--- base/process/launch.cc.orig	2021-03-12 23:57:15 UTC
 +++ base/process/launch.cc
 @@ -15,7 +15,7 @@ LaunchOptions::~LaunchOptions() = default;
  
diff --git a/www/chromium/files/patch-base_process_launch.h b/www/chromium/files/patch-base_process_launch.h
index 67808bf9..84f42875 100644
--- a/www/chromium/files/patch-base_process_launch.h
+++ b/www/chromium/files/patch-base_process_launch.h
@@ -1,6 +1,6 @@
---- base/process/launch.h.orig	2020-11-13 06:36:34 UTC
+--- base/process/launch.h.orig	2021-03-12 23:57:15 UTC
 +++ base/process/launch.h
-@@ -180,7 +180,7 @@ struct BASE_EXPORT LaunchOptions {
+@@ -182,7 +182,7 @@ struct BASE_EXPORT LaunchOptions {
    bool clear_environment = false;
  #endif  // OS_WIN || OS_POSIX || OS_FUCHSIA
  
@@ -9,7 +9,7 @@
    // 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
-@@ -193,7 +193,7 @@ struct BASE_EXPORT LaunchOptions {
+@@ -195,7 +195,7 @@ struct BASE_EXPORT LaunchOptions {
  
    // Sets parent process death signal to SIGKILL.
    bool kill_on_parent_death = false;
@@ -18,7 +18,7 @@
  
  #if defined(OS_MAC)
    // Mach ports that will be accessible to the child process. These are not
-@@ -408,7 +408,7 @@ BASE_EXPORT void RaiseProcessToHighPriority();
+@@ -410,7 +410,7 @@ BASE_EXPORT void RaiseProcessToHighPriority();
  // binary. This should not be called in production/released code.
  BASE_EXPORT LaunchOptions LaunchOptionsForTest();
  
diff --git a/www/chromium/files/patch-base_process_launch__posix.cc b/www/chromium/files/patch-base_process_launch__posix.cc
index 3fea66d7..b55eb2dd 100644
--- a/www/chromium/files/patch-base_process_launch__posix.cc
+++ b/www/chromium/files/patch-base_process_launch__posix.cc
@@ -1,6 +1,13 @@
---- base/process/launch_posix.cc.orig	2020-11-13 06:36:34 UTC
+--- base/process/launch_posix.cc.orig	2021-03-12 23:57:15 UTC
 +++ base/process/launch_posix.cc
-@@ -65,6 +65,7 @@
+@@ -59,12 +59,14 @@
+ #if defined(OS_FREEBSD)
+ #include <sys/event.h>
+ #include <sys/ucontext.h>
++#include <sys/procctl.h>
+ #endif
+ 
+ #if defined(OS_APPLE)
  #error "macOS should use launch_mac.cc"
  #endif
  
@@ -8,7 +15,7 @@
  extern char** environ;
  
  namespace base {
-@@ -228,6 +229,28 @@ void CloseSuperfluousFds(const base::InjectiveMultimap
+@@ -221,6 +223,28 @@ void CloseSuperfluousFds(const base::InjectiveMultimap
    DirReaderPosix fd_dir(kFDDir);
    if (!fd_dir.IsValid()) {
      // Fallback case: Try every possible fd.
@@ -37,3 +44,37 @@
      for (size_t i = 0; i < max_fds; ++i) {
        const int fd = static_cast<int>(i);
        if (fd == STDIN_FILENO || fd == STDOUT_FILENO || fd == STDERR_FILENO)
+@@ -444,22 +468,32 @@ Process LaunchProcess(const std::vector<std::string>& 
+ 
+     // Set NO_NEW_PRIVS by default. Since NO_NEW_PRIVS only exists in kernel
+     // 3.5+, do not check the return value of prctl here.
+-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX)
++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX) || defined(OS_FREEBSD)
+ #ifndef PR_SET_NO_NEW_PRIVS
+ #define PR_SET_NO_NEW_PRIVS 38
+ #endif
++#if !defined(OS_FREEBSD)
+     if (!options.allow_new_privs) {
+       if (prctl(PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0) && errno != EINVAL) {
+         // Only log if the error is not EINVAL (i.e. not supported).
+         RAW_LOG(FATAL, "prctl(PR_SET_NO_NEW_PRIVS) failed");
+       }
+     }
++#endif
+ 
+     if (options.kill_on_parent_death) {
++#if defined(OS_FREEBSD)
++      int procctl_value = SIGKILL;
++      if (procctl(P_PID, 0, PROC_PDEATHSIG_CTL, &procctl_value)) {
++        RAW_LOG(ERROR, "procctl(PROC_PDEATHSIG_CTL) failed");
++        _exit(127);
++      }
++#else
+       if (prctl(PR_SET_PDEATHSIG, SIGKILL) != 0) {
+         RAW_LOG(ERROR, "prctl(PR_SET_PDEATHSIG) failed");
+         _exit(127);
+       }
++#endif
+     }
+ #endif
+ 
diff --git a/www/chromium/files/patch-base_process_memory.cc b/www/chromium/files/patch-base_process_memory.cc
index 5b624342..9427d265 100644
--- a/www/chromium/files/patch-base_process_memory.cc
+++ b/www/chromium/files/patch-base_process_memory.cc
@@ -1,4 +1,4 @@
---- base/process/memory.cc.orig	2020-11-13 06:36:34 UTC
+--- base/process/memory.cc.orig	2021-03-12 23:57:15 UTC
 +++ base/process/memory.cc
 @@ -55,7 +55,7 @@ NOINLINE void OnNoMemoryInternal(size_t size) {
  }  // namespace internal
diff --git a/www/chromium/files/patch-base_process_memory.h b/www/chromium/files/patch-base_process_memory.h
index 203ced37..ce431bee 100644
--- a/www/chromium/files/patch-base_process_memory.h
+++ b/www/chromium/files/patch-base_process_memory.h
@@ -1,4 +1,4 @@
---- base/process/memory.h.orig	2020-11-13 06:36:34 UTC
+--- base/process/memory.h.orig	2021-03-12 23:57:15 UTC
 +++ base/process/memory.h
 @@ -24,7 +24,7 @@ BASE_EXPORT void EnableTerminationOnOutOfMemory();
  // Crash reporting classifies such crashes as OOM.
diff --git a/www/chromium/files/patch-base_process_memory__unittest.cc b/www/chromium/files/patch-base_process_memory__unittest.cc
index f219ce17..ebd8ce1d 100644
--- a/www/chromium/files/patch-base_process_memory__unittest.cc
+++ b/www/chromium/files/patch-base_process_memory__unittest.cc
@@ -1,4 +1,4 @@
---- base/process/memory_unittest.cc.orig	2020-11-13 06:36:34 UTC
+--- base/process/memory_unittest.cc.orig	2021-03-12 23:57:15 UTC
 +++ base/process/memory_unittest.cc
 @@ -38,6 +38,8 @@
  #if defined(OS_LINUX) || defined(OS_CHROMEOS)
diff --git a/www/chromium/files/patch-base_process_process__handle.cc b/www/chromium/files/patch-base_process_process__handle.cc
index 6b50c9ec..28e99ae6 100644
--- a/www/chromium/files/patch-base_process_process__handle.cc
+++ b/www/chromium/files/patch-base_process_process__handle.cc
@@ -1,4 +1,4 @@
---- base/process/process_handle.cc.orig	2020-11-13 06:36:34 UTC
+--- base/process/process_handle.cc.orig	2021-03-12 23:57:15 UTC
 +++ base/process/process_handle.cc
 @@ -30,7 +30,7 @@ UniqueProcId GetUniqueIdForProcess() {
               : UniqueProcId(GetCurrentProcId());
diff --git a/www/chromium/files/patch-base_process_process__handle.h b/www/chromium/files/patch-base_process_process__handle.h
index e323278c..18238683 100644
--- a/www/chromium/files/patch-base_process_process__handle.h
+++ b/www/chromium/files/patch-base_process_process__handle.h
@@ -1,4 +1,4 @@
---- base/process/process_handle.h.orig	2020-11-13 06:36:34 UTC
+--- base/process/process_handle.h.orig	2021-03-12 23:57:15 UTC
 +++ base/process/process_handle.h
 @@ -103,7 +103,7 @@ BASE_EXPORT ProcessId GetCurrentProcId();
  // processes may be reused.
diff --git a/www/chromium/files/patch-base_process_process__handle__freebsd.cc b/www/chromium/files/patch-base_process_process__handle__freebsd.cc
index 911926ae..76936bbf 100644
--- a/www/chromium/files/patch-base_process_process__handle__freebsd.cc
+++ b/www/chromium/files/patch-base_process_process__handle__freebsd.cc
@@ -1,4 +1,4 @@
---- base/process/process_handle_freebsd.cc.orig	2020-11-13 06:36:34 UTC
+--- base/process/process_handle_freebsd.cc.orig	2021-03-12 23:57:15 UTC
 +++ base/process/process_handle_freebsd.cc
 @@ -16,10 +16,13 @@ namespace base {
  
diff --git a/www/chromium/files/patch-base_process_process__iterator__freebsd.cc b/www/chromium/files/patch-base_process_process__iterator__freebsd.cc
index 3e6bae04..a85419c8 100644
--- a/www/chromium/files/patch-base_process_process__iterator__freebsd.cc
+++ b/www/chromium/files/patch-base_process_process__iterator__freebsd.cc
@@ -1,4 +1,4 @@
---- base/process/process_iterator_freebsd.cc.orig	2021-01-18 21:28:45 UTC
+--- base/process/process_iterator_freebsd.cc.orig	2021-03-12 23:57:15 UTC
 +++ base/process/process_iterator_freebsd.cc
 @@ -10,6 +10,10 @@
  #include <sys/sysctl.h>
diff --git a/www/chromium/files/patch-base_process_process__linux.cc b/www/chromium/files/patch-base_process_process__linux.cc
index 1d8cfc75..a0a20c0f 100644
--- a/www/chromium/files/patch-base_process_process__linux.cc
+++ b/www/chromium/files/patch-base_process_process__linux.cc
@@ -1,4 +1,4 @@
---- base/process/process_linux.cc.orig	2020-11-13 06:36:34 UTC
+--- base/process/process_linux.cc.orig	2021-03-12 23:57:15 UTC
 +++ base/process/process_linux.cc
 @@ -24,7 +24,9 @@ namespace base {
  
@@ -8,7 +8,7 @@
  const int kForegroundPriority = 0;
 +#endif
  
- #if defined(OS_CHROMEOS) || BUILDFLAG(IS_LACROS)
+ #if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
  // We are more aggressive in our lowering of background process priority
 @@ -69,7 +71,7 @@ struct CGroups {
      return groups;
@@ -17,7 +17,7 @@
 -#else
 +#elif !defined(OS_BSD)
  const int kBackgroundPriority = 5;
- #endif  // defined(OS_CHROMEOS) || BUILDFLAG(IS_LACROS)
+ #endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
  
 @@ -96,13 +98,18 @@ Time Process::CreationTime() const {
    if (!start_ticks)
@@ -37,12 +37,12 @@
 +#if !defined(OS_BSD)
  // static
  bool Process::CanBackgroundProcesses() {
- #if defined(OS_CHROMEOS) || BUILDFLAG(IS_LACROS)
+ #if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 @@ -154,6 +161,7 @@ bool Process::SetProcessBackgrounded(bool background) 
    DPCHECK(result == 0);
    return result == 0;
  }
 +#endif // !defined(OS_BSD)
  
- #if defined(OS_CHROMEOS) || BUILDFLAG(IS_LACROS)
+ #if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
  bool IsProcessBackgroundedCGroup(const StringPiece& cgroup_contents) {
diff --git a/www/chromium/files/patch-base_process_process__metrics.cc b/www/chromium/files/patch-base_process_process__metrics.cc
index 7712b3ca..b1789fe4 100644
--- a/www/chromium/files/patch-base_process_process__metrics.cc
+++ b/www/chromium/files/patch-base_process_process__metrics.cc
@@ -1,6 +1,6 @@
---- base/process/process_metrics.cc.orig	2020-11-13 06:36:34 UTC
+--- base/process/process_metrics.cc.orig	2021-03-12 23:57:15 UTC
 +++ base/process/process_metrics.cc
-@@ -49,7 +49,7 @@ SystemMetrics SystemMetrics::Sample() {
+@@ -50,7 +50,7 @@ SystemMetrics SystemMetrics::Sample() {
    SystemMetrics system_metrics;
  
    system_metrics.committed_memory_ = GetSystemCommitCharge();
@@ -9,7 +9,7 @@
    GetSystemMemoryInfo(&system_metrics.memory_info_);
    GetVmStatInfo(&system_metrics.vmstat_info_);
    GetSystemDiskInfo(&system_metrics.disk_info_);
-@@ -68,7 +68,7 @@ std::unique_ptr<Value> SystemMetrics::ToValue() const 
+@@ -69,7 +69,7 @@ std::unique_ptr<Value> SystemMetrics::ToValue() const 
    std::unique_ptr<DictionaryValue> res(new DictionaryValue());
  
    res->SetIntKey("committed_memory", static_cast<int>(committed_memory_));
@@ -18,7 +18,7 @@
    std::unique_ptr<DictionaryValue> meminfo = memory_info_.ToValue();
    std::unique_ptr<DictionaryValue> vmstat = vmstat_info_.ToValue();
    meminfo->MergeDictionary(vmstat.get());
-@@ -119,7 +119,7 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage(
+@@ -120,7 +120,7 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage(
  }
  #endif
  
@@ -27,7 +27,7 @@
      defined(OS_AIX)
  int ProcessMetrics::CalculateIdleWakeupsPerSecond(
      uint64_t absolute_idle_wakeups) {
-@@ -132,7 +132,7 @@ int ProcessMetrics::GetIdleWakeupsPerSecond() {
+@@ -133,7 +133,7 @@ int ProcessMetrics::GetIdleWakeupsPerSecond() {
    NOTIMPLEMENTED();  // http://crbug.com/120488
    return 0;
  }
diff --git a/www/chromium/files/patch-base_process_process__metrics.h b/www/chromium/files/patch-base_process_process__metrics.h
index bfd237e3..cfbd2005 100644
--- a/www/chromium/files/patch-base_process_process__metrics.h
+++ b/www/chromium/files/patch-base_process_process__metrics.h
@@ -1,4 +1,4 @@
---- base/process/process_metrics.h.orig	2020-11-13 06:36:34 UTC
+--- base/process/process_metrics.h.orig	2021-03-12 23:57:15 UTC
 +++ base/process/process_metrics.h
 @@ -47,7 +47,7 @@ namespace base {
  // Full declaration is in process_metrics_iocounters.h.
@@ -128,7 +128,7 @@
 +#endif  // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) ||
          // defined(OS_AIX) defined(OS_FUCHSIA)
  
- #if defined(OS_CHROMEOS) || BUILDFLAG(IS_LACROS)
+ #if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 @@ -406,11 +406,11 @@ struct BASE_EXPORT SystemMemoryInfoKB {
  // Exposed for memory debugging widget.
  BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoKB* meminfo);
@@ -151,7 +151,7 @@
 +#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) ||
          // defined(OS_AIX)
  
- #if defined(OS_CHROMEOS) || BUILDFLAG(IS_LACROS)
+ #if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 @@ -597,7 +597,7 @@ class BASE_EXPORT SystemMetrics {
    FRIEND_TEST_ALL_PREFIXES(SystemMetricsTest, SystemMetrics);
  
diff --git a/www/chromium/files/patch-base_process_process__metrics__freebsd.cc b/www/chromium/files/patch-base_process_process__metrics__freebsd.cc
index 524b56b1..f6df9a5b 100644
--- a/www/chromium/files/patch-base_process_process__metrics__freebsd.cc
+++ b/www/chromium/files/patch-base_process_process__metrics__freebsd.cc
@@ -1,4 +1,4 @@
---- base/process/process_metrics_freebsd.cc.orig	2020-11-13 06:36:34 UTC
+--- base/process/process_metrics_freebsd.cc.orig	2021-03-12 23:57:15 UTC
 +++ base/process/process_metrics_freebsd.cc
 @@ -3,8 +3,10 @@
  // found in the LICENSE file.
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 46408ab6..69540cbc 100644
--- a/www/chromium/files/patch-base_process_process__metrics__posix.cc
+++ b/www/chromium/files/patch-base_process_process__metrics__posix.cc
@@ -1,4 +1,4 @@
---- base/process/process_metrics_posix.cc.orig	2020-11-13 06:36:34 UTC
+--- base/process/process_metrics_posix.cc.orig	2021-03-12 23:57:15 UTC
 +++ base/process/process_metrics_posix.cc
 @@ -20,6 +20,8 @@
  
diff --git a/www/chromium/files/patch-base_process_process__unittest.cc b/www/chromium/files/patch-base_process_process__unittest.cc
index 4054f858..e2c0cca7 100644
--- a/www/chromium/files/patch-base_process_process__unittest.cc
+++ b/www/chromium/files/patch-base_process_process__unittest.cc
@@ -1,6 +1,6 @@
---- base/process/process_unittest.cc.orig	2020-11-13 06:36:34 UTC
+--- base/process/process_unittest.cc.orig	2021-03-12 23:57:15 UTC
 +++ base/process/process_unittest.cc
-@@ -153,7 +153,7 @@ TEST_F(ProcessTest, CreationTimeOtherProcess) {
+@@ -138,7 +138,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 =
diff --git a/www/chromium/files/patch-base_process_process__util__unittest.cc b/www/chromium/files/patch-base_process_process__util__unittest.cc
index 6fba5022..0b9f07e4 100644
--- a/www/chromium/files/patch-base_process_process__util__unittest.cc
+++ b/www/chromium/files/patch-base_process_process__util__unittest.cc
@@ -1,4 +1,4 @@
---- base/process/process_util_unittest.cc.orig	2021-01-18 21:28:45 UTC
+--- base/process/process_util_unittest.cc.orig	2021-03-12 23:57:15 UTC
 +++ base/process/process_util_unittest.cc
 @@ -1308,11 +1308,11 @@ std::string TestLaunchProcess(const CommandLine& cmdli
    options.fds_to_remap.emplace_back(fds[1], STDOUT_FILENO);
diff --git a/www/chromium/files/patch-base_profiler_register__context.h b/www/chromium/files/patch-base_profiler_register__context.h
index 79ee85b0..20c522c3 100644
--- a/www/chromium/files/patch-base_profiler_register__context.h
+++ b/www/chromium/files/patch-base_profiler_register__context.h
@@ -1,4 +1,4 @@
---- base/profiler/register_context.h.orig	2020-11-13 06:36:34 UTC
+--- base/profiler/register_context.h.orig	2021-03-12 23:57:15 UTC
 +++ base/profiler/register_context.h
 @@ -17,7 +17,7 @@
  #include <windows.h>
diff --git a/www/chromium/files/patch-base_profiler_sampling__profiler__thread__token.cc b/www/chromium/files/patch-base_profiler_sampling__profiler__thread__token.cc
index ec7f92d5..cb734b35 100644
--- a/www/chromium/files/patch-base_profiler_sampling__profiler__thread__token.cc
+++ b/www/chromium/files/patch-base_profiler_sampling__profiler__thread__token.cc
@@ -1,4 +1,4 @@
---- base/profiler/sampling_profiler_thread_token.cc.orig	2020-11-13 06:36:34 UTC
+--- base/profiler/sampling_profiler_thread_token.cc.orig	2021-03-12 23:57:15 UTC
 +++ base/profiler/sampling_profiler_thread_token.cc
 @@ -7,7 +7,7 @@
  namespace base {
diff --git a/www/chromium/files/patch-base_profiler_sampling__profiler__thread__token.h b/www/chromium/files/patch-base_profiler_sampling__profiler__thread__token.h
index c36c1078..6a8db9bd 100644
--- a/www/chromium/files/patch-base_profiler_sampling__profiler__thread__token.h
+++ b/www/chromium/files/patch-base_profiler_sampling__profiler__thread__token.h
@@ -1,4 +1,4 @@
---- base/profiler/sampling_profiler_thread_token.h.orig	2020-11-13 06:36:34 UTC
+--- base/profiler/sampling_profiler_thread_token.h.orig	2021-03-12 23:57:15 UTC
 +++ base/profiler/sampling_profiler_thread_token.h
 @@ -9,7 +9,7 @@
  #include "base/threading/platform_thread.h"
diff --git a/www/chromium/files/patch-base_profiler_stack__copier__signal.cc b/www/chromium/files/patch-base_profiler_stack__copier__signal.cc
index 47eefaa1..0e9a2eb0 100644
--- a/www/chromium/files/patch-base_profiler_stack__copier__signal.cc
+++ b/www/chromium/files/patch-base_profiler_stack__copier__signal.cc
@@ -1,4 +1,4 @@
---- base/profiler/stack_copier_signal.cc.orig	2020-11-13 06:36:34 UTC
+--- base/profiler/stack_copier_signal.cc.orig	2021-03-12 23:57:15 UTC
 +++ base/profiler/stack_copier_signal.cc
 @@ -4,7 +4,14 @@
  
@@ -15,7 +15,7 @@
  #include <signal.h>
  #include <sys/ucontext.h>
  #include <syscall.h>
-@@ -34,8 +41,13 @@ class AsyncSafeWaitableEvent {
+@@ -35,8 +42,13 @@ class AsyncSafeWaitableEvent {
      // for a pthread mutex. So, also check the condition.
      while (true) {
        int res =
@@ -29,7 +29,7 @@
        if (futex_.load(std::memory_order_acquire) != 0)
          return true;
        if (res != 0)
-@@ -45,8 +57,12 @@ class AsyncSafeWaitableEvent {
+@@ -46,8 +58,12 @@ class AsyncSafeWaitableEvent {
  
    void Signal() {
      futex_.store(1, std::memory_order_release);
@@ -42,7 +42,7 @@
    }
  
   private:
-@@ -216,11 +232,18 @@ bool StackCopierSignal::CopyStack(StackBuffer* stack_b
+@@ -221,11 +237,18 @@ bool StackCopierSignal::CopyStack(StackBuffer* stack_b
      if (!scoped_sigaction.succeeded())
        return false;
  
diff --git a/www/chromium/files/patch-base_profiler_stack__sampling__profiler__test__util.cc b/www/chromium/files/patch-base_profiler_stack__sampling__profiler__test__util.cc
index 29ebf0d0..3f2832f8 100644
--- a/www/chromium/files/patch-base_profiler_stack__sampling__profiler__test__util.cc
+++ b/www/chromium/files/patch-base_profiler_stack__sampling__profiler__test__util.cc
@@ -1,4 +1,4 @@
---- base/profiler/stack_sampling_profiler_test_util.cc.orig	2020-11-13 06:36:34 UTC
+--- base/profiler/stack_sampling_profiler_test_util.cc.orig	2021-03-12 23:57:15 UTC
 +++ base/profiler/stack_sampling_profiler_test_util.cc
 @@ -32,7 +32,7 @@
  // Fortunately, it provides _alloca, which functions identically.
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
index 5f14491a..643ce437 100644
--- a/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc
+++ b/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc
@@ -1,4 +1,4 @@
---- base/profiler/stack_sampling_profiler_unittest.cc.orig	2020-11-13 06:36:34 UTC
+--- base/profiler/stack_sampling_profiler_unittest.cc.orig	2021-03-12 23:57:15 UTC
 +++ base/profiler/stack_sampling_profiler_unittest.cc
 @@ -42,7 +42,7 @@
  #include <intrin.h>
diff --git a/www/chromium/files/patch-base_profiler_thread__delegate__posix.cc b/www/chromium/files/patch-base_profiler_thread__delegate__posix.cc
index 849d4018..e98382c1 100644
--- a/www/chromium/files/patch-base_profiler_thread__delegate__posix.cc
+++ b/www/chromium/files/patch-base_profiler_thread__delegate__posix.cc
@@ -1,4 +1,4 @@
---- base/profiler/thread_delegate_posix.cc.orig	2020-11-13 06:36:34 UTC
+--- base/profiler/thread_delegate_posix.cc.orig	2021-03-12 23:57:15 UTC
 +++ base/profiler/thread_delegate_posix.cc
 @@ -12,6 +12,9 @@
  #include "base/profiler/thread_delegate_posix.h"
diff --git a/www/chromium/files/patch-base_sampling__heap__profiler_sampling__heap__profiler.cc b/www/chromium/files/patch-base_sampling__heap__profiler_sampling__heap__profiler.cc
index 63a4e3b6..c194af3d 100644
--- a/www/chromium/files/patch-base_sampling__heap__profiler_sampling__heap__profiler.cc
+++ b/www/chromium/files/patch-base_sampling__heap__profiler_sampling__heap__profiler.cc
@@ -1,4 +1,4 @@
---- base/sampling_heap_profiler/sampling_heap_profiler.cc.orig	2020-11-13 06:36:34 UTC
+--- base/sampling_heap_profiler/sampling_heap_profiler.cc.orig	2021-03-12 23:57:15 UTC
 +++ base/sampling_heap_profiler/sampling_heap_profiler.cc
 @@ -30,6 +30,10 @@
  #include <sys/prctl.h>
diff --git a/www/chromium/files/patch-base_security__unittest.cc b/www/chromium/files/patch-base_security__unittest.cc
index 132ea807..91d05f55 100644
--- a/www/chromium/files/patch-base_security__unittest.cc
+++ b/www/chromium/files/patch-base_security__unittest.cc
@@ -1,4 +1,4 @@
---- base/security_unittest.cc.orig	2020-11-13 06:36:34 UTC
+--- base/security_unittest.cc.orig	2021-03-12 23:57:15 UTC
 +++ base/security_unittest.cc
 @@ -61,7 +61,7 @@ NOINLINE Type HideValueFromCompiler(volatile Type valu
  void OverflowTestsSoftExpectTrue(bool overflow_detected) {
diff --git a/www/chromium/files/patch-base_strings_sys__string__conversions__unittest.cc b/www/chromium/files/patch-base_strings_sys__string__conversions__unittest.cc
index c05afd11..f1d7377c 100644
--- a/www/chromium/files/patch-base_strings_sys__string__conversions__unittest.cc
+++ b/www/chromium/files/patch-base_strings_sys__string__conversions__unittest.cc
@@ -1,4 +1,4 @@
---- base/strings/sys_string_conversions_unittest.cc.orig	2020-11-16 14:00:26 UTC
+--- base/strings/sys_string_conversions_unittest.cc.orig	2021-03-12 23:57:15 UTC
 +++ base/strings/sys_string_conversions_unittest.cc
 @@ -76,7 +76,7 @@ TEST(SysStrings, SysUTF8ToWide) {
  }
diff --git a/www/chromium/files/patch-base_synchronization_lock__impl.h b/www/chromium/files/patch-base_synchronization_lock__impl.h
index ba9ba2a6..08323a1e 100644
--- a/www/chromium/files/patch-base_synchronization_lock__impl.h
+++ b/www/chromium/files/patch-base_synchronization_lock__impl.h
@@ -1,4 +1,4 @@
---- base/synchronization/lock_impl.h.orig	2020-11-13 06:36:34 UTC
+--- base/synchronization/lock_impl.h.orig	2021-03-12 23:57:15 UTC
 +++ base/synchronization/lock_impl.h
 @@ -105,6 +105,8 @@ void LockImpl::Unlock() {
  }
diff --git a/www/chromium/files/patch-base_syslog__logging.cc b/www/chromium/files/patch-base_syslog__logging.cc
index 6df3281f..3c3a7a71 100644
--- a/www/chromium/files/patch-base_syslog__logging.cc
+++ b/www/chromium/files/patch-base_syslog__logging.cc
@@ -1,4 +1,4 @@
---- base/syslog_logging.cc.orig	2020-11-13 06:36:34 UTC
+--- base/syslog_logging.cc.orig	2021-03-12 23:57:15 UTC
 +++ base/syslog_logging.cc
 @@ -13,7 +13,7 @@
  #include "base/strings/string_util.h"
diff --git a/www/chromium/files/patch-base_system_sys__info.cc b/www/chromium/files/patch-base_system_sys__info.cc
index f5ba828f..6567dc43 100644
--- a/www/chromium/files/patch-base_system_sys__info.cc
+++ b/www/chromium/files/patch-base_system_sys__info.cc
@@ -1,7 +1,7 @@
---- base/system/sys_info.cc.orig	2020-11-13 06:36:34 UTC
+--- base/system/sys_info.cc.orig	2021-03-12 23:57:15 UTC
 +++ base/system/sys_info.cc
-@@ -104,7 +104,7 @@ void SysInfo::GetHardwareInfo(base::OnceCallback<void(
- #elif defined(OS_ANDROID) || defined(OS_APPLE)
+@@ -94,7 +94,7 @@ void SysInfo::GetHardwareInfo(base::OnceCallback<void(
+ #if defined(OS_WIN) || defined(OS_ANDROID) || defined(OS_APPLE)
    base::ThreadPool::PostTaskAndReplyWithResult(
        FROM_HERE, {}, base::BindOnce(&GetHardwareInfoSync), std::move(callback));
 -#elif defined(OS_LINUX) || defined(OS_CHROMEOS)
diff --git a/www/chromium/files/patch-base_system_sys__info.h b/www/chromium/files/patch-base_system_sys__info.h
index 9cfe26c9..16d9092b 100644
--- a/www/chromium/files/patch-base_system_sys__info.h
+++ b/www/chromium/files/patch-base_system_sys__info.h
@@ -1,6 +1,6 @@
---- base/system/sys_info.h.orig	2021-01-18 21:28:45 UTC
+--- base/system/sys_info.h.orig	2021-03-12 23:57:15 UTC
 +++ base/system/sys_info.h
-@@ -208,6 +208,8 @@ class BASE_EXPORT SysInfo {
+@@ -202,6 +202,8 @@ class BASE_EXPORT SysInfo {
    // On Desktop this returns true when memory <= 512MB.
    static bool IsLowEndDevice();
  
@@ -9,7 +9,7 @@
   private:
    FRIEND_TEST_ALL_PREFIXES(SysInfoTest, AmountOfAvailablePhysicalMemory);
    FRIEND_TEST_ALL_PREFIXES(debug::SystemMetricsTest, ParseMeminfo);
-@@ -217,7 +219,7 @@ class BASE_EXPORT SysInfo {
+@@ -211,7 +213,7 @@ class BASE_EXPORT SysInfo {
    static bool IsLowEndDeviceImpl();
    static HardwareInfo GetHardwareInfoSync();
  
diff --git a/www/chromium/files/patch-base_system_sys__info__freebsd.cc b/www/chromium/files/patch-base_system_sys__info__freebsd.cc
index 7bacdbf3..d9d76662 100644
--- a/www/chromium/files/patch-base_system_sys__info__freebsd.cc
+++ b/www/chromium/files/patch-base_system_sys__info__freebsd.cc
@@ -1,4 +1,4 @@
---- base/system/sys_info_freebsd.cc.orig	2020-11-13 06:36:34 UTC
+--- base/system/sys_info_freebsd.cc.orig	2021-03-12 23:57:15 UTC
 +++ base/system/sys_info_freebsd.cc
 @@ -9,30 +9,95 @@
  #include <sys/sysctl.h>
diff --git a/www/chromium/files/patch-base_system_sys__info__posix.cc b/www/chromium/files/patch-base_system_sys__info__posix.cc
index 87f69159..4f5d2539 100644
--- a/www/chromium/files/patch-base_system_sys__info__posix.cc
+++ b/www/chromium/files/patch-base_system_sys__info__posix.cc
@@ -1,6 +1,18 @@
---- base/system/sys_info_posix.cc.orig	2020-11-13 06:36:34 UTC
+--- base/system/sys_info_posix.cc.orig	2021-03-12 23:57:15 UTC
 +++ base/system/sys_info_posix.cc
-@@ -223,6 +223,8 @@ std::string SysInfo::OperatingSystemArchitecture() {
+@@ -25,6 +25,11 @@
+ #if defined(OS_ANDROID)
+ #include <sys/vfs.h>
+ #define statvfs statfs  // Android uses a statvfs-like statfs struct and call.
++#elif defined(OS_BSD)
++#include <sys/param.h>
++#include <sys/mount.h>
++#define statvfs statfs
++#define f_frsize f_bsize
+ #else
+ #include <sys/statvfs.h>
+ #endif
+@@ -224,6 +229,8 @@ std::string SysInfo::OperatingSystemArchitecture() {
      arch = "x86";
    } else if (arch == "amd64") {
      arch = "x86_64";
diff --git a/www/chromium/files/patch-base_system_sys__info__unittest.cc b/www/chromium/files/patch-base_system_sys__info__unittest.cc
index 02bec6b9..75ea1a02 100644
--- a/www/chromium/files/patch-base_system_sys__info__unittest.cc
+++ b/www/chromium/files/patch-base_system_sys__info__unittest.cc
@@ -1,6 +1,6 @@
---- base/system/sys_info_unittest.cc.orig	2021-01-18 21:28:45 UTC
+--- base/system/sys_info_unittest.cc.orig	2021-03-12 23:57:15 UTC
 +++ base/system/sys_info_unittest.cc
-@@ -50,13 +50,13 @@ TEST_F(SysInfoTest, AmountOfMem) {
+@@ -62,13 +62,13 @@ TEST_F(SysInfoTest, AmountOfMem) {
    EXPECT_GE(SysInfo::AmountOfVirtualMemory(), 0);
  }
  
@@ -17,16 +17,16 @@
  TEST_F(SysInfoTest, MAYBE_AmountOfAvailablePhysicalMemory) {
    // Note: info is in _K_bytes.
    SystemMemoryInfoKB info;
-@@ -87,7 +87,7 @@ TEST_F(SysInfoTest, MAYBE_AmountOfAvailablePhysicalMem
+@@ -99,7 +99,7 @@ TEST_F(SysInfoTest, MAYBE_AmountOfAvailablePhysicalMem
    EXPECT_GT(amount, static_cast<int64_t>(info.free) * 1024);
    EXPECT_LT(amount / 1024, info.total);
  }
 -#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
-+#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSDD)
++#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD)
  
  TEST_F(SysInfoTest, AmountOfFreeDiskSpace) {
    // We aren't actually testing that it's correct, just that it's sane.
-@@ -137,7 +137,7 @@ TEST_F(SysInfoTest, NestedVolumesAmountOfTotalDiskSpac
+@@ -149,7 +149,7 @@ TEST_F(SysInfoTest, NestedVolumesAmountOfTotalDiskSpac
  }
  #endif  // defined(OS_FUCHSIA)
  
@@ -35,7 +35,7 @@
      defined(OS_CHROMEOS) || defined(OS_FUCHSIA)
  TEST_F(SysInfoTest, OperatingSystemVersionNumbers) {
    int32_t os_major_version = -1;
-@@ -198,7 +198,7 @@ TEST_F(SysInfoTest, GetHardwareInfo) {
+@@ -210,7 +210,7 @@ TEST_F(SysInfoTest, GetHardwareInfo) {
    EXPECT_TRUE(IsStringUTF8(hardware_info->model));
    bool empty_result_expected =
  #if defined(OS_ANDROID) || defined(OS_APPLE) || defined(OS_WIN) || \
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
index 2b31585f..32c3cb7f 100644
--- 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
@@ -1,4 +1,4 @@
---- base/task/thread_pool/environment_config_unittest.cc.orig	2020-11-13 06:36:34 UTC
+--- base/task/thread_pool/environment_config_unittest.cc.orig	2021-03-12 23:57:15 UTC
 +++ base/task/thread_pool/environment_config_unittest.cc
 @@ -14,7 +14,7 @@ namespace internal {
  TEST(ThreadPoolEnvironmentConfig, CanUseBackgroundPriorityForWorker) {
diff --git a/www/chromium/files/patch-base_test_BUILD.gn b/www/chromium/files/patch-base_test_BUILD.gn
index 84cc7d20..77c53a07 100644
--- a/www/chromium/files/patch-base_test_BUILD.gn
+++ b/www/chromium/files/patch-base_test_BUILD.gn
@@ -1,6 +1,6 @@
---- base/test/BUILD.gn.orig	2021-01-18 21:28:45 UTC
+--- base/test/BUILD.gn.orig	2021-03-12 23:57:15 UTC
 +++ base/test/BUILD.gn
-@@ -416,7 +416,11 @@ if (is_linux || is_chromeos) {
+@@ -428,7 +428,11 @@ if (is_linux || is_chromeos) {
  
    copy("fonts_conf") {
      sources = [ "fonts.conf" ]
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 356c0291..a383ea3c 100644
--- a/www/chromium/files/patch-base_test_launcher_test__launcher.cc
+++ b/www/chromium/files/patch-base_test_launcher_test__launcher.cc
@@ -1,6 +1,6 @@
---- base/test/launcher/test_launcher.cc.orig	2021-01-18 21:28:45 UTC
+--- base/test/launcher/test_launcher.cc.orig	2021-03-12 23:57:15 UTC
 +++ base/test/launcher/test_launcher.cc
-@@ -57,6 +57,7 @@
+@@ -58,6 +58,7 @@
  #include "testing/gtest/include/gtest/gtest.h"
  
  #if defined(OS_POSIX)
@@ -8,7 +8,7 @@
  #include <fcntl.h>
  
  #include "base/files/file_descriptor_watcher_posix.h"
-@@ -598,7 +599,7 @@ ChildProcessResults DoLaunchChildTestProcess(
+@@ -599,7 +600,7 @@ ChildProcessResults DoLaunchChildTestProcess(
  #if !defined(OS_FUCHSIA)
    options.new_process_group = true;
  #endif
@@ -17,7 +17,7 @@
    options.kill_on_parent_death = true;
  #endif
  
-@@ -1515,7 +1516,7 @@ bool TestLauncher::Init(CommandLine* command_line) {
+@@ -1516,7 +1517,7 @@ bool TestLauncher::Init(CommandLine* command_line) {
    results_tracker_.AddGlobalTag("OS_IOS");
  #endif
  
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
index 07fa4b15..137f48db 100644
--- a/www/chromium/files/patch-base_test_test__file__util__posix.cc
+++ b/www/chromium/files/patch-base_test_test__file__util__posix.cc
@@ -1,4 +1,4 @@
---- base/test/test_file_util_posix.cc.orig	2020-11-13 06:36:34 UTC
+--- base/test/test_file_util_posix.cc.orig	2021-03-12 23:57:15 UTC
 +++ base/test/test_file_util_posix.cc
 @@ -87,7 +87,7 @@ void SyncPageCacheToDisk() {
    sync();
diff --git a/www/chromium/files/patch-base_test_test__suite.cc b/www/chromium/files/patch-base_test_test__suite.cc
index b9f1034a..c4d11460 100644
--- a/www/chromium/files/patch-base_test_test__suite.cc
+++ b/www/chromium/files/patch-base_test_test__suite.cc
@@ -1,4 +1,4 @@
---- base/test/test_suite.cc.orig	2020-11-13 06:36:34 UTC
+--- base/test/test_suite.cc.orig	2021-03-12 23:57:15 UTC
 +++ base/test/test_suite.cc
 @@ -66,7 +66,7 @@
  #include "base/test/test_support_android.h"
diff --git a/www/chromium/files/patch-base_third__party_libevent_BUILD.gn b/www/chromium/files/patch-base_third__party_libevent_BUILD.gn
index b7bd8c4f..5ef582ab 100644
--- a/www/chromium/files/patch-base_third__party_libevent_BUILD.gn
+++ b/www/chromium/files/patch-base_third__party_libevent_BUILD.gn
@@ -1,4 +1,4 @@
---- base/third_party/libevent/BUILD.gn.orig	2020-11-13 06:36:34 UTC
+--- base/third_party/libevent/BUILD.gn.orig	2021-03-12 23:57:15 UTC
 +++ base/third_party/libevent/BUILD.gn
 @@ -43,13 +43,20 @@ static_library("libevent") {
        "mac/event-config.h",
diff --git a/www/chromium/files/patch-base_threading_platform__thread.h b/www/chromium/files/patch-base_threading_platform__thread.h
index a75b6132..ec417fb7 100644
--- a/www/chromium/files/patch-base_threading_platform__thread.h
+++ b/www/chromium/files/patch-base_threading_platform__thread.h
@@ -1,6 +1,6 @@
---- base/threading/platform_thread.h.orig	2020-11-13 06:36:34 UTC
+--- base/threading/platform_thread.h.orig	2021-03-12 23:57:15 UTC
 +++ base/threading/platform_thread.h
-@@ -230,7 +230,7 @@ class BASE_EXPORT PlatformThread {
+@@ -231,7 +231,7 @@ class BASE_EXPORT PlatformThread {
    // Returns a realtime period provided by |delegate|.
    static TimeDelta GetRealtimePeriod(Delegate* delegate);
  
diff --git a/www/chromium/files/patch-base_threading_platform__thread__internal__posix.h b/www/chromium/files/patch-base_threading_platform__thread__internal__posix.h
index 5bcd7133..1d75cd4c 100644
--- a/www/chromium/files/patch-base_threading_platform__thread__internal__posix.h
+++ b/www/chromium/files/patch-base_threading_platform__thread__internal__posix.h
@@ -1,4 +1,4 @@
---- base/threading/platform_thread_internal_posix.h.orig	2020-11-16 17:28:09 UTC
+--- base/threading/platform_thread_internal_posix.h.orig	2021-03-12 23:57:15 UTC
 +++ base/threading/platform_thread_internal_posix.h
 @@ -47,13 +47,13 @@ bool SetCurrentThreadPriorityForPlatform(ThreadPriorit
  // of CanIncreaseThreadPriority().
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 ffb57676..354fb7c8 100644
--- a/www/chromium/files/patch-base_threading_platform__thread__linux.cc
+++ b/www/chromium/files/patch-base_threading_platform__thread__linux.cc
@@ -1,6 +1,6 @@
---- base/threading/platform_thread_linux.cc.orig	2020-11-13 06:36:34 UTC
+--- base/threading/platform_thread_linux.cc.orig	2021-03-12 23:57:15 UTC
 +++ base/threading/platform_thread_linux.cc
-@@ -24,7 +24,9 @@
+@@ -27,7 +27,9 @@
  
  #if !defined(OS_NACL) && !defined(OS_AIX)
  #include <pthread.h>
@@ -10,7 +10,7 @@
  #include <sys/resource.h>
  #include <sys/time.h>
  #include <sys/types.h>
-@@ -264,7 +266,7 @@ const ThreadPriorityToNiceValuePair kThreadPriorityToN
+@@ -298,7 +300,7 @@ const ThreadPriorityToNiceValuePair kThreadPriorityToN
  
  Optional<bool> CanIncreaseCurrentThreadPriorityForPlatform(
      ThreadPriority priority) {
@@ -19,7 +19,7 @@
    // A non-zero soft-limit on RLIMIT_RTPRIO is required to be allowed to invoke
    // pthread_setschedparam in SetCurrentThreadPriorityForPlatform().
    struct rlimit rlim;
-@@ -314,7 +316,7 @@ Optional<ThreadPriority> GetCurrentThreadPriorityForPl
+@@ -348,7 +350,7 @@ Optional<ThreadPriority> GetCurrentThreadPriorityForPl
  void PlatformThread::SetName(const std::string& name) {
    ThreadIdNameManager::GetInstance()->SetName(name);
  
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 459b2c3b..6df05331 100644
--- a/www/chromium/files/patch-base_threading_platform__thread__posix.cc
+++ b/www/chromium/files/patch-base_threading_platform__thread__posix.cc
@@ -1,4 +1,4 @@
---- base/threading/platform_thread_posix.cc.orig	2020-11-13 06:36:34 UTC
+--- base/threading/platform_thread_posix.cc.orig	2021-03-12 23:57:15 UTC
 +++ base/threading/platform_thread_posix.cc
 @@ -32,6 +32,10 @@
  #include <sys/syscall.h>
@@ -18,14 +18,14 @@
 -#if defined(OS_LINUX) || defined(OS_CHROMEOS)
 +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
  
- // Store the thread ids in local storage since calling the SWI can
+ // Store the thread ids in local storage since calling the SWI can be
  // expensive and PlatformThread::CurrentId is used liberally. Clear
 @@ -159,11 +163,11 @@ class InitAtFork {
    InitAtFork() { pthread_atfork(nullptr, nullptr, internal::ClearTidCache); }
  };
  
 -#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSSD)
++#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
  
  }  // namespace
  
diff --git a/www/chromium/files/patch-base_threading_platform__thread__unittest.cc b/www/chromium/files/patch-base_threading_platform__thread__unittest.cc
index 975180f9..8f58f524 100644
--- a/www/chromium/files/patch-base_threading_platform__thread__unittest.cc
+++ b/www/chromium/files/patch-base_threading_platform__thread__unittest.cc
@@ -1,4 +1,4 @@
---- base/threading/platform_thread_unittest.cc.orig	2021-01-18 21:28:45 UTC
+--- base/threading/platform_thread_unittest.cc.orig	2021-03-12 23:57:15 UTC
 +++ base/threading/platform_thread_unittest.cc
 @@ -312,7 +312,7 @@ TEST(PlatformThreadTest,
  // and hardcodes what we know. Please inform scheduler-dev@chromium.org if this
diff --git a/www/chromium/files/patch-base_threading_scoped__blocking__call__unittest.cc b/www/chromium/files/patch-base_threading_scoped__blocking__call__unittest.cc
index 755f30ed..7a59470f 100644
--- a/www/chromium/files/patch-base_threading_scoped__blocking__call__unittest.cc
+++ b/www/chromium/files/patch-base_threading_scoped__blocking__call__unittest.cc
@@ -1,4 +1,4 @@
---- base/threading/scoped_blocking_call_unittest.cc.orig	2020-11-13 06:36:34 UTC
+--- base/threading/scoped_blocking_call_unittest.cc.orig	2021-03-12 23:57:15 UTC
 +++ base/threading/scoped_blocking_call_unittest.cc
 @@ -273,7 +273,7 @@ TEST_F(ScopedBlockingCallIOJankMonitoringTest, ManyInA
  }
diff --git a/www/chromium/files/patch-base_threading_thread__task__runner__handle.cc b/www/chromium/files/patch-base_threading_thread__task__runner__handle.cc
index de0f0145..00985979 100644
--- a/www/chromium/files/patch-base_threading_thread__task__runner__handle.cc
+++ b/www/chromium/files/patch-base_threading_thread__task__runner__handle.cc
@@ -1,4 +1,4 @@
---- base/threading/thread_task_runner_handle.cc.orig	2020-11-13 06:36:34 UTC
+--- base/threading/thread_task_runner_handle.cc.orig	2021-03-12 23:57:15 UTC
 +++ base/threading/thread_task_runner_handle.cc
 @@ -8,6 +8,7 @@
  #include <utility>
@@ -8,19 +8,19 @@
  #include "base/check_op.h"
  #include "base/lazy_instance.h"
  #include "base/run_loop.h"
-@@ -38,6 +39,7 @@ bool ThreadTaskRunnerHandle::IsSet() {
-   return !!thread_task_runner_tls.Pointer()->Get();
+@@ -33,6 +34,7 @@ const scoped_refptr<SingleThreadTaskRunner>& ThreadTas
+   return current->task_runner_;
  }
  
 +#if defined(OS_BSD)
  // static
- ScopedClosureRunner ThreadTaskRunnerHandle::OverrideForTesting(
-     scoped_refptr<SingleThreadTaskRunner> overriding_task_runner) {
-@@ -82,6 +84,7 @@ ScopedClosureRunner ThreadTaskRunnerHandle::OverrideFo
-       base::Unretained(ttrh->task_runner_.get()),
-       std::move(no_running_during_override)));
+ bool ThreadTaskRunnerHandle::IsSet() {
+   return !!thread_task_runner_tls.Pointer()->Get();
+@@ -80,6 +82,7 @@ ThreadTaskRunnerHandleOverride::ThreadTaskRunnerHandle
+   if (!allow_nested_runloop)
+     no_running_during_override_.emplace();
  }
 +#endif
  
- ThreadTaskRunnerHandle::ThreadTaskRunnerHandle(
-     scoped_refptr<SingleThreadTaskRunner> task_runner)
+ ThreadTaskRunnerHandleOverride::~ThreadTaskRunnerHandleOverride() {
+   if (task_runner_to_restore_) {
diff --git a/www/chromium/files/patch-base_time_time__unittest.cc b/www/chromium/files/patch-base_time_time__unittest.cc
index 7aa69a9a..c0cabcc1 100644
--- a/www/chromium/files/patch-base_time_time__unittest.cc
+++ b/www/chromium/files/patch-base_time_time__unittest.cc
@@ -1,4 +1,4 @@
---- base/time/time_unittest.cc.orig	2020-11-16 17:58:27 UTC
+--- base/time/time_unittest.cc.orig	2021-03-12 23:57:15 UTC
 +++ base/time/time_unittest.cc
 @@ -1969,6 +1969,7 @@ TEST(TimeDelta, Overflows) {
    EXPECT_TRUE((kLargeDelta / 0.5).is_max());
diff --git a/www/chromium/files/patch-base_trace__event_heap__profiler__allocation__context__tracker.cc b/www/chromium/files/patch-base_trace__event_heap__profiler__allocation__context__tracker.cc
new file mode 100644
index 00000000..08477d7b
--- /dev/null
+++ b/www/chromium/files/patch-base_trace__event_heap__profiler__allocation__context__tracker.cc
@@ -0,0 +1,38 @@
+--- base/trace_event/heap_profiler_allocation_context_tracker.cc.orig	2021-03-12 23:57:15 UTC
++++ base/trace_event/heap_profiler_allocation_context_tracker.cc
+@@ -30,6 +30,10 @@
+ #include <sys/prctl.h>
+ #endif
+ 
++#if defined(OS_BSD)
++#include <pthread_np.h>
++#endif
++
+ namespace base {
+ namespace trace_event {
+ 
+@@ -61,13 +65,23 @@ ThreadLocalStorage::Slot& AllocationContextTrackerTLS(
+ // with id. This function intentionally leaks the allocated strings since they
+ // are used to tag allocations even after the thread dies.
+ const char* GetAndLeakThreadName() {
+-  char name[16];
++#if defined(OS_BSD)
++  constexpr size_t kBufferLen = 64;
++#else
++  constexpr size_t kBufferLen = 16;
++#endif
++  char name[kBufferLen];
+ #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+   // If the thread name is not set, try to get it from prctl. Thread name might
+   // not be set in cases where the thread started before heap profiling was
+   // enabled.
+   int err = prctl(PR_GET_NAME, name);
+   if (!err) {
++    return strdup(name);
++  }
++#elif defined(OS_BSD) && __FreeBSD__ >= 12
++  pthread_get_name_np(pthread_self(), name, kBufferLen);
++  if (*name != '\0') {
+     return strdup(name);
+   }
+ #endif  // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
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 c38c4a9a..afbf97a6 100644
--- a/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc
+++ b/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc
@@ -1,4 +1,4 @@
---- base/trace_event/malloc_dump_provider.cc.orig	2021-01-18 21:28:45 UTC
+--- base/trace_event/malloc_dump_provider.cc.orig	2021-03-12 23:57:15 UTC
 +++ base/trace_event/malloc_dump_provider.cc
 @@ -17,6 +17,8 @@
  
@@ -9,7 +9,7 @@
  #else
  #include <malloc.h>
  #endif
-@@ -163,6 +165,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump
+@@ -184,6 +186,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump
    }
  #elif defined(OS_FUCHSIA)
  // TODO(fuchsia): Port, see https://crbug.com/706592.
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 39523ac9..a6931d12 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,6 +1,6 @@
---- base/trace_event/process_memory_dump.cc.orig	2021-01-18 21:28:45 UTC
+--- base/trace_event/process_memory_dump.cc.orig	2021-03-12 23:57:15 UTC
 +++ base/trace_event/process_memory_dump.cc
-@@ -100,7 +100,7 @@ size_t ProcessMemoryDump::CountResidentBytes(void* sta
+@@ -101,7 +101,7 @@ base::Optional<size_t> ProcessMemoryDump::CountResiden
  #if defined(OS_WIN)
    std::unique_ptr<PSAPI_WORKING_SET_EX_INFORMATION[]> vec(
        new PSAPI_WORKING_SET_EX_INFORMATION[max_vec_size]);
diff --git a/www/chromium/files/patch-base_trace__event_process__memory__dump.h b/www/chromium/files/patch-base_trace__event_process__memory__dump.h
deleted file mode 100644
index dea3b589..00000000
--- a/www/chromium/files/patch-base_trace__event_process__memory__dump.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- base/trace_event/process_memory_dump.h.orig	2020-11-13 06:36:34 UTC
-+++ base/trace_event/process_memory_dump.h
-@@ -22,7 +22,7 @@
- 
- // Define COUNT_RESIDENT_BYTES_SUPPORTED if platform supports counting of the
- // resident memory.
--#if !defined(OS_NACL)
-+#if !defined(OS_NACL) && !defined(OS_BSD)
- #define COUNT_RESIDENT_BYTES_SUPPORTED
- #endif
- 
diff --git a/www/chromium/files/patch-base_util_memory__pressure_system__memory__pressure__evaluator.cc b/www/chromium/files/patch-base_util_memory__pressure_system__memory__pressure__evaluator.cc
index 6f4603a0..a7a50b33 100644
--- a/www/chromium/files/patch-base_util_memory__pressure_system__memory__pressure__evaluator.cc
+++ b/www/chromium/files/patch-base_util_memory__pressure_system__memory__pressure__evaluator.cc
@@ -1,20 +1,20 @@
---- base/util/memory_pressure/system_memory_pressure_evaluator.cc.orig	2020-11-16 14:03:42 UTC
+--- base/util/memory_pressure/system_memory_pressure_evaluator.cc.orig	2021-03-12 23:57:15 UTC
 +++ base/util/memory_pressure/system_memory_pressure_evaluator.cc
-@@ -14,7 +14,7 @@
- #elif defined(OS_WIN)
- #include "base/util/memory_pressure/system_memory_pressure_evaluator_win.h"
+@@ -17,7 +17,7 @@
  #include "base/win/windows_version.h"
--#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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)
  #include "base/util/memory_pressure/system_memory_pressure_evaluator_linux.h"
  #endif
  
-@@ -45,7 +45,7 @@ SystemMemoryPressureEvaluator::CreateDefaultSystemEval
-     evaluator->CreateOSSignalPressureEvaluator(monitor->CreateVoter());
-   }
+@@ -50,7 +50,7 @@ SystemMemoryPressureEvaluator::CreateDefaultSystemEval
    return evaluator;
--#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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)
    return std::make_unique<util::os_linux::SystemMemoryPressureEvaluator>(
        monitor->CreateVoter());
  #endif
diff --git a/www/chromium/files/patch-build_config_BUILD.gn b/www/chromium/files/patch-build_config_BUILD.gn
index 7ea45f21..516a836e 100644
--- a/www/chromium/files/patch-build_config_BUILD.gn
+++ b/www/chromium/files/patch-build_config_BUILD.gn
@@ -1,4 +1,4 @@
---- build/config/BUILD.gn.orig	2021-01-18 21:28:45 UTC
+--- build/config/BUILD.gn.orig	2021-03-12 23:57:15 UTC
 +++ build/config/BUILD.gn
 @@ -232,9 +232,7 @@ config("default_libs") {
      ]
@@ -10,7 +10,7 @@
      ]
    }
  }
-@@ -317,7 +315,7 @@ config("executable_config") {
+@@ -313,7 +311,7 @@ config("executable_config") {
        "//build/config/ios:ios_dynamic_flags",
        "//build/config/ios:ios_executable_flags",
      ]
diff --git a/www/chromium/files/patch-build_config_BUILDCONFIG.gn b/www/chromium/files/patch-build_config_BUILDCONFIG.gn
index e013fead..e434d1df 100644
--- a/www/chromium/files/patch-build_config_BUILDCONFIG.gn
+++ b/www/chromium/files/patch-build_config_BUILDCONFIG.gn
@@ -1,6 +1,6 @@
---- build/config/BUILDCONFIG.gn.orig	2021-01-18 21:28:45 UTC
+--- build/config/BUILDCONFIG.gn.orig	2021-03-12 23:57:15 UTC
 +++ build/config/BUILDCONFIG.gn
-@@ -183,8 +183,8 @@ if (host_toolchain == "") {
+@@ -194,8 +194,8 @@ if (host_toolchain == "") {
    # TODO(dpranke): Add some sort of assert here that verifies that
    # no toolchain omitted host_toolchain from its toolchain_args().
  
@@ -11,7 +11,7 @@
        host_toolchain = "//build/toolchain/linux:clang_$host_cpu"
      } else if (is_clang) {
        host_toolchain = "//build/toolchain/linux:clang_$host_cpu"
-@@ -221,7 +221,7 @@ if (target_os == "android") {
+@@ -232,7 +232,7 @@ if (target_os == "android") {
    assert(host_os == "linux" || host_os == "mac",
           "Android builds are only supported on Linux and Mac hosts.")
    _default_toolchain = "//build/toolchain/android:android_clang_$target_cpu"
@@ -20,7 +20,7 @@
    # See comments in build/toolchain/cros/BUILD.gn about board compiles.
    if (is_clang) {
      _default_toolchain = "//build/toolchain/linux:clang_$target_cpu"
-@@ -282,10 +282,11 @@ if (custom_toolchain != "") {
+@@ -293,10 +293,11 @@ if (custom_toolchain != "") {
  # current_os value directly.
  
  is_android = current_os == "android"
diff --git a/www/chromium/files/patch-build_config_compiler_BUILD.gn b/www/chromium/files/patch-build_config_compiler_BUILD.gn
index 28544113..2a92a506 100644
--- a/www/chromium/files/patch-build_config_compiler_BUILD.gn
+++ b/www/chromium/files/patch-build_config_compiler_BUILD.gn
@@ -1,6 +1,6 @@
---- build/config/compiler/BUILD.gn.orig	2021-01-18 21:28:45 UTC
+--- build/config/compiler/BUILD.gn.orig	2021-03-12 23:57:15 UTC
 +++ build/config/compiler/BUILD.gn
-@@ -129,7 +129,7 @@ declare_args() {
+@@ -132,7 +132,7 @@ declare_args() {
    #
    # TODO(crbug.com/977230): Enabling this when 'use_xcode_clang' is true may
    # call an old clang that doesn't support auto-init.
@@ -9,7 +9,7 @@
  
    # This argument is to control whether enabling text section splitting in the
    # final binary. When enabled, the separated text sections with prefix
-@@ -291,7 +291,7 @@ config("compiler") {
+@@ -316,7 +316,7 @@ config("compiler") {
      }
  
      # Linker warnings.
@@ -18,7 +18,7 @@
        ldflags += [ "-Wl,--fatal-warnings" ]
      }
      if (fatal_linker_warnings && is_apple) {
-@@ -387,7 +387,7 @@ config("compiler") {
+@@ -411,7 +411,7 @@ config("compiler") {
  
      # Compiler instrumentation can introduce dependencies in DSOs to symbols in
      # the executable they are loaded into, so they are unresolved at link-time.
@@ -27,7 +27,7 @@
        ldflags += [
          "-Wl,-z,defs",
          "-Wl,--as-needed",
-@@ -478,7 +478,7 @@ config("compiler") {
+@@ -501,7 +501,7 @@ config("compiler") {
      ldflags += [ "-Wl,-z,keep-text-section-prefix" ]
    }
  
@@ -36,7 +36,7 @@
      cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ]
  
      cflags += [
-@@ -777,7 +777,7 @@ config("compiler_cpu_abi") {
+@@ -796,7 +796,7 @@ config("compiler_cpu_abi") {
          cflags += [ "-mtune=$arm_tune" ]
        }
      } else if (current_cpu == "arm64") {
@@ -45,7 +45,7 @@
          cflags += [ "--target=aarch64-linux-gnu" ]
          ldflags += [ "--target=aarch64-linux-gnu" ]
        }
-@@ -1127,7 +1127,7 @@ config("compiler_deterministic") {
+@@ -1146,7 +1146,7 @@ config("compiler_deterministic") {
        "-Xclang",
        ".",
      ]
@@ -54,7 +54,7 @@
        # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167)
        asmflags = [ "-Wa,-fdebug-compilation-dir,." ]
      }
-@@ -1510,7 +1510,7 @@ config("default_warnings") {
+@@ -1529,7 +1529,7 @@ config("default_warnings") {
          cflags += [ "-Wno-nonportable-include-path" ]
        }
  
@@ -63,7 +63,26 @@
          # Flags NaCl (Clang 3.7) and Xcode 9.2 (Clang clang-900.0.39.2) do not
          # recognize.
          cflags += [
-@@ -1685,7 +1685,7 @@ config("no_chromium_code") {
+@@ -1570,6 +1570,18 @@ config("default_warnings") {
+           cflags += [ "-Wno-max-tokens" ]
+         }
+       }
++
++      if (is_clang && is_bsd) {
++        cflags += [
++          "-Wno-ignored-pragma-optimize",
++          "-Wno-implicit-int-float-conversion",
++          "-Wno-final-dtor-non-final-class",
++          "-Wno-builtin-assume-aligned-alignment",
++          "-Wno-deprecated-copy",
++          "-Wno-thread-safety-analysis",
++          "-Wno-thread-safety-attributes",
++        ]
++      }
+     }
+   }
+ }
+@@ -1699,7 +1711,7 @@ config("no_chromium_code") {
        # suppressing them individually, we just blanket suppress them here.
        "-Wno-unused-variable",
      ]
@@ -72,16 +91,16 @@
        cflags += [
          # TODO(https://crbug.com/1031169): Clean up and enable.
          "-Wno-misleading-indentation",
-@@ -1763,7 +1763,7 @@ config("thin_archive") {
-   # Mac and iOS use the mac-specific "libtool" command, not ar, which doesn't
-   # have a "thin archive" mode (it does accept -T, but it means truncating
-   # archive names to 16 characters, which is not what we want).
--  if ((is_posix && !is_nacl && !is_apple) || is_fuchsia) {
-+  if ((is_posix && !is_nacl && !is_apple && !is_bsd) || is_fuchsia) {
+@@ -1777,7 +1789,7 @@ config("export_dynamic") {
+ config("thin_archive") {
+   # The macOS and iOS default linker ld64 does not support reading thin
+   # archives.
+-  if ((is_posix && !is_nacl && (!is_apple || use_lld)) || is_fuchsia) {
++  if ((is_posix && !is_nacl && (!is_apple || use_lld) && !is_bsd) || is_fuchsia) {
      arflags = [ "-T" ]
    } else if (is_win && use_lld) {
      arflags = [ "/llvmlibthin" ]
-@@ -2317,7 +2317,7 @@ config("symbols") {
+@@ -2318,7 +2330,7 @@ config("symbols") {
      # flag, so we can use use -g1 for pnacl and nacl-clang compiles.
      # gcc nacl is is_nacl && !is_clang, pnacl and nacl-clang are && is_clang.
      if (!is_nacl || is_clang) {
@@ -90,7 +109,7 @@
      }
  
      # TODO(https://crbug.com/1050118): Investigate missing debug info on mac.
-@@ -2349,7 +2349,7 @@ config("symbols") {
+@@ -2350,7 +2362,7 @@ config("symbols") {
      # DWARF info may be corrupt; offsets in a range list entry are in different
      # sections" there.  Maybe just a bug in nacl_switch_32.S.
      if (!is_apple && !is_nacl && current_cpu != "x86" &&
diff --git a/www/chromium/files/patch-build_config_compiler_compiler.gni b/www/chromium/files/patch-build_config_compiler_compiler.gni
index 01a14560..712d36e5 100644
--- a/www/chromium/files/patch-build_config_compiler_compiler.gni
+++ b/www/chromium/files/patch-build_config_compiler_compiler.gni
@@ -1,11 +1,11 @@
---- build/config/compiler/compiler.gni.orig	2021-01-18 21:28:45 UTC
+--- build/config/compiler/compiler.gni.orig	2021-03-12 23:57:15 UTC
 +++ build/config/compiler/compiler.gni
-@@ -196,7 +196,7 @@ declare_args() {
+@@ -201,7 +201,7 @@ declare_args() {
+ 
  declare_args() {
    # Whether to use the gold linker from binutils instead of lld or bfd.
-   use_gold =
--      !use_lld && !(is_chromecast && is_linux &&
-+      !is_bsd && !use_lld && !(is_chromecast && is_linux &&
-                     (current_cpu == "arm" || current_cpu == "mipsel")) &&
-       ((is_linux && (current_cpu == "x64" || current_cpu == "x86" ||
-                      current_cpu == "arm" || current_cpu == "arm64" ||
+-  use_gold = !use_lld && !(is_chromecast && is_linux &&
++  use_gold = !is_bsd && !use_lld && !(is_chromecast && is_linux &&
+                            (current_cpu == "arm" || current_cpu == "mipsel")) &&
+              (((is_linux || is_chromeos_lacros) &&
+                (current_cpu == "x64" || current_cpu == "x86" ||
diff --git a/www/chromium/files/patch-build_config_features.gni b/www/chromium/files/patch-build_config_features.gni
index 247dd9c8..a40d39ee 100644
--- a/www/chromium/files/patch-build_config_features.gni
+++ b/www/chromium/files/patch-build_config_features.gni
@@ -1,4 +1,4 @@
---- build/config/features.gni.orig	2020-11-13 06:36:34 UTC
+--- build/config/features.gni.orig	2021-03-12 23:57:15 UTC
 +++ build/config/features.gni
 @@ -26,7 +26,7 @@ declare_args() {
    proprietary_codecs = is_chrome_branded || is_chromecast
diff --git a/www/chromium/files/patch-build_config_freetype_freetype.gni b/www/chromium/files/patch-build_config_freetype_freetype.gni
index 6431f976..b0cafcef 100644
--- a/www/chromium/files/patch-build_config_freetype_freetype.gni
+++ b/www/chromium/files/patch-build_config_freetype_freetype.gni
@@ -1,4 +1,4 @@
---- build/config/freetype/freetype.gni.orig	2020-11-13 06:36:34 UTC
+--- build/config/freetype/freetype.gni.orig	2021-03-19 11:22:27 UTC
 +++ build/config/freetype/freetype.gni
 @@ -10,5 +10,5 @@ declare_args() {
    # than version 2.7.1 and have color bitmap support compiled in. WARNING:
diff --git a/www/chromium/files/patch-build_config_linux_BUILD.gn b/www/chromium/files/patch-build_config_linux_BUILD.gn
index bc9748b2..3b27fbfe 100644
--- a/www/chromium/files/patch-build_config_linux_BUILD.gn
+++ b/www/chromium/files/patch-build_config_linux_BUILD.gn
@@ -1,8 +1,8 @@
---- build/config/linux/BUILD.gn.orig	2020-11-13 06:36:34 UTC
+--- build/config/linux/BUILD.gn.orig	2021-03-12 23:57:15 UTC
 +++ build/config/linux/BUILD.gn
-@@ -30,7 +30,7 @@ config("runtime_library") {
+@@ -32,7 +32,7 @@ config("runtime_library") {
  
-   if ((!(is_chromeos || chromeos_is_browser_only) ||
+   if ((!(is_chromeos_ash || is_chromeos_lacros) ||
         default_toolchain != "//build/toolchain/cros:target") &&
 -      (!use_custom_libcxx || current_cpu == "mipsel")) {
 +      (!use_custom_libcxx || current_cpu == "mipsel") && !is_bsd) {
diff --git a/www/chromium/files/patch-build_config_linux_pkg-config.py b/www/chromium/files/patch-build_config_linux_pkg-config.py
index 3ac95532..aa7ca0f7 100644
--- a/www/chromium/files/patch-build_config_linux_pkg-config.py
+++ b/www/chromium/files/patch-build_config_linux_pkg-config.py
@@ -1,4 +1,4 @@
---- build/config/linux/pkg-config.py.orig	2020-11-13 06:36:34 UTC
+--- build/config/linux/pkg-config.py.orig	2021-03-12 23:57:15 UTC
 +++ build/config/linux/pkg-config.py
 @@ -59,8 +59,12 @@ def SetConfigPath(options):
      print("You must specify an architecture via -a if using a sysroot.")
diff --git a/www/chromium/files/patch-build_config_ozone.gni b/www/chromium/files/patch-build_config_ozone.gni
index d49986fd..add2a94c 100644
--- a/www/chromium/files/patch-build_config_ozone.gni
+++ b/www/chromium/files/patch-build_config_ozone.gni
@@ -1,12 +1,12 @@
---- build/config/ozone.gni.orig	2021-01-18 21:28:45 UTC
+--- build/config/ozone.gni.orig	2021-03-12 23:57:15 UTC
 +++ build/config/ozone.gni
-@@ -69,6 +69,9 @@ declare_args() {
+@@ -70,6 +70,9 @@ declare_args() {
        ozone_platform = "x11"
        ozone_platform_drm = true
        ozone_platform_x11 = true
 +    } else if (is_bsd) {
 +      ozone_platform = "x11"
 +      ozone_platform_x11 = true
-     } else if (is_linux) {
+     } else if (is_linux || is_chromeos_lacros) {
        ozone_platform = "x11"
        ozone_platform_wayland = true
diff --git a/www/chromium/files/patch-build_config_sysroot.gni b/www/chromium/files/patch-build_config_sysroot.gni
index 9e340d8b..65b672a9 100644
--- a/www/chromium/files/patch-build_config_sysroot.gni
+++ b/www/chromium/files/patch-build_config_sysroot.gni
@@ -1,4 +1,4 @@
---- build/config/sysroot.gni.orig	2020-11-13 06:36:34 UTC
+--- build/config/sysroot.gni.orig	2021-03-12 23:57:15 UTC
 +++ build/config/sysroot.gni
 @@ -21,9 +21,9 @@ declare_args() {
  
diff --git a/www/chromium/files/patch-build_detect__host__arch.py b/www/chromium/files/patch-build_detect__host__arch.py
index 9d0ebae9..84b6ece3 100644
--- a/www/chromium/files/patch-build_detect__host__arch.py
+++ b/www/chromium/files/patch-build_detect__host__arch.py
@@ -1,4 +1,4 @@
---- build/detect_host_arch.py.orig	2020-11-13 06:36:34 UTC
+--- build/detect_host_arch.py.orig	2021-03-12 23:57:15 UTC
 +++ build/detect_host_arch.py
 @@ -21,6 +21,8 @@ def HostArch():
      host_arch = 'ia32'
diff --git a/www/chromium/files/patch-build_gn__run__binary.py b/www/chromium/files/patch-build_gn__run__binary.py
index bf433af3..c56ad6ea 100644
--- a/www/chromium/files/patch-build_gn__run__binary.py
+++ b/www/chromium/files/patch-build_gn__run__binary.py
@@ -1,4 +1,4 @@
---- build/gn_run_binary.py.orig	2020-11-13 06:36:34 UTC
+--- build/gn_run_binary.py.orig	2021-03-12 23:57:15 UTC
 +++ build/gn_run_binary.py
 @@ -24,7 +24,7 @@ if not os.path.isabs(path):
  # The rest of the arguments are passed directly to the executable.
diff --git a/www/chromium/files/patch-build_linux_chrome.map b/www/chromium/files/patch-build_linux_chrome.map
index d4b55689..8e4f0f67 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	2020-11-13 06:36:34 UTC
+--- build/linux/chrome.map.orig	2021-03-12 23:57:15 UTC
 +++ build/linux/chrome.map
 @@ -1,4 +1,7 @@
  {
@@ -19,10 +19,10 @@
    # Memory allocation symbols.  We want chrome and any libraries to
    # share the same heap, so it is correct to export these symbols.
    calloc;
-@@ -81,7 +88,4 @@ global:
-   localtime64;
-   localtime64_r;
+@@ -83,7 +90,4 @@ global:
    localtime_r;
+ 
+   v8dbg_*;
 -
 -local:
 -  *;
diff --git a/www/chromium/files/patch-build_linux_libpci_BUILD.gn b/www/chromium/files/patch-build_linux_libpci_BUILD.gn
index aae9271a..e0f1b0b5 100644
--- a/www/chromium/files/patch-build_linux_libpci_BUILD.gn
+++ b/www/chromium/files/patch-build_linux_libpci_BUILD.gn
@@ -1,4 +1,4 @@
---- build/linux/libpci/BUILD.gn.orig	2020-11-13 06:36:34 UTC
+--- build/linux/libpci/BUILD.gn.orig	2021-03-12 23:57:15 UTC
 +++ build/linux/libpci/BUILD.gn
 @@ -3,20 +3,36 @@
  # found in the LICENSE file.
diff --git a/www/chromium/files/patch-build_linux_unbundle_libusb.gn b/www/chromium/files/patch-build_linux_unbundle_libusb.gn
index cc33eba5..e164aa29 100644
--- a/www/chromium/files/patch-build_linux_unbundle_libusb.gn
+++ b/www/chromium/files/patch-build_linux_unbundle_libusb.gn
@@ -1,4 +1,4 @@
---- build/linux/unbundle/libusb.gn.orig	2020-11-16 10:04:40 UTC
+--- build/linux/unbundle/libusb.gn.orig	2021-03-15 11:01:22 UTC
 +++ build/linux/unbundle/libusb.gn
 @@ -0,0 +1,24 @@
 +# Copyright 2016 The Chromium Authors. All rights reserved.
diff --git a/www/chromium/files/patch-build_linux_unbundle_replace__gn__files.py b/www/chromium/files/patch-build_linux_unbundle_replace__gn__files.py
index ba668940..e49e1e7e 100644
--- a/www/chromium/files/patch-build_linux_unbundle_replace__gn__files.py
+++ b/www/chromium/files/patch-build_linux_unbundle_replace__gn__files.py
@@ -1,4 +1,4 @@
---- build/linux/unbundle/replace_gn_files.py.orig	2020-11-13 06:36:34 UTC
+--- build/linux/unbundle/replace_gn_files.py.orig	2021-03-12 23:57:15 UTC
 +++ build/linux/unbundle/replace_gn_files.py
 @@ -27,6 +27,7 @@ REPLACEMENTS = {
    'libevent': 'base/third_party/libevent/BUILD.gn',
diff --git a/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni b/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni
index 5ee773af..e4843269 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	2021-01-18 21:28:45 UTC
+--- build/toolchain/gcc_toolchain.gni.orig	2021-03-12 23:57:15 UTC
 +++ build/toolchain/gcc_toolchain.gni
-@@ -50,6 +50,11 @@ if (enable_resource_allowlist_generation) {
+@@ -51,6 +51,11 @@ if (enable_resource_allowlist_generation) {
        "enable_resource_allowlist_generation=true does not work for target_os=$target_os")
  }
  
@@ -12,7 +12,7 @@
  # This template defines a toolchain for something that works like gcc
  # (including clang).
  #
-@@ -626,13 +631,23 @@ template("clang_toolchain") {
+@@ -639,13 +644,23 @@ template("clang_toolchain") {
    }
  
    gcc_toolchain(target_name) {
diff --git a/www/chromium/files/patch-build_toolchain_get__concurrent__links.py b/www/chromium/files/patch-build_toolchain_get__concurrent__links.py
index fe86ac61..c886e27c 100644
--- a/www/chromium/files/patch-build_toolchain_get__concurrent__links.py
+++ b/www/chromium/files/patch-build_toolchain_get__concurrent__links.py
@@ -1,4 +1,4 @@
---- build/toolchain/get_concurrent_links.py.orig	2020-11-13 06:36:34 UTC
+--- build/toolchain/get_concurrent_links.py.orig	2021-03-12 23:57:15 UTC
 +++ build/toolchain/get_concurrent_links.py
 @@ -53,6 +53,14 @@ def _GetTotalMemoryInBytes():
        return int(subprocess.check_output(['sysctl', '-n', 'hw.memsize']))
diff --git a/www/chromium/files/patch-build_toolchain_linux_BUILD.gn b/www/chromium/files/patch-build_toolchain_linux_BUILD.gn
index d979167d..cf2cfe07 100644
--- a/www/chromium/files/patch-build_toolchain_linux_BUILD.gn
+++ b/www/chromium/files/patch-build_toolchain_linux_BUILD.gn
@@ -1,4 +1,4 @@
---- build/toolchain/linux/BUILD.gn.orig	2021-01-18 21:28:45 UTC
+--- build/toolchain/linux/BUILD.gn.orig	2021-03-12 23:57:15 UTC
 +++ build/toolchain/linux/BUILD.gn
 @@ -23,7 +23,6 @@ clang_toolchain("clang_arm") {
  }
diff --git a/www/chromium/files/patch-cc_BUILD.gn b/www/chromium/files/patch-cc_BUILD.gn
index f2fa2bb7..fa5dd4be 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	2021-01-18 21:28:45 UTC
+--- cc/BUILD.gn.orig	2021-03-12 23:57:15 UTC
 +++ cc/BUILD.gn
-@@ -620,7 +620,7 @@ cc_test_static_library("test_support") {
+@@ -633,7 +633,7 @@ cc_test_static_library("test_support") {
    if (enable_vulkan) {
      deps += [ "//gpu/vulkan/init" ]
    }
@@ -9,7 +9,7 @@
      data_deps = [ "//third_party/mesa_headers" ]
    }
  }
-@@ -832,7 +832,6 @@ cc_test("cc_unittests") {
+@@ -848,7 +848,6 @@ cc_test("cc_unittests") {
    ]
    data_deps = [
      "//testing/buildbot/filters:cc_unittests_filters",
diff --git a/www/chromium/files/patch-cc_layers_scrollbar__layer__impl__base.cc b/www/chromium/files/patch-cc_layers_scrollbar__layer__impl__base.cc
index 9ecfbba6..95fb4533 100644
--- a/www/chromium/files/patch-cc_layers_scrollbar__layer__impl__base.cc
+++ b/www/chromium/files/patch-cc_layers_scrollbar__layer__impl__base.cc
@@ -1,4 +1,4 @@
---- cc/layers/scrollbar_layer_impl_base.cc.orig	2020-11-13 06:36:34 UTC
+--- cc/layers/scrollbar_layer_impl_base.cc.orig	2021-03-12 23:57:15 UTC
 +++ cc/layers/scrollbar_layer_impl_base.cc
 @@ -219,8 +219,8 @@ gfx::Rect ScrollbarLayerImplBase::ComputeThumbQuadRect
    int thumb_offset = TrackStart();
diff --git a/www/chromium/files/patch-cc_test_layer__tree__test.cc b/www/chromium/files/patch-cc_test_layer__tree__test.cc
index fa16b79f..8f25479f 100644
--- a/www/chromium/files/patch-cc_test_layer__tree__test.cc
+++ b/www/chromium/files/patch-cc_test_layer__tree__test.cc
@@ -1,6 +1,6 @@
---- cc/test/layer_tree_test.cc.orig	2021-01-18 21:28:45 UTC
+--- cc/test/layer_tree_test.cc.orig	2021-03-12 23:57:15 UTC
 +++ cc/test/layer_tree_test.cc
-@@ -676,7 +676,7 @@ LayerTreeTest::LayerTreeTest(viz::RendererType rendere
+@@ -673,7 +673,7 @@ LayerTreeTest::LayerTreeTest(viz::RendererType rendere
      init_vulkan = true;
    } else if (renderer_type_ == viz::RendererType::kSkiaDawn) {
      scoped_feature_list_.InitAndEnableFeature(features::kSkiaDawn);
diff --git a/www/chromium/files/patch-cc_test_pixel__test.cc b/www/chromium/files/patch-cc_test_pixel__test.cc
index 432cdf45..279686d8 100644
--- a/www/chromium/files/patch-cc_test_pixel__test.cc
+++ b/www/chromium/files/patch-cc_test_pixel__test.cc
@@ -1,4 +1,4 @@
---- cc/test/pixel_test.cc.orig	2020-11-13 06:36:34 UTC
+--- cc/test/pixel_test.cc.orig	2021-03-12 23:57:15 UTC
 +++ cc/test/pixel_test.cc
 @@ -69,7 +69,7 @@ PixelTest::PixelTest(GraphicsBackend backend)
      init_vulkan = true;
diff --git a/www/chromium/files/patch-cc_trees_frame__rate__estimator.cc b/www/chromium/files/patch-cc_trees_frame__rate__estimator.cc
index ac015f4e..9665897d 100644
--- a/www/chromium/files/patch-cc_trees_frame__rate__estimator.cc
+++ b/www/chromium/files/patch-cc_trees_frame__rate__estimator.cc
@@ -1,4 +1,4 @@
---- cc/trees/frame_rate_estimator.cc.orig	2020-11-13 06:36:34 UTC
+--- cc/trees/frame_rate_estimator.cc.orig	2021-03-12 23:57:15 UTC
 +++ cc/trees/frame_rate_estimator.cc
 @@ -48,7 +48,7 @@ void FrameRateEstimator::WillDraw(base::TimeTicks now)
    // frequency is lower than that, then using a lower frame rate is permitted.
diff --git a/www/chromium/files/patch-cc_trees_property__tree.cc b/www/chromium/files/patch-cc_trees_property__tree.cc
index 59dd0746..c3572792 100644
--- a/www/chromium/files/patch-cc_trees_property__tree.cc
+++ b/www/chromium/files/patch-cc_trees_property__tree.cc
@@ -1,6 +1,6 @@
---- cc/trees/property_tree.cc.orig	2021-01-18 21:28:45 UTC
+--- cc/trees/property_tree.cc.orig	2021-03-12 23:57:15 UTC
 +++ cc/trees/property_tree.cc
-@@ -1295,13 +1295,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollOffset(int scro
+@@ -1300,13 +1300,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollOffset(int scro
  
    gfx::Size clip_layer_bounds = container_bounds(scroll_node->id);
  
diff --git a/www/chromium/files/patch-chrome_BUILD.gn b/www/chromium/files/patch-chrome_BUILD.gn
index 58f9f142..a3a298b8 100644
--- a/www/chromium/files/patch-chrome_BUILD.gn
+++ b/www/chromium/files/patch-chrome_BUILD.gn
@@ -1,6 +1,6 @@
---- chrome/BUILD.gn.orig	2021-01-18 21:28:45 UTC
+--- chrome/BUILD.gn.orig	2021-03-12 23:57:15 UTC
 +++ chrome/BUILD.gn
-@@ -1227,6 +1227,10 @@ group("browser_dependencies") {
+@@ -1243,6 +1243,10 @@ group("browser_dependencies") {
      public_deps += [ "//chromeos/lacros" ]
    }
  
@@ -8,6 +8,6 @@
 +    public_deps -= [ "//components/crash/core/app" ]
 +  }
 +
-   if (is_chromeos) {
+   if (is_chromeos_ash) {
      public_deps += [
        "//chrome/browser/chromeos",
diff --git a/www/chromium/files/patch-chrome_app_BUILD.gn b/www/chromium/files/patch-chrome_app_BUILD.gn
index 7fb979ce..84e99450 100644
--- a/www/chromium/files/patch-chrome_app_BUILD.gn
+++ b/www/chromium/files/patch-chrome_app_BUILD.gn
@@ -1,4 +1,4 @@
---- chrome/app/BUILD.gn.orig	2021-01-18 21:28:46 UTC
+--- chrome/app/BUILD.gn.orig	2021-03-12 23:57:16 UTC
 +++ chrome/app/BUILD.gn
 @@ -143,7 +143,7 @@ static_library("test_support") {
      "//v8:v8_headers",
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 f7cf60b9..8e1c8d63 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	2020-11-13 06:36:35 UTC
+--- chrome/app/chrome_command_ids.h.orig	2021-03-12 23:57:16 UTC
 +++ chrome/app/chrome_command_ids.h
-@@ -61,7 +61,7 @@
- #define IDC_ALL_WINDOWS_FRONT           34048
+@@ -64,7 +64,7 @@
  #define IDC_NAME_WINDOW                 34049
  
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+ // 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)
  #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 a5a64acd..0bf1ec54 100644
--- a/www/chromium/files/patch-chrome_app_chrome__main.cc
+++ b/www/chromium/files/patch-chrome_app_chrome__main.cc
@@ -1,6 +1,6 @@
---- chrome/app/chrome_main.cc.orig	2021-01-18 21:28:46 UTC
+--- chrome/app/chrome_main.cc.orig	2021-03-12 23:57:16 UTC
 +++ chrome/app/chrome_main.cc
-@@ -119,12 +119,12 @@ int ChromeMain(int argc, const char** argv) {
+@@ -130,12 +130,12 @@ int ChromeMain(int argc, const char** argv) {
    MainThreadStackSamplingProfiler scoped_sampling_profiler;
  
    // Chrome-specific process modes.
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 0fafceb8..faa92dea 100644
--- a/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc
+++ b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc
@@ -1,6 +1,6 @@
---- chrome/app/chrome_main_delegate.cc.orig	2021-01-18 21:28:46 UTC
+--- chrome/app/chrome_main_delegate.cc.orig	2021-03-12 23:57:16 UTC
 +++ chrome/app/chrome_main_delegate.cc
-@@ -148,12 +148,12 @@
+@@ -149,12 +149,12 @@
  #include "v8/include/v8.h"
  #endif
  
@@ -15,7 +15,7 @@
  #include "chrome/browser/policy/policy_path_parser.h"
  #include "components/crash/core/app/crashpad.h"
  #endif
-@@ -259,7 +259,7 @@ void SetUpExtendedCrashReporting(bool is_browser_proce
+@@ -260,7 +260,7 @@ void SetUpExtendedCrashReporting(bool is_browser_proce
  
  #endif  // defined(OS_WIN)
  
@@ -24,7 +24,7 @@
  void AdjustLinuxOOMScore(const std::string& process_type) {
    int score = -1;
  
-@@ -294,13 +294,13 @@ void AdjustLinuxOOMScore(const std::string& process_ty
+@@ -295,7 +295,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty
    if (score > -1)
      base::AdjustOOMScore(base::GetCurrentProcId(), score);
  }
@@ -33,32 +33,25 @@
  
  // Returns true if this subprocess type needs the ResourceBundle initialized
  // 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)
-       // The zygote process opens the resources for the renderers.
-       process_type == switches::kZygoteProcess ||
- #endif
-@@ -338,7 +338,7 @@ bool HandleVersionSwitches(const base::CommandLine& co
-   return false;
- }
+@@ -341,7 +341,7 @@ bool HandleVersionSwitches(const base::CommandLine& co
  
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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)
  // 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) ||
-@@ -348,7 +348,7 @@ void HandleHelpSwitches(const base::CommandLine& comma
+@@ -351,7 +351,7 @@ void HandleHelpSwitches(const base::CommandLine& comma
      PLOG(FATAL) << "execlp failed";
    }
  }
--#endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#endif  // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+-#endif  // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#endif  // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
  
  #if !defined(OS_MAC) && !defined(OS_ANDROID)
  void SIGTERMProfilingShutdown(int signal) {
-@@ -402,7 +402,7 @@ void InitializeUserDataDir(base::CommandLine* command_
+@@ -405,7 +405,7 @@ void InitializeUserDataDir(base::CommandLine* command_
    std::string process_type =
        command_line->GetSwitchValueASCII(switches::kProcessType);
  
@@ -67,7 +60,7 @@
    // On Linux, Chrome does not support running multiple copies under different
    // DISPLAYs, so the profile directory can be specified in the environment to
    // support the virtual desktop use-case.
-@@ -414,7 +414,7 @@ void InitializeUserDataDir(base::CommandLine* command_
+@@ -417,7 +417,7 @@ void InitializeUserDataDir(base::CommandLine* command_
        user_data_dir = base::FilePath::FromUTF8Unsafe(user_data_dir_string);
      }
    }
@@ -76,16 +69,16 @@
  #if defined(OS_MAC)
    policy::path_parser::CheckUserDataDirPolicy(&user_data_dir);
  #endif  // OS_MAC
-@@ -486,7 +486,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat
+@@ -488,7 +488,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat
+   startup_metric_utils::RecordApplicationStartTime(now);
  #endif
  
- #if defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || \
--    defined(OS_CHROMEOS)
-+    defined(OS_CHROMEOS) || defined(OS_BSD)
+-#if defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || \
++#if defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \
+     defined(OS_CHROMEOS)
    // Record the startup process creation time on supported platforms. On Android
    // this is recorded in ChromeMainDelegateAndroid.
-   startup_metric_utils::RecordStartupProcessCreationTime(
-@@ -709,7 +709,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
+@@ -723,7 +723,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
    v8_crashpad_support::SetUp();
  #endif
  
@@ -94,16 +87,16 @@
    if (!crash_reporter::IsCrashpadEnabled()) {
      breakpad::SetFirstChanceExceptionHandler(v8::TryHandleWebAssemblyTrapPosix);
    }
-@@ -720,7 +720,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
-     *exit_code = 0;
-     return true;  // Got a --version switch; exit with a success error code.
+@@ -736,7 +736,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
    }
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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)
    // This will directly exit if the user asked for help.
    HandleHelpSwitches(command_line);
  #endif
-@@ -928,7 +928,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -945,7 +945,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
  
    crash_reporter::InitializeCrashKeys();
  
@@ -112,7 +105,7 @@
    ChromeCrashReporterClient::Create();
  #endif
  
-@@ -941,7 +941,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -958,7 +958,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
    child_process_logging::Init();
  #endif
  #if defined(ARCH_CPU_ARM_FAMILY) && \
@@ -121,7 +114,7 @@
    // Create an instance of the CPU class to parse /proc/cpuinfo and cache
    // cpu_brand info.
    base::CPU cpu_info;
-@@ -1058,7 +1058,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -1075,7 +1075,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
          locale;
    }
  
@@ -130,7 +123,7 @@
    // Zygote needs to call InitCrashReporter() in RunZygote().
    if (process_type != switches::kZygoteProcess) {
  #if defined(OS_ANDROID)
-@@ -1079,7 +1079,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -1096,7 +1096,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
      }
  #endif  // defined(OS_ANDROID)
    }
@@ -139,7 +132,7 @@
  
  #if defined(OS_ANDROID)
    CHECK_EQ(base::android::GetLibraryProcessType(),
-@@ -1099,7 +1099,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -1116,7 +1116,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
  void ChromeMainDelegate::SandboxInitialized(const std::string& process_type) {
    // Note: If you are adding a new process type below, be sure to adjust the
    // AdjustLinuxOOMScore function too.
@@ -148,7 +141,7 @@
    AdjustLinuxOOMScore(process_type);
  #endif
  #if defined(OS_WIN)
-@@ -1141,7 +1141,7 @@ int ChromeMainDelegate::RunProcess(
+@@ -1158,7 +1158,7 @@ int ChromeMainDelegate::RunProcess(
  
      // This entry is not needed on Linux, where the NaCl loader
      // process is launched via nacl_helper instead.
@@ -157,7 +150,7 @@
      {switches::kNaClLoaderProcess, NaClMain},
  #else
      {"<invalid>", nullptr},  // To avoid constant array of size 0
-@@ -1169,7 +1169,7 @@ void ChromeMainDelegate::ProcessExiting(const std::str
+@@ -1186,7 +1186,7 @@ void ChromeMainDelegate::ProcessExiting(const std::str
  #endif  // !defined(OS_ANDROID)
  }
  
@@ -165,8 +158,8 @@
 +#if (defined(OS_LINUX) || defined(OS_CHROMEOS))
  void ChromeMainDelegate::ZygoteStarting(
      std::vector<std::unique_ptr<content::ZygoteForkDelegate>>* delegates) {
- #if defined(OS_CHROMEOS)
-@@ -1206,7 +1206,7 @@ void ChromeMainDelegate::ZygoteForked() {
+ #if BUILDFLAG(IS_CHROMEOS_ASH)
+@@ -1223,7 +1223,7 @@ void ChromeMainDelegate::ZygoteForked() {
    crash_keys::SetCrashKeysFromCommandLine(*command_line);
  }
  
diff --git a/www/chromium/files/patch-chrome_app_chromium__strings.grd b/www/chromium/files/patch-chrome_app_chromium__strings.grd
index bdca535d..79ef7856 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	2020-11-13 06:36:35 UTC
+--- chrome/app/chromium_strings.grd.orig	2021-03-12 23:57:16 UTC
 +++ chrome/app/chromium_strings.grd
-@@ -698,7 +698,7 @@ Chromium is unable to recover your settings.
+@@ -716,7 +716,7 @@ Chromium is unable to recover your settings.
        </if>
  
        <!-- about:browser-switch strings -->
@@ -9,7 +9,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>
-@@ -809,7 +809,7 @@ Chromium is unable to recover your settings.
+@@ -839,7 +839,7 @@ Chromium is unable to recover your settings.
        </message>
  
        <!-- ProcessSingleton -->
@@ -18,7 +18,7 @@
          <message name="IDS_PROFILE_IN_USE_POSIX" desc="Message shown when the browser cannot start because the profile is in use on a different host.">
            The profile appears to be in use by another Chromium process (<ph name="PROCESS_ID">$1<ex>12345</ex></ph>) on another computer (<ph name="HOST_NAME">$2<ex>example.com</ex></ph>). Chromium has locked the profile so that it doesn't get corrupted. If you are sure no other processes are using this profile, you can unlock the profile and relaunch Chromium.
          </message>
-@@ -1028,7 +1028,7 @@ Chromium is unable to recover your settings.
+@@ -1058,7 +1058,7 @@ Chromium is unable to recover your settings.
        </message>
  
        <!-- Plugin Placeholders -->
diff --git a/www/chromium/files/patch-chrome_app_generated__resources.grd b/www/chromium/files/patch-chrome_app_generated__resources.grd
index e5745e50..44276de0 100644
--- a/www/chromium/files/patch-chrome_app_generated__resources.grd
+++ b/www/chromium/files/patch-chrome_app_generated__resources.grd
@@ -1,6 +1,6 @@
---- chrome/app/generated_resources.grd.orig	2021-01-18 21:28:46 UTC
+--- chrome/app/generated_resources.grd.orig	2021-03-12 23:57:16 UTC
 +++ chrome/app/generated_resources.grd
-@@ -5263,7 +5263,7 @@ Keep your key file in a safe place. You will need it t
+@@ -5255,7 +5255,7 @@ Keep your key file in a safe place. You will need it t
        </if>
  
        <!-- chrome://browser-switch strings -->
@@ -9,21 +9,21 @@
          <message name="IDS_ABOUT_BROWSER_SWITCH_TITLE" desc="about:browser-switch page title">
            Legacy Browser Support
          </message>
-@@ -7269,7 +7269,7 @@ the Bookmarks menu.">
+@@ -7305,7 +7305,7 @@ Keep your key file in a safe place. You will need it t
          Google Pay
        </message>
  
--      <if expr="is_linux and not chromeos">
-+      <if expr="is_posix and not chromeos">
+-      <if expr="is_linux and not chromeos and not lacros">
++      <if expr="is_posix and not chromeos and not lacros">
          <message name="IDS_SHOW_WINDOW_DECORATIONS" desc="The label of a radio button in the options dialog for using the system title bar and borders.">
            Use system title bar and borders
          </message>
-@@ -8257,7 +8257,7 @@ Please help our engineers fix this problem. Tell us wh
+@@ -8296,7 +8296,7 @@ Please help our engineers fix this problem. Tell us wh
          Set as default
        </message>
  
--      <if expr="is_linux and not chromeos">
-+      <if expr="is_posix and not chromeos">
+-      <if expr="is_linux and not chromeos and not lacros">
++      <if expr="is_posix and not chromeos and not lacros">
          <message name="IDS_MINIMIZE_WINDOW_MENU" desc="The Linux browser window menu item text for minimizing the window.">
            Minimize
          </message>
diff --git a/www/chromium/files/patch-chrome_app_google__chrome__strings.grd b/www/chromium/files/patch-chrome_app_google__chrome__strings.grd
index 28217b08..64089b9c 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	2020-11-13 06:36:35 UTC
+--- chrome/app/google_chrome_strings.grd.orig	2021-03-12 23:57:16 UTC
 +++ chrome/app/google_chrome_strings.grd
-@@ -705,7 +705,7 @@ Google Chrome is unable to recover your settings.
+@@ -723,7 +723,7 @@ Google Chrome is unable to recover your settings.
        </if>
  
        <!-- about:browser-switch strings -->
@@ -9,7 +9,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>
-@@ -816,7 +816,7 @@ Google Chrome is unable to recover your settings.
+@@ -846,7 +846,7 @@ Google Chrome is unable to recover your settings.
        </message>
  
        <!-- ProcessSingleton -->
@@ -18,7 +18,7 @@
          <message name="IDS_PROFILE_IN_USE_POSIX" desc="Message shown when the browser cannot start because the profile is in use on a different host.">
            The profile appears to be in use by another Google Chrome process (<ph name="PROCESS_ID">$1<ex>12345</ex></ph>) on another computer (<ph name="HOST_NAME">$2<ex>example.com</ex></ph>).  Chrome has locked the profile so that it doesn't get corrupted.  If you are sure no other processes are using this profile, you can unlock the profile and relaunch Chrome.
          </message>
-@@ -1042,7 +1042,7 @@ Google Chrome is unable to recover your settings.
+@@ -1072,7 +1072,7 @@ Google Chrome is unable to recover your settings.
        </message>
  
        <!-- Plugin Placeholders -->
diff --git a/www/chromium/files/patch-chrome_app_profiles__strings.grdp b/www/chromium/files/patch-chrome_app_profiles__strings.grdp
index a4943a16..99d7594a 100644
--- a/www/chromium/files/patch-chrome_app_profiles__strings.grdp
+++ b/www/chromium/files/patch-chrome_app_profiles__strings.grdp
@@ -1,4 +1,4 @@
---- chrome/app/profiles_strings.grdp.orig	2021-01-20 14:08:57 UTC
+--- chrome/app/profiles_strings.grdp.orig	2021-03-12 23:57:16 UTC
 +++ chrome/app/profiles_strings.grdp
 @@ -87,7 +87,7 @@
        Add Profile...
diff --git a/www/chromium/files/patch-chrome_app_settings__strings.grdp b/www/chromium/files/patch-chrome_app_settings__strings.grdp
index 0df7e092..323a398d 100644
--- a/www/chromium/files/patch-chrome_app_settings__strings.grdp
+++ b/www/chromium/files/patch-chrome_app_settings__strings.grdp
@@ -1,20 +1,20 @@
---- chrome/app/settings_strings.grdp.orig	2020-11-13 06:36:36 UTC
+--- chrome/app/settings_strings.grdp.orig	2021-03-12 23:57:17 UTC
 +++ chrome/app/settings_strings.grdp
-@@ -110,7 +110,7 @@
+@@ -117,7 +117,7 @@
        Theme
      </message>
    </if>
--  <if expr="is_linux and not chromeos">
-+  <if expr="is_posix and not chromeos">
+-  <if expr="is_linux and not chromeos and not lacros">
++  <if expr="is_posix and not chromeos and not lacros">
      <message name="IDS_SETTINGS_SYSTEM_THEME" desc="Text of the label describing the system (GTK+) browser theme on Linux">
        GTK+
      </message>
-@@ -124,7 +124,7 @@
+@@ -131,7 +131,7 @@
        Use Classic
      </message>
    </if>
--  <if expr="not is_linux or chromeos">
-+  <if expr="not is_posix or chromeos">
+-  <if expr="not is_linux or chromeos or lacros">
++  <if expr="not is_posix or chromeos or lacros">
      <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_app_shutdown__signal__handlers__posix.cc b/www/chromium/files/patch-chrome_app_shutdown__signal__handlers__posix.cc
index be7ad224..669e2bac 100644
--- a/www/chromium/files/patch-chrome_app_shutdown__signal__handlers__posix.cc
+++ b/www/chromium/files/patch-chrome_app_shutdown__signal__handlers__posix.cc
@@ -1,4 +1,4 @@
---- chrome/app/shutdown_signal_handlers_posix.cc.orig	2020-11-13 06:36:36 UTC
+--- chrome/app/shutdown_signal_handlers_posix.cc.orig	2021-03-12 23:57:17 UTC
 +++ chrome/app/shutdown_signal_handlers_posix.cc
 @@ -186,12 +186,18 @@ void InstallShutdownSignalHandlers(
    g_pipe_pid = getpid();
diff --git a/www/chromium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd b/www/chromium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd
index 875a420e..04cf7d9e 100644
--- a/www/chromium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd
+++ b/www/chromium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd
@@ -1,4 +1,4 @@
---- chrome/app/theme/chrome_unscaled_resources.grd.orig	2020-11-13 06:36:36 UTC
+--- chrome/app/theme/chrome_unscaled_resources.grd.orig	2021-03-12 23:57:17 UTC
 +++ chrome/app/theme/chrome_unscaled_resources.grd
 @@ -18,7 +18,7 @@
          <include name="IDR_PRODUCT_LOGO_64" file="google_chrome/product_logo_64.png" type="BINDATA" />
diff --git a/www/chromium/files/patch-chrome_app_theme_theme__resources.grd b/www/chromium/files/patch-chrome_app_theme_theme__resources.grd
index cf59148f..a5f75e71 100644
--- a/www/chromium/files/patch-chrome_app_theme_theme__resources.grd
+++ b/www/chromium/files/patch-chrome_app_theme_theme__resources.grd
@@ -1,4 +1,4 @@
---- chrome/app/theme/theme_resources.grd.orig	2020-11-13 06:36:36 UTC
+--- chrome/app/theme/theme_resources.grd.orig	2021-03-12 23:57:17 UTC
 +++ chrome/app/theme/theme_resources.grd
 @@ -25,7 +25,7 @@
        <!-- KEEP THESE IN ALPHABETICAL ORDER!  DO NOT ADD TO RANDOM PLACES JUST
diff --git a/www/chromium/files/patch-chrome_browser_BUILD.gn b/www/chromium/files/patch-chrome_browser_BUILD.gn
index aa17c380..5cf14a0f 100644
--- a/www/chromium/files/patch-chrome_browser_BUILD.gn
+++ b/www/chromium/files/patch-chrome_browser_BUILD.gn
@@ -1,6 +1,6 @@
---- chrome/browser/BUILD.gn.orig	2021-01-18 21:28:49 UTC
+--- chrome/browser/BUILD.gn.orig	2021-03-12 23:57:17 UTC
 +++ chrome/browser/BUILD.gn
-@@ -5161,7 +5161,7 @@ static_library("browser") {
+@@ -5277,7 +5277,7 @@ static_library("browser") {
      ]
    }
  
diff --git a/www/chromium/files/patch-chrome_browser_about__flags.cc b/www/chromium/files/patch-chrome_browser_about__flags.cc
index fb03e7ca..15cee067 100644
--- a/www/chromium/files/patch-chrome_browser_about__flags.cc
+++ b/www/chromium/files/patch-chrome_browser_about__flags.cc
@@ -1,6 +1,6 @@
---- chrome/browser/about_flags.cc.orig	2021-01-18 21:28:49 UTC
+--- chrome/browser/about_flags.cc.orig	2021-03-12 23:57:17 UTC
 +++ chrome/browser/about_flags.cc
-@@ -188,7 +188,7 @@
+@@ -191,7 +191,7 @@
  #include "ui/gl/gl_switches.h"
  #include "ui/native_theme/native_theme_features.h"
  
@@ -9,7 +9,7 @@
  #include "base/allocator/buildflags.h"
  #endif
  
-@@ -886,7 +886,7 @@ const FeatureEntry::Choice kMemlogSamplingRateChoices[
+@@ -918,7 +918,7 @@ const FeatureEntry::Choice kMemlogSamplingRateChoices[
       heap_profiling::kMemlogSamplingRate5MB},
  };
  
@@ -18,7 +18,7 @@
      defined(OS_WIN)
  const FeatureEntry::FeatureParam kOmniboxDocumentProviderServerScoring[] = {
      {"DocumentUseServerScore", "true"},
-@@ -1236,7 +1236,7 @@ const FeatureEntry::FeatureVariation kOmniboxBookmarkP
+@@ -1268,7 +1268,7 @@ const FeatureEntry::FeatureVariation kOmniboxBookmarkP
      },
  };
  
@@ -27,43 +27,43 @@
          // defined(OS_WIN)
  
  const FeatureEntry::FeatureVariation
-@@ -2869,7 +2869,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -3009,7 +3009,7 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(ash::features::kSystemTrayMicGainSetting)},
- #endif  // OS_CHROMEOS
+ #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
  
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)) || defined(OS_BSD)
+-#if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && !defined(OS_ANDROID)
++#if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) && !defined(OS_ANDROID)
      {
          "enable-accelerated-video-decode",
          flag_descriptions::kAcceleratedVideoDecodeName,
-@@ -2885,7 +2885,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -3025,7 +3025,7 @@ const FeatureEntry kFeatureEntries[] = {
          kOsMac | kOsWin | kOsCrOS | kOsAndroid,
          SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode),
      },
--#endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+#endif  // (defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)) || defined(OS_BSD)
+-#endif  // (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) &&
++#endif  // (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) &&
+         // !defined(OS_ANDROID)
      {
          "disable-accelerated-video-encode",
-         flag_descriptions::kAcceleratedVideoEncodeName,
-@@ -3208,7 +3208,7 @@ const FeatureEntry kFeatureEntries[] = {
-      flag_descriptions::kEnableOfflinePreviewsDescription, kOsAndroid,
-      FEATURE_VALUE_TYPE(previews::features::kOfflinePreviews)},
- #endif  // OS_ANDROID
+@@ -3367,7 +3367,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)
      {"enable-save-data", flag_descriptions::kEnableSaveDataName,
       flag_descriptions::kEnableSaveDataDescription, kOsCrOS | kOsLinux,
       SINGLE_VALUE_TYPE(
-@@ -3222,7 +3222,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -3381,7 +3381,7 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kEnableNavigationPredictorRendererWarmupName,
       flag_descriptions::kEnableNavigationPredictorRendererWarmupDescription,
       kOsAll, FEATURE_VALUE_TYPE(features::kNavigationPredictorRendererWarmup)},
--#endif  // OS_CHROMEOS || OS_LINUX
-+#endif  // OS_CHROMEOS || OS_LINUX || OS_BSD
+-#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || OS_LINUX
++#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || OS_LINUX || defined(OS_BSD)
      {"enable-preconnect-to-search",
       flag_descriptions::kEnablePreconnectToSearchName,
       flag_descriptions::kEnablePreconnectToSearchDescription, kOsAll,
-@@ -3977,7 +3977,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -4173,7 +4173,7 @@ const FeatureEntry kFeatureEntries[] = {
       kOsAll,
       FEATURE_VALUE_TYPE(omnibox::kOmniboxTrendingZeroPrefixSuggestionsOnNTP)},
  
@@ -72,16 +72,16 @@
      defined(OS_WIN)
      {"omnibox-experimental-keyword-mode",
       flag_descriptions::kOmniboxExperimentalKeywordModeName,
-@@ -4054,7 +4054,7 @@ const FeatureEntry kFeatureEntries[] = {
-      FEATURE_WITH_PARAMS_VALUE_TYPE(omnibox::kBookmarkPaths,
-                                     kOmniboxBookmarkPathsVariations,
-                                     "OmniboxBundledExperimentV1")},
+@@ -4254,7 +4254,7 @@ const FeatureEntry kFeatureEntries[] = {
+      flag_descriptions::kOmniboxDisableCGIParamMatchingName,
+      flag_descriptions::kOmniboxDisableCGIParamMatchingDescription, kOsDesktop,
+      FEATURE_VALUE_TYPE(omnibox::kDisableCGIParamMatching)},
 -#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) ||
 +#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) ||
          // defined(OS_WIN)
  
      {"enable-speculative-service-worker-start-on-query-input",
-@@ -4344,14 +4344,14 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -4563,14 +4563,14 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kClickToOpenPDFDescription, kOsAll,
       FEATURE_VALUE_TYPE(features::kClickToOpenPDFPlaceholder)},
  
@@ -98,7 +98,7 @@
          // defined(OS_CHROMEOS)
  
  #if !defined(OS_ANDROID)
-@@ -5043,7 +5043,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -5258,7 +5258,7 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(kClickToCallUI)},
  #endif  // BUILDFLAG(ENABLE_CLICK_TO_CALL)
  
@@ -107,7 +107,7 @@
      defined(OS_CHROMEOS)
      {"remote-copy-receiver", flag_descriptions::kRemoteCopyReceiverName,
       flag_descriptions::kRemoteCopyReceiverDescription, kOsDesktop,
-@@ -5060,7 +5060,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -5275,7 +5275,7 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kRemoteCopyProgressNotificationName,
       flag_descriptions::kRemoteCopyProgressNotificationDescription, kOsDesktop,
       FEATURE_VALUE_TYPE(kRemoteCopyProgressNotification)},
@@ -116,7 +116,7 @@
          // defined(OS_CHROMEOS)
  
      {"restrict-gamepad-access", flag_descriptions::kRestrictGamepadAccessName,
-@@ -5643,7 +5643,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -5852,7 +5852,7 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kMouseSubframeNoImplicitCaptureDescription, kOsAll,
       FEATURE_VALUE_TYPE(features::kMouseSubframeNoImplicitCapture)},
  
@@ -125,7 +125,7 @@
      defined(OS_CHROMEOS)
      {"global-media-controls", flag_descriptions::kGlobalMediaControlsName,
       flag_descriptions::kGlobalMediaControlsDescription,
-@@ -5684,7 +5684,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -5893,7 +5893,7 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kGlobalMediaControlsOverlayControlsDescription,
       kOsWin | kOsMac | kOsLinux,
       FEATURE_VALUE_TYPE(media::kGlobalMediaControlsOverlayControls)},
@@ -134,16 +134,16 @@
          // defined(OS_CHROMEOS)
  
  #if BUILDFLAG(ENABLE_SPELLCHECK) && defined(OS_WIN)
-@@ -5861,7 +5861,7 @@ const FeatureEntry kFeatureEntries[] = {
-      FEATURE_VALUE_TYPE(
-          password_manager::features::kEnablePasswordsAccountStorage)},
+@@ -6072,7 +6072,7 @@ const FeatureEntry kFeatureEntries[] = {
+          kPasswordsAccountStorageVariations,
+          "ButterForPasswords")},
  
 -#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
 +#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \
      defined(OS_CHROMEOS)
      {"passwords-account-storage-iph",
       flag_descriptions::kEnablePasswordsAccountStorageIPHName,
-@@ -5869,7 +5869,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -6080,7 +6080,7 @@ const FeatureEntry kFeatureEntries[] = {
       kOsWin | kOsMac | kOsLinux,
       FEATURE_VALUE_TYPE(
           feature_engagement::kIPHPasswordsAccountStorageFeature)},
@@ -152,7 +152,7 @@
          // defined(OS_CHROMEOS)
  
      {"autofill-always-return-cloud-tokenized-card",
-@@ -6602,7 +6602,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -6794,7 +6794,7 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(ash::features::kEnhancedDeskAnimations)},
  #endif
  
@@ -161,20 +161,20 @@
      defined(OS_CHROMEOS)
      {"enable-oop-print-drivers", flag_descriptions::kEnableOopPrintDriversName,
       flag_descriptions::kEnableOopPrintDriversDescription, kOsDesktop,
-@@ -6636,14 +6636,14 @@ const FeatureEntry kFeatureEntries[] = {
-      FEATURE_VALUE_TYPE(features::kMuteNotificationsDuringScreenShare)},
- #endif  // !defined(OS_ANDROID)
+@@ -6833,14 +6833,14 @@ const FeatureEntry kFeatureEntries[] = {
  
--#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || \
-+#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) || \
+ // 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) || \
      defined(OS_MAC)
      {"enable-ephemeral-guest-profiles-on-desktop",
       flag_descriptions::kEnableEphemeralGuestProfilesOnDesktopName,
       flag_descriptions::kEnableEphemeralGuestProfilesOnDesktopDescription,
       kOsWin | kOsLinux | kOsMac,
       FEATURE_VALUE_TYPE(features::kEnableEphemeralGuestProfilesOnDesktop)},
--#endif  // defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ||
-+#endif  // defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) ||
-         // defined(OS_MAC)
+-#endif  // defined(OS_WIN) || (defined(OS_LINUX) ||
++#endif  // defined(OS_WIN) || (defined(OS_LINUX) || defined(OS_BSD) ||
+         // BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_MAC)
  
  #if defined(OS_ANDROID)
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 22cb8782..07af7718 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,15 +1,15 @@
---- chrome/browser/after_startup_task_utils.cc.orig	2020-11-13 06:36:36 UTC
+--- chrome/browser/after_startup_task_utils.cc.orig	2021-03-12 23:57:17 UTC
 +++ chrome/browser/after_startup_task_utils.cc
-@@ -32,7 +32,7 @@
- #include "chrome/browser/ui/tabs/tab_strip_model.h"
- #endif
+@@ -35,7 +35,7 @@
  
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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)
  #include "ui/views/linux_ui/linux_ui.h"
  #endif
  
-@@ -119,7 +119,7 @@ void QueueTask(std::unique_ptr<AfterStartupTask> queue
+@@ -122,7 +122,7 @@ void QueueTask(std::unique_ptr<AfterStartupTask> queue
  
  void SetBrowserStartupIsComplete() {
    DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ -18,7 +18,7 @@
      defined(OS_CHROMEOS)
    // Process::Current().CreationTime() is not available on all platforms.
    const base::Time process_creation_time =
-@@ -128,7 +128,7 @@ void SetBrowserStartupIsComplete() {
+@@ -131,7 +131,7 @@ void SetBrowserStartupIsComplete() {
      UMA_HISTOGRAM_LONG_TIMES("Startup.AfterStartupTaskDelayedUntilTime",
                               base::Time::Now() - process_creation_time);
    }
@@ -27,12 +27,12 @@
          // defined(OS_CHROMEOS)
    UMA_HISTOGRAM_COUNTS_10000("Startup.AfterStartupTaskCount",
                               g_after_startup_tasks.Get().size());
-@@ -138,7 +138,7 @@ void SetBrowserStartupIsComplete() {
-   g_after_startup_tasks.Get().clear();
-   g_after_startup_tasks.Get().shrink_to_fit();
+@@ -143,7 +143,7 @@ void SetBrowserStartupIsComplete() {
  
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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)
    // 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_media__galleries_media__galleries__apitest.cc b/www/chromium/files/patch-chrome_browser_apps_platform__apps_api_media__galleries_media__galleries__apitest.cc
new file mode 100644
index 00000000..7360aeda
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_apps_platform__apps_api_media__galleries_media__galleries__apitest.cc
@@ -0,0 +1,20 @@
+--- chrome/browser/apps/platform_apps/api/media_galleries/media_galleries_apitest.cc.orig	2021-03-12 23:57:17 UTC
++++ chrome/browser/apps/platform_apps/api/media_galleries/media_galleries_apitest.cc
+@@ -294,7 +294,7 @@ IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppPpapiT
+ 
+ // Test is flaky, it fails on certain bots, namely WinXP Tests(1) and Linux
+ // (dbg)(1)(32).  See crbug.com/354425.
+-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS)
++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+ #define MAYBE_MediaGalleriesNoAccess DISABLED_MediaGalleriesNoAccess
+ #else
+ #define MAYBE_MediaGalleriesNoAccess MediaGalleriesNoAccess
+@@ -332,7 +332,7 @@ IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowse
+ 
+ // Test is flaky, it fails on certain bots, namely WinXP Tests(1) and Linux
+ // (dbg)(1)(32).  See crbug.com/354425.
+-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS)
++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+ #define MAYBE_MediaGalleriesCopyTo DISABLED_MediaGalleriesCopyTo
+ #else
+ #define MAYBE_MediaGalleriesCopyTo MediaGalleriesCopyTo
diff --git a/www/chromium/files/patch-chrome_browser_apps_platform__apps_api_media__galleries_media__galleries__watch__apitest.cc b/www/chromium/files/patch-chrome_browser_apps_platform__apps_api_media__galleries_media__galleries__watch__apitest.cc
new file mode 100644
index 00000000..03e99a4b
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_apps_platform__apps_api_media__galleries_media__galleries__watch__apitest.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/apps/platform_apps/api/media_galleries/media_galleries_watch_apitest.cc.orig	2021-03-12 23:57:17 UTC
++++ chrome/browser/apps/platform_apps/api/media_galleries/media_galleries_watch_apitest.cc
+@@ -224,7 +224,7 @@ IN_PROC_BROWSER_TEST_F(MediaGalleriesGalleryWatchApiTe
+ // Test is flaky on windows and linux: crbug.com/1150017.
+ // 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)
+ #define MAYBE_RemoveListenerAndModifyGallery \
+   DISABLED_RemoveListenerAndModifyGallery
+ #else
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 b87d7fc2..8f5d4515 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	2020-11-13 06:36:36 UTC
+--- chrome/browser/apps/platform_apps/api/music_manager_private/device_id_linux.cc.orig	2021-03-12 23:57:17 UTC
 +++ chrome/browser/apps/platform_apps/api/music_manager_private/device_id_linux.cc
 @@ -4,6 +4,11 @@
  
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 47359ed2..1fcfaa6e 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,4 +1,4 @@
---- chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc.orig	2021-01-18 21:28:49 UTC
+--- chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc.orig	2021-03-12 23:57:17 UTC
 +++ chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc
 @@ -87,7 +87,7 @@ ChromeAutocompleteSchemeClassifier::GetInputTypeForSch
        return metrics::OmniboxInputType::QUERY;
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 13bd7d24..3ef4068a 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,6 +1,6 @@
---- chrome/browser/background/background_mode_manager.cc.orig	2021-01-18 21:28:49 UTC
+--- chrome/browser/background/background_mode_manager.cc.orig	2021-03-12 23:57:17 UTC
 +++ chrome/browser/background/background_mode_manager.cc
-@@ -850,7 +850,7 @@ gfx::ImageSkia GetStatusTrayIcon() {
+@@ -873,7 +873,7 @@ gfx::ImageSkia GetStatusTrayIcon() {
      return gfx::ImageSkia();
  
    return family->CreateExact(size).AsImageSkia();
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 484ab714..12fbf70b 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,4 +1,4 @@
---- chrome/browser/background/background_mode_optimizer.cc.orig	2020-11-13 06:36:36 UTC
+--- chrome/browser/background/background_mode_optimizer.cc.orig	2021-03-12 23:57:17 UTC
 +++ chrome/browser/background/background_mode_optimizer.cc
 @@ -30,10 +30,10 @@ std::unique_ptr<BackgroundModeOptimizer> BackgroundMod
            switches::kKeepAliveForTest))
diff --git a/www/chromium/files/patch-chrome_browser_browser__resources.grd b/www/chromium/files/patch-chrome_browser_browser__resources.grd
index 45fb9150..08b5e8f5 100644
--- a/www/chromium/files/patch-chrome_browser_browser__resources.grd
+++ b/www/chromium/files/patch-chrome_browser_browser__resources.grd
@@ -1,6 +1,6 @@
---- chrome/browser/browser_resources.grd.orig	2021-01-18 21:28:49 UTC
+--- chrome/browser/browser_resources.grd.orig	2021-03-12 23:57:17 UTC
 +++ chrome/browser/browser_resources.grd
-@@ -78,7 +78,7 @@
+@@ -89,7 +89,7 @@
          <include name="IDR_DISCARDS_SITE_DATA_MOJOM_WEBUI_JS" file="${root_gen_dir}\mojom-webui\chrome\browser\ui\webui\discards\site_data.mojom-webui.js" use_base_dir="false" type="BINDATA" />
          <include name="IDR_DISCARDS_SORTED_TABLE_BEHAVIOR_JS" file="resources\discards\sorted_table_behavior.js" type="BINDATA" />
        </if>
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 d6f8b88e..be2b16e3 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,15 +1,15 @@
---- chrome/browser/chrome_browser_interface_binders.cc.orig	2021-01-18 21:28:49 UTC
+--- chrome/browser/chrome_browser_interface_binders.cc.orig	2021-03-12 23:57:17 UTC
 +++ chrome/browser/chrome_browser_interface_binders.cc
-@@ -135,7 +135,7 @@
- #include "media/mojo/mojom/speech_recognition_service.mojom.h"
- #endif
+@@ -138,7 +138,7 @@
+ #include "mojo/public/cpp/bindings/self_owned_receiver.h"
+ #endif  // defined(OS_ANDROID)
  
 -#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
 +#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \
      defined(OS_CHROMEOS)
  #include "chrome/browser/ui/webui/discards/discards.mojom.h"
  #include "chrome/browser/ui/webui/discards/discards_ui.h"
-@@ -775,7 +775,7 @@ void PopulateChromeWebUIFrameBinders(
+@@ -835,7 +835,7 @@ void PopulateChromeWebUIFrameBinders(
    }
  #endif
  
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 34b9ba7f..ace685c2 100644
--- a/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc
+++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc
@@ -1,15 +1,15 @@
---- chrome/browser/chrome_browser_main.cc.orig	2021-01-18 21:28:49 UTC
+--- chrome/browser/chrome_browser_main.cc.orig	2021-03-12 23:57:17 UTC
 +++ chrome/browser/chrome_browser_main.cc
-@@ -247,7 +247,7 @@
- #endif  // defined(OS_WIN)
- 
+@@ -251,7 +251,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) || \
--    (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+    (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+-    (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
++    (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD)
  #include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h"
  #include "chrome/browser/metrics/desktop_session_duration/touch_mode_stats_tracker.h"
  #include "chrome/browser/profiles/profile_activity_metrics_recorder.h"
-@@ -926,7 +926,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
+@@ -935,7 +935,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
        AddFirstRunNewTabs(browser_creator_.get(), master_prefs_->new_tabs);
      }
  
@@ -18,25 +18,25 @@
      // 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 .
-@@ -935,7 +935,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
+@@ -944,7 +944,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
                                   &user_native_messaging_dir));
      if (!base::PathExists(user_native_messaging_dir))
        base::CreateDirectory(user_native_messaging_dir);
 -#endif  // defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS)
 +#endif  // defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
    }
- #endif  // !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
- 
-@@ -957,7 +957,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
- #endif  // defined(OS_MAC)
+ #endif  // !defined(OS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH)
  
+@@ -968,7 +968,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) || \
--    (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+    (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+-    (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
++    (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD)
    metrics::DesktopSessionDurationTracker::Initialize();
    ProfileActivityMetricsRecorder::Initialize();
    TouchModeStatsTracker::Initialize(
-@@ -1114,6 +1114,7 @@ void ChromeBrowserMainParts::PostBrowserStart() {
+@@ -1125,6 +1125,7 @@ void ChromeBrowserMainParts::PostBrowserStart() {
        base::TimeDelta::FromMinutes(1));
  
  #if !defined(OS_ANDROID)
@@ -44,7 +44,7 @@
    if (base::FeatureList::IsEnabled(features::kWebUsb)) {
      web_usb_detector_.reset(new WebUsbDetector());
      content::GetUIThreadTaskRunner({base::TaskPriority::BEST_EFFORT})
-@@ -1121,6 +1122,7 @@ void ChromeBrowserMainParts::PostBrowserStart() {
+@@ -1132,6 +1133,7 @@ void ChromeBrowserMainParts::PostBrowserStart() {
                     base::BindOnce(&WebUsbDetector::Initialize,
                                    base::Unretained(web_usb_detector_.get())));
    }
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 c493e50d..0350cb5d 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	2020-11-13 06:36:36 UTC
+--- chrome/browser/chrome_browser_main_linux.cc.orig	2021-03-12 23:57:17 UTC
 +++ chrome/browser/chrome_browser_main_linux.cc
-@@ -81,6 +81,7 @@ void ChromeBrowserMainPartsLinux::PreProfileInit() {
+@@ -82,6 +82,7 @@ void ChromeBrowserMainPartsLinux::PreProfileInit() {
  void ChromeBrowserMainPartsLinux::PostProfileInit() {
    ChromeBrowserMainPartsPosix::PostProfileInit();
  
@@ -8,7 +8,7 @@
    bool breakpad_registered;
    if (crash_reporter::IsCrashpadEnabled()) {
      // If we're using crashpad, there's no breakpad and crashpad is always
-@@ -98,10 +99,11 @@ void ChromeBrowserMainPartsLinux::PostProfileInit() {
+@@ -99,10 +100,11 @@ void ChromeBrowserMainPartsLinux::PostProfileInit() {
    }
    g_browser_process->metrics_service()->RecordBreakpadRegistration(
        breakpad_registered);
@@ -16,17 +16,17 @@
  }
  
  void ChromeBrowserMainPartsLinux::PostMainMessageLoopStart() {
--#if !defined(OS_CHROMEOS)
-+#if !defined(OS_CHROMEOS) && !defined(OS_BSD)
+-#if !BUILDFLAG(IS_CHROMEOS_ASH)
++#if !BUILDFLAG(IS_CHROMEOS_ASH) && !defined(OS_BSD)
    bluez::BluezDBusManager::Initialize(nullptr /* system_bus */);
  #endif
  
-@@ -109,7 +111,7 @@ void ChromeBrowserMainPartsLinux::PostMainMessageLoopS
+@@ -110,7 +112,7 @@ void ChromeBrowserMainPartsLinux::PostMainMessageLoopS
  }
  
  void ChromeBrowserMainPartsLinux::PostDestroyThreads() {
--#if !defined(OS_CHROMEOS)
-+#if !defined(OS_CHROMEOS) && !defined(OS_BSD)
+-#if !BUILDFLAG(IS_CHROMEOS_ASH)
++#if !BUILDFLAG(IS_CHROMEOS_ASH) && !defined(OS_BSD)
    bluez::BluezDBusManager::Shutdown();
    bluez::BluezDBusThreadManager::Shutdown();
  #endif
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 376071a0..761d1095 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	2020-11-13 06:36:36 UTC
+--- chrome/browser/chrome_browser_main_posix.cc.orig	2021-03-12 23:57:17 UTC
 +++ chrome/browser/chrome_browser_main_posix.cc
-@@ -70,7 +70,7 @@ void ExitHandler::ExitWhenPossibleOnUIThread(int signa
-     // ExitHandler takes care of deleting itself.
-     new ExitHandler();
+@@ -72,7 +72,7 @@ void ExitHandler::ExitWhenPossibleOnUIThread(int signa
    } else {
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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)
      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 f326832f..87c0062c 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,33 +1,33 @@
---- chrome/browser/chrome_content_browser_client.cc.orig	2021-01-18 21:28:49 UTC
+--- chrome/browser/chrome_content_browser_client.cc.orig	2021-03-12 23:57:17 UTC
 +++ chrome/browser/chrome_content_browser_client.cc
-@@ -432,7 +432,7 @@
+@@ -448,7 +448,7 @@
  #include "components/user_manager/user.h"
  #include "components/user_manager/user_manager.h"
  #include "services/service_manager/public/mojom/interface_provider_spec.mojom.h"
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
+-#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
  #include "chrome/browser/chrome_browser_main_linux.h"
  #elif defined(OS_ANDROID)
  #include "base/android/application_status_listener.h"
-@@ -490,7 +490,7 @@
- #endif  //  !defined(OS_ANDROID)
- 
+@@ -508,7 +508,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) || \
--    (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+    (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+-    (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
++    (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD)
  #include "chrome/browser/browser_switcher/browser_switcher_navigation_throttle.h"
  #endif
  
-@@ -522,7 +522,7 @@
- #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h"
- #endif
+@@ -542,7 +542,7 @@
  
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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)
  #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h"
  #endif
  
-@@ -849,11 +849,13 @@ breakpad::CrashHandlerHostLinux* CreateCrashHandlerHos
+@@ -866,11 +866,13 @@ breakpad::CrashHandlerHostLinux* CreateCrashHandlerHos
  }
  
  int GetCrashSignalFD(const base::CommandLine& command_line) {
@@ -41,25 +41,25 @@
  
    // Extensions have the same process type as renderers.
    if (command_line.HasSwitch(extensions::switches::kExtensionProcess)) {
-@@ -1378,7 +1380,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(
- #elif defined(OS_CHROMEOS)
-   main_parts = std::make_unique<chromeos::ChromeBrowserMainPartsChromeos>(
-       parameters, &startup_data_);
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
+@@ -1417,7 +1419,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(
+ #elif BUILDFLAG(IS_CHROMEOS_LACROS)
+   main_parts = std::make_unique<ChromeBrowserMainPartsLacros>(parameters,
+                                                               &startup_data_);
+-#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
    main_parts =
        std::make_unique<ChromeBrowserMainPartsLinux>(parameters, &startup_data_);
  #elif defined(OS_ANDROID)
-@@ -1407,7 +1409,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(
- #if BUILDFLAG(IS_LACROS)
-   main_parts->AddParts(
+@@ -1448,7 +1450,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(
        std::make_unique<ChromeBrowserMainExtraPartsViewsLacros>());
--#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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)
    main_parts->AddParts(
        std::make_unique<ChromeBrowserMainExtraPartsViewsLinux>());
  #else
-@@ -2168,7 +2170,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
+@@ -2205,7 +2207,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
      command_line->AppendSwitchASCII(switches::kMetricsClientID,
                                      client_info->client_id);
    }
@@ -68,7 +68,16 @@
  #if defined(OS_ANDROID)
    bool enable_crash_reporter = true;
  #else
-@@ -3725,7 +3727,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
+@@ -2499,7 +2501,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)
+   // 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)) {
+@@ -3806,7 +3808,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
    }
  }
  
@@ -77,7 +86,7 @@
  void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
      const base::CommandLine& command_line,
      int child_process_id,
-@@ -3760,7 +3762,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFi
+@@ -3841,7 +3843,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFi
      mappings->Share(kCrashDumpSignal, crash_signal_fd);
    }
  }
@@ -86,21 +95,12 @@
  
  #if defined(OS_WIN)
  base::string16 ChromeContentBrowserClient::GetAppContainerSidForSandboxType(
-@@ -3848,7 +3850,7 @@ bool ChromeContentBrowserClient::IsRendererCodeIntegri
- 
- void ChromeContentBrowserClient::WillStartServiceManager() {
- #if defined(OS_WIN) || defined(OS_MAC) || \
--    (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+    (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
-   auto* chrome_feature_list_creator =
-       startup_data_.chrome_feature_list_creator();
-   // This has to run very early before ServiceManagerContext is created.
-@@ -4083,7 +4085,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
-   }
- 
+@@ -4165,7 +4167,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) || \
--    (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+    (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+-    (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
++    (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD)
    MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle::
                         MaybeCreateThrottleFor(handle),
                     &throttles);
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 27f74011..31cda227 100644
--- a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h
+++ b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h
@@ -1,6 +1,6 @@
---- chrome/browser/chrome_content_browser_client.h.orig	2020-11-13 06:36:36 UTC
+--- chrome/browser/chrome_content_browser_client.h.orig	2021-03-12 23:57:17 UTC
 +++ chrome/browser/chrome_content_browser_client.h
-@@ -394,12 +394,12 @@ class ChromeContentBrowserClient : public content::Con
+@@ -407,12 +407,12 @@ class ChromeContentBrowserClient : public content::Con
    void OverridePageVisibilityState(
        content::RenderFrameHost* render_frame_host,
        content::PageVisibilityState* visibility_state) override;
diff --git a/www/chromium/files/patch-chrome_browser_crash__upload__list_crash__upload__list.cc b/www/chromium/files/patch-chrome_browser_crash__upload__list_crash__upload__list.cc
index 5f623d2a..273043a7 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	2020-11-13 06:36:36 UTC
+--- chrome/browser/crash_upload_list/crash_upload_list.cc.orig	2021-03-12 23:57:17 UTC
 +++ chrome/browser/crash_upload_list/crash_upload_list.cc
-@@ -38,7 +38,7 @@ scoped_refptr<UploadList> CreateCrashUploadList() {
+@@ -39,7 +39,7 @@ scoped_refptr<UploadList> CreateCrashUploadList() {
  // ChromeOS uses crash_sender as its uploader even when Crashpad is enabled,
  // which isn't compatible with CrashUploadListCrashpad. crash_sender continues
  // to log uploads in CrashUploadList::kReporterLogFilename.
--#if !defined(OS_CHROMEOS)
-+#if !defined(OS_CHROMEOS) && !defined(OS_BSD)
+-#if !BUILDFLAG(IS_CHROMEOS_ASH)
++#if !BUILDFLAG(IS_CHROMEOS_ASH) && !defined(OS_BSD)
    if (crash_reporter::IsCrashpadEnabled()) {
      return new CrashUploadListCrashpad();
    }
diff --git a/www/chromium/files/patch-chrome_browser_crash__upload__list_crash__upload__list__crashpad.cc b/www/chromium/files/patch-chrome_browser_crash__upload__list_crash__upload__list__crashpad.cc
index dd5533be..8ad947b9 100644
--- a/www/chromium/files/patch-chrome_browser_crash__upload__list_crash__upload__list__crashpad.cc
+++ b/www/chromium/files/patch-chrome_browser_crash__upload__list_crash__upload__list__crashpad.cc
@@ -1,4 +1,4 @@
---- chrome/browser/crash_upload_list/crash_upload_list_crashpad.cc.orig	2020-11-13 06:36:36 UTC
+--- chrome/browser/crash_upload_list/crash_upload_list_crashpad.cc.orig	2021-03-12 23:57:17 UTC
 +++ chrome/browser/crash_upload_list/crash_upload_list_crashpad.cc
 @@ -42,6 +42,9 @@ CrashUploadListCrashpad::CrashUploadListCrashpad() = d
  CrashUploadListCrashpad::~CrashUploadListCrashpad() = default;
diff --git a/www/chromium/files/patch-chrome_browser_custom__handlers_protocol__handler__registry.cc b/www/chromium/files/patch-chrome_browser_custom__handlers_protocol__handler__registry.cc
index b7f53883..c0a5999f 100644
--- a/www/chromium/files/patch-chrome_browser_custom__handlers_protocol__handler__registry.cc
+++ b/www/chromium/files/patch-chrome_browser_custom__handlers_protocol__handler__registry.cc
@@ -1,6 +1,6 @@
---- chrome/browser/custom_handlers/protocol_handler_registry.cc.orig	2020-11-13 06:36:36 UTC
+--- chrome/browser/custom_handlers/protocol_handler_registry.cc.orig	2021-03-12 23:57:17 UTC
 +++ chrome/browser/custom_handlers/protocol_handler_registry.cc
-@@ -43,7 +43,7 @@ const ProtocolHandler& LookupHandler(
+@@ -45,7 +45,7 @@ const ProtocolHandler& LookupHandler(
  // If true default protocol handlers will be removed if the OS level
  // registration for a protocol is no longer Chrome.
  bool ShouldRemoveHandlersNotInOS() {
diff --git a/www/chromium/files/patch-chrome_browser_defaults.cc b/www/chromium/files/patch-chrome_browser_defaults.cc
index 98d87662..c0d44968 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	2020-11-13 06:36:36 UTC
+--- chrome/browser/defaults.cc.orig	2021-03-12 23:57:17 UTC
 +++ chrome/browser/defaults.cc
-@@ -43,7 +43,7 @@ const bool kSyncAutoStarts = true;
- const bool kSyncAutoStarts = false;
- #endif
+@@ -46,7 +46,7 @@ const bool kSyncAutoStarts = false;
  
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+ // 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 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 e8d62f2f..59053815 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,11 +1,11 @@
---- chrome/browser/dev_ui_browser_resources.grd.orig	2020-11-13 06:36:36 UTC
+--- chrome/browser/dev_ui_browser_resources.grd.orig	2021-03-12 23:57:17 UTC
 +++ chrome/browser/dev_ui_browser_resources.grd
-@@ -57,7 +57,7 @@ This file specifies browser resources for developer-fa
+@@ -55,7 +55,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" />
  
 -      <if expr="is_android or is_linux">
 +      <if expr="is_android or is_posix">
-         <include name="IDR_SANDBOX_INTERNALS_HTML" file="resources\sandbox_internals\sandbox_internals.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
-         <include name="IDR_SANDBOX_INTERNALS_JS" file="resources\sandbox_internals\sandbox_internals.js" type="BINDATA" />
+         <include name="IDR_SANDBOX_INTERNALS_HTML" file="resources\sandbox_internals\sandbox_internals.html" preprocess="true" type="BINDATA" />
+         <include name="IDR_SANDBOX_INTERNALS_JS" file="resources\sandbox_internals\sandbox_internals.js" preprocess="true" type="BINDATA" />
        </if>
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 ca42fa00..1df6bcb5 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	2020-11-13 06:36:36 UTC
+--- chrome/browser/device_identity/device_oauth2_token_service_factory.cc.orig	2021-03-12 23:57:17 UTC
 +++ chrome/browser/device_identity/device_oauth2_token_service_factory.cc
-@@ -28,7 +28,7 @@ std::unique_ptr<DeviceOAuth2TokenStore> CreatePlatform
- #if defined(OS_CHROMEOS)
+@@ -30,7 +30,7 @@ std::unique_ptr<DeviceOAuth2TokenStore> CreatePlatform
    return std::make_unique<chromeos::DeviceOAuth2TokenStoreChromeOS>(
        local_state);
--#elif defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX)
-+#elif defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD)
+ #elif defined(OS_WIN) || defined(OS_MAC) || \
+-    (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
++    (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD)
    DCHECK(
        base::FeatureList::IsEnabled(policy::features::kCBCMPolicyInvalidations));
    return std::make_unique<DeviceOAuth2TokenStoreDesktop>(local_state);
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 2ae6632f..231300fd 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,4 +1,4 @@
---- chrome/browser/devtools/devtools_eye_dropper.cc.orig	2021-01-18 21:28:49 UTC
+--- chrome/browser/devtools/devtools_eye_dropper.cc.orig	2021-03-12 23:57:17 UTC
 +++ chrome/browser/devtools/devtools_eye_dropper.cc
 @@ -165,7 +165,7 @@ void DevToolsEyeDropper::UpdateCursor() {
  // magnified projection only with centered hotspot.
diff --git a/www/chromium/files/patch-chrome_browser_diagnostics_diagnostics__writer.h b/www/chromium/files/patch-chrome_browser_diagnostics_diagnostics__writer.h
index eb170bb7..9373fba6 100644
--- a/www/chromium/files/patch-chrome_browser_diagnostics_diagnostics__writer.h
+++ b/www/chromium/files/patch-chrome_browser_diagnostics_diagnostics__writer.h
@@ -1,4 +1,4 @@
---- chrome/browser/diagnostics/diagnostics_writer.h.orig	2020-11-13 06:36:36 UTC
+--- chrome/browser/diagnostics/diagnostics_writer.h.orig	2021-03-12 23:57:17 UTC
 +++ chrome/browser/diagnostics/diagnostics_writer.h
 @@ -15,6 +15,8 @@ namespace diagnostics {
  // Console base class used internally.
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 43e7a724..aa0c0b99 100644
--- a/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc
+++ b/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc
@@ -1,6 +1,6 @@
---- chrome/browser/download/chrome_download_manager_delegate.cc.orig	2021-01-18 21:28:49 UTC
+--- chrome/browser/download/chrome_download_manager_delegate.cc.orig	2021-03-12 23:57:17 UTC
 +++ chrome/browser/download/chrome_download_manager_delegate.cc
-@@ -1400,7 +1400,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
+@@ -1443,7 +1443,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
          target_info->is_filetype_handled_safely)
        DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true);
  
@@ -9,7 +9,7 @@
      if (item->GetOriginalMimeType() == "application/x-x509-user-cert")
        DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true);
  #endif
-@@ -1453,7 +1453,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
+@@ -1496,7 +1496,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
  
  bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferreredForFile(
      const base::FilePath& path) {
@@ -18,7 +18,7 @@
      defined(OS_MAC)
    if (path.MatchesExtension(FILE_PATH_LITERAL(".pdf"))) {
      return !download_prefs_->ShouldOpenPdfInSystemReader();
-@@ -1549,7 +1549,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow
+@@ -1593,7 +1593,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow
      bool content_initiated,
      content::CheckDownloadAllowedCallback check_download_allowed_cb) {
    DCHECK_CURRENTLY_ON(BrowserThread::UI);
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 b96ac86b..e59032af 100644
--- a/www/chromium/files/patch-chrome_browser_download_download__commands.cc
+++ b/www/chromium/files/patch-chrome_browser_download_download__commands.cc
@@ -1,4 +1,4 @@
---- chrome/browser/download/download_commands.cc.orig	2020-11-13 06:36:36 UTC
+--- chrome/browser/download/download_commands.cc.orig	2021-03-12 23:57:17 UTC
 +++ chrome/browser/download/download_commands.cc
 @@ -27,7 +27,7 @@
  #include "net/base/url_util.h"
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 2c1f4554..ceaa75f9 100644
--- a/www/chromium/files/patch-chrome_browser_download_download__commands.h
+++ b/www/chromium/files/patch-chrome_browser_download_download__commands.h
@@ -1,4 +1,4 @@
---- chrome/browser/download/download_commands.h.orig	2020-11-13 06:36:36 UTC
+--- chrome/browser/download/download_commands.h.orig	2021-03-12 23:57:17 UTC
 +++ chrome/browser/download/download_commands.h
 @@ -48,7 +48,7 @@ class DownloadCommands {
    bool IsCommandVisible(Command command) 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 32eccd31..cff9400d 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,4 +1,4 @@
---- chrome/browser/download/download_item_model.cc.orig	2020-11-13 06:36:36 UTC
+--- chrome/browser/download/download_item_model.cc.orig	2021-03-12 23:57:17 UTC
 +++ chrome/browser/download/download_item_model.cc
 @@ -571,7 +571,7 @@ bool DownloadItemModel::IsCommandChecked(
        return download_->GetOpenWhenComplete() ||
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 7417997e..bbdb1e79 100644
--- a/www/chromium/files/patch-chrome_browser_download_download__prefs.cc
+++ b/www/chromium/files/patch-chrome_browser_download_download__prefs.cc
@@ -1,6 +1,6 @@
---- chrome/browser/download/download_prefs.cc.orig	2020-11-13 06:36:36 UTC
+--- chrome/browser/download/download_prefs.cc.orig	2021-03-12 23:57:17 UTC
 +++ chrome/browser/download/download_prefs.cc
-@@ -67,7 +67,7 @@ namespace {
+@@ -68,7 +68,7 @@ namespace {
  // Consider downloads 'dangerous' if they go to the home directory on Linux and
  // to the desktop on any platform.
  bool DownloadPathIsDangerous(const base::FilePath& download_path) {
@@ -9,16 +9,16 @@
    base::FilePath home_dir = base::GetHomeDir();
    if (download_path == home_dir) {
      return true;
-@@ -172,7 +172,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profi
+@@ -173,7 +173,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profi
                                  GetDefaultDownloadDirectoryForProfile()));
- #endif  // defined(OS_CHROMEOS)
+ #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
  
 -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \
 +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \
      defined(OS_MAC)
    should_open_pdf_in_system_reader_ =
        prefs->GetBoolean(prefs::kOpenPdfDownloadInSystemReader);
-@@ -300,7 +300,7 @@ void DownloadPrefs::RegisterProfilePrefs(
+@@ -301,7 +301,7 @@ void DownloadPrefs::RegisterProfilePrefs(
                                   default_download_path);
    registry->RegisterFilePathPref(prefs::kSaveFileDefaultDirectory,
                                   default_download_path);
@@ -27,7 +27,7 @@
      defined(OS_MAC)
    registry->RegisterBooleanPref(prefs::kOpenPdfDownloadInSystemReader, false);
  #endif
-@@ -430,7 +430,7 @@ bool DownloadPrefs::IsDownloadPathManaged() const {
+@@ -431,7 +431,7 @@ bool DownloadPrefs::IsDownloadPathManaged() const {
  }
  
  bool DownloadPrefs::IsAutoOpenByUserUsed() const {
@@ -36,7 +36,7 @@
      defined(OS_MAC)
    if (ShouldOpenPdfInSystemReader())
      return true;
-@@ -445,7 +445,7 @@ bool DownloadPrefs::IsAutoOpenEnabled(const GURL& url,
+@@ -446,7 +446,7 @@ bool DownloadPrefs::IsAutoOpenEnabled(const GURL& url,
      return false;
    DCHECK(extension[0] == base::FilePath::kExtensionSeparator);
    extension.erase(0, 1);
@@ -45,7 +45,7 @@
      defined(OS_MAC)
    if (base::FilePath::CompareEqualIgnoreCase(extension,
                                               FILE_PATH_LITERAL("pdf")) &&
-@@ -496,7 +496,7 @@ void DownloadPrefs::DisableAutoOpenByUserBasedOnExtens
+@@ -497,7 +497,7 @@ void DownloadPrefs::DisableAutoOpenByUserBasedOnExtens
    SaveAutoOpenState();
  }
  
@@ -54,7 +54,7 @@
      defined(OS_MAC)
  void DownloadPrefs::SetShouldOpenPdfInSystemReader(bool should_open) {
    if (should_open_pdf_in_system_reader_ == should_open)
-@@ -518,7 +518,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons
+@@ -519,7 +519,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons
  #endif
  
  void DownloadPrefs::ResetAutoOpenByUser() {
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 dc591a61..d6bc6675 100644
--- a/www/chromium/files/patch-chrome_browser_download_download__prefs.h
+++ b/www/chromium/files/patch-chrome_browser_download_download__prefs.h
@@ -1,4 +1,4 @@
---- chrome/browser/download/download_prefs.h.orig	2020-11-13 06:36:36 UTC
+--- chrome/browser/download/download_prefs.h.orig	2021-03-12 23:57:17 UTC
 +++ chrome/browser/download/download_prefs.h
 @@ -117,7 +117,7 @@ class DownloadPrefs {
    // Disables auto-open based on file extension.
diff --git a/www/chromium/files/patch-chrome_browser_download_download__query.cc b/www/chromium/files/patch-chrome_browser_download_download__query.cc
index a3d5b963..9888563b 100644
--- a/www/chromium/files/patch-chrome_browser_download_download__query.cc
+++ b/www/chromium/files/patch-chrome_browser_download_download__query.cc
@@ -1,4 +1,4 @@
---- chrome/browser/download/download_query.cc.orig	2020-11-13 06:36:36 UTC
+--- chrome/browser/download/download_query.cc.orig	2021-03-12 23:57:17 UTC
 +++ chrome/browser/download/download_query.cc
 @@ -28,7 +28,11 @@
  #include "components/download/public/common/download_item.h"
diff --git a/www/chromium/files/patch-chrome_browser_download_download__shelf__context__menu.cc b/www/chromium/files/patch-chrome_browser_download_download__shelf__context__menu.cc
index 684cafa3..bd3f723c 100644
--- a/www/chromium/files/patch-chrome_browser_download_download__shelf__context__menu.cc
+++ b/www/chromium/files/patch-chrome_browser_download_download__shelf__context__menu.cc
@@ -1,4 +1,4 @@
---- chrome/browser/download/download_shelf_context_menu.cc.orig	2020-11-13 06:36:36 UTC
+--- chrome/browser/download/download_shelf_context_menu.cc.orig	2021-03-12 23:57:17 UTC
 +++ chrome/browser/download/download_shelf_context_menu.cc
 @@ -146,7 +146,7 @@ base::string16 DownloadShelfContextMenu::GetLabelForCo
                     : IDS_DOWNLOAD_MENU_PLATFORM_OPEN_ALWAYS;
diff --git a/www/chromium/files/patch-chrome_browser_error__reporting_BUILD.gn b/www/chromium/files/patch-chrome_browser_error__reporting_BUILD.gn
index 3098fc8c..1d5b25c5 100644
--- a/www/chromium/files/patch-chrome_browser_error__reporting_BUILD.gn
+++ b/www/chromium/files/patch-chrome_browser_error__reporting_BUILD.gn
@@ -1,6 +1,6 @@
---- chrome/browser/error_reporting/BUILD.gn.orig	2021-01-19 12:11:56 UTC
+--- chrome/browser/error_reporting/BUILD.gn.orig	2021-03-12 23:57:17 UTC
 +++ chrome/browser/error_reporting/BUILD.gn
-@@ -22,6 +22,13 @@ static_library("error_reporting") {
+@@ -25,6 +25,13 @@ static_library("error_reporting") {
      "//services/network:network_service",
      "//services/network/public/cpp",
    ]
@@ -14,8 +14,8 @@
  }
  
  source_set("test_support") {
-@@ -35,6 +42,12 @@ source_set("test_support") {
-     "//base",
+@@ -42,6 +49,12 @@ source_set("test_support") {
+     "//components/crash/content/browser/error_reporting",
      "//components/crash/content/browser/error_reporting:mock_crash_endpoint",
    ]
 +
@@ -27,7 +27,7 @@
  }
  
  source_set("unit_test") {
-@@ -52,4 +65,12 @@ source_set("unit_test") {
+@@ -60,4 +73,12 @@ source_set("unit_test") {
      "//net:test_support",
      "//testing/gtest",
    ]
diff --git a/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn b/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn
index 2d6ff3f8..ed7c6f3d 100644
--- a/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn
+++ b/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn
@@ -1,7 +1,7 @@
---- chrome/browser/extensions/BUILD.gn.orig	2021-01-18 21:28:49 UTC
+--- chrome/browser/extensions/BUILD.gn.orig	2021-03-12 23:57:17 UTC
 +++ chrome/browser/extensions/BUILD.gn
-@@ -1233,6 +1233,12 @@ static_library("extensions") {
-     deps += [ "//chrome/common:service_process_mojom" ]
+@@ -1248,6 +1248,12 @@ static_library("extensions") {
+     ]
    }
  
 +  if (is_bsd) {
diff --git a/www/chromium/files/patch-chrome_browser_extensions_activity__log_activity__log.cc b/www/chromium/files/patch-chrome_browser_extensions_activity__log_activity__log.cc
index 02ba7ca0..a717fdad 100644
--- a/www/chromium/files/patch-chrome_browser_extensions_activity__log_activity__log.cc
+++ b/www/chromium/files/patch-chrome_browser_extensions_activity__log_activity__log.cc
@@ -1,4 +1,4 @@
---- chrome/browser/extensions/activity_log/activity_log.cc.orig	2021-01-18 21:28:49 UTC
+--- chrome/browser/extensions/activity_log/activity_log.cc.orig	2021-03-12 23:57:17 UTC
 +++ chrome/browser/extensions/activity_log/activity_log.cc
 @@ -49,7 +49,11 @@
  #include "extensions/common/extension.h"
diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_device__info__fetcher.cc b/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_device__info__fetcher.cc
index 032cb092..3a882ddd 100644
--- a/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_device__info__fetcher.cc
+++ b/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_device__info__fetcher.cc
@@ -1,4 +1,4 @@
---- chrome/browser/extensions/api/enterprise_reporting_private/device_info_fetcher.cc.orig	2020-11-13 06:36:36 UTC
+--- chrome/browser/extensions/api/enterprise_reporting_private/device_info_fetcher.cc.orig	2021-03-12 23:57:17 UTC
 +++ chrome/browser/extensions/api/enterprise_reporting_private/device_info_fetcher.cc
 @@ -10,7 +10,7 @@
  #include "chrome/browser/extensions/api/enterprise_reporting_private/device_info_fetcher_mac.h"
diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_device__info__fetcher__linux.cc b/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_device__info__fetcher__linux.cc
index 0f027d57..5aa9ea53 100644
--- a/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_device__info__fetcher__linux.cc
+++ b/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_device__info__fetcher__linux.cc
@@ -1,4 +1,4 @@
---- chrome/browser/extensions/api/enterprise_reporting_private/device_info_fetcher_linux.cc.orig	2020-11-13 06:36:36 UTC
+--- chrome/browser/extensions/api/enterprise_reporting_private/device_info_fetcher_linux.cc.orig	2021-03-12 23:57:17 UTC
 +++ chrome/browser/extensions/api/enterprise_reporting_private/device_info_fetcher_linux.cc
 @@ -8,7 +8,9 @@
  #include <gio/gio.h>
diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_erp_chrome_desktop_report_request_helper.cc b/www/chromium/files/patch-chrome_browser_extensions_api_erp_chrome_desktop_report_request_helper.cc
index 72a1313e..d05d040a 100644
--- a/www/chromium/files/patch-chrome_browser_extensions_api_erp_chrome_desktop_report_request_helper.cc
+++ b/www/chromium/files/patch-chrome_browser_extensions_api_erp_chrome_desktop_report_request_helper.cc
@@ -1,4 +1,4 @@
---- chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc.orig	2021-01-18 21:28:50 UTC
+--- chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc.orig	2021-03-12 23:57:17 UTC
 +++ chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc
 @@ -22,7 +22,7 @@
  #include "base/win/registry.h"
diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_extension__action_browser__action__interactive__test.cc b/www/chromium/files/patch-chrome_browser_extensions_api_extension__action_browser__action__interactive__test.cc
index ba7cf1f6..319d165d 100644
--- a/www/chromium/files/patch-chrome_browser_extensions_api_extension__action_browser__action__interactive__test.cc
+++ b/www/chromium/files/patch-chrome_browser_extensions_api_extension__action_browser__action__interactive__test.cc
@@ -1,6 +1,6 @@
---- chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc.orig	2021-01-18 21:28:50 UTC
+--- chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc.orig	2021-03-12 23:57:17 UTC
 +++ chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc
-@@ -280,7 +280,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionInteractiveTest, T
+@@ -281,7 +281,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionInteractiveTest, T
    frame_observer.Wait();
    // Non-Aura Linux uses a singleton for the popup, so it looks like all windows
    // have popups if there is any popup open.
diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc b/www/chromium/files/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc
index 0db1b2f1..d5212afd 100644
--- a/www/chromium/files/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc
+++ b/www/chromium/files/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc
@@ -1,4 +1,4 @@
---- chrome/browser/extensions/api/image_writer_private/removable_storage_provider.cc.orig	2020-11-13 06:36:36 UTC
+--- chrome/browser/extensions/api/image_writer_private/removable_storage_provider.cc.orig	2021-03-12 23:57:17 UTC
 +++ chrome/browser/extensions/api/image_writer_private/removable_storage_provider.cc
 @@ -22,6 +22,7 @@ static base::LazyInstance<scoped_refptr<StorageDeviceL
  
diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc b/www/chromium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc
index 5502b9a6..1f7a5b0c 100644
--- a/www/chromium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc
+++ b/www/chromium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc
@@ -1,6 +1,6 @@
---- chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc.orig	2020-11-13 06:36:36 UTC
+--- chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc.orig	2021-03-12 23:57:17 UTC
 +++ chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc
-@@ -284,6 +284,8 @@ bool ChromeRuntimeAPIDelegate::GetPlatformInfo(Platfor
+@@ -286,6 +286,8 @@ bool ChromeRuntimeAPIDelegate::GetPlatformInfo(Platfor
      info->os = extensions::api::runtime::PLATFORM_OS_CROS;
    } else if (strcmp(os, "linux") == 0) {
      info->os = extensions::api::runtime::PLATFORM_OS_LINUX;
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 672c3ce6..57214f0e 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-01-18 21:28:50 UTC
+--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig	2021-03-12 23:57:17 UTC
 +++ chrome/browser/extensions/api/settings_private/prefs_util.cc
-@@ -171,7 +171,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
-   (*s_allowlist)[bookmarks::prefs::kShowBookmarkBar] =
-       settings_api::PrefType::PREF_TYPE_BOOLEAN;
+@@ -176,7 +176,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
  
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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)
    (*s_allowlist)[::prefs::kUseCustomChromeFrame] =
        settings_api::PrefType::PREF_TYPE_BOOLEAN;
  #endif
-@@ -181,7 +181,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
-   // Appearance settings.
-   (*s_allowlist)[::prefs::kCurrentThemeID] =
+@@ -188,7 +188,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
        settings_api::PrefType::PREF_TYPE_STRING;
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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)
    (*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 0677c99d..6d8ab965 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,4 +1,4 @@
---- chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc.orig	2020-11-13 06:36:36 UTC
+--- chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc.orig	2021-03-12 23:57:17 UTC
 +++ chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc
 @@ -30,7 +30,7 @@
  #include "extensions/browser/process_manager.h"
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 52c2f5c6..f00c82fb 100644
--- a/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc
+++ b/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc
@@ -1,6 +1,6 @@
---- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig	2020-11-13 06:36:36 UTC
+--- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig	2021-03-12 23:57:17 UTC
 +++ chrome/browser/extensions/browser_context_keyed_service_factories.cc
-@@ -53,7 +53,7 @@
+@@ -54,7 +54,7 @@
  #include "extensions/browser/api/networking_private/networking_private_delegate_factory.h"
  #include "ppapi/buildflags/buildflags.h"
  
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 834594ad..e76cbaed 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,15 +1,15 @@
---- chrome/browser/extensions/external_provider_impl.cc.orig	2020-11-13 06:36:37 UTC
+--- chrome/browser/extensions/external_provider_impl.cc.orig	2021-03-12 23:57:18 UTC
 +++ chrome/browser/extensions/external_provider_impl.cc
-@@ -776,7 +776,7 @@ void ExternalProviderImpl::CreateExternalProviders(
-   }
- #endif
+@@ -792,7 +792,7 @@ void ExternalProviderImpl::CreateExternalProviders(
    if (!profile->GetPrefs()->GetBoolean(pref_names::kBlockExternalExtensions)) {
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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)
      provider_list->push_back(std::make_unique<ExternalProviderImpl>(
          service,
          base::MakeRefCounted<ExternalPrefLoader>(
-@@ -803,7 +803,7 @@ void ExternalProviderImpl::CreateExternalProviders(
+@@ -819,7 +819,7 @@ void ExternalProviderImpl::CreateExternalProviders(
            bundled_extension_creation_flags));
  
        // Define a per-user source of external extensions.
diff --git a/www/chromium/files/patch-chrome_browser_native__file__system_chrome__native__file__system__permission__context.cc b/www/chromium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc
similarity index 68%
rename from www/chromium/files/patch-chrome_browser_native__file__system_chrome__native__file__system__permission__context.cc
rename to www/chromium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc
index e8aa98c2..bfb1783f 100644
--- a/www/chromium/files/patch-chrome_browser_native__file__system_chrome__native__file__system__permission__context.cc
+++ b/www/chromium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc
@@ -1,6 +1,6 @@
---- chrome/browser/native_file_system/chrome_native_file_system_permission_context.cc.orig	2021-01-18 21:28:50 UTC
-+++ chrome/browser/native_file_system/chrome_native_file_system_permission_context.cc
-@@ -143,7 +143,7 @@ const struct {
+--- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig	2021-03-12 23:57:18 UTC
++++ chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
+@@ -144,7 +144,7 @@ const struct {
      {base::DIR_APP_DATA, nullptr, kBlockAllChildren},
      {base::DIR_HOME, FILE_PATH_LITERAL("Library"), kBlockAllChildren},
  #endif
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 d35311eb..c86ce4f8 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	2020-11-13 06:36:37 UTC
+--- chrome/browser/first_run/first_run_dialog.h.orig	2021-03-12 23:57:18 UTC
 +++ chrome/browser/first_run/first_run_dialog.h
-@@ -9,7 +9,7 @@
- #include "build/build_config.h"
- 
+@@ -12,7 +12,7 @@
  // Hide this function on platforms where the dialog does not exist.
--#if defined(OS_MAC) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+#if defined(OS_MAC) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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)
  
  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 bda3866c..8af51071 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,18 +1,19 @@
---- chrome/browser/first_run/first_run_internal.h.orig	2021-01-18 21:28:50 UTC
+--- chrome/browser/first_run/first_run_internal.h.orig	2021-03-12 23:57:18 UTC
 +++ chrome/browser/first_run/first_run_internal.h
-@@ -55,13 +55,13 @@ FirstRunState DetermineFirstRunState(bool has_sentinel
-                                      bool force_first_run,
-                                      bool no_first_run);
+@@ -58,14 +58,13 @@ FirstRunState DetermineFirstRunState(bool has_sentinel
  
--#if defined(OS_MAC) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+#if defined(OS_MAC) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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)
  // 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
  // build, etc).
  void ForceFirstRunDialogShownForTesting(bool shown);
--#endif  // defined(OS_MAC) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+#endif  // defined(OS_MAC) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+-#endif  // defined(OS_MAC) || (defined(OS_LINUX) ||
+-        // BUILDFLAG(IS_CHROMEOS_LACROS))
++#endif  // defined(OS_MAC) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD)
  
  }  // namespace internal
  }  // namespace first_run
diff --git a/www/chromium/files/patch-chrome_browser_first__run_first__run__internal__posix.cc b/www/chromium/files/patch-chrome_browser_first__run_first__run__internal__posix.cc
index 7413bfd5..60672eda 100644
--- a/www/chromium/files/patch-chrome_browser_first__run_first__run__internal__posix.cc
+++ b/www/chromium/files/patch-chrome_browser_first__run_first__run__internal__posix.cc
@@ -1,20 +1,20 @@
---- chrome/browser/first_run/first_run_internal_posix.cc.orig	2020-11-13 06:36:37 UTC
+--- chrome/browser/first_run/first_run_internal_posix.cc.orig	2021-03-12 23:57:18 UTC
 +++ chrome/browser/first_run/first_run_internal_posix.cc
-@@ -45,7 +45,7 @@ enum class ForcedShowDialogState {
+@@ -46,7 +46,7 @@ enum class ForcedShowDialogState {
  ForcedShowDialogState g_forced_show_dialog_state =
      ForcedShowDialogState::kNotForced;
  
--#if !defined(OS_CHROMEOS)
-+#if !defined(OS_CHROMEOS) && !defined(OS_BSD)
+-#if !BUILDFLAG(IS_CHROMEOS_ASH)
++#if !BUILDFLAG(IS_CHROMEOS_ASH) && !defined(OS_BSD)
  // Returns whether the first run dialog should be shown. This is only true for
  // certain builds, and only if the user has not already set preferences. In a
  // real, official-build first run, initializes the default metrics reporting if
-@@ -96,7 +96,7 @@ void ForceFirstRunDialogShownForTesting(bool shown) {
+@@ -97,7 +97,7 @@ void ForceFirstRunDialogShownForTesting(bool shown) {
  }
  
  void DoPostImportPlatformSpecificTasks(Profile* profile) {
--#if !defined(OS_CHROMEOS)
-+#if !defined(OS_CHROMEOS) && !defined(OS_BSD)
+-#if !BUILDFLAG(IS_CHROMEOS_ASH)
++#if !BUILDFLAG(IS_CHROMEOS_ASH) && !defined(OS_BSD)
    if (!ShouldShowFirstRunDialog())
      return;
  
diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc
index 06233854..cfc4b064 100644
--- a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc
+++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc
@@ -1,6 +1,6 @@
---- chrome/browser/flag_descriptions.cc.orig	2021-01-18 21:28:50 UTC
+--- chrome/browser/flag_descriptions.cc.orig	2021-03-12 23:57:18 UTC
 +++ chrome/browser/flag_descriptions.cc
-@@ -4609,7 +4609,7 @@ const char kEnableNewBadgeOnMenuItemsDescription[] =
+@@ -4772,7 +4772,7 @@ const char kEnableNewBadgeOnMenuItemsDescription[] =
  
  // Random platform combinations -----------------------------------------------
  
@@ -9,7 +9,7 @@
      defined(OS_CHROMEOS)
  
  const char kEnableMediaFeedsName[] = "Enables Media Feeds";
-@@ -4653,17 +4653,17 @@ const char kRemoteCopyProgressNotificationDescription[
+@@ -4816,27 +4816,27 @@ const char kRemoteCopyProgressNotificationDescription[
      "Enables progress notifications to be shown for the remote copy feature "
      "when receiving a message.";
  
@@ -29,11 +29,6 @@
 +#endif  // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) ||
          // defined(OS_CHROMEOS)
  
- #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_CHROMEOS)
-@@ -4675,14 +4675,14 @@ const char kWebContentsOcclusionDescription[] =
- 
- #endif  // defined(OS_WIN) || defined(OS_MAC) || defined(OS_CHROMEOS)
- 
 -#if defined(OS_CHROMEOS) || defined(OS_LINUX)
 +#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD)
  #if BUILDFLAG(USE_TCMALLOC)
@@ -45,21 +40,30 @@
 -#endif  // #if defined(OS_CHROMEOS) || defined(OS_LINUX)
 +#endif  // #if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD)
  
- #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
+ #if !defined(OS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH)
  const char kUserDataSnapshotName[] = "Enable user data snapshots";
-@@ -4698,13 +4698,13 @@ const char kWebShareDescription[] =
-     "platforms.";
- #endif  // defined(OS_WIN) || defined(OS_CHROMEOS)
+@@ -4854,13 +4854,13 @@ const char kWebShareDescription[] =
  
--#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || \
-+#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) || \
+ // 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) || \
      defined(OS_MAC)
  const char kEnableEphemeralGuestProfilesOnDesktopName[] =
      "Enable ephemeral Guest profiles on Desktop";
  const char kEnableEphemeralGuestProfilesOnDesktopDescription[] =
      "Enables ephemeral Guest profiles on Windows, Linux, and Mac.";
--#endif  // defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ||
-+#endif  // defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) ||
-         // defined(OS_MAC)
+-#endif  // defined(OS_WIN) || (defined(OS_LINUX) ||
++#endif  // defined(OS_WIN) || (defined(OS_LINUX) || defined(OS_BSD) ||
+         // BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_MAC)
  
  // Feature flags --------------------------------------------------------------
+@@ -4953,7 +4953,7 @@ const char kAutofillCreditCardUploadDescription[] =
+ 
+ #endif  // defined(TOOLKIT_VIEWS) || defined(OS_ANDROID)
+ 
+-#if !defined(OS_WIN) && !defined(OS_FUCHSIA)
++#if !defined(OS_WIN) && !defined(OS_FUCHSIA) && !defined(OS_BSD)
+ const char kSendWebUIJavaScriptErrorReportsName[] =
+     "Send WebUI JavaScript Error Reports";
+ const char kSendWebUIJavaScriptErrorReportsDescription[] =
diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.h b/www/chromium/files/patch-chrome_browser_flag__descriptions.h
index 70902c3e..28ba171c 100644
--- a/www/chromium/files/patch-chrome_browser_flag__descriptions.h
+++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.h
@@ -1,6 +1,6 @@
---- chrome/browser/flag_descriptions.h.orig	2021-01-18 21:28:50 UTC
+--- chrome/browser/flag_descriptions.h.orig	2021-03-12 23:57:18 UTC
 +++ chrome/browser/flag_descriptions.h
-@@ -19,9 +19,9 @@
+@@ -20,9 +20,9 @@
  #include "ppapi/buildflags/buildflags.h"
  #include "printing/buildflags/buildflags.h"
  
@@ -12,7 +12,7 @@
  
  // This file declares strings used in chrome://flags. These messages are not
  // translated, because instead of end-users they target Chromium developers and
-@@ -2699,7 +2699,7 @@ extern const char kEnableNewBadgeOnMenuItemsDescriptio
+@@ -2790,7 +2790,7 @@ extern const char kEnableNewBadgeOnMenuItemsDescriptio
  
  // Random platform combinations -----------------------------------------------
  
@@ -21,7 +21,7 @@
      defined(OS_CHROMEOS)
  
  extern const char kEnableMediaFeedsName[];
-@@ -2726,7 +2726,7 @@ extern const char kRemoteCopyProgressNotificationDescr
+@@ -2817,15 +2817,15 @@ extern const char kRemoteCopyProgressNotificationDescr
  extern const char kDirectManipulationStylusName[];
  extern const char kDirectManipulationStylusDescription[];
  
@@ -29,11 +29,6 @@
 +#endif  // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) ||
          // defined(OS_CHROMEOS)
  
- #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_CHROMEOS)
-@@ -2736,12 +2736,12 @@ extern const char kWebContentsOcclusionDescription[];
- 
- #endif  // defined(OS_WIN) || defined(OS_MAC) || defined(OS_CHROMEOS)
- 
 -#if defined(OS_CHROMEOS) || defined(OS_LINUX)
 +#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD)
  #if BUILDFLAG(USE_TCMALLOC)
@@ -43,19 +38,28 @@
 -#endif  // #if defined(OS_CHROMEOS) || defined(OS_LINUX)
 +#endif  // #if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD)
  
- #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
+ #if !defined(OS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH)
  extern const char kUserDataSnapshotName[];
-@@ -2753,11 +2753,11 @@ extern const char kWebShareName[];
- extern const char kWebShareDescription[];
- #endif  // defined(OS_WIN) || defined(OS_CHROMEOS)
+@@ -2839,11 +2839,11 @@ extern const char kWebShareDescription[];
  
--#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || \
-+#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) || \
+ // 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) || \
      defined(OS_MAC)
  extern const char kEnableEphemeralGuestProfilesOnDesktopName[];
  extern const char kEnableEphemeralGuestProfilesOnDesktopDescription[];
--#endif  // defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS) ||
-+#endif  // defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) ||
-         // defined(OS_MAC)
+-#endif  // defined(OS_WIN) || (defined(OS_LINUX) ||
++#endif  // defined(OS_WIN) || (defined(OS_LINUX) || defined(OS_BSD) ||
+         // BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_MAC)
  
  // Feature flags --------------------------------------------------------------
+@@ -2906,7 +2906,7 @@ extern const char kAutofillCreditCardUploadDescription
+ 
+ #endif  // defined(TOOLKIT_VIEWS) || defined(OS_ANDROID)
+ 
+-#if !defined(OS_WIN) && !defined(OS_FUCHSIA)
++#if !defined(OS_WIN) && !defined(OS_FUCHSIA) && !defined(OS_BSD)
+ extern const char kSendWebUIJavaScriptErrorReportsName[];
+ extern const char kSendWebUIJavaScriptErrorReportsDescription[];
+ #endif
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 5d715683..f5e4258b 100644
--- a/www/chromium/files/patch-chrome_browser_intranet__redirect__detector.h
+++ b/www/chromium/files/patch-chrome_browser_intranet__redirect__detector.h
@@ -1,4 +1,4 @@
---- chrome/browser/intranet_redirect_detector.h.orig	2020-11-16 14:19:24 UTC
+--- chrome/browser/intranet_redirect_detector.h.orig	2021-03-12 23:57:18 UTC
 +++ chrome/browser/intranet_redirect_detector.h
 @@ -27,7 +27,7 @@ class SimpleURLLoader;
  
diff --git a/www/chromium/files/patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc b/www/chromium/files/patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc
index b5eef183..87ee148f 100644
--- a/www/chromium/files/patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc
+++ b/www/chromium/files/patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc
@@ -1,4 +1,4 @@
---- chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig	2020-11-13 06:36:37 UTC
+--- chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig	2021-03-12 23:57:18 UTC
 +++ chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc
 @@ -39,10 +39,12 @@ void MTPDeviceMapService::RegisterMTPFileSystem(
      // Note that this initializes the delegate asynchronously, but since
@@ -7,8 +7,8 @@
 +#if !defined(OS_FREEBSD)
      CreateMTPDeviceAsyncDelegate(
          device_location, read_only,
-         base::Bind(&MTPDeviceMapService::AddAsyncDelegate,
-                    base::Unretained(this), device_location, read_only));
+         base::BindOnce(&MTPDeviceMapService::AddAsyncDelegate,
+                        base::Unretained(this), device_location, read_only));
 +#endif
      mtp_device_usage_map_[key] = 0;
    }
diff --git a/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 d46dbf81..1d035446 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	2020-11-13 06:36:37 UTC
+--- chrome/browser/media_galleries/media_file_system_registry.cc.orig	2021-03-12 23:57:18 UTC
 +++ chrome/browser/media_galleries/media_file_system_registry.cc
-@@ -735,7 +735,10 @@ class MediaFileSystemRegistry::MediaFileSystemContextI
+@@ -736,7 +736,10 @@ 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
new file mode 100644
index 00000000..c34939ba
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_media_audio__service__util.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/media/audio_service_util.cc.orig	2021-03-12 23:57:18 UTC
++++ chrome/browser/media/audio_service_util.cc
+@@ -24,7 +24,7 @@ bool IsAudioServiceSandboxEnabled() {
+ // 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) || BUILDFLAG(IS_CHROMEOS_LACROS))
++    (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD)
+   const policy::PolicyMap& policies =
+       g_browser_process->browser_policy_connector()
+           ->GetPolicyService()
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 d2b2859b..61a8f93f 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	2020-11-13 06:36:37 UTC
+--- chrome/browser/media/router/discovery/discovery_network_list_posix.cc.orig	2021-03-12 23:57:18 UTC
 +++ chrome/browser/media/router/discovery/discovery_network_list_posix.cc
 @@ -10,6 +10,7 @@
  #include <netinet/in.h>
diff --git a/www/chromium/files/patch-chrome_browser_media_router_discovery_discovery__network__list__wifi__linux.cc b/www/chromium/files/patch-chrome_browser_media_router_discovery_discovery__network__list__wifi__linux.cc
index bdac7644..c42ffa49 100644
--- a/www/chromium/files/patch-chrome_browser_media_router_discovery_discovery__network__list__wifi__linux.cc
+++ b/www/chromium/files/patch-chrome_browser_media_router_discovery_discovery__network__list__wifi__linux.cc
@@ -1,4 +1,4 @@
---- chrome/browser/media/router/discovery/discovery_network_list_wifi_linux.cc.orig	2020-11-13 06:36:37 UTC
+--- chrome/browser/media/router/discovery/discovery_network_list_wifi_linux.cc.orig	2021-03-12 23:57:18 UTC
 +++ chrome/browser/media/router/discovery/discovery_network_list_wifi_linux.cc
 @@ -9,7 +9,11 @@
  #include <sys/socket.h>
diff --git a/www/chromium/files/patch-chrome_browser_media_router_providers_wired__display_wired__display__media__route__provider.cc b/www/chromium/files/patch-chrome_browser_media_router_providers_wired__display_wired__display__media__route__provider.cc
index 068d8fd2..b883b109 100644
--- a/www/chromium/files/patch-chrome_browser_media_router_providers_wired__display_wired__display__media__route__provider.cc
+++ b/www/chromium/files/patch-chrome_browser_media_router_providers_wired__display_wired__display__media__route__provider.cc
@@ -1,6 +1,6 @@
---- chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider.cc.orig	2020-11-13 06:36:37 UTC
+--- chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider.cc.orig	2021-03-12 23:57:18 UTC
 +++ chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider.cc
-@@ -112,6 +112,12 @@ void WiredDisplayMediaRouteProvider::CreateRoute(
+@@ -105,6 +105,12 @@ void WiredDisplayMediaRouteProvider::CreateRoute(
      bool off_the_record,
      CreateRouteCallback callback) {
    DCHECK(!base::Contains(presentations_, presentation_id));
@@ -13,7 +13,7 @@
    base::Optional<Display> display = GetDisplayBySinkId(sink_id);
    if (!display) {
      std::move(callback).Run(base::nullopt, nullptr,
-@@ -138,6 +144,7 @@ void WiredDisplayMediaRouteProvider::CreateRoute(
+@@ -131,6 +137,7 @@ void WiredDisplayMediaRouteProvider::CreateRoute(
    std::move(callback).Run(route, nullptr, base::nullopt,
                            RouteRequestResult::OK);
    NotifyRouteObservers();
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 f5946e14..0336df51 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,8 +1,8 @@
---- chrome/browser/media/webrtc/webrtc_event_log_uploader.cc.orig	2020-11-13 06:36:37 UTC
+--- chrome/browser/media/webrtc/webrtc_event_log_uploader.cc.orig	2021-03-12 23:57:18 UTC
 +++ chrome/browser/media/webrtc/webrtc_event_log_uploader.cc
-@@ -40,6 +40,8 @@ const char kProduct[] = "Chrome_Mac";
+@@ -41,6 +41,8 @@ const char kProduct[] = "Chrome_Mac";
  const char kProduct[] = "Chrome_ChromeOS";
- #elif defined(OS_LINUX)
+ #elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
  const char kProduct[] = "Chrome_Linux";
 +#elif defined(OS_FREEBSD)
 +const char kProduct[] = "Chrome_FreeBSD";
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 479fa6c5..2e65e602 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	2020-11-13 06:36:37 UTC
+--- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig	2021-03-12 23:57:18 UTC
 +++ chrome/browser/media/webrtc/webrtc_log_uploader.cc
-@@ -357,6 +357,8 @@ void WebRtcLogUploader::SetupMultipart(
+@@ -360,6 +360,8 @@ void WebRtcLogUploader::SetupMultipart(
    const char product[] = "Chrome_Android";
- #elif defined(OS_CHROMEOS)
+ #elif BUILDFLAG(IS_CHROMEOS_ASH)
    const char product[] = "Chrome_ChromeOS";
 +#elif defined(OS_FREEBSD)
 +  const char product[] = "Chrome_FreeBSD";
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 7d91b0ea..72f24793 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,4 +1,4 @@
---- chrome/browser/media/webrtc/webrtc_logging_controller.cc.orig	2020-11-13 06:36:37 UTC
+--- chrome/browser/media/webrtc/webrtc_logging_controller.cc.orig	2021-03-12 23:57:18 UTC
 +++ chrome/browser/media/webrtc/webrtc_logging_controller.cc
 @@ -23,10 +23,10 @@
  #include "content/public/browser/browser_context.h"
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 fe8b7922..ae65167a 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,4 +1,4 @@
---- chrome/browser/media/webrtc/webrtc_logging_controller.h.orig	2020-11-13 06:36:37 UTC
+--- chrome/browser/media/webrtc/webrtc_logging_controller.h.orig	2021-03-12 23:57:18 UTC
 +++ chrome/browser/media/webrtc/webrtc_logging_controller.h
 @@ -129,13 +129,13 @@ class WebRtcLoggingController
                           size_t web_app_id,
diff --git a/www/chromium/files/patch-chrome_browser_memory__details.cc b/www/chromium/files/patch-chrome_browser_memory__details.cc
index c12c2928..0ca5d7cd 100644
--- a/www/chromium/files/patch-chrome_browser_memory__details.cc
+++ b/www/chromium/files/patch-chrome_browser_memory__details.cc
@@ -1,4 +1,4 @@
---- chrome/browser/memory_details.cc.orig	2020-11-13 06:36:37 UTC
+--- chrome/browser/memory_details.cc.orig	2021-03-12 23:57:18 UTC
 +++ chrome/browser/memory_details.cc
 @@ -38,7 +38,7 @@
  #include "services/resource_coordinator/public/cpp/memory_instrumentation/memory_instrumentation.h"
diff --git a/www/chromium/files/patch-chrome_browser_memory__details__linux.cc b/www/chromium/files/patch-chrome_browser_memory__details__linux.cc
index 8247a226..db0d3691 100644
--- a/www/chromium/files/patch-chrome_browser_memory__details__linux.cc
+++ b/www/chromium/files/patch-chrome_browser_memory__details__linux.cc
@@ -1,6 +1,6 @@
---- chrome/browser/memory_details_linux.cc.orig	2020-11-13 06:36:37 UTC
+--- chrome/browser/memory_details_linux.cc.orig	2021-03-12 23:57:18 UTC
 +++ chrome/browser/memory_details_linux.cc
-@@ -69,8 +69,10 @@ ProcessData GetProcessDataMemoryInformation(
+@@ -70,8 +70,10 @@ ProcessData GetProcessDataMemoryInformation(
  
      std::unique_ptr<base::ProcessMetrics> metrics(
          base::ProcessMetrics::CreateProcessMetrics(pid));
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 208ca0da..128c217f 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,8 +1,8 @@
---- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig	2021-01-18 21:28:50 UTC
+--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig	2021-03-12 23:57:18 UTC
 +++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
-@@ -52,7 +52,9 @@
- 
- #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+@@ -56,7 +56,9 @@
+ // of lacros-chrome is complete.
+ #if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
  #include <gnu/libc-version.h>
 +#endif
  
@@ -10,12 +10,12 @@
  #include "base/linux_util.h"
  #include "base/strings/string_split.h"
  #include "base/strings/string_util.h"
-@@ -61,7 +63,7 @@
+@@ -65,7 +67,7 @@
  #include "ui/base/ui_base_features.h"
  #include "ui/base/x/x11_util.h"
  #endif
--#endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+-#endif  // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#endif  // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
  
  #if defined(USE_OZONE) || defined(USE_X11)
  #include "ui/events/devices/device_data_manager.h"
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 56b45667..f6154072 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,25 +1,24 @@
---- chrome/browser/metrics/chrome_metrics_service_client.cc.orig	2021-01-18 21:28:50 UTC
+--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig	2021-03-12 23:57:18 UTC
 +++ chrome/browser/metrics/chrome_metrics_service_client.cc
-@@ -696,11 +696,11 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
- #endif  // defined(OS_WIN)
- 
+@@ -697,10 +697,10 @@ 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) || \
--    (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+    (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+-    (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
++    (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD)
    metrics_service_->RegisterMetricsProvider(
        std::make_unique<DesktopPlatformFeaturesMetricsProvider>());
- #endif  //  defined(OS_WIN) || defined(OS_MAC) || \
--        // (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+        // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+-#endif  // defined(OS_WIN) || defined(OS_MAC) || (defined(OS_LINUX) ||
++#endif  // defined(OS_WIN) || defined(OS_MAC) || (defined(OS_LINUX) || defined(OS_BSD) ||
+         // BUILDFLAG(IS_CHROMEOS_LACROS))
  
  #if BUILDFLAG(ENABLE_PLUGINS)
-   plugin_metrics_provider_ = new PluginMetricsProvider(local_state);
-@@ -974,7 +974,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve
-   }
- #endif
+@@ -978,7 +978,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve
+ // 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) && !defined(OS_CHROMEOS))
-+    (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+-    (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
++    (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD)
    // This creates the DesktopProfileSessionDurationsServices if it didn't exist
    // already.
    metrics::DesktopProfileSessionDurationsServiceFactory::GetForBrowserContext(
diff --git a/www/chromium/files/patch-chrome_browser_metrics_process__memory__metrics__emitter.cc b/www/chromium/files/patch-chrome_browser_metrics_process__memory__metrics__emitter.cc
index 8f7295bc..13065daf 100644
--- a/www/chromium/files/patch-chrome_browser_metrics_process__memory__metrics__emitter.cc
+++ b/www/chromium/files/patch-chrome_browser_metrics_process__memory__metrics__emitter.cc
@@ -1,6 +1,6 @@
---- chrome/browser/metrics/process_memory_metrics_emitter.cc.orig	2021-01-18 21:28:50 UTC
+--- chrome/browser/metrics/process_memory_metrics_emitter.cc.orig	2021-03-12 23:57:18 UTC
 +++ chrome/browser/metrics/process_memory_metrics_emitter.cc
-@@ -497,7 +497,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc
+@@ -509,7 +509,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc
  
    builder->SetPrivateMemoryFootprint(pmd.os_dump().private_footprint_kb / kKiB);
    builder->SetSharedMemoryFootprint(pmd.os_dump().shared_footprint_kb / kKiB);
@@ -9,7 +9,7 @@
    builder->SetPrivateSwapFootprint(pmd.os_dump().private_footprint_swap_kb /
                                     kKiB);
  #endif
-@@ -520,7 +520,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc
+@@ -532,7 +532,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc
    MEMORY_METRICS_HISTOGRAM_MB(std::string(kMemoryHistogramPrefix) +
                                    process_name + ".SharedMemoryFootprint",
                                pmd.os_dump().shared_footprint_kb / kKiB);
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 afed6828..6995743b 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,20 +1,20 @@
---- chrome/browser/net/system_network_context_manager.cc.orig	2021-01-18 21:28:50 UTC
+--- chrome/browser/net/system_network_context_manager.cc.orig	2021-03-12 23:57:18 UTC
 +++ chrome/browser/net/system_network_context_manager.cc
-@@ -77,11 +77,11 @@
- #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
- #endif  // defined(OS_CHROMEOS)
+@@ -81,11 +81,11 @@
  
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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)
  #include "chrome/common/chrome_paths_internal.h"
  #include "chrome/grit/chromium_strings.h"
  #include "ui/base/l10n/l10n_util.h"
--#endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#endif  // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+-#endif  // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#endif  // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
  
  #if BUILDFLAG(ENABLE_EXTENSIONS)
  #include "extensions/common/constants.h"
-@@ -142,10 +142,10 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
+@@ -146,10 +146,10 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
    auth_dynamic_params->basic_over_http_enabled =
        local_state->GetBoolean(prefs::kBasicAuthOverHttpEnabled);
  
@@ -27,7 +27,7 @@
  
  #if defined(OS_POSIX)
    auth_dynamic_params->ntlm_v2_enabled =
-@@ -360,10 +360,10 @@ SystemNetworkContextManager::SystemNetworkContextManag
+@@ -364,10 +364,10 @@ SystemNetworkContextManager::SystemNetworkContextManag
    pref_change_registrar_.Add(prefs::kBasicAuthOverHttpEnabled,
                               auth_pref_callback);
  
@@ -40,7 +40,7 @@
  
  #if defined(OS_POSIX)
    pref_change_registrar_.Add(prefs::kNtlmV2Enabled, auth_pref_callback);
-@@ -411,10 +411,10 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
+@@ -416,10 +416,10 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
    registry->RegisterStringPref(prefs::kAuthServerAllowlist, std::string());
    registry->RegisterStringPref(prefs::kAuthNegotiateDelegateAllowlist,
                                 std::string());
@@ -53,12 +53,12 @@
  
  #if defined(OS_POSIX)
    registry->RegisterBooleanPref(
-@@ -506,7 +506,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea
-   // NetworkContext is created, but before anything has the chance to use it.
-   stub_resolver_config_reader_.UpdateNetworkService(true /* record_metrics */);
+@@ -513,7 +513,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea
  
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) || defined(OS_BSD)
+ // 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();
  
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 841884f6..2df862c7 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,6 +1,6 @@
---- chrome/browser/notifications/notification_display_service_impl.cc.orig	2021-01-18 21:28:50 UTC
+--- chrome/browser/notifications/notification_display_service_impl.cc.orig	2021-03-12 23:57:18 UTC
 +++ chrome/browser/notifications/notification_display_service_impl.cc
-@@ -29,7 +29,7 @@
+@@ -30,7 +30,7 @@
  #include "chrome/browser/extensions/api/notifications/extension_notification_handler.h"
  #endif
  
@@ -9,16 +9,16 @@
      defined(OS_WIN)
  #include "chrome/browser/send_tab_to_self/desktop_notification_handler.h"
  #include "chrome/browser/sharing/sharing_notification_handler.h"
-@@ -63,7 +63,7 @@ NotificationDisplayServiceImpl* NotificationDisplaySer
- // static
- void NotificationDisplayServiceImpl::RegisterProfilePrefs(
+@@ -66,7 +66,7 @@ void NotificationDisplayServiceImpl::RegisterProfilePr
      user_prefs::PrefRegistrySyncable* registry) {
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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)
    registry->RegisterBooleanPref(prefs::kAllowNativeNotifications, true);
  #endif
  }
-@@ -78,7 +78,7 @@ NotificationDisplayServiceImpl::NotificationDisplaySer
+@@ -81,7 +81,7 @@ NotificationDisplayServiceImpl::NotificationDisplaySer
      AddNotificationHandler(NotificationHandler::Type::WEB_PERSISTENT,
                             std::make_unique<PersistentNotificationHandler>());
  
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 880d5c7e..604c6252 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	2021-01-19 11:25:20 UTC
+--- chrome/browser/notifications/notification_platform_bridge_delegator.cc.orig	2021-03-12 23:57:18 UTC
 +++ chrome/browser/notifications/notification_platform_bridge_delegator.cc
-@@ -55,7 +55,7 @@ bool NativeNotificationsEnabled(Profile* profile) {
+@@ -56,7 +56,7 @@ bool NativeNotificationsEnabled(Profile* profile) {
    return true;
  #elif defined(OS_WIN)
    return NotificationPlatformBridgeWin::NativeNotificationEnabled();
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
+-#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
    if (profile) {
      // Prefs take precedence over flags.
      PrefService* prefs = profile->GetPrefs();
diff --git a/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc b/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc
index 73a160aa..362cb84d 100644
--- a/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc
+++ b/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc
@@ -1,14 +1,26 @@
---- chrome/browser/password_manager/chrome_password_manager_client.cc.orig	2021-01-18 21:28:50 UTC
+--- chrome/browser/password_manager/chrome_password_manager_client.cc.orig	2021-03-12 23:57:18 UTC
 +++ chrome/browser/password_manager/chrome_password_manager_client.cc
-@@ -99,7 +99,11 @@
- #include "net/base/url_util.h"
- #include "net/cert/cert_status_flags.h"
- #include "services/metrics/public/cpp/ukm_recorder.h"
+@@ -9,6 +9,10 @@
+ #include <string>
+ #include <utility>
+ 
 +#if defined(OS_BSD)
 +#include <re2/re2.h>
-+#else
- #include "third_party/re2/src/re2/re2.h"
 +#endif
++
+ #include "base/bind.h"
+ #include "base/callback_helpers.h"
+ #include "base/command_line.h"
+@@ -101,8 +105,11 @@
+ #include "net/cert/cert_status_flags.h"
+ #include "services/metrics/public/cpp/ukm_recorder.h"
+ #include "services/network/public/cpp/is_potentially_trustworthy.h"
+-#include "third_party/re2/src/re2/re2.h"
  #include "url/url_constants.h"
++
++#if !defined(OS_BSD)
++#include "third_party/re2/src/re2/re2.h"
++#endif
  
  #if BUILDFLAG(FULL_SAFE_BROWSING)
+ #include "chrome/browser/safe_browsing/advanced_protection_status_manager.h"
diff --git a/www/chromium/files/patch-chrome_browser_password__manager_password__store__factory.cc b/www/chromium/files/patch-chrome_browser_password__manager_password__store__factory.cc
index 3961c25d..de9c680b 100644
--- a/www/chromium/files/patch-chrome_browser_password__manager_password__store__factory.cc
+++ b/www/chromium/files/patch-chrome_browser_password__manager_password__store__factory.cc
@@ -1,11 +1,11 @@
---- chrome/browser/password_manager/password_store_factory.cc.orig	2021-01-18 21:28:50 UTC
+--- chrome/browser/password_manager/password_store_factory.cc.orig	2021-03-12 23:57:18 UTC
 +++ chrome/browser/password_manager/password_store_factory.cc
-@@ -171,7 +171,7 @@ PasswordStoreFactory::BuildServiceInstanceFor(
-       network_context_getter);
- 
+@@ -163,7 +163,7 @@ PasswordStoreFactory::BuildServiceInstanceFor(
+ // 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) && !defined(OS_CHROMEOS))
-+    (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+-    (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
++    (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_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_pdf_pdf__extension__test.cc b/www/chromium/files/patch-chrome_browser_pdf_pdf__extension__test.cc
index cf811f1a..b2754c5d 100644
--- a/www/chromium/files/patch-chrome_browser_pdf_pdf__extension__test.cc
+++ b/www/chromium/files/patch-chrome_browser_pdf_pdf__extension__test.cc
@@ -1,11 +1,20 @@
---- chrome/browser/pdf/pdf_extension_test.cc.orig	2021-01-18 21:28:50 UTC
+--- chrome/browser/pdf/pdf_extension_test.cc.orig	2021-03-12 23:57:18 UTC
 +++ chrome/browser/pdf/pdf_extension_test.cc
-@@ -2192,7 +2192,7 @@ class PDFExtensionClipboardTest : public PDFExtensionT
-   // Runs `action` and checks the Linux selection clipboard contains `expected`.
-   void DoActionAndCheckSelectionClipboard(base::OnceClosure action,
+@@ -2188,7 +2188,7 @@ class PDFExtensionClipboardTest : public PDFExtensionT
                                            const std::string& expected) {
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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)
      DoActionAndCheckClipboard(std::move(action),
                                ui::ClipboardBuffer::kSelection, expected);
  #else
+@@ -2320,7 +2320,7 @@ IN_PROC_BROWSER_TEST_P(PDFExtensionClipboardTest,
+ // Flaky on ChromeOS (https://crbug.com/1121446)
+ // 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)
+ #define MAYBE_CombinedShiftArrowPresses DISABLED_CombinedShiftArrowPresses
+ #else
+ #define MAYBE_CombinedShiftArrowPresses CombinedShiftArrowPresses
diff --git a/www/chromium/files/patch-chrome_browser_performance__manager_policies_policy__features.cc b/www/chromium/files/patch-chrome_browser_performance__manager_policies_policy__features.cc
index 63f71da3..fa4a7c73 100644
--- a/www/chromium/files/patch-chrome_browser_performance__manager_policies_policy__features.cc
+++ b/www/chromium/files/patch-chrome_browser_performance__manager_policies_policy__features.cc
@@ -1,4 +1,4 @@
---- chrome/browser/performance_manager/policies/policy_features.cc.orig	2021-01-19 11:25:47 UTC
+--- chrome/browser/performance_manager/policies/policy_features.cc.orig	2021-03-12 23:57:18 UTC
 +++ chrome/browser/performance_manager/policies/policy_features.cc
 @@ -125,7 +125,7 @@ const base::Feature kPageFreezingFromPerformanceManage
  
diff --git a/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__history.cc b/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__history.cc
index e8223a8b..fc5c3d11 100644
--- a/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__history.cc
+++ b/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__history.cc
@@ -1,4 +1,4 @@
---- chrome/browser/performance_monitor/process_metrics_history.cc.orig	2020-11-13 06:36:37 UTC
+--- chrome/browser/performance_monitor/process_metrics_history.cc.orig	2021-03-12 23:57:18 UTC
 +++ chrome/browser/performance_monitor/process_metrics_history.cc
 @@ -47,7 +47,7 @@ void ProcessMetricsHistory::SampleMetrics() {
  #if defined(OS_WIN)
diff --git a/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__history.h b/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__history.h
index da3196ef..af0c6406 100644
--- a/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__history.h
+++ b/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__history.h
@@ -1,4 +1,4 @@
---- chrome/browser/performance_monitor/process_metrics_history.h.orig	2020-11-13 06:36:37 UTC
+--- chrome/browser/performance_monitor/process_metrics_history.h.orig	2021-03-12 23:57:18 UTC
 +++ chrome/browser/performance_monitor/process_metrics_history.h
 @@ -71,7 +71,7 @@ class ProcessMetricsHistory {
    uint64_t disk_usage_ = 0;
diff --git a/www/chromium/files/patch-chrome_browser_plugins_plugin__info__host__impl.cc b/www/chromium/files/patch-chrome_browser_plugins_plugin__info__host__impl.cc
index ea664315..98274b15 100644
--- a/www/chromium/files/patch-chrome_browser_plugins_plugin__info__host__impl.cc
+++ b/www/chromium/files/patch-chrome_browser_plugins_plugin__info__host__impl.cc
@@ -1,6 +1,6 @@
---- chrome/browser/plugins/plugin_info_host_impl.cc.orig	2021-01-18 21:28:50 UTC
+--- chrome/browser/plugins/plugin_info_host_impl.cc.orig	2021-03-12 23:57:18 UTC
 +++ chrome/browser/plugins/plugin_info_host_impl.cc
-@@ -380,7 +380,7 @@ void PluginInfoHostImpl::ComponentPluginLookupDone(
+@@ -379,7 +379,7 @@ void PluginInfoHostImpl::ComponentPluginLookupDone(
      std::unique_ptr<component_updater::ComponentInfo> cus_plugin_info) {
    if (cus_plugin_info) {
      output->status = chrome::mojom::PluginStatus::kComponentUpdateRequired;
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 f29fc42d..089a8c4d 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	2020-11-13 06:36:37 UTC
+--- chrome/browser/plugins/plugins_resource_service.cc.orig	2021-03-12 23:57:18 UTC
 +++ chrome/browser/plugins/plugins_resource_service.cc
 @@ -62,7 +62,7 @@ GURL GetPluginsServerURL() {
    filename = "plugins_win.json";
- #elif defined(OS_CHROMEOS)
+ #elif BUILDFLAG(IS_CHROMEOS_ASH)
    filename = "plugins_chromeos.json";
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
+-#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
    filename = "plugins_linux.json";
  #elif defined(OS_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 e45bc256..1ffba3d3 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,4 +1,4 @@
---- chrome/browser/policy/browser_signin_policy_handler.cc.orig	2020-11-13 06:36:37 UTC
+--- chrome/browser/policy/browser_signin_policy_handler.cc.orig	2021-03-12 23:57:18 UTC
 +++ chrome/browser/policy/browser_signin_policy_handler.cc
 @@ -52,7 +52,7 @@ void BrowserSigninPolicyHandler::ApplyPolicySettings(c
      }
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 de246c17..279da02a 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,4 +1,4 @@
---- chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc.orig	2020-11-16 14:21:44 UTC
+--- chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc.orig	2021-03-12 23:57:18 UTC
 +++ chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc
 @@ -43,9 +43,9 @@
  #include "chrome/browser/policy/browser_dm_token_storage_mac.h"
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 8febb778..9df20861 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,30 +1,30 @@
---- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig	2021-01-18 21:28:50 UTC
+--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig	2021-03-12 23:57:18 UTC
 +++ chrome/browser/policy/configuration_policy_handler_list_factory.cc
-@@ -1231,11 +1231,11 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+@@ -1233,11 +1233,11 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
      base::Value::Type::BOOLEAN },
- #endif  // !defined(OS_MAC) && !defined(OS_CHROMEOS)
+ #endif // !defined(OS_MAC) && !BUILDFLAG(IS_CHROMEOS_ASH)
  
 -#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS)
 +#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) || defined(OS_BSD)
    { key::kAuthNegotiateDelegateByKdcPolicy,
      prefs::kAuthNegotiateDelegateByKdcPolicy,
      base::Value::Type::BOOLEAN },
--#endif  // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS)
-+#endif  // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS)
++#endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) || defined(OS_BSD)
  
  #if !defined(OS_MAC)
    { key::kFullscreenAllowed,
-@@ -1279,11 +1279,11 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
-     base::Value::Type::BOOLEAN },
+@@ -1282,11 +1282,11 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
  #endif  // BUILDFLAG(ENABLE_SPELLCHECK)
  
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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)
    { key::kAllowNativeNotifications,
      prefs::kAllowNativeNotifications,
      base::Value::Type::BOOLEAN },
--#endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#endif  // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+-#endif // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#endif // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || deined(OS_BSD)
  
    { key::kScrollToTextFragmentEnabled,
      prefs::kScrollToTextFragmentEnabled,
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 24ef044f..1e914d84 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	2021-01-18 21:28:50 UTC
+--- chrome/browser/policy/device_management_service_configuration.cc.orig	2021-03-12 23:57:18 UTC
 +++ chrome/browser/policy/device_management_service_configuration.cc
-@@ -18,7 +18,7 @@
+@@ -20,7 +20,7 @@
  #endif
  
  #if defined(OS_WIN) || defined(OS_MAC) || \
 -    ((defined(OS_LINUX) || defined(OS_CHROMEOS)) && !defined(OS_ANDROID))
 +    ((defined(OS_LINUX) || defined(OS_CHROMEOS)) && !defined(OS_ANDROID)) || defined(OS_BSD)
  #include "chrome/browser/enterprise/connectors/common.h"
- #include "chrome/browser/enterprise/connectors/connectors_manager.h"
+ #include "chrome/browser/enterprise/connectors/connectors_service.h"
  #endif
-@@ -95,7 +95,7 @@ DeviceManagementServiceConfiguration::GetEncryptedRepo
- std::string
- DeviceManagementServiceConfiguration::GetReportingConnectorServerUrl() {
+@@ -98,7 +98,7 @@ std::string
+ DeviceManagementServiceConfiguration::GetReportingConnectorServerUrl(
+     content::BrowserContext* context) {
  #if defined(OS_WIN) || defined(OS_MAC) || \
 -    ((defined(OS_LINUX) || defined(OS_CHROMEOS)) && !defined(OS_ANDROID))
 +    ((defined(OS_LINUX) || defined(OS_CHROMEOS)) && !defined(OS_ANDROID)) || defined(OS_BSD)
-   auto settings =
-       enterprise_connectors::ConnectorsManager::GetInstance()
-           ->GetReportingSettings(
+   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 beb84f61..bcd86474 100644
--- a/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc
+++ b/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc
@@ -1,20 +1,20 @@
---- chrome/browser/prefs/browser_prefs.cc.orig	2021-01-18 21:28:50 UTC
+--- chrome/browser/prefs/browser_prefs.cc.orig	2021-03-12 23:57:18 UTC
 +++ chrome/browser/prefs/browser_prefs.cc
-@@ -382,7 +382,7 @@
- #endif
- 
+@@ -388,7 +388,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) || \
--    (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+    (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+-    (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
++    (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD)
  #include "chrome/browser/browser_switcher/browser_switcher_prefs.h"
  #endif
  
-@@ -1012,7 +1012,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
- #endif
- 
+@@ -1080,7 +1080,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) || \
--    (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+    (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+-    (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
++    (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD)
    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 c9c61303..b75c93b9 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-01-18 21:28:50 UTC
+--- chrome/browser/prefs/pref_service_incognito_allowlist.cc.orig	2021-03-12 23:57:18 UTC
 +++ chrome/browser/prefs/pref_service_incognito_allowlist.cc
 @@ -136,7 +136,7 @@ const char* const kPersistentPrefNames[] = {
-     prefs::kShowFullscreenToolbar,
- #endif
  
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if defined(OS_BSD) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
+ // 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)
      // 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 2c60efb1..a459cd5e 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,20 +1,20 @@
---- chrome/browser/printing/print_job_worker.cc.orig	2020-11-16 14:22:42 UTC
+--- chrome/browser/printing/print_job_worker.cc.orig	2021-03-12 23:57:18 UTC
 +++ chrome/browser/printing/print_job_worker.cc
-@@ -223,7 +223,7 @@ void PrintJobWorker::UpdatePrintSettings(base::Value n
+@@ -224,7 +224,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) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_CUPS) && !defined(OS_CHROMEOS)
+-#if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && defined(USE_CUPS)
++#if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) && defined(USE_CUPS)
      PrinterBasicInfo basic_info;
      if (print_backend->GetPrinterBasicInfo(printer_name, &basic_info)) {
        base::Value advanced_settings(base::Value::Type::DICTIONARY);
-@@ -233,7 +233,7 @@ void PrintJobWorker::UpdatePrintSettings(base::Value n
+@@ -234,7 +234,7 @@ void PrintJobWorker::UpdatePrintSettings(base::Value n
        new_settings.SetKey(kSettingAdvancedSettings,
                            std::move(advanced_settings));
      }
--#endif  // defined(OS_LINUX) && defined(USE_CUPS) && !defined(OS_CHROMEOS)
-+#endif  // (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_CUPS) && !defined(OS_CHROMEOS)
+-#endif  // (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) &&
++#endif  // (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) &&
+         // defined(USE_CUPS)
    }
  
-   PrintingContext::Result result;
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 685ecb00..f78dd938 100644
--- a/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc
+++ b/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc
@@ -1,6 +1,6 @@
---- chrome/browser/process_singleton_posix.cc.orig	2020-11-13 06:36:37 UTC
+--- chrome/browser/process_singleton_posix.cc.orig	2021-03-12 23:57:18 UTC
 +++ chrome/browser/process_singleton_posix.cc
-@@ -94,11 +94,11 @@
+@@ -95,12 +95,12 @@
  #include "net/base/network_interfaces.h"
  #include "ui/base/l10n/l10n_util.h"
  
@@ -9,12 +9,13 @@
  #include "chrome/browser/ui/process_singleton_dialog_linux.h"
  #endif
  
--#if defined(TOOLKIT_VIEWS) && defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if defined(TOOLKIT_VIEWS) && (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+ #if defined(TOOLKIT_VIEWS) && \
+-    (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
++    (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD))
  #include "ui/views/linux_ui/linux_ui.h"
  #endif
  
-@@ -295,7 +295,7 @@ bool DisplayProfileInUseError(const base::FilePath& lo
+@@ -297,7 +297,7 @@ bool DisplayProfileInUseError(const base::FilePath& lo
    if (g_disable_prompt)
      return g_user_opted_unlock_in_use_profile;
  
@@ -23,12 +24,12 @@
    base::string16 relaunch_button_text = l10n_util::GetStringUTF16(
        IDS_PROFILE_IN_USE_LINUX_RELAUNCH);
    return ShowProcessSingletonDialog(error, relaunch_button_text);
-@@ -871,7 +871,7 @@ ProcessSingleton::NotifyResult ProcessSingleton::Notif
-     SendRemoteProcessInteractionResultHistogram(REMOTE_PROCESS_SHUTTING_DOWN);
+@@ -874,7 +874,7 @@ ProcessSingleton::NotifyResult ProcessSingleton::Notif
      return PROCESS_NONE;
    } else if (strncmp(buf, kACKToken, base::size(kACKToken) - 1) == 0) {
--#if defined(TOOLKIT_VIEWS) && defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if defined(TOOLKIT_VIEWS) && (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+ #if defined(TOOLKIT_VIEWS) && \
+-    (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
++    (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_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 58c17808..d6e69643 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	2021-01-18 21:28:50 UTC
+--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig	2021-03-12 23:57:18 UTC
 +++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
-@@ -319,7 +319,7 @@ void ChromeBrowserMainExtraPartsProfiles::
-   media_router::MediaRouterUIServiceFactory::GetInstance();
- #endif
+@@ -337,7 +337,7 @@ void ChromeBrowserMainExtraPartsProfiles::
+ // 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) && !defined(OS_CHROMEOS))
-+    (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+-    (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
++    (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD)
    metrics::DesktopProfileSessionDurationsServiceFactory::GetInstance();
  #endif
    ModelTypeStoreServiceFactory::GetInstance();
diff --git a/www/chromium/files/patch-chrome_browser_profiles_profile.cc b/www/chromium/files/patch-chrome_browser_profiles_profile.cc
index 4c8fd444..7a0eb7be 100644
--- a/www/chromium/files/patch-chrome_browser_profiles_profile.cc
+++ b/www/chromium/files/patch-chrome_browser_profiles_profile.cc
@@ -1,11 +1,11 @@
---- chrome/browser/profiles/profile.cc.orig	2021-01-19 11:26:11 UTC
+--- chrome/browser/profiles/profile.cc.orig	2021-03-12 23:57:18 UTC
 +++ chrome/browser/profiles/profile.cc
-@@ -387,7 +387,7 @@ bool Profile::IsIncognitoProfile() const {
- 
- // static
+@@ -360,7 +360,7 @@ bool Profile::IsIncognitoProfile() const {
  bool Profile::IsEphemeralGuestProfileEnabled() {
--#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || \
-+#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) || \
+ // 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) || \
      defined(OS_MAC)
    return base::FeatureList::IsEnabled(
        features::kEnableEphemeralGuestProfilesOnDesktop);
diff --git a/www/chromium/files/patch-chrome_browser_profiles_profile__attributes__entry.cc b/www/chromium/files/patch-chrome_browser_profiles_profile__attributes__entry.cc
index f6b59e99..951c83a9 100644
--- a/www/chromium/files/patch-chrome_browser_profiles_profile__attributes__entry.cc
+++ b/www/chromium/files/patch-chrome_browser_profiles_profile__attributes__entry.cc
@@ -1,6 +1,6 @@
---- chrome/browser/profiles/profile_attributes_entry.cc.orig	2021-01-18 21:28:50 UTC
+--- chrome/browser/profiles/profile_attributes_entry.cc.orig	2021-03-12 23:57:18 UTC
 +++ chrome/browser/profiles/profile_attributes_entry.cc
-@@ -158,7 +158,7 @@ void ProfileAttributesEntry::Initialize(ProfileInfoCac
+@@ -159,7 +159,7 @@ void ProfileAttributesEntry::Initialize(ProfileInfoCac
    if (is_force_signin_enabled_) {
      if (!IsAuthenticated())
        is_force_signin_profile_locked_ = true;
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 52208192..43c75146 100644
--- a/www/chromium/files/patch-chrome_browser_profiles_profiles__state.cc
+++ b/www/chromium/files/patch-chrome_browser_profiles_profiles__state.cc
@@ -1,6 +1,6 @@
---- chrome/browser/profiles/profiles_state.cc.orig	2021-01-19 11:26:28 UTC
+--- chrome/browser/profiles/profiles_state.cc.orig	2021-03-12 23:57:18 UTC
 +++ chrome/browser/profiles/profiles_state.cc
-@@ -179,7 +179,7 @@ bool IsRegularOrGuestSession(Browser* browser) {
+@@ -180,7 +180,7 @@ bool IsRegularOrGuestSession(Browser* browser) {
  bool IsGuestModeRequested(const base::CommandLine& command_line,
                            PrefService* local_state,
                            bool show_warning) {
diff --git a/www/chromium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.cc b/www/chromium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.cc
index 8c931010..802cb76d 100644
--- a/www/chromium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.cc
+++ b/www/chromium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.cc
@@ -1,6 +1,6 @@
---- chrome/browser/renderer_context_menu/render_view_context_menu.cc.orig	2021-01-18 21:28:50 UTC
+--- chrome/browser/renderer_context_menu/render_view_context_menu.cc.orig	2021-03-12 23:57:18 UTC
 +++ chrome/browser/renderer_context_menu/render_view_context_menu.cc
-@@ -2085,7 +2085,7 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id)
+@@ -2117,7 +2117,7 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id)
      case IDC_CHECK_SPELLING_WHILE_TYPING:
        return prefs->GetBoolean(spellcheck::prefs::kSpellCheckEnable);
  
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 709bd4d8..85d0d720 100644
--- a/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc
+++ b/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc
@@ -1,24 +1,24 @@
---- chrome/browser/renderer_preferences_util.cc.orig	2021-01-18 21:28:50 UTC
+--- chrome/browser/renderer_preferences_util.cc.orig	2021-03-12 23:57:18 UTC
 +++ chrome/browser/renderer_preferences_util.cc
-@@ -34,7 +34,7 @@
+@@ -35,7 +35,7 @@
  #include "ui/base/cocoa/defaults_utils.h"
  #endif
  
--#if defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if defined(USE_AURA) && (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
+-#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))
  #include "chrome/browser/themes/theme_service.h"
  #include "chrome/browser/themes/theme_service_factory.h"
  #include "ui/views/linux_ui/linux_ui.h"
-@@ -153,7 +153,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc
+@@ -154,7 +154,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc
      prefs->caret_blink_interval = interval;
  #endif
  
--#if defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if defined(USE_AURA) && (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
+-#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))
    views::LinuxUI* linux_ui = views::LinuxUI::instance();
    if (linux_ui) {
      if (ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme()) {
-@@ -172,7 +172,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc
+@@ -173,7 +173,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc
    }
  #endif
  
diff --git a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.js b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.js
index 3ef9b119..40e53f4f 100644
--- a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.js
+++ b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.js
@@ -1,4 +1,4 @@
---- chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.js.orig	2020-11-13 06:36:37 UTC
+--- chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.js.orig	2021-03-12 23:57:18 UTC
 +++ chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.js
 @@ -23,7 +23,7 @@ export class AppearanceBrowserProxy {
  
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 a7551ed5..752d4a35 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	2020-11-13 06:36:37 UTC
+--- chrome/browser/resources/settings/appearance_page/appearance_page.html.orig	2021-03-12 23:57:18 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">
-+<if expr="not is_posix or chromeos">
+-<if expr="not is_linux or chromeos or lacros">
++<if expr="not is_posix or chromeos or lacros">
            <template is="dom-if" if="[[prefs.extensions.theme.id.value]]">
              <div class="separator"></div>
              <cr-button id="useDefault" on-click="onUseDefaultTap_">
@@ -13,17 +13,17 @@
              </cr-button>
            </template>
  </if>
--<if expr="is_linux and not chromeos">
-+<if expr="is_posix and not chromeos">
+-<if expr="is_linux and not chromeos and not lacros">
++<if expr="is_posix and not chromeos and not lacros">
            <div class="settings-row continuation"
                hidden="[[!showThemesSecondary_(
                    prefs.extensions.theme.id.value, useSystemTheme_)]]"
-@@ -99,7 +99,7 @@
+@@ -109,7 +109,7 @@
              pref="{{prefs.bookmark_bar.show_on_all_tabs}}"
              label="$i18n{showBookmarksBar}">
          </settings-toggle-button>
--<if expr="is_linux and not chromeos">
-+<if expr="is_posix and not chromeos">
+-<if expr="is_linux and not chromeos and not lacros">
++<if expr="is_posix and not chromeos and not lacros">
          <div class="hr" hidden="[[!pageVisibility.bookmarksBar]]"></div>
          <settings-toggle-button
              pref="{{prefs.browser.custom_chrome_frame}}"
diff --git a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.js b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.js
index 3949958c..6a750abc 100644
--- a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.js
+++ b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.js
@@ -1,4 +1,4 @@
---- chrome/browser/resources/settings/appearance_page/appearance_page.js.orig	2020-11-13 06:36:37 UTC
+--- chrome/browser/resources/settings/appearance_page/appearance_page.js.orig	2021-03-12 23:57:18 UTC
 +++ chrome/browser/resources/settings/appearance_page/appearance_page.js
 @@ -137,7 +137,7 @@ Polymer({
      'defaultFontSizeChanged_(prefs.webkit.webprefs.default_font_size.value)',
@@ -22,12 +22,12 @@
      }
  
      let i18nId;
--    // <if expr="is_linux and not chromeos">
-+    // <if expr="is_bsd and not chromeos">
+-    // <if expr="is_linux 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">
-+    // <if expr="not is_bsd or chromeos">
+-    // <if expr="not is_linux or chromeos or lacros">
++    // <if expr="not is_posix or chromeos or lacros">
      i18nId = 'chooseFromWebStore';
      // </if>
      this.themeSublabel_ = this.i18n(i18nId);
diff --git a/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__handler__util.cc b/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__handler__util.cc
index 15819a56..a38ecd5e 100644
--- a/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__handler__util.cc
+++ b/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__handler__util.cc
@@ -1,4 +1,4 @@
---- chrome/browser/safe_browsing/incident_reporting/incident_handler_util.cc.orig	2020-11-13 06:36:37 UTC
+--- chrome/browser/safe_browsing/incident_reporting/incident_handler_util.cc.orig	2021-03-12 23:57:18 UTC
 +++ chrome/browser/safe_browsing/incident_reporting/incident_handler_util.cc
 @@ -8,7 +8,11 @@
  
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 39e05c8d..0f91113f 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,4 +1,4 @@
---- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc.orig	2021-01-18 21:28:51 UTC
+--- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc.orig	2021-03-12 23:57:18 UTC
 +++ chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc
 @@ -708,7 +708,7 @@ void IncidentReportingService::OnEnvironmentDataCollec
    environment_collection_pending_ = false;
diff --git a/www/chromium/files/patch-chrome_browser_search_search__suggest_search__suggest__service.cc b/www/chromium/files/patch-chrome_browser_search_search__suggest_search__suggest__service.cc
index 5be8db6d..2602baf5 100644
--- a/www/chromium/files/patch-chrome_browser_search_search__suggest_search__suggest__service.cc
+++ b/www/chromium/files/patch-chrome_browser_search_search__suggest_search__suggest__service.cc
@@ -1,4 +1,4 @@
---- chrome/browser/search/search_suggest/search_suggest_service.cc.orig	2021-01-18 21:28:51 UTC
+--- chrome/browser/search/search_suggest/search_suggest_service.cc.orig	2021-03-12 23:57:18 UTC
 +++ chrome/browser/search/search_suggest/search_suggest_service.cc
 @@ -21,7 +21,11 @@
  #include "components/search/ntp_features.h"
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 8f9ac3f8..c801c758 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,4 +1,4 @@
---- chrome/browser/send_tab_to_self/receiving_ui_handler_registry.cc.orig	2020-11-13 06:36:37 UTC
+--- chrome/browser/send_tab_to_self/receiving_ui_handler_registry.cc.orig	2021-03-12 23:57:18 UTC
 +++ chrome/browser/send_tab_to_self/receiving_ui_handler_registry.cc
 @@ -11,7 +11,7 @@
  #include "chrome/browser/profiles/profile.h"
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 1a04e805..5de5bca3 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,4 +1,4 @@
---- chrome/browser/send_tab_to_self/send_tab_to_self_client_service.cc.orig	2020-11-13 06:36:37 UTC
+--- chrome/browser/send_tab_to_self/send_tab_to_self_client_service.cc.orig	2021-03-12 23:57:18 UTC
 +++ chrome/browser/send_tab_to_self/send_tab_to_self_client_service.cc
 @@ -40,7 +40,7 @@ void SendTabToSelfClientService::SendTabToSelfModelLoa
  void SendTabToSelfClientService::EntriesAddedRemotely(
diff --git a/www/chromium/files/patch-chrome_browser_sharing_shared__clipboard_feature__flags.cc b/www/chromium/files/patch-chrome_browser_sharing_shared__clipboard_feature__flags.cc
index 9db0cf76..2b367cf3 100644
--- a/www/chromium/files/patch-chrome_browser_sharing_shared__clipboard_feature__flags.cc
+++ b/www/chromium/files/patch-chrome_browser_sharing_shared__clipboard_feature__flags.cc
@@ -1,4 +1,4 @@
---- chrome/browser/sharing/shared_clipboard/feature_flags.cc.orig	2020-11-13 06:36:37 UTC
+--- chrome/browser/sharing/shared_clipboard/feature_flags.cc.orig	2021-03-12 23:57:18 UTC
 +++ chrome/browser/sharing/shared_clipboard/feature_flags.cc
 @@ -7,7 +7,7 @@
  const base::Feature kSharedClipboardUI{"SharedClipboardUI",
diff --git a/www/chromium/files/patch-chrome_browser_sharing_shared__clipboard_feature__flags.h b/www/chromium/files/patch-chrome_browser_sharing_shared__clipboard_feature__flags.h
index 2be79ddd..72cf2e40 100644
--- a/www/chromium/files/patch-chrome_browser_sharing_shared__clipboard_feature__flags.h
+++ b/www/chromium/files/patch-chrome_browser_sharing_shared__clipboard_feature__flags.h
@@ -1,4 +1,4 @@
---- chrome/browser/sharing/shared_clipboard/feature_flags.h.orig	2020-11-13 06:36:37 UTC
+--- chrome/browser/sharing/shared_clipboard/feature_flags.h.orig	2021-03-12 23:57:18 UTC
 +++ chrome/browser/sharing/shared_clipboard/feature_flags.h
 @@ -14,7 +14,7 @@
  // Feature to allow shared clipboard gets processed.
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 4e65f78d..ef9dcdc4 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,6 +1,6 @@
---- chrome/browser/sharing/sharing_device_registration.cc.orig	2020-11-13 06:36:37 UTC
+--- chrome/browser/sharing/sharing_device_registration.cc.orig	2021-03-12 23:57:18 UTC
 +++ chrome/browser/sharing/sharing_device_registration.cc
-@@ -325,7 +325,7 @@ bool SharingDeviceRegistration::IsSmsFetcherSupported(
+@@ -324,7 +324,7 @@ bool SharingDeviceRegistration::IsSmsFetcherSupported(
  }
  
  bool SharingDeviceRegistration::IsRemoteCopySupported() const {
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 d0eedc03..95bb19a9 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,6 +1,6 @@
---- chrome/browser/sharing/sharing_handler_registry_impl.cc.orig	2020-11-13 06:36:37 UTC
+--- chrome/browser/sharing/sharing_handler_registry_impl.cc.orig	2021-03-12 23:57:18 UTC
 +++ chrome/browser/sharing/sharing_handler_registry_impl.cc
-@@ -22,10 +22,10 @@
+@@ -23,10 +23,10 @@
  #include "chrome/browser/sharing/shared_clipboard/shared_clipboard_message_handler_desktop.h"
  #endif  // defined(OS_ANDROID)
  
@@ -8,12 +8,12 @@
 +#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \
      defined(OS_CHROMEOS)
  #include "chrome/browser/sharing/shared_clipboard/remote_copy_message_handler.h"
--#endif  // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX)
-+#endif  // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) ||
-         // defined(OS_CHROMEOS)
+-#endif  // defined(OS_WIN) || defined(OS_MAC) || (defined(OS_LINUX) ||
++#endif  // defined(OS_WIN) || defined(OS_MAC) || (defined(OS_LINUX) || defined(OS_BSD) ||
+         // BUILDFLAG(IS_CHROMEOS_LACROS)) defined(OS_CHROMEOS)
  
  SharingHandlerRegistryImpl::SharingHandlerRegistryImpl(
-@@ -70,14 +70,14 @@ SharingHandlerRegistryImpl::SharingHandlerRegistryImpl
+@@ -71,14 +71,14 @@ SharingHandlerRegistryImpl::SharingHandlerRegistryImpl
          {chrome_browser_sharing::SharingMessage::kSharedClipboardMessage});
    }
  
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 4d1a0b58..5861fffb 100644
--- a/www/chromium/files/patch-chrome_browser_signin_signin__util.cc
+++ b/www/chromium/files/patch-chrome_browser_signin_signin__util.cc
@@ -1,6 +1,6 @@
---- chrome/browser/signin/signin_util.cc.orig	2021-01-18 21:28:51 UTC
+--- chrome/browser/signin/signin_util.cc.orig	2021-03-12 23:57:18 UTC
 +++ chrome/browser/signin/signin_util.cc
-@@ -33,7 +33,7 @@
+@@ -34,7 +34,7 @@
  #include "google_apis/gaia/gaia_auth_util.h"
  #include "ui/base/l10n/l10n_util.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 4dc0568e..3ecf338a 100644
--- a/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc
+++ b/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc
@@ -1,6 +1,6 @@
---- chrome/browser/sync/chrome_sync_client.cc.orig	2021-01-18 21:28:51 UTC
+--- chrome/browser/sync/chrome_sync_client.cc.orig	2021-03-12 23:57:18 UTC
 +++ chrome/browser/sync/chrome_sync_client.cc
-@@ -470,7 +470,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy
+@@ -466,7 +466,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.
@@ -9,12 +9,12 @@
    // Dictionary sync is enabled by default.
    if (!disabled_types.Has(syncer::DICTIONARY) &&
        GetPrefService()->GetBoolean(spellcheck::prefs::kSpellCheckEnable)) {
-@@ -479,7 +479,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy
+@@ -475,7 +475,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy
              syncer::DICTIONARY, model_type_store_factory,
              GetSyncableServiceForType(syncer::DICTIONARY), dump_stack));
    }
 -#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN)
 +#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_BSD)
  
- #if defined(OS_CHROMEOS)
+ #if BUILDFLAG(IS_CHROMEOS_ASH)
    if (arc::IsArcAllowedForProfile(profile_) &&
diff --git a/www/chromium/files/patch-chrome_browser_sync_device__info__sync__service__factory.cc b/www/chromium/files/patch-chrome_browser_sync_device__info__sync__service__factory.cc
index d42df1b0..8bdafda1 100644
--- a/www/chromium/files/patch-chrome_browser_sync_device__info__sync__service__factory.cc
+++ b/www/chromium/files/patch-chrome_browser_sync_device__info__sync__service__factory.cc
@@ -1,17 +1,17 @@
---- chrome/browser/sync/device_info_sync_service_factory.cc.orig	2021-01-19 11:26:56 UTC
+--- chrome/browser/sync/device_info_sync_service_factory.cc.orig	2021-03-12 23:57:18 UTC
 +++ chrome/browser/sync/device_info_sync_service_factory.cc
-@@ -42,12 +42,12 @@ class DeviceInfoSyncClient : public syncer::DeviceInfo
-   std::string GetSigninScopedDeviceId() const override {
- // Since the local sync backend is currently only supported on Windows, Mac and
- // Linux don't even check the pref on other os-es.
--#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX)
-+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD)
+@@ -47,12 +47,12 @@ class DeviceInfoSyncClient : public syncer::DeviceInfo
+ // 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)
      syncer::SyncPrefs prefs(profile_->GetPrefs());
      if (prefs.IsLocalSyncEnabled()) {
        return "local_device";
      }
--#endif  // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX)
-+#endif  // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD)
+-#endif  // defined(OS_WIN) || defined(OS_MAC) || (defined(OS_LINUX) ||
++#endif  // defined(OS_WIN) || defined(OS_MAC) || (defined(OS_LINUX) || defined(OS_BSD) ||
+         // BUILDFLAG(IS_CHROMEOS_LACROS))
  
      return GetSigninScopedDeviceIdForProfile(profile_);
-   }
diff --git a/www/chromium/files/patch-chrome_browser_sync_profile__sync__service__factory.cc b/www/chromium/files/patch-chrome_browser_sync_profile__sync__service__factory.cc
index 7f9ece9d..83fb3a06 100644
--- a/www/chromium/files/patch-chrome_browser_sync_profile__sync__service__factory.cc
+++ b/www/chromium/files/patch-chrome_browser_sync_profile__sync__service__factory.cc
@@ -1,20 +1,20 @@
---- chrome/browser/sync/profile_sync_service_factory.cc.orig	2021-01-19 11:27:21 UTC
+--- chrome/browser/sync/profile_sync_service_factory.cc.orig	2021-03-12 23:57:18 UTC
 +++ chrome/browser/sync/profile_sync_service_factory.cc
-@@ -202,7 +202,7 @@ KeyedService* ProfileSyncServiceFactory::BuildServiceI
- 
- // Only check the local sync backend pref on the supported platforms of
- // Windows, Mac and Linux.
--#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX)
-+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD)
+@@ -217,7 +217,7 @@ KeyedService* ProfileSyncServiceFactory::BuildServiceI
+ // 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)
    syncer::SyncPrefs prefs(profile->GetPrefs());
    local_sync_backend_enabled = prefs.IsLocalSyncEnabled();
    UMA_HISTOGRAM_BOOLEAN("Sync.Local.Enabled", local_sync_backend_enabled);
-@@ -220,7 +220,7 @@ KeyedService* ProfileSyncServiceFactory::BuildServiceI
+@@ -235,7 +235,7 @@ KeyedService* ProfileSyncServiceFactory::BuildServiceI
  
      init_params.start_behavior = syncer::ProfileSyncService::AUTO_START;
    }
--#endif  // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX)
-+#endif  // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD)
+-#endif  // defined(OS_WIN) || defined(OS_MAC) || (defined(OS_LINUX) ||
++#endif  // defined(OS_WIN) || defined(OS_MAC) || (defined(OS_LINUX) || defined(OS_BSD) ||
+         // BUILDFLAG(IS_CHROMEOS_LACROS))
  
    if (!local_sync_backend_enabled) {
-     // Always create the GCMProfileService instance such that we can listen to
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 7be62201..ecbbffc1 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,6 +1,6 @@
---- chrome/browser/task_manager/sampling/task_group.cc.orig	2020-11-13 06:36:37 UTC
+--- chrome/browser/task_manager/sampling/task_group.cc.orig	2021-03-12 23:57:19 UTC
 +++ chrome/browser/task_manager/sampling/task_group.cc
-@@ -32,9 +32,9 @@ const int kBackgroundRefreshTypesMask =
+@@ -33,9 +33,9 @@ const int kBackgroundRefreshTypesMask =
  #if defined(OS_WIN)
      REFRESH_TYPE_START_TIME | REFRESH_TYPE_CPU_TIME |
  #endif  // defined(OS_WIN)
@@ -12,7 +12,7 @@
  #if BUILDFLAG(ENABLE_NACL)
      REFRESH_TYPE_NACL |
  #endif  // BUILDFLAG(ENABLE_NACL)
-@@ -113,9 +113,9 @@ TaskGroup::TaskGroup(
+@@ -114,9 +114,9 @@ TaskGroup::TaskGroup(
  #if BUILDFLAG(ENABLE_NACL)
        nacl_debug_stub_port_(nacl::kGdbDebugStubPortUnknown),
  #endif  // BUILDFLAG(ENABLE_NACL)
@@ -24,7 +24,7 @@
        idle_wakeups_per_second_(-1),
        gpu_memory_has_duplicates_(false),
        is_backgrounded_(false) {
-@@ -128,10 +128,10 @@ TaskGroup::TaskGroup(
+@@ -129,10 +129,10 @@ TaskGroup::TaskGroup(
                              weak_ptr_factory_.GetWeakPtr()),
          base::BindRepeating(&TaskGroup::OnIdleWakeupsRefreshDone,
                              weak_ptr_factory_.GetWeakPtr()),
@@ -37,7 +37,7 @@
          base::BindRepeating(&TaskGroup::OnProcessPriorityDone,
                              weak_ptr_factory_.GetWeakPtr()));
  
-@@ -299,14 +299,14 @@ void TaskGroup::OnRefreshNaClDebugStubPortDone(int nac
+@@ -300,14 +300,14 @@ void TaskGroup::OnRefreshNaClDebugStubPortDone(int nac
  }
  #endif  // BUILDFLAG(ENABLE_NACL)
  
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 4a6df838..34a3c4b7 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,6 +1,6 @@
---- chrome/browser/task_manager/sampling/task_group.h.orig	2020-11-13 06:36:37 UTC
+--- chrome/browser/task_manager/sampling/task_group.h.orig	2021-03-12 23:57:19 UTC
 +++ chrome/browser/task_manager/sampling/task_group.h
-@@ -39,7 +39,7 @@ constexpr int kUnsupportedVMRefreshFlags =
+@@ -40,7 +40,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 |
@@ -9,7 +9,7 @@
      REFRESH_TYPE_FD_COUNT |
  #endif
      REFRESH_TYPE_HARD_FAULTS;
-@@ -122,9 +122,9 @@ class TaskGroup {
+@@ -123,9 +123,9 @@ class TaskGroup {
    int nacl_debug_stub_port() const { return nacl_debug_stub_port_; }
  #endif  // BUILDFLAG(ENABLE_NACL)
  
@@ -21,7 +21,7 @@
  
    int idle_wakeups_per_second() const { return idle_wakeups_per_second_; }
  
-@@ -138,9 +138,9 @@ class TaskGroup {
+@@ -139,9 +139,9 @@ class TaskGroup {
    void RefreshNaClDebugStubPort(int child_process_unique_id);
    void OnRefreshNaClDebugStubPortDone(int port);
  #endif
@@ -33,7 +33,7 @@
  
    void OnCpuRefreshDone(double cpu_usage);
    void OnSwappedMemRefreshDone(int64_t swapped_mem_bytes);
-@@ -209,10 +209,10 @@ class TaskGroup {
+@@ -210,10 +210,10 @@ class TaskGroup {
  #if BUILDFLAG(ENABLE_NACL)
    int nacl_debug_stub_port_;
  #endif  // BUILDFLAG(ENABLE_NACL)
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 14411152..ffa0292c 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,6 +1,6 @@
---- chrome/browser/task_manager/sampling/task_group_sampler.cc.orig	2020-11-13 06:36:37 UTC
+--- chrome/browser/task_manager/sampling/task_group_sampler.cc.orig	2021-03-12 23:57:19 UTC
 +++ chrome/browser/task_manager/sampling/task_group_sampler.cc
-@@ -43,9 +43,9 @@ TaskGroupSampler::TaskGroupSampler(
+@@ -44,9 +44,9 @@ TaskGroupSampler::TaskGroupSampler(
      const OnCpuRefreshCallback& on_cpu_refresh,
      const OnSwappedMemRefreshCallback& on_swapped_mem_refresh,
      const OnIdleWakeupsCallback& on_idle_wakeups,
@@ -12,7 +12,7 @@
      const OnProcessPriorityCallback& on_process_priority)
      : process_(std::move(process)),
        process_metrics_(CreateProcessMetrics(process_.Handle())),
-@@ -53,9 +53,9 @@ TaskGroupSampler::TaskGroupSampler(
+@@ -54,9 +54,9 @@ TaskGroupSampler::TaskGroupSampler(
        on_cpu_refresh_callback_(on_cpu_refresh),
        on_swapped_mem_refresh_callback_(on_swapped_mem_refresh),
        on_idle_wakeups_callback_(on_idle_wakeups),
@@ -24,7 +24,7 @@
        on_process_priority_callback_(on_process_priority) {
    DCHECK(blocking_pool_runner.get());
  
-@@ -85,7 +85,7 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags) 
+@@ -86,7 +86,7 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags) 
          base::BindOnce(on_swapped_mem_refresh_callback_));
    }
  
@@ -33,7 +33,7 @@
    if (TaskManagerObserver::IsResourceRefreshEnabled(REFRESH_TYPE_IDLE_WAKEUPS,
                                                      refresh_flags)) {
      base::PostTaskAndReplyWithResult(
-@@ -93,9 +93,9 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags) 
+@@ -94,9 +94,9 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags) 
          base::BindOnce(&TaskGroupSampler::RefreshIdleWakeupsPerSecond, this),
          base::BindOnce(on_idle_wakeups_callback_));
    }
@@ -45,7 +45,7 @@
    if (TaskManagerObserver::IsResourceRefreshEnabled(REFRESH_TYPE_FD_COUNT,
                                                      refresh_flags)) {
      base::PostTaskAndReplyWithResult(
-@@ -103,7 +103,7 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags) 
+@@ -104,7 +104,7 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags) 
          base::BindOnce(&TaskGroupSampler::RefreshOpenFdCount, this),
          base::BindOnce(on_open_fd_count_callback_));
    }
@@ -54,7 +54,7 @@
  
    if (TaskManagerObserver::IsResourceRefreshEnabled(REFRESH_TYPE_PRIORITY,
                                                      refresh_flags)) {
-@@ -145,13 +145,13 @@ int TaskGroupSampler::RefreshIdleWakeupsPerSecond() {
+@@ -146,13 +146,13 @@ int TaskGroupSampler::RefreshIdleWakeupsPerSecond() {
    return process_metrics_->GetIdleWakeupsPerSecond();
  }
  
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 65c55ccf..9cb379f3 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,4 +1,4 @@
---- chrome/browser/task_manager/sampling/task_group_sampler.h.orig	2020-11-13 06:36:37 UTC
+--- chrome/browser/task_manager/sampling/task_group_sampler.h.orig	2021-03-12 23:57:19 UTC
 +++ chrome/browser/task_manager/sampling/task_group_sampler.h
 @@ -32,9 +32,9 @@ class TaskGroupSampler : public base::RefCountedThread
    using OnCpuRefreshCallback = base::RepeatingCallback<void(double)>;
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 7721b4b0..4f0c20ce 100644
--- a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc
+++ b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc
@@ -1,6 +1,6 @@
---- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig	2020-11-13 06:36:37 UTC
+--- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig	2021-03-12 23:57:19 UTC
 +++ chrome/browser/task_manager/sampling/task_manager_impl.cc
-@@ -220,11 +220,11 @@ void TaskManagerImpl::GetUSERHandles(TaskId task_id,
+@@ -221,11 +221,11 @@ void TaskManagerImpl::GetUSERHandles(TaskId task_id,
  }
  
  int TaskManagerImpl::GetOpenFdCount(TaskId task_id) const {
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 2c5fac1b..4b2b1812 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,4 +1,4 @@
---- chrome/browser/task_manager/task_manager_observer.h.orig	2020-11-13 06:36:37 UTC
+--- chrome/browser/task_manager/task_manager_observer.h.orig	2021-03-12 23:57:19 UTC
 +++ chrome/browser/task_manager/task_manager_observer.h
 @@ -43,11 +43,11 @@ enum RefreshType {
    // or backgrounded.
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 3513040b..73c9a110 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,29 +1,29 @@
---- chrome/browser/themes/theme_service_factory.cc.orig	2020-11-13 06:36:37 UTC
+--- chrome/browser/themes/theme_service_factory.cc.orig	2021-03-12 23:57:19 UTC
 +++ chrome/browser/themes/theme_service_factory.cc
-@@ -22,7 +22,7 @@
- #include "chrome/browser/themes/theme_helper_win.h"
- #endif
+@@ -25,7 +25,7 @@
  
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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)
  #include "chrome/browser/themes/theme_service_aura_linux.h"
  #include "ui/views/linux_ui/linux_ui.h"
  #endif
-@@ -77,7 +77,7 @@ ThemeServiceFactory::~ThemeServiceFactory() {}
- 
- KeyedService* ThemeServiceFactory::BuildServiceInstanceFor(
+@@ -82,7 +82,7 @@ KeyedService* ThemeServiceFactory::BuildServiceInstanc
      content::BrowserContext* profile) const {
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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)
    using ThemeService = ThemeServiceAuraLinux;
  #endif
  
-@@ -89,7 +89,7 @@ KeyedService* ThemeServiceFactory::BuildServiceInstanc
- 
- void ThemeServiceFactory::RegisterProfilePrefs(
+@@ -96,7 +96,7 @@ void ThemeServiceFactory::RegisterProfilePrefs(
      user_prefs::PrefRegistrySyncable* registry) {
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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)
    bool default_uses_system_theme = false;
  
    const views::LinuxUI* linux_ui = views::LinuxUI::instance();
diff --git a/www/chromium/files/patch-chrome_browser_tracing_crash__service__uploader.cc b/www/chromium/files/patch-chrome_browser_tracing_crash__service__uploader.cc
index ebf3e8cb..50ba900f 100644
--- a/www/chromium/files/patch-chrome_browser_tracing_crash__service__uploader.cc
+++ b/www/chromium/files/patch-chrome_browser_tracing_crash__service__uploader.cc
@@ -1,6 +1,6 @@
---- chrome/browser/tracing/crash_service_uploader.cc.orig	2020-11-13 06:36:37 UTC
+--- chrome/browser/tracing/crash_service_uploader.cc.orig	2021-03-12 23:57:19 UTC
 +++ chrome/browser/tracing/crash_service_uploader.cc
-@@ -160,6 +160,8 @@ void TraceCrashServiceUploader::DoCompressOnBackground
+@@ -161,6 +161,8 @@ void TraceCrashServiceUploader::DoCompressOnBackground
    const char product[] = "Chrome_Linux";
  #elif defined(OS_ANDROID)
    const char product[] = "Chrome_Android";
diff --git a/www/chromium/files/patch-chrome_browser_ui_BUILD.gn b/www/chromium/files/patch-chrome_browser_ui_BUILD.gn
index c1b26ea1..2481cdc0 100644
--- a/www/chromium/files/patch-chrome_browser_ui_BUILD.gn
+++ b/www/chromium/files/patch-chrome_browser_ui_BUILD.gn
@@ -1,6 +1,6 @@
---- chrome/browser/ui/BUILD.gn.orig	2021-01-18 21:28:51 UTC
+--- chrome/browser/ui/BUILD.gn.orig	2021-03-12 23:57:19 UTC
 +++ chrome/browser/ui/BUILD.gn
-@@ -610,12 +610,15 @@ static_library("ui") {
+@@ -617,12 +617,15 @@ static_library("ui") {
      deps += [ "//components/autofill/content/browser/webauthn" ]
    }
  
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 0115dc7f..9013611d 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,38 +1,38 @@
---- chrome/browser/ui/browser_command_controller.cc.orig	2021-01-18 21:28:51 UTC
+--- chrome/browser/ui/browser_command_controller.cc.orig	2021-03-12 23:57:19 UTC
 +++ chrome/browser/ui/browser_command_controller.cc
-@@ -83,7 +83,7 @@
- #include "components/session_manager/core/session_manager.h"
- #endif
+@@ -87,7 +87,7 @@
  
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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)
  #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h"
  #endif
  
-@@ -247,7 +247,7 @@ bool BrowserCommandController::IsReservedCommandOrKey(
- #endif
-   }
+@@ -256,7 +256,7 @@ bool BrowserCommandController::IsReservedCommandOrKey(
  
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+ // 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 this key was registered by the user as a content editing hotkey, then
    // it is not reserved.
    ui::TextEditKeyBindingsDelegateAuraLinux* delegate =
-@@ -477,7 +477,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
-       break;
- #endif
+@@ -492,7 +492,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
  
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+ // 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)
      case IDC_MINIMIZE_WINDOW:
        browser_->window()->Minimize();
        break;
-@@ -951,7 +951,7 @@ void BrowserCommandController::InitCommandState() {
-   command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_4, true);
-   command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_5, true);
+@@ -989,7 +989,7 @@ void BrowserCommandController::InitCommandState() {
  #endif
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+ // 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)
    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__view__prefs.cc b/www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc
index aaa30d1c..991c95bc 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,24 +1,24 @@
---- chrome/browser/ui/browser_view_prefs.cc.orig	2020-11-13 06:36:38 UTC
+--- chrome/browser/ui/browser_view_prefs.cc.orig	2021-03-12 23:57:19 UTC
 +++ chrome/browser/ui/browser_view_prefs.cc
-@@ -26,7 +26,7 @@ namespace {
- // Old values: 0 = SHRINK (default), 1 = STACKED.
- const char kTabStripLayoutType[] = "tab_strip_layout_type";
+@@ -29,7 +29,7 @@ const char kTabStripLayoutType[] = "tab_strip_layout_t
  
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+ // 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)
  bool GetCustomFramePrefDefault() {
  #if defined(USE_OZONE)
    if (features::IsUsingOzonePlatform()) {
-@@ -51,10 +51,10 @@ void RegisterBrowserViewLocalPrefs(PrefRegistrySimple*
- 
- void RegisterBrowserViewProfilePrefs(
+@@ -56,10 +56,10 @@ void RegisterBrowserViewProfilePrefs(
      user_prefs::PrefRegistrySyncable* registry) {
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+ // 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)
    registry->RegisterBooleanPref(prefs::kUseCustomChromeFrame,
                                  GetCustomFramePrefDefault());
--#endif  // defined(OS_LINUX) && defined(!OS_CHROMEOS)
-+#endif  // (defined(OS_LINUX) || defined(OS_BSD)) && defined(!OS_CHROMEOS)
+-#endif  // (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) &&
++#endif  // (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) &&
+         // defined(!OS_CHROMEOS)
  }
  
- void MigrateBrowserTabStripPrefs(PrefService* prefs) {
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 d4f53e99..aebb5647 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,4 +1,4 @@
---- chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc.orig	2020-11-13 06:36:38 UTC
+--- chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc.orig	2021-03-12 23:57:19 UTC
 +++ chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc
 @@ -16,7 +16,7 @@
  
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 98d6e66c..5310e445 100644
--- a/www/chromium/files/patch-chrome_browser_ui_sad__tab.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_sad__tab.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/sad_tab.cc.orig	2020-11-13 06:36:38 UTC
+--- chrome/browser/ui/sad_tab.cc.orig	2021-03-12 23:57:19 UTC
 +++ chrome/browser/ui/sad_tab.cc
 @@ -189,7 +189,7 @@ std::vector<int> SadTab::GetSubMessages() {
        // Only show Incognito suggestion if not already in Incognito mode.
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 d1fbf6b0..62627a62 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	2020-11-13 06:36:38 UTC
+--- chrome/browser/ui/startup/bad_flags_prompt.cc.orig	2021-03-12 23:57:19 UTC
 +++ chrome/browser/ui/startup/bad_flags_prompt.cc
-@@ -88,7 +88,7 @@ static const char* kBadFlags[] = {
-     extensions::switches::kExtensionsOnChromeURLs,
- #endif
+@@ -96,7 +96,7 @@ static const char* kBadFlags[] = {
  
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+ // 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)
      // 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_tab__helpers.cc b/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc
index 79d52bc8..62db14a4 100644
--- a/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/tab_helpers.cc.orig	2021-01-18 21:28:51 UTC
+--- chrome/browser/ui/tab_helpers.cc.orig	2021-03-12 23:57:19 UTC
 +++ chrome/browser/ui/tab_helpers.cc
-@@ -149,7 +149,7 @@
+@@ -150,7 +150,7 @@
  #include "chrome/browser/ui/app_list/search/cros_action_history/cros_action_recorder_tab_tracker.h"
  #endif
  
@@ -9,12 +9,12 @@
      defined(OS_CHROMEOS)
  #include "chrome/browser/ui/blocked_content/framebust_block_tab_helper.h"
  #include "chrome/browser/ui/hats/hats_helper.h"
-@@ -409,11 +409,11 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
- #endif
- 
+@@ -422,11 +422,11 @@ 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) || \
--    (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+    (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+-    (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
++    (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD)
    metrics::DesktopSessionDurationObserver::CreateForWebContents(web_contents);
  #endif
  
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 32245f7e..d5aed68a 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,6 +1,6 @@
---- chrome/browser/ui/task_manager/task_manager_columns.cc.orig	2020-11-13 06:36:38 UTC
+--- chrome/browser/ui/task_manager/task_manager_columns.cc.orig	2021-03-12 23:57:19 UTC
 +++ chrome/browser/ui/task_manager/task_manager_columns.cc
-@@ -93,10 +93,10 @@ const TableColumnData kColumns[] = {
+@@ -94,10 +94,10 @@ const TableColumnData kColumns[] = {
       base::size("100000") * kCharWidth, -1, true, false, false},
  #endif
  
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 1f128b51..53cfa2ac 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,4 +1,4 @@
---- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig	2020-11-13 06:36:38 UTC
+--- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig	2021-03-12 23:57:19 UTC
 +++ chrome/browser/ui/task_manager/task_manager_table_model.cc
 @@ -450,13 +450,13 @@ base::string16 TaskManagerTableModel::GetText(int row,
            ? stringifier_->backgrounded_string()
diff --git a/www/chromium/files/patch-chrome_browser_ui_test_test__browser__dialog.cc b/www/chromium/files/patch-chrome_browser_ui_test_test__browser__dialog.cc
index ff7e4745..e17ce80c 100644
--- a/www/chromium/files/patch-chrome_browser_ui_test_test__browser__dialog.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_test_test__browser__dialog.cc
@@ -1,11 +1,11 @@
---- chrome/browser/ui/test/test_browser_dialog.cc.orig	2020-11-13 06:36:38 UTC
+--- chrome/browser/ui/test/test_browser_dialog.cc.orig	2021-03-12 23:57:19 UTC
 +++ chrome/browser/ui/test/test_browser_dialog.cc
-@@ -114,7 +114,7 @@ bool TestBrowserDialog::VerifyUi() {
- 
-   views::Widget* dialog_widget = *(added.begin());
+@@ -117,7 +117,7 @@ bool TestBrowserDialog::VerifyUi() {
  // TODO(https://crbug.com/958242) support Mac for pixel tests.
--#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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)
    dialog_widget->SetBlockCloseForTesting(true);
    // Deactivate before taking screenshot. Deactivated dialog pixel outputs
    // is more predictable than activated dialog.
diff --git a/www/chromium/files/patch-chrome_browser_ui_test_test__browser__ui.cc b/www/chromium/files/patch-chrome_browser_ui_test_test__browser__ui.cc
index 5b0c8bd0..0b4bee4f 100644
--- a/www/chromium/files/patch-chrome_browser_ui_test_test__browser__ui.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_test_test__browser__ui.cc
@@ -1,29 +1,29 @@
---- chrome/browser/ui/test/test_browser_ui.cc.orig	2020-11-13 06:36:38 UTC
+--- chrome/browser/ui/test/test_browser_ui.cc.orig	2021-03-12 23:57:19 UTC
 +++ chrome/browser/ui/test/test_browser_ui.cc
-@@ -10,7 +10,7 @@
- #include "build/build_config.h"
- 
+@@ -13,7 +13,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) || \
--    (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+    (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+-    (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
++    (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD)
  #include "chrome/test/pixel/browser_skia_gold_pixel_diff.h"
  #include "ui/base/test/skia_gold_matching_algorithm.h"
  #include "ui/compositor/test/draw_waiter_for_test.h"
-@@ -32,7 +32,7 @@ std::string NameFromTestCase() {
- }  // namespace
- 
+@@ -37,7 +37,7 @@ std::string NameFromTestCase() {
  TestBrowserUi::TestBrowserUi() {
--#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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)
    // Default to fuzzy diff. The magic number is chosen based on
    // past experiments.
    SetPixelMatchAlgorithm(
-@@ -43,7 +43,7 @@ TestBrowserUi::TestBrowserUi() {
- TestBrowserUi::~TestBrowserUi() = default;
- 
+@@ -50,7 +50,7 @@ TestBrowserUi::~TestBrowserUi() = default;
  // TODO(https://crbug.com/958242) support Mac for pixel tests.
--#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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)
  bool TestBrowserUi::VerifyPixelUi(views::Widget* widget,
                                    const std::string& screenshot_prefix,
                                    const std::string& screenshot_name) {
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 50e489e0..db18a67d 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,24 +1,24 @@
---- chrome/browser/ui/views/accelerator_table.cc.orig	2020-11-13 06:36:38 UTC
+--- chrome/browser/ui/views/accelerator_table.cc.orig	2021-03-12 23:57:19 UTC
 +++ chrome/browser/ui/views/accelerator_table.cc
-@@ -58,7 +58,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
-     {ui::VKEY_S, ui::EF_PLATFORM_ACCELERATOR, IDC_SAVE_PAGE},
-     {ui::VKEY_9, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_LAST_TAB},
+@@ -61,7 +61,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
      {ui::VKEY_NUMPAD9, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_LAST_TAB},
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+ // 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)
      {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},
-@@ -88,7 +88,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
-     {ui::VKEY_NUMPAD7, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_6},
-     {ui::VKEY_8, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_7},
+@@ -93,7 +93,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
      {ui::VKEY_NUMPAD8, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_7},
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+ // 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)
      {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},
-@@ -106,7 +106,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
+@@ -111,7 +111,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
      {ui::VKEY_8, ui::EF_ALT_DOWN, IDC_SELECT_TAB_7},
      {ui::VKEY_NUMPAD8, ui::EF_ALT_DOWN, IDC_SELECT_TAB_7},
      {ui::VKEY_BROWSER_FAVORITES, ui::EF_NONE, IDC_SHOW_BOOKMARK_BAR},
@@ -27,10 +27,10 @@
      {ui::VKEY_B, ui::EF_SHIFT_DOWN | ui::EF_PLATFORM_ACCELERATOR,
       IDC_SHOW_BOOKMARK_BAR},
      {ui::VKEY_OEM_MINUS, ui::EF_PLATFORM_ACCELERATOR, IDC_ZOOM_MINUS},
-@@ -132,14 +132,14 @@ const AcceleratorMapping kAcceleratorMap[] = {
+@@ -137,14 +137,14 @@ const AcceleratorMapping kAcceleratorMap[] = {
       IDC_SHOW_AVATAR_MENU},
  
-   // Platform-specific key maps.
+ // Platform-specific key maps.
 -#if defined(OS_LINUX) || defined(OS_CHROMEOS)
 +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
      {ui::VKEY_BROWSER_BACK, ui::EF_NONE, IDC_BACK},
@@ -42,5 +42,5 @@
 -#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS)
 +#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
  
- #if defined(OS_CHROMEOS)
+ #if BUILDFLAG(IS_CHROMEOS_ASH)
      // On Chrome OS, VKEY_BROWSER_SEARCH is handled in Ash.
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 2ec42358..efa3b242 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,29 +1,29 @@
---- chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc.orig	2021-01-19 11:28:04 UTC
+--- chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc.orig	2021-03-12 23:57:19 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"
+@@ -22,7 +22,7 @@
  
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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)
  #include "chrome/browser/shell_integration_linux.h"
  #endif
  
-@@ -56,7 +56,7 @@ void ChromeNativeAppWindowViewsAura::OnBeforeWidgetIni
-     const AppWindow::CreateParams& create_params,
-     views::Widget::InitParams* init_params,
+@@ -61,7 +61,7 @@ void ChromeNativeAppWindowViewsAura::OnBeforeWidgetIni
      views::Widget* widget) {
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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)
    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
-@@ -66,7 +66,7 @@ void ChromeNativeAppWindowViewsAura::OnBeforeWidgetIni
+@@ -71,7 +71,7 @@ void ChromeNativeAppWindowViewsAura::OnBeforeWidgetIni
    init_params->wm_class_class = shell_integration_linux::GetProgramClassClass();
    const char kX11WindowRoleApp[] = "app";
    init_params->wm_role_name = std::string(kX11WindowRoleApp);
--#endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#endif  // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+-#endif  // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#endif  // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
  
    ChromeNativeAppWindowViews::OnBeforeWidgetInit(create_params, init_params,
                                                   widget);
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_bookmarks_bookmark__bar__view__test.cc b/www/chromium/files/patch-chrome_browser_ui_views_bookmarks_bookmark__bar__view__test.cc
index aff4f9a2..b57924c6 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_bookmarks_bookmark__bar__view__test.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_bookmarks_bookmark__bar__view__test.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc.orig	2020-11-13 06:36:38 UTC
+--- chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc.orig	2021-03-12 23:57:19 UTC
 +++ chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc
-@@ -1848,7 +1848,7 @@ class BookmarkBarViewTest20 : public BookmarkBarViewEv
+@@ -1856,7 +1856,7 @@ class BookmarkBarViewTest20 : public BookmarkBarViewEv
    }
  
    void Step3() {
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 94dfc016..b3be8383 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,38 +1,38 @@
---- chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc.orig	2021-01-18 21:28:51 UTC
+--- chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc.orig	2021-03-12 23:57:19 UTC
 +++ chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc
-@@ -35,7 +35,7 @@
- #include "ui/wm/core/wm_state.h"
- #endif  // defined(USE_AURA)
+@@ -38,7 +38,7 @@
  
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
+ // 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)
  #include <sys/stat.h>
  #include <sys/types.h>
  #include <unistd.h>
-@@ -45,7 +45,7 @@
+@@ -48,7 +48,7 @@
  #include "chrome/grit/generated_resources.h"
  #include "content/public/common/content_switches.h"
  #include "ui/base/l10n/l10n_util.h"
--#endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#endif  // (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
+-#endif  // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#endif  // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
  
  // This connector is used in ui_devtools's TracingAgent to hook up with the
  // tracing service.
-@@ -115,7 +115,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit(
-         return controller;
-       }));
+@@ -120,7 +120,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit(
  
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
+ // 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)
    // 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.
-@@ -146,7 +146,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit(
+@@ -151,7 +151,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit(
    base::RunLoop().RunUntilIdle();
  
    exit(EXIT_FAILURE);
--#endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#endif  // (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
+-#endif  // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#endif  // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
  }
  
  void ChromeBrowserMainExtraPartsViews::PostBrowserStart() {
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 65f553f2..c7288101 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	2020-11-13 06:36:38 UTC
+--- chrome/browser/ui/views/chrome_views_delegate.h.orig	2021-03-12 23:57:19 UTC
 +++ chrome/browser/ui/views/chrome_views_delegate.h
-@@ -44,7 +44,7 @@ class ChromeViewsDelegate : public views::ViewsDelegat
-   HICON GetSmallWindowIcon() const override;
-   int GetAppbarAutohideEdges(HMONITOR monitor,
+@@ -48,7 +48,7 @@ class ChromeViewsDelegate : public views::ViewsDelegat
                               base::OnceClosure callback) override;
--#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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)
    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 41930749..8d780aa5 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,6 +1,15 @@
---- chrome/browser/ui/views/download/download_item_view.cc.orig	2020-11-13 06:36:38 UTC
+--- chrome/browser/ui/views/download/download_item_view.cc.orig	2021-03-12 23:57:19 UTC
 +++ chrome/browser/ui/views/download/download_item_view.cc
-@@ -190,7 +190,7 @@ bool UseNewWarnings() {
+@@ -189,7 +189,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 (UseNewWarnings())
+     return STYLE_EMPHASIZED;
+ #endif
+@@ -197,7 +197,7 @@ int GetFilenameStyle(const views::Label& label) {
  }
  
  int GetFilenameStyle(const views::StyledLabel& label) {
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
deleted file mode 100644
index 4b89d981..00000000
--- a/www/chromium/files/patch-chrome_browser_ui_views_first__run__dialog.cc
+++ /dev/null
@@ -1,14 +0,0 @@
---- chrome/browser/ui/views/first_run_dialog.cc.orig	2020-11-13 06:36:38 UTC
-+++ chrome/browser/ui/views/first_run_dialog.cc
-@@ -114,9 +114,11 @@ void FirstRunDialog::Done() {
- bool FirstRunDialog::Accept() {
-   GetWidget()->Hide();
- 
-+#if !defined(OS_BSD)
-   ChangeMetricsReportingStateWithReply(
-       report_crashes_->GetChecked(),
-       base::BindRepeating(&InitCrashReporterIfEnabled));
-+#endif
- 
-   if (make_default_->GetChecked())
-     shell_integration::SetAsDefaultBrowser();
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 14e55ae7..a9f61575 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,28 +1,29 @@
---- chrome/browser/ui/views/frame/browser_frame.cc.orig	2020-11-13 06:36:38 UTC
+--- chrome/browser/ui/views/frame/browser_frame.cc.orig	2021-03-12 23:57:19 UTC
 +++ chrome/browser/ui/views/frame/browser_frame.cc
-@@ -38,14 +38,14 @@
- #include "components/user_manager/user_manager.h"
- #endif
+@@ -44,7 +44,7 @@
  
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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)
  #include "ui/display/screen.h"
  #endif
  
- namespace {
- 
+@@ -53,7 +53,7 @@ namespace {
  bool IsUsingGtkTheme(Profile* profile) {
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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)
    return ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme();
  #else
    return false;
-@@ -204,7 +204,7 @@ const ui::NativeTheme* BrowserFrame::GetNativeTheme() 
- 
- void BrowserFrame::OnNativeWidgetWorkspaceChanged() {
-   chrome::SaveWindowWorkspace(browser_view_->browser(), GetWorkspace());
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+@@ -226,7 +226,7 @@ void BrowserFrame::OnNativeWidgetWorkspaceChanged() {
+                                            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 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()
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 57389815..44deeeab 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,20 +1,20 @@
---- chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc.orig	2020-11-13 06:36:38 UTC
+--- chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc.orig	2021-03-12 23:57:19 UTC
 +++ chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc
-@@ -13,7 +13,7 @@
- #include "chrome/browser/ui/views/frame/glass_browser_frame_view.h"
- #endif
+@@ -16,7 +16,7 @@
  
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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)
  #include "chrome/browser/ui/views/frame/desktop_linux_browser_frame_view.h"
  #include "chrome/browser/ui/views/frame/desktop_linux_browser_frame_view_layout.h"
  #include "ui/views/linux_ui/linux_ui.h"
-@@ -27,7 +27,7 @@ namespace {
- std::unique_ptr<OpaqueBrowserFrameView> CreateOpaqueBrowserFrameView(
-     BrowserFrame* frame,
+@@ -32,7 +32,7 @@ std::unique_ptr<OpaqueBrowserFrameView> CreateOpaqueBr
      BrowserView* browser_view) {
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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)
    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 31392d6a..13902a04 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,20 +1,20 @@
---- chrome/browser/ui/views/frame/browser_view.cc.orig	2021-01-18 21:28:51 UTC
+--- chrome/browser/ui/views/frame/browser_view.cc.orig	2021-03-12 23:57:19 UTC
 +++ chrome/browser/ui/views/frame/browser_view.cc
-@@ -1506,7 +1506,7 @@ void BrowserView::ToolbarSizeChanged(bool is_animating
- void BrowserView::TabDraggingStatusChanged(bool is_dragging) {
-   // TODO(crbug.com/1110266): Remove explicit OS_CHROMEOS check once OS_LINUX
+@@ -1504,7 +1504,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra
    // CrOS cleanup is done.
--#if !defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if !defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+ // 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))
    contents_web_view_->SetFastResize(is_dragging);
    if (!is_dragging) {
      // When tab dragging is ended, we need to make sure the web contents get
-@@ -1887,7 +1887,7 @@ void BrowserView::UserChangedTheme(BrowserThemeChangeT
-   const bool should_use_native_frame = frame_->ShouldUseNativeFrame();
- 
+@@ -1886,7 +1886,7 @@ void BrowserView::UserChangedTheme(BrowserThemeChangeT
    bool must_regenerate_frame;
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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)
    // GTK and user theme changes can both change frame buttons, so the frame
    // always needs to be regenerated on Linux.
    must_regenerate_frame = true;
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 35a03cd0..2876c709 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,6 +1,6 @@
---- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig	2021-01-18 21:28:51 UTC
+--- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig	2021-03-12 23:57:19 UTC
 +++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
-@@ -49,7 +49,7 @@
+@@ -50,7 +50,7 @@
  #include "ui/views/window/vector_icons/vector_icons.h"
  #include "ui/views/window/window_shape.h"
  
@@ -9,16 +9,16 @@
  #include "ui/views/controls/menu/menu_runner.h"
  #endif
  
-@@ -464,7 +464,7 @@ bool OpaqueBrowserFrameView::EverHasVisibleBackgroundT
- 
- OpaqueBrowserFrameView::FrameButtonStyle
+@@ -468,7 +468,7 @@ OpaqueBrowserFrameView::FrameButtonStyle
  OpaqueBrowserFrameView::GetFrameButtonStyle() const {
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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)
    return FrameButtonStyle::kMdButton;
  #else
    return FrameButtonStyle::kImageButton;
-@@ -659,7 +659,7 @@ gfx::Rect OpaqueBrowserFrameView::IconBounds() const {
+@@ -662,7 +662,7 @@ gfx::Rect OpaqueBrowserFrameView::IconBounds() const {
  }
  
  void OpaqueBrowserFrameView::WindowIconPressed() {
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__platform__specific.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__platform__specific.cc
index 3a877d45..e86717a6 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__platform__specific.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__platform__specific.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/views/frame/opaque_browser_frame_view_platform_specific.cc.orig	2020-11-13 06:36:38 UTC
+--- chrome/browser/ui/views/frame/opaque_browser_frame_view_platform_specific.cc.orig	2021-03-12 23:57:19 UTC
 +++ chrome/browser/ui/views/frame/opaque_browser_frame_view_platform_specific.cc
 @@ -6,7 +6,7 @@
  
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 8bf51357..ca587eec 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,29 +1,29 @@
---- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig	2020-11-13 06:36:38 UTC
+--- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig	2021-03-12 23:57:19 UTC
 +++ chrome/browser/ui/views/frame/system_menu_model_builder.cc
-@@ -63,7 +63,7 @@ void SystemMenuModelBuilder::BuildMenu(ui::SimpleMenuM
- 
- void SystemMenuModelBuilder::BuildSystemMenuForBrowserWindow(
+@@ -70,7 +70,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser
      ui::SimpleMenuModel* model) {
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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)
    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);
-@@ -78,7 +78,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser
-     model->AddSeparator(ui::NORMAL_SEPARATOR);
-     model->AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER);
+@@ -87,7 +87,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser
    }
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+ // 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)
    model->AddSeparator(ui::NORMAL_SEPARATOR);
    model->AddCheckItemWithStringId(IDC_USE_SYSTEM_TITLE_BAR,
                                    IDS_SHOW_WINDOW_DECORATIONS_MENU);
-@@ -116,7 +116,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForAppOrPo
-     model->AddSeparator(ui::NORMAL_SEPARATOR);
-     model->AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER);
+@@ -130,7 +130,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForAppOrPo
    }
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+ // 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)
    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 237f3a93..7a4ba4c1 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,29 +1,29 @@
---- chrome/browser/ui/views/frame/system_menu_model_delegate.cc.orig	2020-11-13 06:36:38 UTC
+--- chrome/browser/ui/views/frame/system_menu_model_delegate.cc.orig	2021-03-12 23:57:19 UTC
 +++ chrome/browser/ui/views/frame/system_menu_model_delegate.cc
-@@ -15,7 +15,7 @@
- #include "components/sessions/core/tab_restore_service.h"
- #include "ui/base/l10n/l10n_util.h"
+@@ -19,7 +19,7 @@
  
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+ // 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)
  #include "chrome/common/pref_names.h"
  #include "components/prefs/pref_service.h"
  #endif
-@@ -30,7 +30,7 @@ SystemMenuModelDelegate::SystemMenuModelDelegate(
- SystemMenuModelDelegate::~SystemMenuModelDelegate() {}
- 
+@@ -36,7 +36,7 @@ SystemMenuModelDelegate::~SystemMenuModelDelegate() {}
  bool SystemMenuModelDelegate::IsCommandIdChecked(int command_id) const {
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+ // 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 (command_id == IDC_USE_SYSTEM_TITLE_BAR) {
      PrefService* prefs = browser_->profile()->GetPrefs();
      return !prefs->GetBoolean(prefs::kUseCustomChromeFrame);
-@@ -44,7 +44,7 @@ bool SystemMenuModelDelegate::IsCommandIdEnabled(int c
- }
- 
+@@ -52,7 +52,7 @@ bool SystemMenuModelDelegate::IsCommandIdEnabled(int c
  bool SystemMenuModelDelegate::IsCommandIdVisible(int command_id) const {
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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)
    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 c5a6f0a4..9f9a9ae9 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,6 +1,6 @@
---- chrome/browser/ui/views/hung_renderer_view.cc.orig	2021-01-18 21:28:51 UTC
+--- chrome/browser/ui/views/hung_renderer_view.cc.orig	2021-03-12 23:57:19 UTC
 +++ chrome/browser/ui/views/hung_renderer_view.cc
-@@ -425,7 +425,7 @@ void HungRendererDialogView::ForceCrashHungRenderer() 
+@@ -423,7 +423,7 @@ void HungRendererDialogView::ForceCrashHungRenderer() 
    content::RenderProcessHost* rph =
        hung_pages_table_model_->GetRenderWidgetHost()->GetProcess();
    if (rph) {
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
new file mode 100644
index 00000000..cbb7d40c
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/ui/views/profiles/profile_menu_view_base.cc.orig	2021-03-12 23:57:19 UTC
++++ chrome/browser/ui/views/profiles/profile_menu_view_base.cc
+@@ -573,7 +573,7 @@ void ProfileMenuViewBase::SetProfileIdentityInfo(
+ 
+   auto avatar_image_view = std::make_unique<AvatarImageView>(image_model, this);
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_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_tabs_new__tab__button.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_new__tab__button.cc
index f20448e2..46ea7da2 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	2020-11-13 06:36:38 UTC
+--- chrome/browser/ui/views/tabs/new_tab_button.cc.orig	2021-03-12 23:57:19 UTC
 +++ chrome/browser/ui/views/tabs/new_tab_button.cc
-@@ -57,7 +57,7 @@ class NewTabButton::HighlightPathGenerator
- NewTabButton::NewTabButton(TabStrip* tab_strip, PressedCallback callback)
-     : views::ImageButton(std::move(callback)), tab_strip_(tab_strip) {
+@@ -58,7 +58,7 @@ NewTabButton::NewTabButton(TabStrip* tab_strip, Presse
    SetAnimateOnStateChange(true);
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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)
    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 18e668b1..54e32ac0 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/tabs/tab.cc.orig	2021-01-18 21:28:51 UTC
+--- chrome/browser/ui/views/tabs/tab.cc.orig	2021-03-12 23:57:19 UTC
 +++ chrome/browser/ui/views/tabs/tab.cc
-@@ -576,7 +576,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent&
+@@ -577,7 +577,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent&
    if (mouse_hovered_ || !GetWidget()->IsMouseEventsEnabled())
      return;
  
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc
index f12761d8..107266dc 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig	2021-01-18 21:28:51 UTC
+--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig	2021-03-12 23:57:19 UTC
 +++ chrome/browser/ui/views/tabs/tab_drag_controller.cc
-@@ -446,7 +446,7 @@ void TabDragController::Init(TabDragContext* source_co
+@@ -447,7 +447,7 @@ void TabDragController::Init(TabDragContext* source_co
    //     synchronous on desktop Linux, so use that.
    // - Chrome OS
    //     Releasing capture on Ash cancels gestures so avoid it.
@@ -9,21 +9,21 @@
    can_release_capture_ = false;
  #endif
    start_point_in_screen_ = gfx::Point(source_view_offset, mouse_offset.y());
-@@ -896,7 +896,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon
-     else
-       SetCapture(target_context);
+@@ -898,7 +898,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon
  
--#if !defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if (!defined(OS_LINUX) || defined(OS_CHROMEOS)) && !defined(OS_BSD)
+ // 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))
      // EndMoveLoop is going to snap the window back to its original location.
      // Hide it so users don't see this. Hiding a window in Linux aura causes
      // it to lose capture so skip it.
-@@ -2088,7 +2088,7 @@ TabDragController::Liveness TabDragController::GetLoca
-     if (dragged_window)
-       exclude.insert(dragged_window);
+@@ -2107,7 +2107,7 @@ TabDragController::Liveness TabDragController::GetLoca
    }
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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)
    // Exclude windows which are pending deletion via Browser::TabStripEmpty().
    // These windows can be returned in the Linux Aura port because the browser
    // window which was used for dragging is not hidden once all of its tabs are
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_web__apps_pwa__confirmation__bubble__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_web__apps_pwa__confirmation__bubble__view.cc
deleted file mode 100644
index 1e35b5c8..00000000
--- a/www/chromium/files/patch-chrome_browser_ui_views_web__apps_pwa__confirmation__bubble__view.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/browser/ui/views/web_apps/pwa_confirmation_bubble_view.cc.orig	2021-01-18 21:28:51 UTC
-+++ chrome/browser/ui/views/web_apps/pwa_confirmation_bubble_view.cc
-@@ -42,7 +42,7 @@
- 
- namespace {
- 
--#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
-+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \
-     defined(OS_CHROMEOS)
- constexpr char kDeviceTypeForCheckbox[] = "computer";
- #else
diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc b/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc
index 88b5db98..011a32a8 100644
--- a/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/webui/about_ui.cc.orig	2020-11-13 06:36:38 UTC
+--- chrome/browser/ui/webui/about_ui.cc.orig	2021-03-12 23:57:19 UTC
 +++ chrome/browser/ui/webui/about_ui.cc
-@@ -579,7 +579,7 @@ std::string ChromeURLs() {
+@@ -580,7 +580,7 @@ std::string ChromeURLs() {
    return html;
  }
  
@@ -9,7 +9,7 @@
  std::string AboutLinuxProxyConfig() {
    std::string data;
    AppendHeader(&data, 0,
-@@ -635,7 +635,7 @@ void AboutUIHTMLSource::StartDataRequest(
+@@ -636,7 +636,7 @@ void AboutUIHTMLSource::StartDataRequest(
        response =
            ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(idr);
      }
diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc b/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc
index 51b097e7..ca11fbd3 100644
--- a/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc
@@ -1,15 +1,15 @@
---- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig	2021-01-18 21:28:51 UTC
+--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig	2021-03-12 23:57:19 UTC
 +++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
-@@ -241,7 +241,7 @@
+@@ -242,7 +242,7 @@
  #include "chrome/browser/ui/webui/app_launcher_page_ui.h"
  #endif
  
 -#if defined(OS_LINUX) || defined(OS_CHROMEOS)
 +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
- #include "chrome/browser/ui/webui/webui_js_exception/webui_js_exception_ui.h"
+ #include "chrome/browser/ui/webui/webui_js_error/webui_js_error_ui.h"
  #endif
  
-@@ -262,12 +262,12 @@
+@@ -263,12 +263,12 @@
  #include "chrome/browser/ui/webui/conflicts/conflicts_ui.h"
  #endif
  
@@ -24,7 +24,7 @@
      defined(OS_ANDROID)
  #include "chrome/browser/ui/webui/sandbox/sandbox_internals_ui.h"
  #endif
-@@ -473,7 +473,7 @@ bool IsAboutUI(const GURL& url) {
+@@ -465,7 +465,7 @@ bool IsAboutUI(const GURL& url) {
  #if !defined(OS_ANDROID)
            || url.host_piece() == chrome::kChromeUITermsHost
  #endif
@@ -32,17 +32,17 @@
 +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
            || url.host_piece() == chrome::kChromeUILinuxProxyConfigHost
  #endif
- #if defined(OS_CHROMEOS)
-@@ -808,7 +808,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
+ #if BUILDFLAG(IS_CHROMEOS_ASH)
+@@ -811,7 +811,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
    }
  #endif  // !defined(OFFICIAL_BUILD)
- #endif  // defined(OS_CHROMEOS)
+ #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
 -#if defined(OS_LINUX) || defined(OS_CHROMEOS)
 +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
-   if (url.host_piece() == chrome::kChromeUIWebUIJsExceptionHost)
-     return &NewWebUI<WebUIJsExceptionUI>;
+   if (url.host_piece() == chrome::kChromeUIWebUIJsErrorHost)
+     return &NewWebUI<WebUIJsErrorUI>;
  #endif
-@@ -876,7 +876,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
+@@ -873,7 +873,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
    if (url.host_piece() == chrome::kChromeUINaClHost)
      return &NewWebUI<NaClUI>;
  #endif
@@ -51,7 +51,7 @@
      defined(USE_AURA)
    if (url.host_piece() == chrome::kChromeUITabModalConfirmDialogHost)
      return &NewWebUI<ConstrainedWebDialogUI>;
-@@ -920,19 +920,19 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
+@@ -917,13 +917,13 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
      return &NewWebUI<media_router::MediaRouterInternalsUI>;
    }
  #endif
@@ -67,10 +67,12 @@
      defined(OS_CHROMEOS)
    if (url.host_piece() == chrome::kChromeUIDiscardsHost)
      return &NewWebUI<DiscardsUI>;
- #endif
+@@ -931,7 +931,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
+ // 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) && !defined(OS_CHROMEOS))
-+    (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+-    (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
++    (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD))
    if (url.host_piece() == chrome::kChromeUIBrowserSwitchHost)
      return &NewWebUI<BrowserSwitchUI>;
  #endif
diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc b/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc
index b90cefd7..3266c2ae 100644
--- a/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc
@@ -1,20 +1,20 @@
---- chrome/browser/ui/webui/settings/appearance_handler.cc.orig	2020-11-13 06:36:38 UTC
+--- chrome/browser/ui/webui/settings/appearance_handler.cc.orig	2021-03-12 23:57:19 UTC
 +++ chrome/browser/ui/webui/settings/appearance_handler.cc
-@@ -27,7 +27,7 @@ void AppearanceHandler::RegisterMessages() {
-       "useDefaultTheme",
-       base::BindRepeating(&AppearanceHandler::HandleUseDefaultTheme,
+@@ -31,7 +31,7 @@ void AppearanceHandler::RegisterMessages() {
                            base::Unretained(this)));
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_BSD) && !defined(OS_CHROMEOS)
+ // 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)
    web_ui()->RegisterMessageCallback(
        "useSystemTheme",
        base::BindRepeating(&AppearanceHandler::HandleUseSystemTheme,
-@@ -39,7 +39,7 @@ void AppearanceHandler::HandleUseDefaultTheme(const ba
-   ThemeServiceFactory::GetForProfile(profile_)->UseDefaultTheme();
- }
+@@ -45,7 +45,7 @@ void AppearanceHandler::HandleUseDefaultTheme(const ba
  
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_BSD) && !defined(OS_CHROMEOS)
+ // 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)
  void AppearanceHandler::HandleUseSystemTheme(const base::ListValue* args) {
    if (profile_->IsSupervised())
      NOTREACHED();
diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.h b/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.h
index c6ba905a..89e50df2 100644
--- a/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.h
+++ b/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.h
@@ -1,11 +1,11 @@
---- chrome/browser/ui/webui/settings/appearance_handler.h.orig	2020-11-13 06:36:38 UTC
+--- chrome/browser/ui/webui/settings/appearance_handler.h.orig	2021-03-12 23:57:19 UTC
 +++ chrome/browser/ui/webui/settings/appearance_handler.h
-@@ -36,7 +36,7 @@ class AppearanceHandler : public SettingsPageUIHandler
-   // Changes the UI theme of the browser to the default theme.
-   void HandleUseDefaultTheme(const base::ListValue* args);
+@@ -39,7 +39,7 @@ class AppearanceHandler : public SettingsPageUIHandler
  
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
+ // 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)
    // Changes the UI theme of the browser to the system (GTK+) theme.
    void HandleUseSystemTheme(const base::ListValue* args);
  #endif
diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc b/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc
index 9563b5d1..cc30f8b2 100644
--- a/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc
@@ -1,11 +1,20 @@
---- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig	2021-01-18 21:28:52 UTC
+--- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig	2021-03-12 23:57:19 UTC
 +++ chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
-@@ -341,7 +341,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
-     {"minimumFont", IDS_SETTINGS_MINIMUM_FONT_SIZE_LABEL},
-     {"tiny", IDS_SETTINGS_TINY_FONT_SIZE},
+@@ -343,7 +343,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
      {"huge", IDS_SETTINGS_HUGE_FONT_SIZE},
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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)
      {"systemTheme", IDS_SETTINGS_SYSTEM_THEME},
      {"useSystemTheme", IDS_SETTINGS_USE_SYSTEM_THEME},
      {"classicTheme", IDS_SETTINGS_CLASSIC_THEME},
+@@ -351,7 +351,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
+ #else
+     {"resetToDefaultTheme", IDS_SETTINGS_RESET_TO_DEFAULT_THEME},
+ #endif
+-#if defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)
++#if (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD)
+     {"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS},
+ #endif
+ #if defined(OS_MAC)
diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_webui__js__error_webui__js__error__ui.cc b/www/chromium/files/patch-chrome_browser_ui_webui_webui__js__error_webui__js__error__ui.cc
new file mode 100644
index 00000000..527c02f9
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_ui_webui_webui__js__error_webui__js__error__ui.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/ui/webui/webui_js_error/webui_js_error_ui.cc.orig	2021-03-16 13:50:34 UTC
++++ chrome/browser/ui/webui/webui_js_error/webui_js_error_ui.cc
+@@ -20,7 +20,7 @@
+ 
+ WebUIJsErrorUI::WebUIJsErrorUI(content::WebUI* web_ui)
+     : content::WebUIController(web_ui) {
+-#if !defined(OS_WIN) && !defined(OS_FUCHSIA)
++#if !defined(OS_WIN) && !defined(OS_FUCHSIA) && !defined(OS_BSD)
+   VLOG(3) << std::boolalpha << "chrome://webuijserror loading. "
+           << "Experiment state: send javascript errors is "
+           << base::FeatureList::IsEnabled(
diff --git a/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__file__handler__registration.h b/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__file__handler__registration.h
index 5eb9bb9e..34ccd1a2 100644
--- a/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__file__handler__registration.h
+++ b/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__file__handler__registration.h
@@ -1,4 +1,4 @@
---- chrome/browser/web_applications/components/web_app_file_handler_registration.h.orig	2020-11-13 06:36:38 UTC
+--- chrome/browser/web_applications/components/web_app_file_handler_registration.h.orig	2021-03-12 23:57:19 UTC
 +++ chrome/browser/web_applications/components/web_app_file_handler_registration.h
 @@ -38,7 +38,7 @@ void RegisterFileHandlersWithOs(const AppId& app_id,
  // If a shim app was required, also removes the shim app.
diff --git a/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__run__on__os__login.cc b/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__run__on__os__login.cc
new file mode 100644
index 00000000..828489c2
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__run__on__os__login.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/web_applications/components/web_app_run_on_os_login.cc.orig	2021-03-12 23:57:19 UTC
++++ chrome/browser/web_applications/components/web_app_run_on_os_login.cc
+@@ -34,7 +34,7 @@ namespace internals {
+ 
+ // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
+ // complete.
+-#if !(defined(OS_WIN) || defined(OS_MAC) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)))
++#if !(defined(OS_WIN) || defined(OS_MAC) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)))
+ // TODO(crbug.com/897302): This boilerplate function is used for platforms
+ // that don't support Run On OS Login. Currently the feature is supported on
+ // Windows, Linux and MacOS.
diff --git a/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__shortcut.cc b/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__shortcut.cc
index 098790bb..d16144a1 100644
--- a/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__shortcut.cc
+++ b/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__shortcut.cc
@@ -1,4 +1,4 @@
---- chrome/browser/web_applications/components/web_app_shortcut.cc.orig	2021-01-18 21:28:52 UTC
+--- chrome/browser/web_applications/components/web_app_shortcut.cc.orig	2021-03-12 23:57:19 UTC
 +++ chrome/browser/web_applications/components/web_app_shortcut.cc
 @@ -33,7 +33,7 @@ namespace {
  
diff --git a/www/chromium/files/patch-chrome_browser_web__applications_extensions_bookmark__app__finalizer__utils.cc b/www/chromium/files/patch-chrome_browser_web__applications_extensions_bookmark__app__finalizer__utils.cc
index 778bb3c2..ac0694c7 100644
--- a/www/chromium/files/patch-chrome_browser_web__applications_extensions_bookmark__app__finalizer__utils.cc
+++ b/www/chromium/files/patch-chrome_browser_web__applications_extensions_bookmark__app__finalizer__utils.cc
@@ -1,11 +1,11 @@
---- chrome/browser/web_applications/extensions/bookmark_app_finalizer_utils.cc.orig	2020-11-13 06:36:38 UTC
+--- chrome/browser/web_applications/extensions/bookmark_app_finalizer_utils.cc.orig	2021-03-12 23:57:19 UTC
 +++ chrome/browser/web_applications/extensions/bookmark_app_finalizer_utils.cc
-@@ -15,7 +15,7 @@ namespace {
- 
- #if !defined(OS_CHROMEOS)
+@@ -18,7 +18,7 @@ namespace {
  bool CanOsAddDesktopShortcuts() {
--#if defined(OS_LINUX) || defined(OS_WIN)
-+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
+ // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
+ // complete.
+-#if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_WIN)
++#if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_WIN) || defined(OS_BSD)
    return true;
  #else
    return false;
diff --git a/www/chromium/files/patch-chrome_common_BUILD.gn b/www/chromium/files/patch-chrome_common_BUILD.gn
index 71d13e7a..bde26f91 100644
--- a/www/chromium/files/patch-chrome_common_BUILD.gn
+++ b/www/chromium/files/patch-chrome_common_BUILD.gn
@@ -1,6 +1,6 @@
---- chrome/common/BUILD.gn.orig	2021-01-18 21:28:52 UTC
+--- chrome/common/BUILD.gn.orig	2021-03-12 23:57:19 UTC
 +++ chrome/common/BUILD.gn
-@@ -247,6 +247,10 @@ static_library("common") {
+@@ -251,6 +251,10 @@ static_library("common") {
      public_deps += [ "//ppapi/shared_impl" ]
    }
  
@@ -11,7 +11,7 @@
    if (enable_extensions) {
      sources += [
        "extensions/api/commands/commands_handler.cc",
-@@ -480,13 +484,21 @@ static_library("common") {
+@@ -481,13 +485,21 @@ static_library("common") {
      public_deps += [ "//chrome/common/safe_browsing" ]
    }
  
diff --git a/www/chromium/files/patch-chrome_common_channel__info.h b/www/chromium/files/patch-chrome_common_channel__info.h
index 172daf17..930457ad 100644
--- a/www/chromium/files/patch-chrome_common_channel__info.h
+++ b/www/chromium/files/patch-chrome_common_channel__info.h
@@ -1,11 +1,11 @@
---- chrome/common/channel_info.h.orig	2020-11-13 06:36:38 UTC
+--- chrome/common/channel_info.h.orig	2021-03-12 23:57:19 UTC
 +++ chrome/common/channel_info.h
-@@ -61,7 +61,7 @@ bool IsSideBySideCapable();
- std::string GetChannelSuffixForDataDir();
- #endif
+@@ -70,7 +70,7 @@ std::string GetChannelSuffixForDataDir();
  
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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)
  // Returns the channel-specific filename of the desktop shortcut used to launch
  // the browser.
  std::string GetDesktopName(base::Environment* env);
diff --git a/www/chromium/files/patch-chrome_common_channel__info__posix.cc b/www/chromium/files/patch-chrome_common_channel__info__posix.cc
index b71431a6..975b44d9 100644
--- a/www/chromium/files/patch-chrome_common_channel__info__posix.cc
+++ b/www/chromium/files/patch-chrome_common_channel__info__posix.cc
@@ -1,20 +1,20 @@
---- chrome/common/channel_info_posix.cc.orig	2020-11-13 06:36:38 UTC
+--- chrome/common/channel_info_posix.cc.orig	2021-03-12 23:57:19 UTC
 +++ chrome/common/channel_info_posix.cc
-@@ -67,7 +67,7 @@ std::string GetChannelSuffixForDataDir() {
-   }
- }
+@@ -70,7 +70,7 @@ std::string GetChannelSuffixForDataDir() {
  
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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)
  std::string GetDesktopName(base::Environment* env) {
  #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
    // Google Chrome packaged as a snap is a special case: the application name
-@@ -96,7 +96,7 @@ std::string GetDesktopName(base::Environment* env) {
+@@ -99,7 +99,7 @@ std::string GetDesktopName(base::Environment* env) {
    return "chromium-browser.desktop";
  #endif
  }
--#endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#endif  // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+-#endif  // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#endif  // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
  
  version_info::Channel GetChannel() {
    return GetChannelImpl(nullptr);
diff --git a/www/chromium/files/patch-chrome_common_chrome__features.cc b/www/chromium/files/patch-chrome_common_chrome__features.cc
index da8ebf0e..cdc137cf 100644
--- a/www/chromium/files/patch-chrome_common_chrome__features.cc
+++ b/www/chromium/files/patch-chrome_common_chrome__features.cc
@@ -1,6 +1,6 @@
---- chrome/common/chrome_features.cc.orig	2021-01-18 21:28:52 UTC
+--- chrome/common/chrome_features.cc.orig	2021-03-12 23:57:19 UTC
 +++ chrome/common/chrome_features.cc
-@@ -96,13 +96,13 @@ const base::Feature kAsyncDns {
+@@ -92,13 +92,13 @@ const base::Feature kAsyncDns {
  #endif
  };
  
@@ -14,21 +14,21 @@
 -#endif  // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS)
 +#endif  // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
  
- #if defined(OS_CHROMEOS)
+ #if BUILDFLAG(IS_CHROMEOS_ASH)
  // Enable Borealis on Chrome OS.
-@@ -343,13 +343,13 @@ const base::Feature kEarlyLibraryLoad{"EarlyLibraryLoa
- const base::Feature kEnableAllSystemWebApps{"EnableAllSystemWebApps",
-                                             base::FEATURE_DISABLED_BY_DEFAULT};
+@@ -348,13 +348,13 @@ const base::Feature kEnableAllSystemWebApps{"EnableAll
  
--#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || \
-+#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) || \
+ // 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) || \
      defined(OS_MAC)
  COMPONENT_EXPORT(CHROME_FEATURES)
  // Enables ephemeral Guest profiles on desktop.
  extern const base::Feature kEnableEphemeralGuestProfilesOnDesktop{
      "EnableEphemeralGuestProfilesOnDesktop", base::FEATURE_DISABLED_BY_DEFAULT};
--#endif  // defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ||
-+#endif  // defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) ||
-         // defined(OS_MAC)
+-#endif  // defined(OS_WIN) || (defined(OS_LINUX) ||
++#endif  // defined(OS_WIN) || (defined(OS_LINUX) || defined(OS_BSD) ||
+         // BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_MAC)
  
  #if defined(OS_WIN)
diff --git a/www/chromium/files/patch-chrome_common_chrome__features.h b/www/chromium/files/patch-chrome_common_chrome__features.h
index 31705c7b..96d4333e 100644
--- a/www/chromium/files/patch-chrome_common_chrome__features.h
+++ b/www/chromium/files/patch-chrome_common_chrome__features.h
@@ -1,6 +1,6 @@
---- chrome/common/chrome_features.h.orig	2021-01-18 21:28:52 UTC
+--- chrome/common/chrome_features.h.orig	2021-03-12 23:57:19 UTC
 +++ chrome/common/chrome_features.h
-@@ -82,10 +82,10 @@ extern const base::Feature kAppShimNewCloseBehavior;
+@@ -78,10 +78,10 @@ extern const base::Feature kAppShimNewCloseBehavior;
  
  COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kAsyncDns;
  
@@ -11,19 +11,19 @@
 -#endif  // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS)
 +#endif  // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
  
- #if defined(OS_CHROMEOS)
+ #if BUILDFLAG(IS_CHROMEOS_ASH)
  COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kBorealis;
-@@ -227,11 +227,11 @@ extern const base::Feature kEnableAmbientAuthenticatio
- COMPONENT_EXPORT(CHROME_FEATURES)
- extern const base::Feature kEnableAmbientAuthenticationInIncognito;
+@@ -230,11 +230,11 @@ extern const base::Feature kEnableAmbientAuthenticatio
  
--#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || \
-+#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) || \
+ // 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) || \
      defined(OS_MAC)
  COMPONENT_EXPORT(CHROME_FEATURES)
  extern const base::Feature kEnableEphemeralGuestProfilesOnDesktop;
--#endif  // defined(OS_WIN) || (defined(OS_LINUX) &6 !defined(OS_CHROMEOS)) ||
-+#endif  // defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) ||
-         // defined(OS_MAC)
+-#endif  // defined(OS_WIN) || (defined(OS_LINUX) ||
++#endif  // defined(OS_WIN) || (defined(OS_LINUX) || defined(OS_BSD) ||
+         // BUILDFLAG(IS_CHROMEOS_LACROS)) ||  defined(OS_MAC)
  
  #if defined(OS_WIN)
diff --git a/www/chromium/files/patch-chrome_common_chrome__paths.cc b/www/chromium/files/patch-chrome_common_chrome__paths.cc
index bca2440a..92a4c997 100644
--- a/www/chromium/files/patch-chrome_common_chrome__paths.cc
+++ b/www/chromium/files/patch-chrome_common_chrome__paths.cc
@@ -1,6 +1,6 @@
---- chrome/common/chrome_paths.cc.orig	2021-01-18 21:28:52 UTC
+--- chrome/common/chrome_paths.cc.orig	2021-03-12 23:57:19 UTC
 +++ chrome/common/chrome_paths.cc
-@@ -47,21 +47,29 @@ namespace {
+@@ -48,21 +48,29 @@ namespace {
  const base::FilePath::CharType kPepperFlashBaseDirectory[] =
      FILE_PATH_LITERAL("PepperFlash");
  
@@ -32,7 +32,7 @@
  
  #if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && \
      BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT)
-@@ -182,7 +190,7 @@ bool PathProvider(int key, base::FilePath* result) {
+@@ -183,7 +191,7 @@ bool PathProvider(int key, base::FilePath* result) {
          return false;
        break;
      case chrome::DIR_DEFAULT_DOWNLOADS_SAFE:
@@ -41,7 +41,7 @@
        if (!GetUserDownloadsDirectorySafe(&cur))
          return false;
        break;
-@@ -453,6 +461,9 @@ bool PathProvider(int key, base::FilePath* result) {
+@@ -447,6 +455,9 @@ bool PathProvider(int key, base::FilePath* result) {
      case chrome::DIR_POLICY_FILES: {
  #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
        cur = base::FilePath(FILE_PATH_LITERAL("/etc/opt/chrome/policies"));
@@ -51,16 +51,20 @@
  #else
        cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies"));
  #endif
-@@ -460,7 +471,7 @@ bool PathProvider(int key, base::FilePath* result) {
-     }
+@@ -455,9 +466,9 @@ bool PathProvider(int key, base::FilePath* result) {
  #endif
- #if defined(OS_CHROMEOS) || \
--    (defined(OS_LINUX) && BUILDFLAG(CHROMIUM_BRANDING)) || defined(OS_MAC)
-+    (defined(OS_LINUX) && BUILDFLAG(CHROMIUM_BRANDING)) || defined(OS_MAC) || defined(OS_BSD)
+ // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
+ // complete.
+-#if defined(OS_CHROMEOS) ||                                  \
+-    ((defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \
+-     BUILDFLAG(CHROMIUM_BRANDING)) ||                        \
++#if defined(OS_CHROMEOS) ||                                                    \
++    ((defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) && \
++     BUILDFLAG(CHROMIUM_BRANDING)) ||                                           \
+     defined(OS_MAC)
      case chrome::DIR_USER_EXTERNAL_EXTENSIONS: {
        if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur))
-         return false;
-@@ -468,7 +479,7 @@ bool PathProvider(int key, base::FilePath* result) {
+@@ -466,7 +477,7 @@ bool PathProvider(int key, base::FilePath* result) {
        break;
      }
  #endif
@@ -69,7 +73,7 @@
      case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: {
        cur = base::FilePath(kFilepathSinglePrefExtensions);
        break;
-@@ -503,7 +514,7 @@ bool PathProvider(int key, base::FilePath* result) {
+@@ -501,7 +512,7 @@ bool PathProvider(int key, base::FilePath* result) {
  #endif
        break;
  
@@ -78,7 +82,7 @@
      case chrome::DIR_NATIVE_MESSAGING:
  #if defined(OS_MAC)
  #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
-@@ -517,6 +528,9 @@ bool PathProvider(int key, base::FilePath* result) {
+@@ -515,6 +526,9 @@ bool PathProvider(int key, base::FilePath* result) {
  #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
        cur = base::FilePath(FILE_PATH_LITERAL(
            "/etc/opt/chrome/native-messaging-hosts"));
@@ -88,7 +92,7 @@
  #else
        cur = base::FilePath(FILE_PATH_LITERAL(
            "/etc/chromium/native-messaging-hosts"));
-@@ -529,7 +543,7 @@ bool PathProvider(int key, base::FilePath* result) {
+@@ -527,7 +541,7 @@ bool PathProvider(int key, base::FilePath* result) {
          return false;
        cur = cur.Append(FILE_PATH_LITERAL("NativeMessagingHosts"));
        break;
diff --git a/www/chromium/files/patch-chrome_common_chrome__paths.h b/www/chromium/files/patch-chrome_common_chrome__paths.h
index 9fca877c..4ab66fec 100644
--- a/www/chromium/files/patch-chrome_common_chrome__paths.h
+++ b/www/chromium/files/patch-chrome_common_chrome__paths.h
@@ -1,15 +1,19 @@
---- chrome/common/chrome_paths.h.orig	2021-01-18 21:28:52 UTC
+--- chrome/common/chrome_paths.h.orig	2021-03-12 23:57:19 UTC
 +++ chrome/common/chrome_paths.h
-@@ -51,7 +51,7 @@ enum {
-                      // contains subdirectories.
+@@ -53,9 +53,9 @@ enum {
  #endif
- #if defined(OS_CHROMEOS) || \
--    (defined(OS_LINUX) && BUILDFLAG(CHROMIUM_BRANDING)) || defined(OS_MAC)
-+    (defined(OS_LINUX) && BUILDFLAG(CHROMIUM_BRANDING)) || defined(OS_MAC) || defined(OS_BSD)
+ // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
+ // complete.
+-#if defined(OS_CHROMEOS) ||                                  \
+-    ((defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \
+-     BUILDFLAG(CHROMIUM_BRANDING)) ||                        \
++#if defined(OS_CHROMEOS) ||                                                     \
++    ((defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) && \
++     BUILDFLAG(CHROMIUM_BRANDING)) ||                                           \
+     defined(OS_MAC)
    DIR_USER_EXTERNAL_EXTENSIONS,  // Directory for per-user external extensions
                                   // on Chrome Mac and Chromium Linux.
-                                  // On Chrome OS, this path is used for OEM
-@@ -59,7 +59,7 @@ enum {
+@@ -64,7 +64,7 @@ enum {
                                   // create it.
  #endif
  
@@ -18,10 +22,10 @@
    DIR_STANDALONE_EXTERNAL_EXTENSIONS,  // Directory for 'per-extension'
                                         // definition manifest files that
                                         // describe extensions which are to be
-@@ -116,7 +116,7 @@ enum {
-   DIR_SUPERVISED_USER_INSTALLED_WHITELISTS,  // Directory where sanitized
-                                              // supervised user whitelists are
-                                              // installed.
+@@ -118,7 +118,7 @@ enum {
+   DIR_CHROMEOS_CUSTOM_WALLPAPERS,     // Directory where custom wallpapers
+                                       // reside.
+ #endif
 -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC)
 +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD)
    DIR_NATIVE_MESSAGING,       // System directory where native messaging host
diff --git a/www/chromium/files/patch-chrome_common_chrome__paths__internal.h b/www/chromium/files/patch-chrome_common_chrome__paths__internal.h
index 5a4c75c4..e02e1cf4 100644
--- a/www/chromium/files/patch-chrome_common_chrome__paths__internal.h
+++ b/www/chromium/files/patch-chrome_common_chrome__paths__internal.h
@@ -1,4 +1,4 @@
---- chrome/common/chrome_paths_internal.h.orig	2020-11-13 06:36:38 UTC
+--- chrome/common/chrome_paths_internal.h.orig	2021-03-12 23:57:19 UTC
 +++ chrome/common/chrome_paths_internal.h
 @@ -45,7 +45,7 @@ void GetUserCacheDirectory(const base::FilePath& profi
  // Get the path to the user's documents directory.
diff --git a/www/chromium/files/patch-chrome_common_chrome__switches.cc b/www/chromium/files/patch-chrome_common_chrome__switches.cc
index b5a35819..f305ec41 100644
--- a/www/chromium/files/patch-chrome_common_chrome__switches.cc
+++ b/www/chromium/files/patch-chrome_common_chrome__switches.cc
@@ -1,6 +1,6 @@
---- chrome/common/chrome_switches.cc.orig	2021-01-18 21:28:52 UTC
+--- chrome/common/chrome_switches.cc.orig	2021-03-12 23:57:19 UTC
 +++ chrome/common/chrome_switches.cc
-@@ -796,7 +796,7 @@ const char kAllowNaClFileHandleAPI[]        = "allow-n
+@@ -810,7 +810,7 @@ const char kAllowNaClFileHandleAPI[]        = "allow-n
  const char kAllowNaClSocketAPI[]            = "allow-nacl-socket-api";
  #endif
  
diff --git a/www/chromium/files/patch-chrome_common_chrome__switches.h b/www/chromium/files/patch-chrome_common_chrome__switches.h
index 464527dd..eb413f4a 100644
--- a/www/chromium/files/patch-chrome_common_chrome__switches.h
+++ b/www/chromium/files/patch-chrome_common_chrome__switches.h
@@ -1,6 +1,6 @@
---- chrome/common/chrome_switches.h.orig	2021-01-18 21:28:52 UTC
+--- chrome/common/chrome_switches.h.orig	2021-03-12 23:57:19 UTC
 +++ chrome/common/chrome_switches.h
-@@ -249,7 +249,7 @@ extern const char kAllowNaClFileHandleAPI[];
+@@ -255,7 +255,7 @@ extern const char kAllowNaClFileHandleAPI[];
  extern const char kAllowNaClSocketAPI[];
  #endif
  
diff --git a/www/chromium/files/patch-chrome_common_extensions_command.cc b/www/chromium/files/patch-chrome_common_extensions_command.cc
index 9b1db0fe..8074e387 100644
--- a/www/chromium/files/patch-chrome_common_extensions_command.cc
+++ b/www/chromium/files/patch-chrome_common_extensions_command.cc
@@ -1,11 +1,11 @@
---- chrome/common/extensions/command.cc.orig	2020-11-13 06:36:38 UTC
+--- chrome/common/extensions/command.cc.orig	2021-03-12 23:57:19 UTC
 +++ chrome/common/extensions/command.cc
-@@ -293,7 +293,7 @@ std::string Command::CommandPlatform() {
+@@ -294,7 +294,7 @@ std::string Command::CommandPlatform() {
    return values::kKeybindingPlatformMac;
- #elif defined(OS_CHROMEOS)
+ #elif BUILDFLAG(IS_CHROMEOS_ASH)
    return values::kKeybindingPlatformChromeOs;
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
+-#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
    return values::kKeybindingPlatformLinux;
  #else
    return "";
diff --git a/www/chromium/files/patch-chrome_common_features.gni b/www/chromium/files/patch-chrome_common_features.gni
index 93fa34eb..182941d7 100644
--- a/www/chromium/files/patch-chrome_common_features.gni
+++ b/www/chromium/files/patch-chrome_common_features.gni
@@ -1,8 +1,8 @@
---- chrome/common/features.gni.orig	2021-01-18 21:28:52 UTC
+--- chrome/common/features.gni.orig	2021-03-12 23:57:19 UTC
 +++ chrome/common/features.gni
-@@ -52,7 +52,7 @@ declare_args() {
+@@ -54,7 +54,7 @@ declare_args() {
    enable_one_click_signin =
-       is_win || is_mac || (is_linux && !is_chromeos && !is_chromecast)
+       is_win || is_mac || ((is_linux || is_chromeos_lacros) && !is_chromecast)
  
 -  enable_service_discovery = (enable_mdns && !is_android) || is_mac
 +  enable_service_discovery = (enable_mdns && !is_android) || is_mac || is_bsd
diff --git a/www/chromium/files/patch-chrome_common_pref__names.cc b/www/chromium/files/patch-chrome_common_pref__names.cc
index 4df741a4..e4c8113e 100644
--- a/www/chromium/files/patch-chrome_common_pref__names.cc
+++ b/www/chromium/files/patch-chrome_common_pref__names.cc
@@ -1,24 +1,24 @@
---- chrome/common/pref_names.cc.orig	2021-01-18 21:28:52 UTC
+--- chrome/common/pref_names.cc.orig	2021-03-12 23:57:19 UTC
 +++ chrome/common/pref_names.cc
-@@ -1089,7 +1089,7 @@ const char kForceYouTubeRestrict[] = "settings.force_y
- // only using an account that belongs to one of the domains from this pref.
- const char kAllowedDomainsForApps[] = "settings.allowed_domains_for_apps";
+@@ -1099,7 +1099,7 @@ const char kAllowedDomainsForApps[] = "settings.allowe
  
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+ // 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)
  // Linux specific preference on whether we should match the system theme.
  const char kUsesSystemTheme[] = "extensions.theme.use_system";
  #endif
-@@ -1246,7 +1246,7 @@ const char kShowUpdatePromotionInfoBar[] =
-     "browser.show_update_promotion_info_bar";
- #endif
+@@ -1274,7 +1274,7 @@ const char kShowUpdatePromotionInfoBar[] =
  
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+ // 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)
  // Boolean that is false if we should show window manager decorations.  If
  // true, we draw a custom chrome frame (thicker title bar and blue border).
  const char kUseCustomChromeFrame[] = "browser.custom_chrome_frame";
-@@ -1687,7 +1687,7 @@ const char kDownloadDefaultDirectory[] = "download.def
+@@ -1726,7 +1726,7 @@ const char kDownloadDefaultDirectory[] = "download.def
  // upgrade a unsafe location to a safe location.
  const char kDownloadDirUpgraded[] = "download.directory_upgrade";
  
@@ -27,7 +27,7 @@
      defined(OS_MAC)
  const char kOpenPdfDownloadInSystemReader[] =
      "download.open_pdf_in_system_reader";
-@@ -2044,12 +2044,12 @@ const char kAmbientAuthenticationInPrivateModesEnabled
+@@ -2103,12 +2103,12 @@ const char kAmbientAuthenticationInPrivateModesEnabled
  // requests.
  const char kBasicAuthOverHttpEnabled[] = "auth.basic_over_http_enabled";
  
@@ -42,12 +42,12 @@
  
  #if defined(OS_POSIX)
  // Boolean that specifies whether NTLMv2 is enabled.
-@@ -2955,7 +2955,7 @@ const char kAutoplayWhitelist[] = "media.autoplay_whit
- const char kBlockAutoplayEnabled[] = "media.block_autoplay";
- #endif  // !defined(OS_ANDROID)
+@@ -3001,7 +3001,7 @@ const char kBlockAutoplayEnabled[] = "media.block_auto
  
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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)
  // Boolean that indicates if native notifications are allowed to be used in
  // place of Chrome notifications.
  const char kAllowNativeNotifications[] = "native_notifications.allowed";
diff --git a/www/chromium/files/patch-chrome_common_pref__names.h b/www/chromium/files/patch-chrome_common_pref__names.h
index 18d910d8..9cee086e 100644
--- a/www/chromium/files/patch-chrome_common_pref__names.h
+++ b/www/chromium/files/patch-chrome_common_pref__names.h
@@ -1,24 +1,24 @@
---- chrome/common/pref_names.h.orig	2021-01-18 21:28:52 UTC
+--- chrome/common/pref_names.h.orig	2021-03-12 23:57:19 UTC
 +++ chrome/common/pref_names.h
-@@ -357,7 +357,7 @@ extern const char kAllowDeletingBrowserHistory[];
- extern const char kForceGoogleSafeSearch[];
- extern const char kForceYouTubeRestrict[];
+@@ -364,7 +364,7 @@ extern const char kForceYouTubeRestrict[];
  extern const char kAllowedDomainsForApps[];
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+ // 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)
  extern const char kUsesSystemTheme[];
  #endif
  extern const char kCurrentThemePackFilename[];
-@@ -384,7 +384,7 @@ extern const char kDefaultBrowserSettingEnabled[];
- #if defined(OS_MAC)
- extern const char kShowUpdatePromotionInfoBar[];
+@@ -393,7 +393,7 @@ extern const char kShowUpdatePromotionInfoBar[];
  #endif
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+ // 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)
  extern const char kUseCustomChromeFrame[];
  #endif
  #if BUILDFLAG(ENABLE_PLUGINS)
-@@ -554,7 +554,7 @@ extern const char kDownloadExtensionsToOpen[];
+@@ -564,7 +564,7 @@ extern const char kDownloadExtensionsToOpen[];
  extern const char kDownloadExtensionsToOpenByPolicy[];
  extern const char kDownloadAllowedURLsForOpenByPolicy[];
  extern const char kDownloadDirUpgraded[];
@@ -27,7 +27,7 @@
      defined(OS_MAC)
  extern const char kOpenPdfDownloadInSystemReader[];
  #endif
-@@ -783,9 +783,9 @@ extern const char kGloballyScopeHTTPAuthCacheEnabled[]
+@@ -795,9 +795,9 @@ extern const char kGloballyScopeHTTPAuthCacheEnabled[]
  extern const char kAmbientAuthenticationInPrivateModesEnabled[];
  extern const char kBasicAuthOverHttpEnabled[];
  
@@ -39,12 +39,12 @@
  
  #if defined(OS_POSIX)
  extern const char kNtlmV2Enabled[];
-@@ -1014,7 +1014,7 @@ extern const char kAutoplayWhitelist[];
- extern const char kBlockAutoplayEnabled[];
- #endif
+@@ -1028,7 +1028,7 @@ extern const char kBlockAutoplayEnabled[];
  
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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)
  extern const char kAllowNativeNotifications[];
  #endif
  
diff --git a/www/chromium/files/patch-chrome_common_webui__url__constants.cc b/www/chromium/files/patch-chrome_common_webui__url__constants.cc
index 7ce98cde..971ae6aa 100644
--- a/www/chromium/files/patch-chrome_common_webui__url__constants.cc
+++ b/www/chromium/files/patch-chrome_common_webui__url__constants.cc
@@ -1,13 +1,13 @@
---- chrome/common/webui_url_constants.cc.orig	2021-01-18 21:28:52 UTC
+--- chrome/common/webui_url_constants.cc.orig	2021-03-12 23:57:19 UTC
 +++ chrome/common/webui_url_constants.cc
-@@ -339,12 +339,12 @@ bool IsSystemWebUIHost(base::StringPiece host) {
+@@ -343,12 +343,12 @@ bool IsSystemWebUIHost(base::StringPiece host) {
  }
- #endif  // defined(OS_CHROMEOS)
+ #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
  
 -#if defined(OS_LINUX) || defined(OS_CHROMEOS)
 +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
- const char kChromeUIWebUIJsExceptionHost[] = "webuijsexception";
- const char kChromeUIWebUIJsExceptionURL[] = "chrome://webuijsexception/";
+ const char kChromeUIWebUIJsErrorHost[] = "webuijserror";
+ const char kChromeUIWebUIJsErrorURL[] = "chrome://webuijserror/";
  #endif
  
 -#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
@@ -15,7 +15,7 @@
      defined(OS_CHROMEOS)
  const char kChromeUIDiscardsHost[] = "discards";
  const char kChromeUIDiscardsURL[] = "chrome://discards/";
-@@ -361,13 +361,13 @@ const char kChromeUINearbyShareURL[] = "chrome://nearb
+@@ -365,7 +365,7 @@ const char kChromeUINearbyShareURL[] = "chrome://nearb
  const char kChromeUILinuxProxyConfigHost[] = "linux-proxy-config";
  #endif
  
@@ -24,14 +24,16 @@
      defined(OS_ANDROID)
  const char kChromeUISandboxHost[] = "sandbox";
  #endif
- 
+@@ -373,7 +373,7 @@ const char kChromeUISandboxHost[] = "sandbox";
+ // 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) && !defined(OS_CHROMEOS))
-+    (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+-    (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
++    (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD)
  const char kChromeUIBrowserSwitchHost[] = "browser-switch";
  const char kChromeUIBrowserSwitchURL[] = "chrome://browser-switch/";
  const char kChromeUIProfileCustomizationHost[] = "profile-customization";
-@@ -378,7 +378,7 @@ const char kChromeUIProfilePickerUrl[] = "chrome://pro
+@@ -384,7 +384,7 @@ const char kChromeUIProfilePickerUrl[] = "chrome://pro
  const char kChromeUIProfilePickerStartupQuery[] = "startup";
  #endif
  
@@ -40,7 +42,7 @@
      defined(USE_AURA)
  const char kChromeUITabModalConfirmDialogHost[] = "tab-modal-confirm-dialog";
  #endif
-@@ -549,14 +549,14 @@ const char* const kChromeHostURLs[] = {
+@@ -553,14 +553,14 @@ const char* const kChromeHostURLs[] = {
      kChromeUIInternetDetailDialogHost,
      kChromeUIAssistantOptInHost,
  #endif
@@ -57,12 +59,12 @@
      defined(OS_ANDROID)
      kChromeUISandboxHost,
  #endif
-@@ -615,7 +615,7 @@ const char* const kChromeDebugURLs[] = {
+@@ -619,7 +619,7 @@ const char* const kChromeDebugURLs[] = {
      content::kChromeUIGpuJavaCrashURL,
      kChromeUIJavaCrashURL,
  #endif
 -#if defined(OS_LINUX) || defined(OS_CHROMEOS)
 +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
-     kChromeUIWebUIJsExceptionURL,
+     kChromeUIWebUIJsErrorURL,
  #endif
      kChromeUIQuitURL,
diff --git a/www/chromium/files/patch-chrome_common_webui__url__constants.h b/www/chromium/files/patch-chrome_common_webui__url__constants.h
index a670a1c6..eb2ea952 100644
--- a/www/chromium/files/patch-chrome_common_webui__url__constants.h
+++ b/www/chromium/files/patch-chrome_common_webui__url__constants.h
@@ -1,13 +1,13 @@
---- chrome/common/webui_url_constants.h.orig	2021-01-18 21:28:52 UTC
+--- chrome/common/webui_url_constants.h.orig	2021-03-12 23:57:19 UTC
 +++ chrome/common/webui_url_constants.h
-@@ -292,12 +292,12 @@ bool IsSystemWebUIHost(base::StringPiece host);
+@@ -295,12 +295,12 @@ bool IsSystemWebUIHost(base::StringPiece host);
  
- #endif  // defined(OS_CHROMEOS)
+ #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
  
 -#if defined(OS_LINUX) || defined(OS_CHROMEOS)
 +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
- extern const char kChromeUIWebUIJsExceptionHost[];
- extern const char kChromeUIWebUIJsExceptionURL[];
+ extern const char kChromeUIWebUIJsErrorHost[];
+ extern const char kChromeUIWebUIJsErrorURL[];
  #endif
  
 -#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
@@ -15,7 +15,7 @@
      defined(OS_CHROMEOS)
  extern const char kChromeUIDiscardsHost[];
  extern const char kChromeUIDiscardsURL[];
-@@ -314,13 +314,13 @@ extern const char kChromeUINearbyShareURL[];
+@@ -317,7 +317,7 @@ extern const char kChromeUINearbyShareURL[];
  extern const char kChromeUILinuxProxyConfigHost[];
  #endif
  
@@ -24,14 +24,16 @@
      defined(OS_ANDROID)
  extern const char kChromeUISandboxHost[];
  #endif
- 
+@@ -325,7 +325,7 @@ extern const char kChromeUISandboxHost[];
+ // 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) && !defined(OS_CHROMEOS))
-+    (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+-    (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
++    (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD)
  extern const char kChromeUIBrowserSwitchHost[];
  extern const char kChromeUIBrowserSwitchURL[];
  extern const char kChromeUIProfileCustomizationHost[];
-@@ -330,7 +330,7 @@ extern const char kChromeUIProfilePickerUrl[];
+@@ -335,7 +335,7 @@ extern const char kChromeUIProfilePickerUrl[];
  extern const char kChromeUIProfilePickerStartupQuery[];
  #endif
  
diff --git a/www/chromium/files/patch-chrome_renderer_chrome__content__renderer__client.cc b/www/chromium/files/patch-chrome_renderer_chrome__content__renderer__client.cc
index dc56b33c..8b011488 100644
--- a/www/chromium/files/patch-chrome_renderer_chrome__content__renderer__client.cc
+++ b/www/chromium/files/patch-chrome_renderer_chrome__content__renderer__client.cc
@@ -1,6 +1,6 @@
---- chrome/renderer/chrome_content_renderer_client.cc.orig	2021-01-18 21:28:52 UTC
+--- chrome/renderer/chrome_content_renderer_client.cc.orig	2021-03-12 23:57:19 UTC
 +++ chrome/renderer/chrome_content_renderer_client.cc
-@@ -1073,7 +1073,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
+@@ -1097,7 +1097,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
        }
  
        case chrome::mojom::PluginStatus::kRestartRequired: {
diff --git a/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.cc b/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.cc
index 7a4d2a5c..05ca4374 100644
--- a/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.cc
+++ b/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.cc
@@ -1,4 +1,4 @@
---- chrome/renderer/pepper/pepper_flash_font_file_host.cc.orig	2021-01-18 21:28:52 UTC
+--- chrome/renderer/pepper/pepper_flash_font_file_host.cc.orig	2021-03-12 23:57:19 UTC
 +++ chrome/renderer/pepper/pepper_flash_font_file_host.cc
 @@ -16,7 +16,7 @@
  #include "ppapi/proxy/ppapi_messages.h"
diff --git a/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.h b/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.h
index f1a6ef3e..bbfcdc95 100644
--- a/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.h
+++ b/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.h
@@ -1,4 +1,4 @@
---- chrome/renderer/pepper/pepper_flash_font_file_host.h.orig	2020-11-13 06:36:38 UTC
+--- chrome/renderer/pepper/pepper_flash_font_file_host.h.orig	2021-03-12 23:57:19 UTC
 +++ chrome/renderer/pepper/pepper_flash_font_file_host.h
 @@ -14,7 +14,7 @@
  #include "ppapi/c/private/pp_private_font_charset.h"
diff --git a/www/chromium/files/patch-chrome_service_cloud__print_print__system.cc b/www/chromium/files/patch-chrome_service_cloud__print_print__system.cc
index 716e461b..187a1ab8 100644
--- a/www/chromium/files/patch-chrome_service_cloud__print_print__system.cc
+++ b/www/chromium/files/patch-chrome_service_cloud__print_print__system.cc
@@ -1,4 +1,4 @@
---- chrome/service/cloud_print/print_system.cc.orig	2020-11-13 06:36:38 UTC
+--- chrome/service/cloud_print/print_system.cc.orig	2021-03-12 23:57:19 UTC
 +++ chrome/service/cloud_print/print_system.cc
 @@ -36,7 +36,7 @@ std::string PrintSystem::GenerateProxyId() {
    return base::GenerateGUID();
diff --git a/www/chromium/files/patch-chrome_test_BUILD.gn b/www/chromium/files/patch-chrome_test_BUILD.gn
index b366a3e6..f8b755da 100644
--- a/www/chromium/files/patch-chrome_test_BUILD.gn
+++ b/www/chromium/files/patch-chrome_test_BUILD.gn
@@ -1,6 +1,6 @@
---- chrome/test/BUILD.gn.orig	2021-01-18 21:28:52 UTC
+--- chrome/test/BUILD.gn.orig	2021-03-12 23:57:20 UTC
 +++ chrome/test/BUILD.gn
-@@ -6791,7 +6791,7 @@ test("chrome_app_unittests") {
+@@ -6915,7 +6915,7 @@ test("chrome_app_unittests") {
      "//components/safe_browsing:buildflags",
      "//pdf:pdf_ppapi",
    ]
diff --git a/www/chromium/files/patch-chrome_test_base_chrome__test__launcher.cc b/www/chromium/files/patch-chrome_test_base_chrome__test__launcher.cc
deleted file mode 100644
index 3e022fb7..00000000
--- a/www/chromium/files/patch-chrome_test_base_chrome__test__launcher.cc
+++ /dev/null
@@ -1,38 +0,0 @@
---- chrome/test/base/chrome_test_launcher.cc.orig	2021-01-18 21:28:52 UTC
-+++ chrome/test/base/chrome_test_launcher.cc
-@@ -60,7 +60,7 @@
- #endif
- 
- #if defined(OS_WIN) || defined(OS_MAC) || \
--    (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+    (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
- #include "chrome/browser/first_run/scoped_relaunch_chrome_browser_override.h"
- #include "chrome/browser/upgrade_detector/installed_version_poller.h"
- #include "testing/gtest/include/gtest/gtest.h"
-@@ -75,7 +75,7 @@ int ChromeTestSuiteRunner::RunTestSuite(int argc, char
-   content::ContentTestSuiteBase::RegisterInProcessThreads();
- #endif
- #if defined(OS_WIN) || defined(OS_MAC) || \
--    (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+    (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
-   InstalledVersionPoller::ScopedDisableForTesting disable_polling(
-       InstalledVersionPoller::MakeScopedDisableForTesting());
- #endif
-@@ -198,7 +198,7 @@ int LaunchChromeTests(size_t parallel_jobs,
-   if (command_line.HasSwitch(switches::kLaunchAsBrowser))
-     sampling_profiler = std::make_unique<MainThreadStackSamplingProfiler>();
- 
--#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD)
-   ChromeCrashReporterClient::Create();
- #elif defined(OS_WIN)
-   // We leak this pointer intentionally. The crash client needs to outlive
-@@ -226,7 +226,7 @@ int LaunchChromeTests(size_t parallel_jobs,
-   }
- 
- #if defined(OS_WIN) || defined(OS_MAC) || \
--    (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+    (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
-   // Cause a test failure for any test that triggers an unexpected relaunch.
-   // Tests that fail here should likely be restructured to put the "before
-   // relaunch" code into a PRE_ test with its own
diff --git a/www/chromium/files/patch-chrome_test_base_in__process__browser__test.cc b/www/chromium/files/patch-chrome_test_base_in__process__browser__test.cc
index d9b256cd..b62921e2 100644
--- a/www/chromium/files/patch-chrome_test_base_in__process__browser__test.cc
+++ b/www/chromium/files/patch-chrome_test_base_in__process__browser__test.cc
@@ -1,6 +1,6 @@
---- chrome/test/base/in_process_browser_test.cc.orig	2021-01-18 21:28:52 UTC
+--- chrome/test/base/in_process_browser_test.cc.orig	2021-03-12 23:57:20 UTC
 +++ chrome/test/base/in_process_browser_test.cc
-@@ -79,6 +79,10 @@
+@@ -80,6 +80,10 @@
  #include "chrome/test/base/scoped_bundle_swizzler_mac.h"
  #endif
  
@@ -11,7 +11,7 @@
  #if defined(OS_WIN)
  #include "base/win/scoped_com_initializer.h"
  #include "base/win/windows_version.h"
-@@ -304,7 +308,7 @@ void InProcessBrowserTest::SetUp() {
+@@ -305,7 +309,7 @@ void InProcessBrowserTest::SetUp() {
    // Cookies). Without this on Mac and Linux, many tests will hang waiting for a
    // user to approve KeyChain/kwallet access. On Windows this is not needed as
    // OS APIs never block.
@@ -20,7 +20,7 @@
    OSCryptMocker::SetUp();
  #endif
  
-@@ -364,7 +368,7 @@ void InProcessBrowserTest::TearDown() {
+@@ -368,7 +372,7 @@ void InProcessBrowserTest::TearDown() {
    com_initializer_.reset();
  #endif
    BrowserTestBase::TearDown();
diff --git a/www/chromium/files/patch-chrome_test_base_interactive__ui__tests__main.cc b/www/chromium/files/patch-chrome_test_base_interactive__ui__tests__main.cc
index 731e516b..01c4eb13 100644
--- a/www/chromium/files/patch-chrome_test_base_interactive__ui__tests__main.cc
+++ b/www/chromium/files/patch-chrome_test_base_interactive__ui__tests__main.cc
@@ -1,20 +1,20 @@
---- chrome/test/base/interactive_ui_tests_main.cc.orig	2021-01-18 21:28:52 UTC
+--- chrome/test/base/interactive_ui_tests_main.cc.orig	2021-03-12 23:57:20 UTC
 +++ chrome/test/base/interactive_ui_tests_main.cc
-@@ -16,7 +16,7 @@
+@@ -17,7 +17,7 @@
  #if defined(USE_AURA)
  #include "ui/aura/test/ui_controls_factory_aura.h"
  #include "ui/base/test/ui_controls_aura.h"
--#if defined(USE_OZONE) && defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if defined(USE_OZONE) && ((defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD))
+-#if defined(USE_OZONE) && (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
++#if defined(USE_OZONE) && (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD))
  #include "ui/base/ui_base_features.h"
  #include "ui/ozone/public/ozone_platform.h"
  #include "ui/views/test/ui_controls_factory_desktop_aura_ozone.h"
-@@ -54,7 +54,7 @@ class InteractiveUITestSuite : public ChromeTestSuite 
+@@ -55,7 +55,7 @@ class InteractiveUITestSuite : public ChromeTestSuite 
      com_initializer_.reset(new base::win::ScopedCOMInitializer());
      ui_controls::InstallUIControlsAura(
          aura::test::CreateUIControlsAura(nullptr));
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
+-#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
  #if defined(USE_OZONE)
      if (features::IsUsingOzonePlatform()) {
        ui::OzonePlatform::InitParams params;
diff --git a/www/chromium/files/patch-chrome_test_base_test__browser__window.h b/www/chromium/files/patch-chrome_test_base_test__browser__window.h
index cc7782b6..8d34cb71 100644
--- a/www/chromium/files/patch-chrome_test_base_test__browser__window.h
+++ b/www/chromium/files/patch-chrome_test_base_test__browser__window.h
@@ -1,4 +1,4 @@
---- chrome/test/base/test_browser_window.h.orig	2021-01-18 21:28:52 UTC
+--- chrome/test/base/test_browser_window.h.orig	2021-03-12 23:57:20 UTC
 +++ chrome/test/base/test_browser_window.h
 @@ -176,7 +176,7 @@ class TestBrowserWindow : public BrowserWindow {
        bool is_source_keyboard) override {}
diff --git a/www/chromium/files/patch-chrome_test_base_testing__browser__process.h b/www/chromium/files/patch-chrome_test_base_testing__browser__process.h
deleted file mode 100644
index d3f6d7be..00000000
--- a/www/chromium/files/patch-chrome_test_base_testing__browser__process.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- chrome/test/base/testing_browser_process.h.orig	2021-01-18 21:28:52 UTC
-+++ chrome/test/base/testing_browser_process.h
-@@ -125,8 +125,8 @@ class TestingBrowserProcess : public BrowserProcess {
-   DownloadRequestLimiter* download_request_limiter() override;
-   StartupData* startup_data() override;
- 
--#if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
--  void StartAutoupdateTimer() override {}
-+#if (defined(OS_WIN) || defined(OS_LINUX) || defined(OS_FREEBSD)) && !defined(OS_CHROMEOS)
-+  void StartAutoupdateTimer() /*override*/ {}
- #endif
- 
-   component_updater::ComponentUpdateService* component_updater() override;
diff --git a/www/chromium/files/patch-chrome_test_chromedriver_chrome__launcher.cc b/www/chromium/files/patch-chrome_test_chromedriver_chrome__launcher.cc
index 6cf1aa4a..06670e71 100644
--- a/www/chromium/files/patch-chrome_test_chromedriver_chrome__launcher.cc
+++ b/www/chromium/files/patch-chrome_test_chromedriver_chrome__launcher.cc
@@ -1,4 +1,4 @@
---- chrome/test/chromedriver/chrome_launcher.cc.orig	2020-11-13 06:36:38 UTC
+--- chrome/test/chromedriver/chrome_launcher.cc.orig	2021-03-12 23:57:20 UTC
 +++ chrome/test/chromedriver/chrome_launcher.cc
 @@ -71,6 +71,10 @@
  #include "chrome/test/chromedriver/keycode_text_conversion.h"
diff --git a/www/chromium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc b/www/chromium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc
index ca21e1ab..8e9ed9f6 100644
--- a/www/chromium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc
+++ b/www/chromium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc
@@ -1,4 +1,4 @@
---- chrome/test/chromedriver/chrome/chrome_finder.cc.orig	2020-11-13 06:36:38 UTC
+--- chrome/test/chromedriver/chrome/chrome_finder.cc.orig	2021-03-12 23:57:20 UTC
 +++ chrome/test/chromedriver/chrome/chrome_finder.cc
 @@ -53,7 +53,7 @@ void GetApplicationDirs(std::vector<base::FilePath>* l
          installation_locations[i].Append(L"Chromium\\Application"));
diff --git a/www/chromium/files/patch-chrome_test_chromedriver_key__converter__unittest.cc b/www/chromium/files/patch-chrome_test_chromedriver_key__converter__unittest.cc
index 6fd34634..77efc23c 100644
--- a/www/chromium/files/patch-chrome_test_chromedriver_key__converter__unittest.cc
+++ b/www/chromium/files/patch-chrome_test_chromedriver_key__converter__unittest.cc
@@ -1,4 +1,4 @@
---- chrome/test/chromedriver/key_converter_unittest.cc.orig	2020-11-13 06:36:38 UTC
+--- chrome/test/chromedriver/key_converter_unittest.cc.orig	2021-03-12 23:57:20 UTC
 +++ chrome/test/chromedriver/key_converter_unittest.cc
 @@ -277,7 +277,7 @@ TEST(KeyConverter, AllShorthandKeys) {
        ->Generate(&key_events);
diff --git a/www/chromium/files/patch-chrome_test_chromedriver_server_chromedriver__server.cc b/www/chromium/files/patch-chrome_test_chromedriver_server_chromedriver__server.cc
index b9ad3fcd..6860b739 100644
--- a/www/chromium/files/patch-chrome_test_chromedriver_server_chromedriver__server.cc
+++ b/www/chromium/files/patch-chrome_test_chromedriver_server_chromedriver__server.cc
@@ -1,6 +1,6 @@
---- chrome/test/chromedriver/server/chromedriver_server.cc.orig	2020-11-13 06:36:39 UTC
+--- chrome/test/chromedriver/server/chromedriver_server.cc.orig	2021-03-12 23:57:20 UTC
 +++ chrome/test/chromedriver/server/chromedriver_server.cc
-@@ -283,7 +283,7 @@ int main(int argc, char *argv[]) {
+@@ -286,7 +286,7 @@ int main(int argc, char *argv[]) {
    base::AtExitManager at_exit;
    base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
  
diff --git a/www/chromium/files/patch-chrome_utility_services.cc b/www/chromium/files/patch-chrome_utility_services.cc
new file mode 100644
index 00000000..ec1cac03
--- /dev/null
+++ b/www/chromium/files/patch-chrome_utility_services.cc
@@ -0,0 +1,29 @@
+--- chrome/utility/services.cc.orig	2021-03-12 23:57:21 UTC
++++ chrome/utility/services.cc
+@@ -76,7 +76,7 @@
+ #endif
+ 
+ #if BUILDFLAG(ENABLE_PRINTING)
+-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
++#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \
+     defined(OS_CHROMEOS)
+ #include "chrome/services/printing/print_backend_service_impl.h"
+ #include "chrome/services/printing/public/mojom/print_backend_service.mojom.h"
+@@ -227,7 +227,7 @@ auto RunPaintPreviewCompositor(
+ #endif  // BUILDFLAG(ENABLE_PAINT_PREVIEW)
+ 
+ #if BUILDFLAG(ENABLE_PRINTING)
+-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
++#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \
+     defined(OS_CHROMEOS)
+ auto RunPrintBackendService(
+     mojo::PendingReceiver<printing::mojom::PrintBackendService> receiver) {
+@@ -335,7 +335,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& 
+ #endif
+ 
+ #if BUILDFLAG(ENABLE_PRINTING)
+-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
++#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \
+     defined(OS_CHROMEOS)
+   services.Add(RunPrintBackendService);
+ #endif
diff --git a/www/chromium/files/patch-chromecast_app_cast__main__delegate.cc b/www/chromium/files/patch-chromecast_app_cast__main__delegate.cc
new file mode 100644
index 00000000..7f01adcd
--- /dev/null
+++ b/www/chromium/files/patch-chromecast_app_cast__main__delegate.cc
@@ -0,0 +1,11 @@
+--- chromecast/app/cast_main_delegate.cc.orig	2021-03-12 23:57:21 UTC
++++ chromecast/app/cast_main_delegate.cc
+@@ -136,7 +136,7 @@ bool CastMainDelegate::BasicStartupComplete(int* exit_
+ 
+ void CastMainDelegate::PreSandboxStartup() {
+ #if defined(ARCH_CPU_ARM_FAMILY) && \
+-    (defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS))
++    (defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD))
+   // Create an instance of the CPU class to parse /proc/cpuinfo and cache the
+   // results. This data needs to be cached when file-reading is still allowed,
+   // since base::CPU expects to be callable later, when file-reading is no
diff --git a/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc b/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc
index ec46ddf1..99cbf449 100644
--- a/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc
+++ b/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc
@@ -1,6 +1,6 @@
---- chromecast/browser/cast_browser_main_parts.cc.orig	2021-01-18 21:28:54 UTC
+--- chromecast/browser/cast_browser_main_parts.cc.orig	2021-03-12 23:57:21 UTC
 +++ chromecast/browser/cast_browser_main_parts.cc
-@@ -73,7 +73,7 @@
+@@ -75,7 +75,7 @@
  #include "ui/base/ui_base_switches.h"
  #include "ui/gl/gl_switches.h"
  
@@ -9,7 +9,7 @@
  #include <fontconfig/fontconfig.h>
  #include <signal.h>
  #include <sys/prctl.h>
-@@ -129,7 +129,7 @@
+@@ -131,7 +131,7 @@
  #include "extensions/browser/extension_prefs.h"  // nogncheck
  #endif
  
@@ -18,7 +18,7 @@
  #include "chromecast/browser/exo/wayland_server_controller.h"
  #endif
  
-@@ -271,7 +271,7 @@ class CastViewsDelegate : public views::ViewsDelegate 
+@@ -273,7 +273,7 @@ class CastViewsDelegate : public views::ViewsDelegate 
  
  #endif  // defined(USE_AURA)
  
@@ -27,7 +27,7 @@
  
  base::FilePath GetApplicationFontsDir() {
    std::unique_ptr<base::Environment> env(base::Environment::Create());
-@@ -287,7 +287,7 @@ base::FilePath GetApplicationFontsDir() {
+@@ -289,7 +289,7 @@ base::FilePath GetApplicationFontsDir() {
    }
  }
  
@@ -36,7 +36,7 @@
  
  }  // namespace
  
-@@ -316,7 +316,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = {
+@@ -318,7 +318,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = {
      {cc::switches::kDisableThreadedAnimation, ""},
  #endif  // defined(OS_ANDROID)
  #endif  // BUILDFLAG(IS_CAST_AUDIO_ONLY)
@@ -45,7 +45,7 @@
  #if defined(ARCH_CPU_X86_FAMILY)
      // This is needed for now to enable the x11 Ozone platform to work with
      // current Linux/NVidia OpenGL drivers.
-@@ -326,7 +326,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = {
+@@ -328,7 +328,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = {
      {switches::kEnableHardwareOverlays, "cast"},
  #endif
  #endif
@@ -54,7 +54,7 @@
      // It's better to start GPU process on demand. For example, for TV platforms
      // cast starts in background and can't render until TV switches to cast
      // input.
-@@ -476,7 +476,7 @@ void CastBrowserMainParts::ToolkitInitialized() {
+@@ -482,7 +482,7 @@ void CastBrowserMainParts::ToolkitInitialized() {
      views_delegate_ = std::make_unique<CastViewsDelegate>();
  #endif  // defined(USE_AURA)
  
@@ -63,7 +63,7 @@
    base::FilePath dir_font = GetApplicationFontsDir();
    const FcChar8 *dir_font_char8 = reinterpret_cast<const FcChar8*>(dir_font.value().data());
    if (!FcConfigAppFontAddDir(gfx::GetGlobalFontConfig(), dir_font_char8)) {
-@@ -660,7 +660,7 @@ void CastBrowserMainParts::PreMainMessageLoopRun() {
+@@ -666,7 +666,7 @@ void CastBrowserMainParts::PreMainMessageLoopRun() {
        cast_browser_process_->browser_context());
  #endif
  
@@ -72,7 +72,7 @@
    wayland_server_controller_ =
        std::make_unique<WaylandServerController>(window_manager_.get());
  #endif
-@@ -742,7 +742,7 @@ bool CastBrowserMainParts::MainMessageLoopRun(int* res
+@@ -748,7 +748,7 @@ bool CastBrowserMainParts::MainMessageLoopRun(int* res
  }
  
  void CastBrowserMainParts::PostMainMessageLoopRun() {
diff --git a/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.h b/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.h
new file mode 100644
index 00000000..c8b3ee59
--- /dev/null
+++ b/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.h
@@ -0,0 +1,11 @@
+--- chromecast/browser/cast_browser_main_parts.h.orig	2021-03-12 23:57:21 UTC
++++ chromecast/browser/cast_browser_main_parts.h
+@@ -133,7 +133,7 @@ class CastBrowserMainParts : public content::BrowserMa
+   std::unique_ptr<PrefService> user_pref_service_;
+ #endif
+ 
+-#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(USE_OZONE)
++#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && defined(USE_OZONE)
+   std::unique_ptr<WaylandServerController> wayland_server_controller_;
+ #endif
+ 
diff --git a/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc b/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc
index a4c02cae..0e0e8e74 100644
--- a/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc
+++ b/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc
@@ -1,4 +1,4 @@
---- chromecast/browser/cast_content_browser_client.cc.orig	2021-01-18 21:28:54 UTC
+--- chromecast/browser/cast_content_browser_client.cc.orig	2021-03-12 23:57:21 UTC
 +++ chromecast/browser/cast_content_browser_client.cc
 @@ -130,9 +130,9 @@
  #include "chromecast/external_mojo/broker_service/broker_service.h"  // nogncheck
@@ -12,7 +12,7 @@
  
  #if BUILDFLAG(ENABLE_CAST_RENDERER)
  #include "base/sequenced_task_runner.h"
-@@ -471,7 +471,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS
+@@ -475,7 +475,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS
                                            switches::kAudioOutputChannels));
      }
    } else if (process_type == switches::kGpuProcess) {
@@ -21,7 +21,7 @@
      // Necessary for accelerated 2d canvas.  By default on Linux, Chromium
      // assumes GLES2 contexts can be lost to a power-save mode, which breaks GPU
      // canvas apps.
-@@ -854,12 +854,12 @@ CastContentBrowserClient::CreateThrottlesForNavigation
+@@ -874,12 +874,12 @@ CastContentBrowserClient::CreateThrottlesForNavigation
              handle, general_audience_browsing_service_.get()));
    }
  
diff --git a/www/chromium/files/patch-chromecast_browser_cast__content__browser__client__receiver__bindings.cc b/www/chromium/files/patch-chromecast_browser_cast__content__browser__client__receiver__bindings.cc
new file mode 100644
index 00000000..86d53c92
--- /dev/null
+++ b/www/chromium/files/patch-chromecast_browser_cast__content__browser__client__receiver__bindings.cc
@@ -0,0 +1,20 @@
+--- chromecast/browser/cast_content_browser_client_receiver_bindings.cc.orig	2021-03-12 23:57:21 UTC
++++ chromecast/browser/cast_content_browser_client_receiver_bindings.cc
+@@ -39,7 +39,7 @@
+ #include "chromecast/external_mojo/broker_service/broker_service.h"  // nogncheck
+ #endif
+ 
+-#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(USE_OZONE)
++#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && defined(USE_OZONE)
+ #include "chromecast/browser/webview/js_channel_service.h"
+ #include "chromecast/common/mojom/js_channel.mojom.h"
+ #endif
+@@ -224,7 +224,7 @@ void CastContentBrowserClient::RunServiceInstance(
+ void CastContentBrowserClient::BindHostReceiverForRenderer(
+     content::RenderProcessHost* render_process_host,
+     mojo::GenericPendingReceiver receiver) {
+-#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(USE_OZONE)
++#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && defined(USE_OZONE)
+   if (auto r = receiver.As<::chromecast::mojom::JsChannelBindingProvider>()) {
+     JsChannelService::Create(render_process_host, std::move(r),
+                              base::ThreadTaskRunnerHandle::Get());
diff --git a/www/chromium/files/patch-chromecast_browser_metrics_cast__browser__metrics.cc b/www/chromium/files/patch-chromecast_browser_metrics_cast__browser__metrics.cc
new file mode 100644
index 00000000..3ad52b29
--- /dev/null
+++ b/www/chromium/files/patch-chromecast_browser_metrics_cast__browser__metrics.cc
@@ -0,0 +1,87 @@
+--- chromecast/browser/metrics/cast_browser_metrics.cc.orig	2021-03-12 23:57:21 UTC
++++ chromecast/browser/metrics/cast_browser_metrics.cc
+@@ -19,9 +19,9 @@
+ #include "content/public/browser/network_service_instance.h"
+ #include "content/public/common/content_switches.h"
+ 
+-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+ #include "chromecast/browser/metrics/external_metrics.h"
+-#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS)
++#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+ 
+ #if defined(OS_ANDROID)
+ #include "chromecast/base/android/dumpstate_writer.h"
+@@ -32,10 +32,10 @@ namespace metrics {
+ 
+ const int kMetricsFetchTimeoutSeconds = 60;
+ 
+-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+ const char kExternalUmaEventsRelativePath[] = "metrics/uma-events";
+ const char kPlatformUmaEventsPath[] = "/data/share/chrome/metrics/uma-events";
+-#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS)
++#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+ 
+ CastBrowserMetrics::CastBrowserMetrics(
+     std::unique_ptr<CastMetricsServiceClient> metrics_service_client) {
+@@ -48,10 +48,10 @@ CastBrowserMetrics::CastBrowserMetrics(
+ }
+ 
+ CastBrowserMetrics::~CastBrowserMetrics() {
+-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+   DCHECK(!external_metrics_);
+   DCHECK(!platform_metrics_);
+-#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS)
++#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+ }
+ 
+ void CastBrowserMetrics::Initialize() {
+@@ -61,9 +61,9 @@ void CastBrowserMetrics::Initialize() {
+   auto stability_provider_unique_ptr =
+       std::make_unique<CastStabilityMetricsProvider>(
+           metrics_service, metrics_service_client_->pref_service());
+-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+   auto* stability_provider = stability_provider_unique_ptr.get();
+-#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS)
++#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+   metrics_service->RegisterMetricsProvider(
+       std::move(stability_provider_unique_ptr));
+ 
+@@ -84,7 +84,7 @@ void CastBrowserMetrics::Initialize() {
+ 
+   metrics_service_client_->StartMetricsService();
+ 
+-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
++#if defined(OS_LINUX) || defined(OS_CHROMEOS)A || defined(OS_BSD)
+   // Start external metrics collection, which feeds data from external
+   // processes into the main external metrics.
+   external_metrics_ = new ExternalMetrics(
+@@ -94,7 +94,7 @@ void CastBrowserMetrics::Initialize() {
+   platform_metrics_ =
+       new ExternalMetrics(stability_provider, kPlatformUmaEventsPath);
+   platform_metrics_->Start();
+-#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS)
++#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+ }
+ 
+ void CastBrowserMetrics::Finalize() {
+@@ -103,14 +103,14 @@ void CastBrowserMetrics::Finalize() {
+   metrics_service_client_->GetMetricsService()->RecordCompletedSessionEnd();
+ #endif  // !defined(OS_ANDROID)
+ 
+-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+   // Stop metrics service cleanly before destructing CastMetricsServiceClient.
+   // The pointer will be deleted in StopAndDestroy().
+   external_metrics_->StopAndDestroy();
+   external_metrics_ = nullptr;
+   platform_metrics_->StopAndDestroy();
+   platform_metrics_ = nullptr;
+-#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS)
++#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+ 
+   metrics_service_client_->Finalize();
+ }
diff --git a/www/chromium/files/patch-chromecast_browser_metrics_cast__browser__metrics.h b/www/chromium/files/patch-chromecast_browser_metrics_cast__browser__metrics.h
new file mode 100644
index 00000000..a780f266
--- /dev/null
+++ b/www/chromium/files/patch-chromecast_browser_metrics_cast__browser__metrics.h
@@ -0,0 +1,15 @@
+--- chromecast/browser/metrics/cast_browser_metrics.h.orig	2021-03-12 23:57:21 UTC
++++ chromecast/browser/metrics/cast_browser_metrics.h
+@@ -38,10 +38,10 @@ class CastBrowserMetrics {
+  private:
+   std::unique_ptr<CastMetricsServiceClient> metrics_service_client_;
+ 
+-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+   ExternalMetrics* external_metrics_ = nullptr;
+   ExternalMetrics* platform_metrics_ = nullptr;
+-#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS)
++#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+ 
+   DISALLOW_COPY_AND_ASSIGN(CastBrowserMetrics);
+ };
diff --git a/www/chromium/files/patch-chromecast_external__mojo_public_cpp_external__mojo__broker.cc b/www/chromium/files/patch-chromecast_external__mojo_public_cpp_external__mojo__broker.cc
index c203de3d..d15a4c98 100644
--- a/www/chromium/files/patch-chromecast_external__mojo_public_cpp_external__mojo__broker.cc
+++ b/www/chromium/files/patch-chromecast_external__mojo_public_cpp_external__mojo__broker.cc
@@ -1,7 +1,7 @@
---- chromecast/external_mojo/public/cpp/external_mojo_broker.cc.orig	2020-11-13 06:36:40 UTC
+--- chromecast/external_mojo/public/cpp/external_mojo_broker.cc.orig	2021-03-12 23:57:21 UTC
 +++ chromecast/external_mojo/public/cpp/external_mojo_broker.cc
-@@ -7,7 +7,7 @@
- #include <map>
+@@ -8,7 +8,7 @@
+ #include <set>
  #include <utility>
  
 -#if defined(OS_LINUX) || defined(OS_CHROMEOS)
@@ -9,7 +9,7 @@
  #include <sys/stat.h>
  #endif
  
-@@ -412,7 +412,7 @@ ExternalMojoBroker::ExternalMojoBroker(const std::stri
+@@ -419,7 +419,7 @@ ExternalMojoBroker::ExternalMojoBroker(const std::stri
        named_channel.TakeServerEndpoint();
    DCHECK(server_endpoint.is_valid());
  
diff --git a/www/chromium/files/patch-chromecast_media_base_default__monotonic__clock.cc b/www/chromium/files/patch-chromecast_media_base_default__monotonic__clock.cc
index 41e243ab..4f315dc4 100644
--- a/www/chromium/files/patch-chromecast_media_base_default__monotonic__clock.cc
+++ b/www/chromium/files/patch-chromecast_media_base_default__monotonic__clock.cc
@@ -1,4 +1,4 @@
---- chromecast/media/base/default_monotonic_clock.cc.orig	2020-11-13 06:36:40 UTC
+--- chromecast/media/base/default_monotonic_clock.cc.orig	2021-03-12 23:57:21 UTC
 +++ chromecast/media/base/default_monotonic_clock.cc
 @@ -9,9 +9,9 @@
  #include "base/time/time.h"
diff --git a/www/chromium/files/patch-chromecast_renderer_cast__content__renderer__client.cc b/www/chromium/files/patch-chromecast_renderer_cast__content__renderer__client.cc
index 976c4c18..4506bf05 100644
--- a/www/chromium/files/patch-chromecast_renderer_cast__content__renderer__client.cc
+++ b/www/chromium/files/patch-chromecast_renderer_cast__content__renderer__client.cc
@@ -1,4 +1,4 @@
---- chromecast/renderer/cast_content_renderer_client.cc.orig	2020-11-13 06:36:40 UTC
+--- chromecast/renderer/cast_content_renderer_client.cc.orig	2021-03-12 23:57:21 UTC
 +++ chromecast/renderer/cast_content_renderer_client.cc
 @@ -202,7 +202,7 @@ void CastContentRendererClient::RenderFrameCreated(
    dispatcher->OnRenderFrameCreated(render_frame);
diff --git a/www/chromium/files/patch-components_BUILD.gn b/www/chromium/files/patch-components_BUILD.gn
index 26aea899..b811f37c 100644
--- a/www/chromium/files/patch-components_BUILD.gn
+++ b/www/chromium/files/patch-components_BUILD.gn
@@ -1,6 +1,6 @@
---- components/BUILD.gn.orig	2021-01-18 21:28:54 UTC
+--- components/BUILD.gn.orig	2021-03-12 23:57:21 UTC
 +++ components/BUILD.gn
-@@ -319,9 +319,13 @@ test("components_unittests") {
+@@ -324,9 +324,13 @@ test("components_unittests") {
      }
  
      if (!is_fuchsia) {  # !iOS and !Fuchsia
diff --git a/www/chromium/files/patch-components_autofill_content_renderer_password__form__conversion__utils.cc b/www/chromium/files/patch-components_autofill_content_renderer_password__form__conversion__utils.cc
index 13765df6..4b4fab3e 100644
--- a/www/chromium/files/patch-components_autofill_content_renderer_password__form__conversion__utils.cc
+++ b/www/chromium/files/patch-components_autofill_content_renderer_password__form__conversion__utils.cc
@@ -1,4 +1,4 @@
---- components/autofill/content/renderer/password_form_conversion_utils.cc.orig	2021-01-18 21:28:54 UTC
+--- components/autofill/content/renderer/password_form_conversion_utils.cc.orig	2021-03-12 23:57:21 UTC
 +++ components/autofill/content/renderer/password_form_conversion_utils.cc
 @@ -18,7 +18,11 @@
  #include "third_party/blink/public/web/web_form_control_element.h"
diff --git a/www/chromium/files/patch-components_autofill_core_browser_autofill__external__delegate.cc b/www/chromium/files/patch-components_autofill_core_browser_autofill__external__delegate.cc
index ca8c7caf..f0c3a61e 100644
--- a/www/chromium/files/patch-components_autofill_core_browser_autofill__external__delegate.cc
+++ b/www/chromium/files/patch-components_autofill_core_browser_autofill__external__delegate.cc
@@ -1,6 +1,6 @@
---- components/autofill/core/browser/autofill_external_delegate.cc.orig	2020-11-13 06:36:40 UTC
+--- components/autofill/core/browser/autofill_external_delegate.cc.orig	2021-03-12 23:57:21 UTC
 +++ components/autofill/core/browser/autofill_external_delegate.cc
-@@ -127,7 +127,7 @@ void AutofillExternalDelegate::OnSuggestionsReturned(
+@@ -128,7 +128,7 @@ void AutofillExternalDelegate::OnSuggestionsReturned(
  
      // Append the "Hide Suggestions" menu item for only Autofill Address and
      // Autocomplete popups.
diff --git a/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc b/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc
index 6ddd2b27..e08ea4f4 100644
--- a/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc
+++ b/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc
@@ -1,20 +1,20 @@
---- components/autofill/core/browser/personal_data_manager.cc.orig	2021-01-18 21:28:54 UTC
+--- components/autofill/core/browser/personal_data_manager.cc.orig	2021-03-12 23:57:21 UTC
 +++ components/autofill/core/browser/personal_data_manager.cc
-@@ -1957,7 +1957,7 @@ bool PersonalDataManager::IsServerCard(const CreditCar
- 
- bool PersonalDataManager::ShouldShowCardsFromAccountOption() const {
+@@ -1917,7 +1917,7 @@ bool PersonalDataManager::ShouldShowCardsFromAccountOp
  // The feature is only for Linux, Windows and Mac.
--#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_WIN) || \
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_WIN) || defined(OS_BSD) || \
+ // 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)) || defined(OS_WIN) || \
++#if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_WIN) || defined(OS_BSD) || \
      defined(OS_APPLE)
    // This option should only be shown for users that have not enabled the Sync
    // Feature and that have server credit cards available.
-@@ -1981,7 +1981,7 @@ bool PersonalDataManager::ShouldShowCardsFromAccountOp
+@@ -1941,7 +1941,7 @@ bool PersonalDataManager::ShouldShowCardsFromAccountOp
    return !is_opted_in;
  #else
    return false;
--#endif  // #if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_WIN) || \
-+#endif  // #if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_WIN) || defined(OS_BSD) || \
-        //     defined(OS_APPLE)
+-#endif  // #if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ||
++#endif  // #if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) ||
+         // defined(OS_WIN) || defined(OS_APPLE)
  }
  
diff --git a/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc b/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc
index e5619788..57920e38 100644
--- a/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc
+++ b/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc
@@ -1,11 +1,11 @@
---- components/autofill/core/common/autofill_payments_features.cc.orig	2021-01-18 21:28:54 UTC
+--- components/autofill/core/common/autofill_payments_features.cc.orig	2021-03-12 23:57:21 UTC
 +++ components/autofill/core/common/autofill_payments_features.cc
-@@ -129,7 +129,7 @@ const base::Feature kAutofillUpstreamAllowAllEmailDoma
- 
- bool ShouldShowImprovedUserConsentForCreditCardSave() {
+@@ -138,7 +138,7 @@ bool ShouldShowImprovedUserConsentForCreditCardSave() 
+ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // of lacros-chrome is complete.
  #if defined(OS_WIN) || defined(OS_APPLE) || \
--    (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+    (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+-    (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
++    (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD)
    // The new user consent UI is fully launched on MacOS, Windows and Linux.
    return true;
  #else
diff --git a/www/chromium/files/patch-components_autofill_core_common_autofill__util.cc b/www/chromium/files/patch-components_autofill_core_common_autofill__util.cc
index 3912a40d..7471ce7e 100644
--- a/www/chromium/files/patch-components_autofill_core_common_autofill__util.cc
+++ b/www/chromium/files/patch-components_autofill_core_common_autofill__util.cc
@@ -1,4 +1,4 @@
---- components/autofill/core/common/autofill_util.cc.orig	2020-11-13 06:36:40 UTC
+--- components/autofill/core/common/autofill_util.cc.orig	2021-03-12 23:57:21 UTC
 +++ components/autofill/core/common/autofill_util.cc
 @@ -174,7 +174,7 @@ bool SanitizedFieldIsEmpty(const base::string16& value
  }
diff --git a/www/chromium/files/patch-components_content__settings_core_browser_website__settings__registry.cc b/www/chromium/files/patch-components_content__settings_core_browser_website__settings__registry.cc
index 4ed86453..5938df06 100644
--- a/www/chromium/files/patch-components_content__settings_core_browser_website__settings__registry.cc
+++ b/www/chromium/files/patch-components_content__settings_core_browser_website__settings__registry.cc
@@ -1,11 +1,11 @@
---- components/content_settings/core/browser/website_settings_registry.cc.orig	2020-11-13 06:36:40 UTC
+--- components/content_settings/core/browser/website_settings_registry.cc.orig	2021-03-12 23:57:22 UTC
 +++ components/content_settings/core/browser/website_settings_registry.cc
-@@ -66,7 +66,7 @@ const WebsiteSettingsInfo* WebsiteSettingsRegistry::Re
- #if defined(OS_WIN)
-   if (!(platform & PLATFORM_WINDOWS))
+@@ -69,7 +69,7 @@ const WebsiteSettingsInfo* WebsiteSettingsRegistry::Re
      return nullptr;
--#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#elif (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+ // 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)
    if (!(platform & PLATFORM_LINUX))
      return nullptr;
  #elif defined(OS_MAC)
diff --git a/www/chromium/files/patch-components_cookie__config_cookie__store__util.cc b/www/chromium/files/patch-components_cookie__config_cookie__store__util.cc
index 9f0298e8..364f70e9 100644
--- a/www/chromium/files/patch-components_cookie__config_cookie__store__util.cc
+++ b/www/chromium/files/patch-components_cookie__config_cookie__store__util.cc
@@ -1,4 +1,4 @@
---- components/cookie_config/cookie_store_util.cc.orig	2020-11-13 06:36:40 UTC
+--- components/cookie_config/cookie_store_util.cc.orig	2021-03-12 23:57:22 UTC
 +++ components/cookie_config/cookie_store_util.cc
 @@ -11,7 +11,7 @@
  
diff --git a/www/chromium/files/patch-components_crash_content_browser_BUILD.gn b/www/chromium/files/patch-components_crash_content_browser_BUILD.gn
index 6a6d550d..b9bc3d7f 100644
--- a/www/chromium/files/patch-components_crash_content_browser_BUILD.gn
+++ b/www/chromium/files/patch-components_crash_content_browser_BUILD.gn
@@ -1,6 +1,6 @@
---- components/crash/content/browser/BUILD.gn.orig	2021-01-18 21:28:55 UTC
+--- components/crash/content/browser/BUILD.gn.orig	2021-03-12 23:57:22 UTC
 +++ components/crash/content/browser/BUILD.gn
-@@ -33,7 +33,7 @@ source_set("browser") {
+@@ -37,7 +37,7 @@ source_set("browser") {
  
    # This is not in the GYP build but this target includes breakpad client
    # headers, so add the dependency here.
@@ -9,7 +9,7 @@
      configs += [ "//third_party/breakpad:client_config" ]
      public_configs = [ "//third_party/breakpad:client_config" ]
    }
-@@ -53,7 +53,7 @@ source_set("browser") {
+@@ -57,7 +57,7 @@ source_set("browser") {
        "//components/crash/android:jni_headers",
        "//mojo/public/cpp/bindings",
      ]
diff --git a/www/chromium/files/patch-components_crash_content_browser_error__reporting_BUILD.gn b/www/chromium/files/patch-components_crash_content_browser_error__reporting_BUILD.gn
index 4923048a..a771de93 100644
--- a/www/chromium/files/patch-components_crash_content_browser_error__reporting_BUILD.gn
+++ b/www/chromium/files/patch-components_crash_content_browser_error__reporting_BUILD.gn
@@ -1,4 +1,4 @@
---- components/crash/content/browser/error_reporting/BUILD.gn.orig	2021-01-19 12:19:09 UTC
+--- components/crash/content/browser/error_reporting/BUILD.gn.orig	2021-03-12 23:57:22 UTC
 +++ components/crash/content/browser/error_reporting/BUILD.gn
 @@ -30,4 +30,10 @@ source_set("mock_crash_endpoint") {
      "//testing/gtest",
diff --git a/www/chromium/files/patch-components_crash_core_app_BUILD.gn b/www/chromium/files/patch-components_crash_core_app_BUILD.gn
index 844f434f..a94a1a1f 100644
--- a/www/chromium/files/patch-components_crash_core_app_BUILD.gn
+++ b/www/chromium/files/patch-components_crash_core_app_BUILD.gn
@@ -1,4 +1,4 @@
---- components/crash/core/app/BUILD.gn.orig	2020-11-16 15:59:38 UTC
+--- components/crash/core/app/BUILD.gn.orig	2021-03-12 23:57:22 UTC
 +++ components/crash/core/app/BUILD.gn
 @@ -3,7 +3,7 @@
  # found in the LICENSE file.
diff --git a/www/chromium/files/patch-components_crash_core_common_BUILD.gn b/www/chromium/files/patch-components_crash_core_common_BUILD.gn
index 71ee941f..f1fc4acd 100644
--- a/www/chromium/files/patch-components_crash_core_common_BUILD.gn
+++ b/www/chromium/files/patch-components_crash_core_common_BUILD.gn
@@ -1,4 +1,4 @@
---- components/crash/core/common/BUILD.gn.orig	2021-01-18 21:28:55 UTC
+--- components/crash/core/common/BUILD.gn.orig	2021-03-12 23:57:22 UTC
 +++ components/crash/core/common/BUILD.gn
 @@ -7,7 +7,7 @@ import("//components/gwp_asan/buildflags/buildflags.gn
  
diff --git a/www/chromium/files/patch-components_discardable__memory_service_discardable__shared__memory__manager.cc b/www/chromium/files/patch-components_discardable__memory_service_discardable__shared__memory__manager.cc
index 69a1d9be..743c768e 100644
--- a/www/chromium/files/patch-components_discardable__memory_service_discardable__shared__memory__manager.cc
+++ b/www/chromium/files/patch-components_discardable__memory_service_discardable__shared__memory__manager.cc
@@ -1,4 +1,4 @@
---- components/discardable_memory/service/discardable_shared_memory_manager.cc.orig	2020-11-13 06:36:40 UTC
+--- components/discardable_memory/service/discardable_shared_memory_manager.cc.orig	2021-03-12 23:57:22 UTC
 +++ components/discardable_memory/service/discardable_shared_memory_manager.cc
 @@ -33,7 +33,7 @@
  #include "components/discardable_memory/common/discardable_shared_memory_heap.h"
@@ -9,12 +9,3 @@
  #include "base/files/file_path.h"
  #include "base/files/file_util.h"
  #include "base/metrics/histogram_macros.h"
-@@ -176,7 +176,7 @@ int64_t GetDefaultMemoryLimit() {
-     max_default_memory_limit /= 8;
- #endif
- 
--#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
-   base::FilePath shmem_dir;
-   if (base::GetShmemTempDir(false, &shmem_dir)) {
-     int64_t shmem_dir_amount_of_free_space =
diff --git a/www/chromium/files/patch-components_download_internal_common_base__file.cc b/www/chromium/files/patch-components_download_internal_common_base__file.cc
index 9de8c461..bc9fecd2 100644
--- a/www/chromium/files/patch-components_download_internal_common_base__file.cc
+++ b/www/chromium/files/patch-components_download_internal_common_base__file.cc
@@ -1,4 +1,4 @@
---- components/download/internal/common/base_file.cc.orig	2020-11-13 06:36:40 UTC
+--- components/download/internal/common/base_file.cc.orig	2021-03-12 23:57:22 UTC
 +++ components/download/internal/common/base_file.cc
 @@ -604,7 +604,7 @@ GURL GetEffectiveAuthorityURL(const GURL& source_url,
  
diff --git a/www/chromium/files/patch-components_feature__engagement_public_event__constants.cc b/www/chromium/files/patch-components_feature__engagement_public_event__constants.cc
index dac29635..ae0c859d 100644
--- a/www/chromium/files/patch-components_feature__engagement_public_event__constants.cc
+++ b/www/chromium/files/patch-components_feature__engagement_public_event__constants.cc
@@ -1,4 +1,4 @@
---- components/feature_engagement/public/event_constants.cc.orig	2021-01-18 21:28:55 UTC
+--- components/feature_engagement/public/event_constants.cc.orig	2021-03-12 23:57:22 UTC
 +++ components/feature_engagement/public/event_constants.cc
 @@ -10,13 +10,13 @@ namespace feature_engagement {
  
@@ -8,9 +8,9 @@
 +#if defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_BSD) || \
      defined(OS_CHROMEOS)
  const char kNewTabOpened[] = "new_tab_opened";
- #endif  // defined(OS_WIN) || defined(OS_APPLE) ||
--        // defined(OS_LINUX) || defined(OS_CHROMEOS)
-+        // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#endif  // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) ||
++#endif  // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_BSD) ||
+         // defined(OS_CHROMEOS)
  
 -#if defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || \
 +#if defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_BSD) || \
diff --git a/www/chromium/files/patch-components_feature__engagement_public_event__constants.h b/www/chromium/files/patch-components_feature__engagement_public_event__constants.h
index 86c60eb5..54ac490a 100644
--- a/www/chromium/files/patch-components_feature__engagement_public_event__constants.h
+++ b/www/chromium/files/patch-components_feature__engagement_public_event__constants.h
@@ -1,4 +1,4 @@
---- components/feature_engagement/public/event_constants.h.orig	2021-01-18 21:28:55 UTC
+--- components/feature_engagement/public/event_constants.h.orig	2021-03-12 23:57:22 UTC
 +++ components/feature_engagement/public/event_constants.h
 @@ -12,16 +12,16 @@ namespace feature_engagement {
  namespace events {
@@ -10,9 +10,9 @@
  // The user has explicitly opened a new tab via an entry point from inside of
  // Chrome.
  extern const char kNewTabOpened[];
- #endif  // defined(OS_WIN) || defined(OS_APPLE) ||
--        // defined(OS_LINUX) || defined(OS_CHROMEOS)
-+        // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#endif  // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) ||
++#endif  // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_BSD) ||
+         // defined(OS_CHROMEOS)
  
  // Desktop
 -#if defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || \
diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc b/www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc
index 4e9006fb..a4e925d1 100644
--- a/www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc
+++ b/www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc
@@ -1,4 +1,4 @@
---- components/feature_engagement/public/feature_configurations.cc.orig	2020-11-16 14:27:02 UTC
+--- components/feature_engagement/public/feature_configurations.cc.orig	2021-03-12 23:57:22 UTC
 +++ components/feature_engagement/public/feature_configurations.cc
 @@ -12,7 +12,7 @@ namespace feature_engagement {
  
diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc
index 5f8245e8..50263cb8 100644
--- a/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc
+++ b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc
@@ -1,4 +1,4 @@
---- components/feature_engagement/public/feature_constants.cc.orig	2021-01-18 21:28:55 UTC
+--- components/feature_engagement/public/feature_constants.cc.orig	2021-03-12 23:57:22 UTC
 +++ components/feature_engagement/public/feature_constants.cc
 @@ -12,7 +12,7 @@ const base::Feature kIPHDemoMode{"IPH_DemoMode",
  const base::Feature kIPHDummyFeature{"IPH_Dummy",
diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h
index f4d6ac83..dd7ff341 100644
--- a/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h
+++ b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h
@@ -1,4 +1,4 @@
---- components/feature_engagement/public/feature_constants.h.orig	2021-01-18 21:28:55 UTC
+--- components/feature_engagement/public/feature_constants.h.orig	2021-03-12 23:57:22 UTC
 +++ components/feature_engagement/public/feature_constants.h
 @@ -16,7 +16,7 @@ extern const base::Feature kIPHDemoMode;
  // A feature to ensure all arrays can contain at least one feature.
diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc b/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc
index b8f57839..c3a42581 100644
--- a/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc
+++ b/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc
@@ -1,6 +1,6 @@
---- components/feature_engagement/public/feature_list.cc.orig	2021-01-18 21:28:55 UTC
+--- components/feature_engagement/public/feature_list.cc.orig	2021-03-12 23:57:22 UTC
 +++ components/feature_engagement/public/feature_list.cc
-@@ -75,7 +75,7 @@ const base::Feature* const kAllFeatures[] = {
+@@ -78,7 +78,7 @@ const base::Feature* const kAllFeatures[] = {
      &kIPHBadgedTranslateManualTriggerFeature,
      &kIPHDiscoverFeedHeaderFeature,
  #endif  // defined(OS_IOS)
@@ -9,7 +9,7 @@
      defined(OS_CHROMEOS)
      &kIPHDesktopTabGroupsNewGroupFeature,
      &kIPHFocusModeFeature,
-@@ -85,7 +85,7 @@ const base::Feature* const kAllFeatures[] = {
+@@ -88,7 +88,7 @@ const base::Feature* const kAllFeatures[] = {
      &kIPHReopenTabFeature,
      &kIPHWebUITabStripFeature,
      &kIPHDesktopPwaInstallFeature,
diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__list.h b/www/chromium/files/patch-components_feature__engagement_public_feature__list.h
index 5a1da865..821707ee 100644
--- a/www/chromium/files/patch-components_feature__engagement_public_feature__list.h
+++ b/www/chromium/files/patch-components_feature__engagement_public_feature__list.h
@@ -1,6 +1,6 @@
---- components/feature_engagement/public/feature_list.h.orig	2021-01-18 21:28:55 UTC
+--- components/feature_engagement/public/feature_list.h.orig	2021-03-12 23:57:22 UTC
 +++ components/feature_engagement/public/feature_list.h
-@@ -142,7 +142,7 @@ DEFINE_VARIATION_PARAM(kIPHDiscoverFeedHeaderFeature,
+@@ -147,7 +147,7 @@ DEFINE_VARIATION_PARAM(kIPHDiscoverFeedHeaderFeature,
                         "IPH_DiscoverFeedHeaderMenu");
  #endif  // defined(OS_IOS)
  
@@ -9,7 +9,7 @@
      defined(OS_CHROMEOS)
  DEFINE_VARIATION_PARAM(kIPHDesktopTabGroupsNewGroupFeature,
                         "IPH_DesktopTabGroupsNewGroup");
-@@ -154,7 +154,7 @@ DEFINE_VARIATION_PARAM(kIPHPasswordsAccountStorageFeat
+@@ -159,7 +159,7 @@ DEFINE_VARIATION_PARAM(kIPHPasswordsAccountStorageFeat
  DEFINE_VARIATION_PARAM(kIPHReopenTabFeature, "IPH_ReopenTab");
  DEFINE_VARIATION_PARAM(kIPHWebUITabStripFeature, "IPH_WebUITabStrip");
  DEFINE_VARIATION_PARAM(kIPHDesktopPwaInstallFeature, "IPH_DesktopPwaInstall");
@@ -18,7 +18,7 @@
          // defined(OS_CHROMEOS)
  
  }  // namespace
-@@ -222,7 +222,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation
+@@ -230,7 +230,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation
          VARIATION_ENTRY(kIPHBadgedReadingListFeature),
          VARIATION_ENTRY(kIPHBadgedTranslateManualTriggerFeature),
          VARIATION_ENTRY(kIPHDiscoverFeedHeaderFeature),
@@ -27,7 +27,7 @@
      defined(OS_CHROMEOS)
          VARIATION_ENTRY(kIPHDesktopTabGroupsNewGroupFeature),
          VARIATION_ENTRY(kIPHFocusModeFeature),
-@@ -232,7 +232,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation
+@@ -240,7 +240,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation
          VARIATION_ENTRY(kIPHReopenTabFeature),
          VARIATION_ENTRY(kIPHWebUITabStripFeature),
          VARIATION_ENTRY(kIPHDesktopPwaInstallFeature),
diff --git a/www/chromium/files/patch-components_feed_core_proto_v2_wire_version.proto b/www/chromium/files/patch-components_feed_core_proto_v2_wire_version.proto
index c7e3ddc0..4f4d1590 100644
--- a/www/chromium/files/patch-components_feed_core_proto_v2_wire_version.proto
+++ b/www/chromium/files/patch-components_feed_core_proto_v2_wire_version.proto
@@ -1,4 +1,4 @@
---- components/feed/core/proto/v2/wire/version.proto.orig	2020-11-26 17:29:25 UTC
+--- components/feed/core/proto/v2/wire/version.proto.orig	2021-03-12 23:57:22 UTC
 +++ components/feed/core/proto/v2/wire/version.proto
 @@ -11,8 +11,8 @@ option optimize_for = LITE_RUNTIME;
  // Specification of an application or OS version.
diff --git a/www/chromium/files/patch-components_feed_core_proto_wire_version.proto b/www/chromium/files/patch-components_feed_core_proto_wire_version.proto
index b3f2537d..91825fbc 100644
--- a/www/chromium/files/patch-components_feed_core_proto_wire_version.proto
+++ b/www/chromium/files/patch-components_feed_core_proto_wire_version.proto
@@ -1,4 +1,4 @@
---- components/feed/core/proto/wire/version.proto.orig	2020-11-26 17:11:18 UTC
+--- components/feed/core/proto/wire/version.proto.orig	2021-03-12 23:57:22 UTC
 +++ components/feed/core/proto/wire/version.proto
 @@ -14,8 +14,8 @@ option java_outer_classname = "VersionProto";
  // Specification of an application or OS version.
diff --git a/www/chromium/files/patch-components_feed_core_v2_proto__util.cc b/www/chromium/files/patch-components_feed_core_v2_proto__util.cc
index 2e0eab35..dee8e069 100644
--- a/www/chromium/files/patch-components_feed_core_v2_proto__util.cc
+++ b/www/chromium/files/patch-components_feed_core_v2_proto__util.cc
@@ -1,4 +1,4 @@
---- components/feed/core/v2/proto_util.cc.orig	2021-01-18 21:28:55 UTC
+--- components/feed/core/v2/proto_util.cc.orig	2021-03-12 23:57:22 UTC
 +++ components/feed/core/v2/proto_util.cc
 @@ -81,8 +81,8 @@ feedwire::Version GetPlatformVersionMessage() {
  
diff --git a/www/chromium/files/patch-components_flags__ui_flags__state.cc b/www/chromium/files/patch-components_flags__ui_flags__state.cc
index a6a5449f..a924a2e6 100644
--- a/www/chromium/files/patch-components_flags__ui_flags__state.cc
+++ b/www/chromium/files/patch-components_flags__ui_flags__state.cc
@@ -1,11 +1,11 @@
---- components/flags_ui/flags_state.cc.orig	2020-11-13 06:36:40 UTC
+--- components/flags_ui/flags_state.cc.orig	2021-03-12 23:57:22 UTC
 +++ components/flags_ui/flags_state.cc
-@@ -687,7 +687,7 @@ int FlagsState::GetCurrentPlatform() {
+@@ -688,7 +688,7 @@ int FlagsState::GetCurrentPlatform() {
    return kOsWin;
- #elif defined(OS_CHROMEOS)
+ #elif BUILDFLAG(IS_CHROMEOS_ASH)
    return kOsCrOS;
--#elif defined(OS_LINUX) || defined(OS_OPENBSD)
-+#elif defined(OS_LINUX) || defined(OS_OPENBSD) || defined(OS_FREEBSD)
+-#elif (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
++#elif (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_FREEBSD) || \
+     defined(OS_OPENBSD)
    return kOsLinux;
  #elif defined(OS_ANDROID)
-   return kOsAndroid;
diff --git a/www/chromium/files/patch-components_gcm__driver_gcm__client.h b/www/chromium/files/patch-components_gcm__driver_gcm__client.h
index 6b9d3e0c..64c25c31 100644
--- a/www/chromium/files/patch-components_gcm__driver_gcm__client.h
+++ b/www/chromium/files/patch-components_gcm__driver_gcm__client.h
@@ -1,4 +1,4 @@
---- components/gcm_driver/gcm_client.h.orig	2020-11-13 06:36:40 UTC
+--- components/gcm_driver/gcm_client.h.orig	2021-03-12 23:57:22 UTC
 +++ components/gcm_driver/gcm_client.h
 @@ -87,6 +87,7 @@ class GCMClient {
      PLATFORM_CROS,
diff --git a/www/chromium/files/patch-components_gcm__driver_gcm__client__impl.cc b/www/chromium/files/patch-components_gcm__driver_gcm__client__impl.cc
index b1ed1bdb..9301a3d3 100644
--- a/www/chromium/files/patch-components_gcm__driver_gcm__client__impl.cc
+++ b/www/chromium/files/patch-components_gcm__driver_gcm__client__impl.cc
@@ -1,4 +1,4 @@
---- components/gcm_driver/gcm_client_impl.cc.orig	2020-11-13 06:36:40 UTC
+--- components/gcm_driver/gcm_client_impl.cc.orig	2021-03-12 23:57:22 UTC
 +++ components/gcm_driver/gcm_client_impl.cc
 @@ -135,6 +135,9 @@ void ToCheckinProtoVersion(
      case GCMClient::PLATFORM_CROS:
diff --git a/www/chromium/files/patch-components_gwp__asan_BUILD.gn b/www/chromium/files/patch-components_gwp__asan_BUILD.gn
index ee9be0f9..f10c5e33 100644
--- a/www/chromium/files/patch-components_gwp__asan_BUILD.gn
+++ b/www/chromium/files/patch-components_gwp__asan_BUILD.gn
@@ -1,4 +1,4 @@
---- components/gwp_asan/BUILD.gn.orig	2020-11-17 12:04:32 UTC
+--- components/gwp_asan/BUILD.gn.orig	2021-03-12 23:57:22 UTC
 +++ components/gwp_asan/BUILD.gn
 @@ -20,4 +20,7 @@ test("gwp_asan_unittests") {
        "//components/gwp_asan/crash_handler:unit_tests",
diff --git a/www/chromium/files/patch-components_invalidation_impl_invalidation__switches.cc b/www/chromium/files/patch-components_invalidation_impl_invalidation__switches.cc
index b1175246..ef6e3823 100644
--- a/www/chromium/files/patch-components_invalidation_impl_invalidation__switches.cc
+++ b/www/chromium/files/patch-components_invalidation_impl_invalidation__switches.cc
@@ -1,4 +1,4 @@
---- components/invalidation/impl/invalidation_switches.cc.orig	2021-01-19 11:31:15 UTC
+--- components/invalidation/impl/invalidation_switches.cc.orig	2021-03-12 23:57:22 UTC
 +++ components/invalidation/impl/invalidation_switches.cc
 @@ -28,7 +28,7 @@ const base::Feature kFCMInvalidationsForSyncDontCheckV
  
diff --git a/www/chromium/files/patch-components_keyed__service_core_dependency__graph__unittest.cc b/www/chromium/files/patch-components_keyed__service_core_dependency__graph__unittest.cc
index d88a8acf..0ab4ffc1 100644
--- a/www/chromium/files/patch-components_keyed__service_core_dependency__graph__unittest.cc
+++ b/www/chromium/files/patch-components_keyed__service_core_dependency__graph__unittest.cc
@@ -1,4 +1,4 @@
---- components/keyed_service/core/dependency_graph_unittest.cc.orig	2020-11-13 06:36:41 UTC
+--- components/keyed_service/core/dependency_graph_unittest.cc.orig	2021-03-12 23:57:22 UTC
 +++ components/keyed_service/core/dependency_graph_unittest.cc
 @@ -9,7 +9,11 @@
  #include "components/keyed_service/core/dependency_graph.h"
diff --git a/www/chromium/files/patch-components_metrics_BUILD.gn b/www/chromium/files/patch-components_metrics_BUILD.gn
index 0c4becbf..1e8014d4 100644
--- a/www/chromium/files/patch-components_metrics_BUILD.gn
+++ b/www/chromium/files/patch-components_metrics_BUILD.gn
@@ -1,6 +1,6 @@
---- components/metrics/BUILD.gn.orig	2021-01-18 21:28:55 UTC
+--- components/metrics/BUILD.gn.orig	2021-03-12 23:57:22 UTC
 +++ components/metrics/BUILD.gn
-@@ -173,6 +173,11 @@ static_library("metrics") {
+@@ -174,6 +174,11 @@ static_library("metrics") {
    if (is_fuchsia) {
      sources += [ "drive_metrics_provider_fuchsia.cc" ]
    }
diff --git a/www/chromium/files/patch-components_metrics_drive__metrics__provider__linux.cc b/www/chromium/files/patch-components_metrics_drive__metrics__provider__linux.cc
index 4f25f410..d8c809c6 100644
--- a/www/chromium/files/patch-components_metrics_drive__metrics__provider__linux.cc
+++ b/www/chromium/files/patch-components_metrics_drive__metrics__provider__linux.cc
@@ -1,4 +1,4 @@
---- components/metrics/drive_metrics_provider_linux.cc.orig	2020-11-13 06:36:41 UTC
+--- components/metrics/drive_metrics_provider_linux.cc.orig	2021-03-12 23:57:22 UTC
 +++ components/metrics/drive_metrics_provider_linux.cc
 @@ -4,7 +4,13 @@
  
diff --git a/www/chromium/files/patch-components_metrics_metrics__log.cc b/www/chromium/files/patch-components_metrics_metrics__log.cc
index d9b00ed4..700af295 100644
--- a/www/chromium/files/patch-components_metrics_metrics__log.cc
+++ b/www/chromium/files/patch-components_metrics_metrics__log.cc
@@ -1,11 +1,11 @@
---- components/metrics/metrics_log.cc.orig	2021-01-18 21:28:55 UTC
+--- components/metrics/metrics_log.cc.orig	2021-03-12 23:57:22 UTC
 +++ components/metrics/metrics_log.cc
 @@ -238,7 +238,7 @@ void MetricsLog::RecordCoreSystemProfile(
  // OperatingSystemVersion refers to the ChromeOS release version.
- #if defined(OS_CHROMEOS)
+ #if BUILDFLAG(IS_CHROMEOS_ASH)
    os->set_kernel_version(base::SysInfo::KernelVersion());
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
+-#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
    // Linux operating system version is copied over into kernel version to be
    // consistent.
    os->set_kernel_version(base::SysInfo::OperatingSystemVersion());
diff --git a/www/chromium/files/patch-components_neterror_resources_neterror.js b/www/chromium/files/patch-components_neterror_resources_neterror.js
index c043f069..7cc56cf5 100644
--- a/www/chromium/files/patch-components_neterror_resources_neterror.js
+++ b/www/chromium/files/patch-components_neterror_resources_neterror.js
@@ -1,4 +1,4 @@
---- components/neterror/resources/neterror.js.orig	2021-01-18 21:28:55 UTC
+--- components/neterror/resources/neterror.js.orig	2021-03-12 23:57:22 UTC
 +++ components/neterror/resources/neterror.js
 @@ -144,7 +144,7 @@ function detailsButtonClick() {
  }
diff --git a/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc b/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc
index faea37ff..d398a7c4 100644
--- a/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc
+++ b/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc
@@ -1,4 +1,4 @@
---- components/network_session_configurator/browser/network_session_configurator.cc.orig	2021-01-18 21:28:55 UTC
+--- components/network_session_configurator/browser/network_session_configurator.cc.orig	2021-03-12 23:57:22 UTC
 +++ components/network_session_configurator/browser/network_session_configurator.cc
 @@ -802,7 +802,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C
    }
diff --git a/www/chromium/files/patch-components_new__or__sad__tab__strings.grdp b/www/chromium/files/patch-components_new__or__sad__tab__strings.grdp
index c8a2ad64..3d3c83cd 100644
--- a/www/chromium/files/patch-components_new__or__sad__tab__strings.grdp
+++ b/www/chromium/files/patch-components_new__or__sad__tab__strings.grdp
@@ -1,4 +1,4 @@
---- components/new_or_sad_tab_strings.grdp.orig	2020-11-13 06:36:41 UTC
+--- components/new_or_sad_tab_strings.grdp.orig	2021-03-12 23:57:22 UTC
 +++ components/new_or_sad_tab_strings.grdp
 @@ -51,7 +51,7 @@
            Open page in a new Incognito window (⇧⌘N)
diff --git a/www/chromium/files/patch-components_os__crypt_os__crypt.h b/www/chromium/files/patch-components_os__crypt_os__crypt.h
index 2c319ae3..e89e7709 100644
--- a/www/chromium/files/patch-components_os__crypt_os__crypt.h
+++ b/www/chromium/files/patch-components_os__crypt_os__crypt.h
@@ -1,48 +1,51 @@
---- components/os_crypt/os_crypt.h.orig	2020-11-13 06:36:41 UTC
+--- components/os_crypt/os_crypt.h.orig	2021-03-12 23:57:22 UTC
 +++ components/os_crypt/os_crypt.h
-@@ -15,9 +15,9 @@
- #include "base/strings/string16.h"
- #include "build/build_config.h"
+@@ -18,9 +18,9 @@
  
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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)
  class KeyStorageLinux;
--#endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#endif  // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+-#endif  // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#endif  // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
  
  #if defined(OS_WIN) || defined(OS_MAC)
  class PrefRegistrySimple;
-@@ -34,13 +34,13 @@ struct Config;
- // true for Linux, if a password management tool is available.
- class OSCrypt {
+@@ -39,16 +39,16 @@ class OSCrypt {
   public:
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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)
    // Set the configuration of OSCrypt.
    static COMPONENT_EXPORT(OS_CRYPT) void SetConfig(
        std::unique_ptr<os_crypt::Config> config);
--#endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#endif  // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+-#endif  // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#endif  // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
  
--#if defined(OS_APPLE) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+#if defined(OS_APPLE) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // of lacros-chrome is complete.
+ #if defined(OS_APPLE) || defined(OS_WIN) || \
+-    (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
++    (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD)
    // On Linux returns true iff the real secret key (not hardcoded one) is
    // available. On MacOS returns true if Keychain is available (for mock
    // Keychain it returns true if not using locked Keychain, false if using
-@@ -131,7 +131,7 @@ class OSCrypt {
-   DISALLOW_IMPLICIT_CONSTRUCTORS(OSCrypt);
- };
+@@ -142,7 +142,7 @@ class OSCrypt {
  
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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)
  // For unit testing purposes, inject methods to be used.
  // |get_key_storage_mock| provides the desired |KeyStorage| implementation.
  // If the provider returns |nullptr|, a hardcoded password will be used.
-@@ -146,6 +146,6 @@ void UseMockKeyStorageForTesting(
+@@ -157,6 +157,6 @@ void UseMockKeyStorageForTesting(
  // Clears any caching and most lazy initialisations performed by the production
  // code. Should be used after any test which required a password.
  COMPONENT_EXPORT(OS_CRYPT) void ClearCacheForTesting();
--#endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#endif  // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+-#endif  // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#endif  // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
  
  #endif  // COMPONENTS_OS_CRYPT_OS_CRYPT_H_
diff --git a/www/chromium/files/patch-components_os__crypt_os__crypt__unittest.cc b/www/chromium/files/patch-components_os__crypt_os__crypt__unittest.cc
index 2de800a4..4487bff2 100644
--- a/www/chromium/files/patch-components_os__crypt_os__crypt__unittest.cc
+++ b/www/chromium/files/patch-components_os__crypt_os__crypt__unittest.cc
@@ -1,11 +1,11 @@
---- components/os_crypt/os_crypt_unittest.cc.orig	2020-11-13 06:36:41 UTC
+--- components/os_crypt/os_crypt_unittest.cc.orig	2021-03-12 23:57:22 UTC
 +++ components/os_crypt/os_crypt_unittest.cc
-@@ -18,7 +18,7 @@
- #include "components/os_crypt/os_crypt_mocker.h"
- #include "testing/gtest/include/gtest/gtest.h"
+@@ -21,7 +21,7 @@
  
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+ // 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)
  #include "components/os_crypt/os_crypt_mocker_linux.h"
  #endif
  
diff --git a/www/chromium/files/patch-components_permissions_prediction__service_prediction__service__common.cc b/www/chromium/files/patch-components_permissions_prediction__service_prediction__service__common.cc
index a9c38a49..6d07b940 100644
--- a/www/chromium/files/patch-components_permissions_prediction__service_prediction__service__common.cc
+++ b/www/chromium/files/patch-components_permissions_prediction__service_prediction__service__common.cc
@@ -1,11 +1,11 @@
---- components/permissions/prediction_service/prediction_service_common.cc.orig	2021-01-19 11:31:48 UTC
+--- components/permissions/prediction_service/prediction_service_common.cc.orig	2021-03-12 23:57:22 UTC
 +++ components/permissions/prediction_service/prediction_service_common.cc
-@@ -10,7 +10,7 @@ namespace permissions {
+@@ -11,7 +11,7 @@ namespace permissions {
  ClientFeatures_Platform GetCurrentPlatformProto() {
  #if defined(OS_WIN)
    return permissions::ClientFeatures_Platform_PLATFORM_WINDOWS;
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
+-#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
    return permissions::ClientFeatures_Platform_PLATFORM_LINUX;
  #elif defined(OS_ANDROID)
    return permissions::ClientFeatures_Platform_PLATFORM_ANDROID;
diff --git a/www/chromium/files/patch-components_plugins_renderer_plugin__placeholder.cc b/www/chromium/files/patch-components_plugins_renderer_plugin__placeholder.cc
index 2f56253b..cd951f9c 100644
--- a/www/chromium/files/patch-components_plugins_renderer_plugin__placeholder.cc
+++ b/www/chromium/files/patch-components_plugins_renderer_plugin__placeholder.cc
@@ -1,4 +1,4 @@
---- components/plugins/renderer/plugin_placeholder.cc.orig	2020-11-13 06:36:41 UTC
+--- components/plugins/renderer/plugin_placeholder.cc.orig	2021-03-12 23:57:22 UTC
 +++ components/plugins/renderer/plugin_placeholder.cc
 @@ -17,7 +17,11 @@
  #include "third_party/blink/public/web/web_plugin_container.h"
diff --git a/www/chromium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc b/www/chromium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc
index 79e7e3b3..97308b54 100644
--- a/www/chromium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc
+++ b/www/chromium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc
@@ -1,8 +1,8 @@
---- components/policy/core/browser/policy_pref_mapping_test.cc.orig	2020-11-13 06:36:41 UTC
+--- components/policy/core/browser/policy_pref_mapping_test.cc.orig	2021-03-12 23:57:22 UTC
 +++ components/policy/core/browser/policy_pref_mapping_test.cc
-@@ -270,6 +270,8 @@ class PolicyTestCase {
+@@ -285,6 +285,8 @@ class PolicyTestCase {
      const std::string os("chromeos");
- #elif defined(OS_LINUX)
+ #elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
      const std::string os("linux");
 +#elif defined(OS_FREEBSD)
 +    const std::string os("freebsd");
diff --git a/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc b/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc
index f5a46462..24192327 100644
--- a/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc
+++ b/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc
@@ -1,49 +1,44 @@
---- components/policy/core/common/cloud/cloud_policy_util.cc.orig	2021-01-18 21:28:55 UTC
+--- components/policy/core/common/cloud/cloud_policy_util.cc.orig	2021-03-12 23:57:22 UTC
 +++ components/policy/core/common/cloud/cloud_policy_util.cc
-@@ -17,7 +17,7 @@
+@@ -18,7 +18,7 @@
  #include <wincred.h>
  #endif
  
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_APPLE)
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_APPLE) || defined(OS_BSD)
+-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_APPLE)
++#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_APPLE) || defined(OS_BSD)
  #include <pwd.h>
  #include <sys/types.h>
  #include <unistd.h>
-@@ -32,7 +32,7 @@
- #import <SystemConfiguration/SCDynamicStoreCopySpecific.h>
- #endif
+@@ -35,7 +35,7 @@
  
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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)
  #include <limits.h>  // For HOST_NAME_MAX
  #endif
  
-@@ -66,7 +66,7 @@
- #include "base/system/sys_info.h"
- #endif
+@@ -71,7 +71,7 @@
  
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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)
  #include "base/system/sys_info.h"
  #endif
  
-@@ -75,9 +75,14 @@ namespace policy {
- namespace em = enterprise_management;
- 
- std::string GetMachineName() {
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
-+#if defined(OS_BSD)
-+  char hostname[MAXHOSTNAMELEN];
-+  if (gethostname(hostname, MAXHOSTNAMELEN) == 0)
-+#else
-   char hostname[HOST_NAME_MAX];
+@@ -100,6 +100,10 @@ std::string GetMachineName() {
    if (gethostname(hostname, HOST_NAME_MAX) == 0)  // Success.
-+#endif
      return hostname;
    return std::string();
- #elif defined(OS_APPLE)
-@@ -136,7 +141,7 @@ std::string GetMachineName() {
++#elif defined(OS_BSD)
++  char hostname[MAXHOSTNAMELEN];
++  if (gethostname(hostname, MAXHOSTNAMELEN) == 0)
++    return hostname;
+ #elif defined(OS_IOS)
+   // Use the Vendor ID as the machine name.
+   return ios::device_util::GetVendorId();
+@@ -148,7 +152,7 @@ std::string GetMachineName() {
  }
  
  std::string GetOSVersion() {
@@ -52,12 +47,12 @@
    return base::SysInfo::OperatingSystemVersion();
  #elif defined(OS_WIN)
    base::win::OSInfo::VersionNumber version_number =
-@@ -159,7 +164,7 @@ std::string GetOSArchitecture() {
+@@ -171,7 +175,7 @@ std::string GetOSArchitecture() {
  }
  
  std::string GetOSUsername() {
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_APPLE)
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_APPLE) || defined(OS_BSD)
+-#if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_APPLE)
++#if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_APPLE) || defined(OS_BSD)
    struct passwd* creds = getpwuid(getuid());
    if (!creds || !creds->pw_name)
      return std::string();
diff --git a/www/chromium/files/patch-components_policy_core_common_schema.cc b/www/chromium/files/patch-components_policy_core_common_schema.cc
index 079d1057..eb6fbdcd 100644
--- a/www/chromium/files/patch-components_policy_core_common_schema.cc
+++ b/www/chromium/files/patch-components_policy_core_common_schema.cc
@@ -1,4 +1,4 @@
---- components/policy/core/common/schema.cc.orig	2020-11-13 06:36:41 UTC
+--- components/policy/core/common/schema.cc.orig	2021-03-12 23:57:22 UTC
 +++ components/policy/core/common/schema.cc
 @@ -24,7 +24,11 @@
  #include "base/strings/stringprintf.h"
diff --git a/www/chromium/files/patch-components_policy_resources_policy__templates.json b/www/chromium/files/patch-components_policy_resources_policy__templates.json
index d1579d98..91f43262 100644
--- a/www/chromium/files/patch-components_policy_resources_policy__templates.json
+++ b/www/chromium/files/patch-components_policy_resources_policy__templates.json
@@ -1,6 +1,6 @@
---- components/policy/resources/policy_templates.json.orig	2021-01-18 21:28:55 UTC
+--- components/policy/resources/policy_templates.json.orig	2021-03-12 23:57:22 UTC
 +++ components/policy/resources/policy_templates.json
-@@ -1217,7 +1217,7 @@
+@@ -1220,7 +1220,7 @@
        'owners': ['file://components/policy/resources/OWNERS'],
        'type': 'string',
        'schema': { 'type': 'string' },
@@ -9,7 +9,7 @@
        'features': {
          'can_be_recommended': True,
          'dynamic_refresh': True,
-@@ -1243,7 +1243,7 @@
+@@ -1246,7 +1246,7 @@
        'owners': ['file://components/policy/resources/OWNERS'],
        'type': 'main',
        'schema': { 'type': 'boolean' },
@@ -18,7 +18,7 @@
        'features': {
          'can_be_recommended': True,
          'dynamic_refresh': True,
-@@ -1264,7 +1264,7 @@
+@@ -1267,7 +1267,7 @@
        'owners': ['file://components/policy/resources/OWNERS'],
        'type': 'string',
        'schema': { 'type': 'string' },
@@ -27,7 +27,7 @@
        'features': {
          'can_be_recommended': True,
          'dynamic_refresh': True,
-@@ -4406,7 +4406,7 @@
+@@ -4507,7 +4507,7 @@
        'owners': ['file://components/policy/resources/OWNERS'],
        'type': 'string',
        'schema': { 'type': 'string' },
@@ -36,7 +36,7 @@
        'features': {
          'dynamic_refresh': False,
          'per_profile': False,
-@@ -4462,7 +4462,7 @@
+@@ -4563,7 +4563,7 @@
        'owners': ['file://components/policy/resources/OWNERS'],
        'type': 'main',
        'schema': { 'type': 'boolean' },
@@ -45,8 +45,8 @@
        'features': {
          'dynamic_refresh': True,
          'per_profile': False,
-@@ -8644,7 +8644,7 @@
-       'owners': ['file://src/net/cert/OWNERS'],
+@@ -8774,7 +8774,7 @@
+       'owners': ['file://net/cert/OWNERS'],
        'type': 'main',
        'schema': { 'type': 'boolean' },
 -      'supported_on': ['chrome_os:30-', 'chrome.linux:30-', 'chrome.win:30-'],
@@ -54,7 +54,7 @@
        'features': {
          'dynamic_refresh': True,
          'per_profile': False,
-@@ -10221,7 +10221,7 @@
+@@ -10360,7 +10360,7 @@
        'owners': ['file://components/policy/resources/OWNERS'],
        'type': 'main',
        'schema': { 'type': 'boolean' },
@@ -63,7 +63,7 @@
        'features': {
          'can_be_recommended': True,
          'dynamic_refresh': True,
-@@ -10957,7 +10957,7 @@
+@@ -11152,7 +11152,7 @@
        'owners': ['file://components/policy/resources/OWNERS'],
        'type': 'main',
        'schema': { 'type': 'boolean' },
diff --git a/www/chromium/files/patch-components_policy_tools_generate__policy__source.py b/www/chromium/files/patch-components_policy_tools_generate__policy__source.py
index 4c7a1836..b17092d7 100644
--- a/www/chromium/files/patch-components_policy_tools_generate__policy__source.py
+++ b/www/chromium/files/patch-components_policy_tools_generate__policy__source.py
@@ -1,4 +1,4 @@
---- components/policy/tools/generate_policy_source.py.orig	2020-11-13 06:36:41 UTC
+--- components/policy/tools/generate_policy_source.py.orig	2021-03-12 23:57:23 UTC
 +++ components/policy/tools/generate_policy_source.py
 @@ -37,8 +37,9 @@ PLATFORM_STRINGS = {
      'ios': ['ios'],
diff --git a/www/chromium/files/patch-components_previews_core_previews__features.cc b/www/chromium/files/patch-components_previews_core_previews__features.cc
index dd4f17ff..2de88a3b 100644
--- a/www/chromium/files/patch-components_previews_core_previews__features.cc
+++ b/www/chromium/files/patch-components_previews_core_previews__features.cc
@@ -1,4 +1,4 @@
---- components/previews/core/previews_features.cc.orig	2020-11-13 06:36:41 UTC
+--- components/previews/core/previews_features.cc.orig	2021-03-12 23:57:23 UTC
 +++ components/previews/core/previews_features.cc
 @@ -14,12 +14,12 @@ namespace features {
  // are enabled are controlled by other features.
@@ -15,4 +15,4 @@
 +#endif  // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
  };
  
- // Enables the Offline previews on android slow connections.
+ // Provides slow page triggering parameters.
diff --git a/www/chromium/files/patch-components_safe__browsing_core_realtime_url__lookup__service__base.cc b/www/chromium/files/patch-components_safe__browsing_core_realtime_url__lookup__service__base.cc
index 64cff1df..2fd6641c 100644
--- a/www/chromium/files/patch-components_safe__browsing_core_realtime_url__lookup__service__base.cc
+++ b/www/chromium/files/patch-components_safe__browsing_core_realtime_url__lookup__service__base.cc
@@ -1,11 +1,11 @@
---- components/safe_browsing/core/realtime/url_lookup_service_base.cc.orig	2021-01-19 11:33:56 UTC
+--- components/safe_browsing/core/realtime/url_lookup_service_base.cc.orig	2021-03-12 23:57:23 UTC
 +++ components/safe_browsing/core/realtime/url_lookup_service_base.cc
-@@ -101,7 +101,7 @@ RTLookupRequest::OSType GetRTLookupRequestOSType() {
+@@ -108,7 +108,7 @@ RTLookupRequest::OSType GetRTLookupRequestOSType() {
    return RTLookupRequest::OS_TYPE_FUCHSIA;
  #elif defined(OS_IOS)
    return RTLookupRequest::OS_TYPE_IOS;
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
+-#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
    return RTLookupRequest::OS_TYPE_LINUX;
  #elif defined(OS_MAC)
    return RTLookupRequest::OS_TYPE_MAC;
diff --git a/www/chromium/files/patch-components_safe__browsing_core_resources_gen__file__type__proto.py b/www/chromium/files/patch-components_safe__browsing_core_resources_gen__file__type__proto.py
index 70a88f15..9bbf0d9f 100644
--- a/www/chromium/files/patch-components_safe__browsing_core_resources_gen__file__type__proto.py
+++ b/www/chromium/files/patch-components_safe__browsing_core_resources_gen__file__type__proto.py
@@ -1,4 +1,4 @@
---- components/safe_browsing/core/resources/gen_file_type_proto.py.orig	2020-11-13 06:36:41 UTC
+--- components/safe_browsing/core/resources/gen_file_type_proto.py.orig	2021-03-12 23:57:23 UTC
 +++ components/safe_browsing/core/resources/gen_file_type_proto.py
 @@ -31,6 +31,7 @@ def PlatformTypes():
      "android": download_file_types_pb2.DownloadFileType.PLATFORM_ANDROID,
diff --git a/www/chromium/files/patch-components_security__interstitials_content_captive__portal__blocking__page.cc b/www/chromium/files/patch-components_security__interstitials_content_captive__portal__blocking__page.cc
index 6d4a8a1e..78566ba1 100644
--- a/www/chromium/files/patch-components_security__interstitials_content_captive__portal__blocking__page.cc
+++ b/www/chromium/files/patch-components_security__interstitials_content_captive__portal__blocking__page.cc
@@ -1,4 +1,4 @@
---- components/security_interstitials/content/captive_portal_blocking_page.cc.orig	2020-11-13 06:36:41 UTC
+--- components/security_interstitials/content/captive_portal_blocking_page.cc.orig	2021-03-12 23:57:23 UTC
 +++ components/security_interstitials/content/captive_portal_blocking_page.cc
 @@ -106,7 +106,7 @@ std::string CaptivePortalBlockingPage::GetWiFiSSID() c
    wifi_service->GetConnectedNetworkSSID(&ssid, &error);
diff --git a/www/chromium/files/patch-components_security__interstitials_content_utils.cc b/www/chromium/files/patch-components_security__interstitials_content_utils.cc
index d6411a65..7cf343de 100644
--- a/www/chromium/files/patch-components_security__interstitials_content_utils.cc
+++ b/www/chromium/files/patch-components_security__interstitials_content_utils.cc
@@ -1,6 +1,6 @@
---- components/security_interstitials/content/utils.cc.orig	2020-11-13 06:36:41 UTC
+--- components/security_interstitials/content/utils.cc.orig	2021-03-12 23:57:23 UTC
 +++ components/security_interstitials/content/utils.cc
-@@ -31,7 +31,7 @@ void LaunchDateAndTimeSettings() {
+@@ -32,7 +32,7 @@ void LaunchDateAndTimeSettings() {
  #if defined(OS_ANDROID)
    JNIEnv* env = base::android::AttachCurrentThread();
    Java_DateAndTimeSettingsHelper_openDateAndTimeSettings(env);
diff --git a/www/chromium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.cc b/www/chromium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.cc
index ecc7dca2..caaefe95 100644
--- a/www/chromium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.cc
+++ b/www/chromium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.cc
@@ -1,4 +1,4 @@
---- components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.cc.orig	2021-01-18 21:28:56 UTC
+--- components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.cc.orig	2021-03-12 23:57:23 UTC
 +++ components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.cc
 @@ -15,7 +15,7 @@
  
diff --git a/www/chromium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.h b/www/chromium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.h
index 7258930a..553368d1 100644
--- a/www/chromium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.h
+++ b/www/chromium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.h
@@ -1,4 +1,4 @@
---- components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.h.orig	2021-01-18 21:28:56 UTC
+--- components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.h.orig	2021-03-12 23:57:23 UTC
 +++ components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.h
 @@ -20,7 +20,7 @@
  #include "mojo/public/cpp/bindings/pending_receiver.h"
diff --git a/www/chromium/files/patch-components_storage__monitor_BUILD.gn b/www/chromium/files/patch-components_storage__monitor_BUILD.gn
index 0fc693ce..4d8d48a2 100644
--- a/www/chromium/files/patch-components_storage__monitor_BUILD.gn
+++ b/www/chromium/files/patch-components_storage__monitor_BUILD.gn
@@ -1,6 +1,6 @@
---- components/storage_monitor/BUILD.gn.orig	2021-01-18 21:28:56 UTC
+--- components/storage_monitor/BUILD.gn.orig	2021-03-12 23:57:23 UTC
 +++ components/storage_monitor/BUILD.gn
-@@ -81,6 +81,13 @@ static_library("storage_monitor") {
+@@ -83,6 +83,13 @@ static_library("storage_monitor") {
      }
    }
  
diff --git a/www/chromium/files/patch-components_storage__monitor_removable__device__constants.cc b/www/chromium/files/patch-components_storage__monitor_removable__device__constants.cc
index 1e87811d..bb2fc0b1 100644
--- a/www/chromium/files/patch-components_storage__monitor_removable__device__constants.cc
+++ b/www/chromium/files/patch-components_storage__monitor_removable__device__constants.cc
@@ -1,4 +1,4 @@
---- components/storage_monitor/removable_device_constants.cc.orig	2020-11-13 06:36:41 UTC
+--- components/storage_monitor/removable_device_constants.cc.orig	2021-03-12 23:57:23 UTC
 +++ components/storage_monitor/removable_device_constants.cc
 @@ -10,7 +10,7 @@ namespace storage_monitor {
  const char kFSUniqueIdPrefix[] = "UUID:";
diff --git a/www/chromium/files/patch-components_storage__monitor_removable__device__constants.h b/www/chromium/files/patch-components_storage__monitor_removable__device__constants.h
index 9402828c..9260a1fa 100644
--- a/www/chromium/files/patch-components_storage__monitor_removable__device__constants.h
+++ b/www/chromium/files/patch-components_storage__monitor_removable__device__constants.h
@@ -1,4 +1,4 @@
---- components/storage_monitor/removable_device_constants.h.orig	2020-11-13 06:36:41 UTC
+--- components/storage_monitor/removable_device_constants.h.orig	2021-03-12 23:57:23 UTC
 +++ components/storage_monitor/removable_device_constants.h
 @@ -15,7 +15,7 @@ namespace storage_monitor {
  extern const char kFSUniqueIdPrefix[];
diff --git a/www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.cc b/www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.cc
index a3c497df..d0ef4edc 100644
--- a/www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.cc
+++ b/www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.cc
@@ -1,4 +1,4 @@
---- components/storage_monitor/storage_monitor_freebsd.cc.orig	2020-11-16 10:08:44 UTC
+--- components/storage_monitor/storage_monitor_freebsd.cc.orig	2021-03-15 11:01:23 UTC
 +++ components/storage_monitor/storage_monitor_freebsd.cc
 @@ -0,0 +1,54 @@
 +// Copyright 2014 The Chromium Authors. All rights reserved.
diff --git a/www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.h b/www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.h
index 22290afe..792d3f4d 100644
--- a/www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.h
+++ b/www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.h
@@ -1,4 +1,4 @@
---- components/storage_monitor/storage_monitor_freebsd.h.orig	2020-11-16 10:08:44 UTC
+--- components/storage_monitor/storage_monitor_freebsd.h.orig	2021-03-15 11:01:23 UTC
 +++ components/storage_monitor/storage_monitor_freebsd.h
 @@ -0,0 +1,45 @@
 +// Copyright 2014 The Chromium Authors. All rights reserved.
diff --git a/www/chromium/files/patch-components_sync__device__info_local__device__info__util.cc b/www/chromium/files/patch-components_sync__device__info_local__device__info__util.cc
index db960aad..d0b76bdd 100644
--- a/www/chromium/files/patch-components_sync__device__info_local__device__info__util.cc
+++ b/www/chromium/files/patch-components_sync__device__info_local__device__info__util.cc
@@ -1,11 +1,11 @@
---- components/sync_device_info/local_device_info_util.cc.orig	2020-11-13 06:36:42 UTC
+--- components/sync_device_info/local_device_info_util.cc.orig	2021-03-12 23:57:23 UTC
 +++ components/sync_device_info/local_device_info_util.cc
-@@ -52,7 +52,7 @@ std::string GetPersonalizableDeviceNameInternal();
+@@ -53,7 +53,7 @@ std::string GetPersonalizableDeviceNameInternal();
  sync_pb::SyncEnums::DeviceType GetLocalDeviceType() {
- #if defined(OS_CHROMEOS)
+ #if BUILDFLAG(IS_CHROMEOS_ASH)
    return sync_pb::SyncEnums_DeviceType_TYPE_CROS;
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
+-#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
    return sync_pb::SyncEnums_DeviceType_TYPE_LINUX;
  #elif defined(OS_ANDROID) || defined(OS_IOS)
    return ui::GetDeviceFormFactor() == ui::DEVICE_FORM_FACTOR_TABLET
diff --git a/www/chromium/files/patch-components_sync__device__info_local__device__info__util__linux.cc b/www/chromium/files/patch-components_sync__device__info_local__device__info__util__linux.cc
index 76eec415..d7f82346 100644
--- a/www/chromium/files/patch-components_sync__device__info_local__device__info__util__linux.cc
+++ b/www/chromium/files/patch-components_sync__device__info_local__device__info__util__linux.cc
@@ -1,7 +1,7 @@
---- components/sync_device_info/local_device_info_util_linux.cc.orig	2020-11-13 06:36:42 UTC
+--- components/sync_device_info/local_device_info_util_linux.cc.orig	2021-03-12 23:57:23 UTC
 +++ components/sync_device_info/local_device_info_util_linux.cc
-@@ -37,8 +37,9 @@ std::string GetPersonalizableDeviceNameInternal() {
- #if defined(OS_CHROMEOS)
+@@ -38,8 +38,9 @@ std::string GetPersonalizableDeviceNameInternal() {
+ #if BUILDFLAG(IS_CHROMEOS_ASH)
    return GetChromeOSDeviceNameFromType();
  #else
 -  char hostname[HOST_NAME_MAX];
diff --git a/www/chromium/files/patch-components_update__client_update__query__params.cc b/www/chromium/files/patch-components_update__client_update__query__params.cc
index a9e8901f..54f7d5aa 100644
--- a/www/chromium/files/patch-components_update__client_update__query__params.cc
+++ b/www/chromium/files/patch-components_update__client_update__query__params.cc
@@ -1,6 +1,6 @@
---- components/update_client/update_query_params.cc.orig	2020-11-13 06:36:42 UTC
+--- components/update_client/update_query_params.cc.orig	2021-03-12 23:57:23 UTC
 +++ components/update_client/update_query_params.cc
-@@ -39,6 +39,8 @@ const char kOs[] =
+@@ -40,6 +40,8 @@ const char kOs[] =
      "fuchsia";
  #elif defined(OS_OPENBSD)
      "openbsd";
diff --git a/www/chromium/files/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc b/www/chromium/files/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc
index 72c1783f..d86b838a 100644
--- a/www/chromium/files/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc
+++ b/www/chromium/files/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc
@@ -1,6 +1,6 @@
---- components/url_formatter/spoof_checks/idn_spoof_checker.cc.orig	2020-11-13 06:36:42 UTC
+--- components/url_formatter/spoof_checks/idn_spoof_checker.cc.orig	2021-03-12 23:57:23 UTC
 +++ components/url_formatter/spoof_checks/idn_spoof_checker.cc
-@@ -291,7 +291,7 @@ IDNSpoofChecker::IDNSpoofChecker() {
+@@ -292,7 +292,7 @@ IDNSpoofChecker::IDNSpoofChecker() {
    // The ideal fix would be to change the omnibox font used for Thai. In
    // that case, the Linux-only list should be revisited and potentially
    // removed.
diff --git a/www/chromium/files/patch-components_url__matcher_regex__set__matcher.cc b/www/chromium/files/patch-components_url__matcher_regex__set__matcher.cc
index ebec8d7b..6d137164 100644
--- a/www/chromium/files/patch-components_url__matcher_regex__set__matcher.cc
+++ b/www/chromium/files/patch-components_url__matcher_regex__set__matcher.cc
@@ -1,4 +1,4 @@
---- components/url_matcher/regex_set_matcher.cc.orig	2020-11-13 06:36:42 UTC
+--- components/url_matcher/regex_set_matcher.cc.orig	2021-03-12 23:57:23 UTC
 +++ components/url_matcher/regex_set_matcher.cc
 @@ -12,8 +12,13 @@
  #include "base/logging.h"
diff --git a/www/chromium/files/patch-components_url__matcher_url__matcher__factory.cc b/www/chromium/files/patch-components_url__matcher_url__matcher__factory.cc
index 08daf720..416dba6b 100644
--- a/www/chromium/files/patch-components_url__matcher_url__matcher__factory.cc
+++ b/www/chromium/files/patch-components_url__matcher_url__matcher__factory.cc
@@ -1,4 +1,4 @@
---- components/url_matcher/url_matcher_factory.cc.orig	2020-11-13 06:36:42 UTC
+--- components/url_matcher/url_matcher_factory.cc.orig	2021-03-12 23:57:23 UTC
 +++ components/url_matcher/url_matcher_factory.cc
 @@ -16,7 +16,11 @@
  #include "base/values.h"
diff --git a/www/chromium/files/patch-components_viz_common_features.cc b/www/chromium/files/patch-components_viz_common_features.cc
index 69dba7ba..6a9c7535 100644
--- a/www/chromium/files/patch-components_viz_common_features.cc
+++ b/www/chromium/files/patch-components_viz_common_features.cc
@@ -1,11 +1,11 @@
---- components/viz/common/features.cc.orig	2021-01-18 21:28:57 UTC
+--- components/viz/common/features.cc.orig	2021-03-12 23:57:23 UTC
 +++ components/viz/common/features.cc
-@@ -25,7 +25,7 @@ const base::Feature kForcePreferredIntervalForVideo{
+@@ -32,7 +32,7 @@ const base::Feature kEnableOverlayPrioritization {
+ // Use the SkiaRenderer.
  const base::Feature kUseSkiaRenderer {
    "UseSkiaRenderer",
- #if defined(OS_WIN) || \
--    (defined(OS_LINUX) && !(defined(OS_CHROMEOS) || BUILDFLAG(IS_CHROMECAST)))
-+    (defined(OS_LINUX) && !(defined(OS_CHROMEOS) || BUILDFLAG(IS_CHROMECAST))) || defined(OS_BSD)
+-#if defined(OS_WIN) || (defined(OS_LINUX) && !(BUILDFLAG(IS_CHROMEOS_ASH) || \
++#if defined(OS_WIN) || defined(OS_BSD) || (defined(OS_LINUX) && !(BUILDFLAG(IS_CHROMEOS_ASH) || \
+                                                BUILDFLAG(IS_CHROMECAST)))
        base::FEATURE_ENABLED_BY_DEFAULT
  #else
-       base::FEATURE_DISABLED_BY_DEFAULT
diff --git a/www/chromium/files/patch-components_viz_common_gpu_dawn__context__provider.cc b/www/chromium/files/patch-components_viz_common_gpu_dawn__context__provider.cc
index 6f55d50b..4b3ec8a9 100644
--- a/www/chromium/files/patch-components_viz_common_gpu_dawn__context__provider.cc
+++ b/www/chromium/files/patch-components_viz_common_gpu_dawn__context__provider.cc
@@ -1,4 +1,4 @@
---- components/viz/common/gpu/dawn_context_provider.cc.orig	2020-11-13 06:36:42 UTC
+--- components/viz/common/gpu/dawn_context_provider.cc.orig	2021-03-12 23:57:23 UTC
 +++ components/viz/common/gpu/dawn_context_provider.cc
 @@ -20,7 +20,7 @@ namespace {
  dawn_native::BackendType GetDefaultBackendType() {
diff --git a/www/chromium/files/patch-components_viz_host_host__display__client.cc b/www/chromium/files/patch-components_viz_host_host__display__client.cc
index cf73a89a..69b6ef58 100644
--- a/www/chromium/files/patch-components_viz_host_host__display__client.cc
+++ b/www/chromium/files/patch-components_viz_host_host__display__client.cc
@@ -1,11 +1,11 @@
---- components/viz/host/host_display_client.cc.orig	2020-11-13 06:36:42 UTC
+--- components/viz/host/host_display_client.cc.orig	2021-03-12 23:57:23 UTC
 +++ components/viz/host/host_display_client.cc
-@@ -56,7 +56,7 @@ void HostDisplayClient::CreateLayeredWindowUpdater(
- }
- #endif
+@@ -60,7 +60,7 @@ void HostDisplayClient::CreateLayeredWindowUpdater(
  
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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)
  void HostDisplayClient::DidCompleteSwapWithNewSize(const gfx::Size& size) {
    NOTIMPLEMENTED();
  }
diff --git a/www/chromium/files/patch-components_viz_host_host__display__client.h b/www/chromium/files/patch-components_viz_host_host__display__client.h
index e7006b32..8b36546c 100644
--- a/www/chromium/files/patch-components_viz_host_host__display__client.h
+++ b/www/chromium/files/patch-components_viz_host_host__display__client.h
@@ -1,11 +1,11 @@
---- components/viz/host/host_display_client.h.orig	2020-11-13 06:36:42 UTC
+--- components/viz/host/host_display_client.h.orig	2021-03-12 23:57:23 UTC
 +++ components/viz/host/host_display_client.h
-@@ -43,7 +43,7 @@ class VIZ_HOST_EXPORT HostDisplayClient : public mojom
-       mojo::PendingReceiver<mojom::LayeredWindowUpdater> receiver) override;
- #endif
+@@ -46,7 +46,7 @@ class VIZ_HOST_EXPORT HostDisplayClient : public mojom
  
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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)
    void DidCompleteSwapWithNewSize(const gfx::Size& size) override;
  #endif
  
diff --git a/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.cc b/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.cc
index 00ba16bd..76e2d795 100644
--- a/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.cc
+++ b/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.cc
@@ -1,20 +1,20 @@
---- components/viz/service/display_embedder/software_output_surface.cc.orig	2020-11-13 06:36:42 UTC
+--- components/viz/service/display_embedder/software_output_surface.cc.orig	2021-03-12 23:57:23 UTC
 +++ components/viz/service/display_embedder/software_output_surface.cc
-@@ -112,7 +112,7 @@ void SoftwareOutputSurface::SwapBuffersCallback(base::
-   base::TimeTicks now = base::TimeTicks::Now();
-   base::TimeDelta interval_to_next_refresh =
+@@ -115,7 +115,7 @@ void SoftwareOutputSurface::SwapBuffersCallback(base::
        now.SnappedToNextTick(refresh_timebase_, refresh_interval_) - now;
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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 (needs_swap_size_notifications_)
      client_->DidSwapWithSize(pixel_size);
  #endif
-@@ -141,7 +141,7 @@ gfx::OverlayTransform SoftwareOutputSurface::GetDispla
-   return gfx::OVERLAY_TRANSFORM_NONE;
- }
+@@ -146,7 +146,7 @@ gfx::OverlayTransform SoftwareOutputSurface::GetDispla
  
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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)
  void SoftwareOutputSurface::SetNeedsSwapSizeNotifications(
      bool needs_swap_size_notifications) {
    needs_swap_size_notifications_ = needs_swap_size_notifications;
diff --git a/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.h b/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.h
index 696bac17..18fea041 100644
--- a/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.h
+++ b/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.h
@@ -1,20 +1,20 @@
---- components/viz/service/display_embedder/software_output_surface.h.orig	2021-01-18 21:28:57 UTC
+--- components/viz/service/display_embedder/software_output_surface.h.orig	2021-03-12 23:57:23 UTC
 +++ components/viz/service/display_embedder/software_output_surface.h
-@@ -48,7 +48,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi
-       UpdateVSyncParametersCallback callback) override;
-   void SetDisplayTransformHint(gfx::OverlayTransform transform) override {}
+@@ -51,7 +51,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi
    gfx::OverlayTransform GetDisplayTransform() override;
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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)
    void SetNeedsSwapSizeNotifications(
        bool needs_swap_size_notifications) override;
  #endif
-@@ -68,7 +68,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi
-   std::queue<std::vector<ui::LatencyInfo>> stored_latency_info_;
-   ui::LatencyTracker latency_tracker_;
+@@ -73,7 +73,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi
  
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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)
    bool needs_swap_size_notifications_ = false;
  #endif
  
diff --git a/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc b/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc
index c7071d81..b3f09fd8 100644
--- a/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc
+++ b/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc
@@ -1,20 +1,20 @@
---- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig	2021-01-18 21:28:57 UTC
+--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig	2021-03-12 23:57:23 UTC
 +++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc
-@@ -56,7 +56,7 @@ RootCompositorFrameSinkImpl::Create(
-   output_surface->SetNeedsSwapSizeNotifications(
-       params->send_swap_size_notifications);
+@@ -59,7 +59,7 @@ RootCompositorFrameSinkImpl::Create(
  
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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)
    // For X11, we need notify client about swap completion after resizing, so the
    // client can use it for synchronize with X11 WM.
    output_surface->SetNeedsSwapSizeNotifications(true);
-@@ -464,7 +464,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw
- #if defined(OS_ANDROID)
-   if (display_client_)
+@@ -466,7 +466,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw
      display_client_->DidCompleteSwapWithSize(pixel_size);
--#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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)
    if (display_client_ && pixel_size != last_swap_pixel_size_) {
      last_swap_pixel_size_ = pixel_size;
      display_client_->DidCompleteSwapWithNewSize(last_swap_pixel_size_);
diff --git a/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h b/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h
index 1fe65c9b..b874528a 100644
--- a/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h
+++ b/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h
@@ -1,11 +1,11 @@
---- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig	2020-11-13 06:36:42 UTC
+--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig	2021-03-12 23:57:23 UTC
 +++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h
-@@ -163,7 +163,7 @@ class RootCompositorFrameSinkImpl : public mojom::Comp
-   base::TimeDelta preferred_frame_interval_ =
-       FrameRateDecider::UnspecifiedFrameInterval();
+@@ -165,7 +165,7 @@ class RootCompositorFrameSinkImpl : public mojom::Comp
  
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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)
    gfx::Size last_swap_pixel_size_;
  #endif
  
diff --git a/www/chromium/files/patch-components_viz_test_fake__output__surface.cc b/www/chromium/files/patch-components_viz_test_fake__output__surface.cc
index dd972aa5..49ccdd18 100644
--- a/www/chromium/files/patch-components_viz_test_fake__output__surface.cc
+++ b/www/chromium/files/patch-components_viz_test_fake__output__surface.cc
@@ -1,11 +1,11 @@
---- components/viz/test/fake_output_surface.cc.orig	2020-11-13 06:36:42 UTC
+--- components/viz/test/fake_output_surface.cc.orig	2021-03-12 23:57:23 UTC
 +++ components/viz/test/fake_output_surface.cc
-@@ -115,7 +115,7 @@ gfx::OverlayTransform FakeOutputSurface::GetDisplayTra
-                                          : gfx::OVERLAY_TRANSFORM_NONE;
- }
+@@ -118,7 +118,7 @@ gfx::OverlayTransform FakeOutputSurface::GetDisplayTra
  
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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)
  void FakeOutputSurface::SetNeedsSwapSizeNotifications(
      bool needs_swap_size_notifications) {}
  #endif
diff --git a/www/chromium/files/patch-components_viz_test_fake__output__surface.h b/www/chromium/files/patch-components_viz_test_fake__output__surface.h
index 680e71a7..d0507c6c 100644
--- a/www/chromium/files/patch-components_viz_test_fake__output__surface.h
+++ b/www/chromium/files/patch-components_viz_test_fake__output__surface.h
@@ -1,11 +1,11 @@
---- components/viz/test/fake_output_surface.h.orig	2020-11-13 06:36:42 UTC
+--- components/viz/test/fake_output_surface.h.orig	2021-03-12 23:57:23 UTC
 +++ components/viz/test/fake_output_surface.h
-@@ -86,7 +86,7 @@ class FakeOutputSurface : public OutputSurface {
-       UpdateVSyncParametersCallback callback) override;
-   void SetDisplayTransformHint(gfx::OverlayTransform transform) override;
+@@ -89,7 +89,7 @@ class FakeOutputSurface : public OutputSurface {
    gfx::OverlayTransform GetDisplayTransform() override;
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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)
    void SetNeedsSwapSizeNotifications(
        bool needs_swap_size_notifications) override;
  #endif
diff --git a/www/chromium/files/patch-components_viz_test_mock__display__client.h b/www/chromium/files/patch-components_viz_test_mock__display__client.h
index 8d46659c..c14469a6 100644
--- a/www/chromium/files/patch-components_viz_test_mock__display__client.h
+++ b/www/chromium/files/patch-components_viz_test_mock__display__client.h
@@ -1,11 +1,11 @@
---- components/viz/test/mock_display_client.h.orig	2020-11-13 06:36:42 UTC
+--- components/viz/test/mock_display_client.h.orig	2021-03-12 23:57:23 UTC
 +++ components/viz/test/mock_display_client.h
-@@ -36,7 +36,7 @@ class MockDisplayClient : public mojom::DisplayClient 
-   MOCK_METHOD1(SetWideColorEnabled, void(bool enabled));
-   MOCK_METHOD1(SetPreferredRefreshRate, void(float refresh_rate));
+@@ -39,7 +39,7 @@ class MockDisplayClient : public mojom::DisplayClient 
  #endif
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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)
    MOCK_METHOD1(DidCompleteSwapWithNewSize, void(const gfx::Size&));
  #endif
  
diff --git a/www/chromium/files/patch-components_webcrypto_algorithms_test__helpers.cc b/www/chromium/files/patch-components_webcrypto_algorithms_test__helpers.cc
index fe1b6dce..659440f0 100644
--- a/www/chromium/files/patch-components_webcrypto_algorithms_test__helpers.cc
+++ b/www/chromium/files/patch-components_webcrypto_algorithms_test__helpers.cc
@@ -1,4 +1,4 @@
---- components/webcrypto/algorithms/test_helpers.cc.orig	2020-11-13 06:36:42 UTC
+--- components/webcrypto/algorithms/test_helpers.cc.orig	2021-03-12 23:57:23 UTC
 +++ components/webcrypto/algorithms/test_helpers.cc
 @@ -25,7 +25,11 @@
  #include "components/webcrypto/status.h"
diff --git a/www/chromium/files/patch-content_app_content__main.cc b/www/chromium/files/patch-content_app_content__main.cc
index 89ed0abd..d7f455a2 100644
--- a/www/chromium/files/patch-content_app_content__main.cc
+++ b/www/chromium/files/patch-content_app_content__main.cc
@@ -1,4 +1,4 @@
---- content/app/content_main.cc.orig	2021-01-18 21:28:57 UTC
+--- content/app/content_main.cc.orig	2021-03-12 23:57:24 UTC
 +++ content/app/content_main.cc
 @@ -229,7 +229,7 @@ int RunContentProcess(const ContentMainParams& params,
  #endif
diff --git a/www/chromium/files/patch-content_app_content__main__runner__impl.cc b/www/chromium/files/patch-content_app_content__main__runner__impl.cc
index 651e503e..46f1c1ac 100644
--- a/www/chromium/files/patch-content_app_content__main__runner__impl.cc
+++ b/www/chromium/files/patch-content_app_content__main__runner__impl.cc
@@ -1,6 +1,6 @@
---- content/app/content_main_runner_impl.cc.orig	2021-01-18 21:28:57 UTC
+--- content/app/content_main_runner_impl.cc.orig	2021-03-12 23:57:24 UTC
 +++ content/app/content_main_runner_impl.cc
-@@ -134,7 +134,7 @@
+@@ -135,7 +135,7 @@
  
  #endif  // OS_POSIX || OS_FUCHSIA
  
@@ -9,7 +9,7 @@
  #include "base/native_library.h"
  #include "base/rand_util.h"
  #include "content/public/common/zygote/sandbox_support_linux.h"
-@@ -154,7 +154,7 @@
+@@ -155,7 +155,7 @@
  #include "content/public/common/content_client.h"
  #endif
  
@@ -18,7 +18,7 @@
  
  #if BUILDFLAG(USE_ZYGOTE_HANDLE)
  #include "content/browser/sandbox_host_linux.h"
-@@ -310,7 +310,7 @@ void InitializeZygoteSandboxForBrowserProcess(
+@@ -342,7 +342,7 @@ void InitializeZygoteSandboxForBrowserProcess(
  }
  #endif  // BUILDFLAG(USE_ZYGOTE_HANDLE)
  
@@ -27,7 +27,7 @@
  
  #if BUILDFLAG(ENABLE_PLUGINS)
  // Loads the (native) libraries but does not initialize them (i.e., does not
-@@ -401,7 +401,7 @@ void PreSandboxInit() {
+@@ -433,7 +433,7 @@ void PreSandboxInit() {
  }
  #endif  // BUILDFLAG(USE_ZYGOTE_HANDLE)
  
@@ -36,7 +36,7 @@
  
  }  // namespace
  
-@@ -464,7 +464,7 @@ int RunZygote(ContentMainDelegate* delegate) {
+@@ -496,7 +496,7 @@ int RunZygote(ContentMainDelegate* delegate) {
    delegate->ZygoteStarting(&zygote_fork_delegates);
    media::InitializeMediaLibrary();
  
@@ -45,7 +45,7 @@
    PreSandboxInit();
  #endif
  
-@@ -855,7 +855,7 @@ int ContentMainRunnerImpl::Run(bool start_service_mana
+@@ -900,7 +900,7 @@ int ContentMainRunnerImpl::Run(bool start_minimal_brow
        mojo::core::InitFeatures();
      }
  
@@ -54,7 +54,7 @@
      // If dynamic Mojo Core is being used, ensure that it's loaded very early in
      // the child/zygote process, before any sandbox is initialized. The library
      // is not fully initialized with IPC support until a ChildProcess is later
-@@ -865,7 +865,7 @@ int ContentMainRunnerImpl::Run(bool start_service_mana
+@@ -910,7 +910,7 @@ int ContentMainRunnerImpl::Run(bool start_minimal_brow
        CHECK_EQ(mojo::LoadCoreLibrary(GetMojoCoreSharedLibraryPath()),
                 MOJO_RESULT_OK);
      }
diff --git a/www/chromium/files/patch-content_browser_BUILD.gn b/www/chromium/files/patch-content_browser_BUILD.gn
index 40aab04f..2cc62712 100644
--- a/www/chromium/files/patch-content_browser_BUILD.gn
+++ b/www/chromium/files/patch-content_browser_BUILD.gn
@@ -1,6 +1,6 @@
---- content/browser/BUILD.gn.orig	2021-01-18 21:28:57 UTC
+--- content/browser/BUILD.gn.orig	2021-03-12 23:57:24 UTC
 +++ content/browser/BUILD.gn
-@@ -2132,6 +2132,15 @@ source_set("browser") {
+@@ -2153,6 +2153,15 @@ source_set("browser") {
      deps += [ "//third_party/speech-dispatcher" ]
    }
  
@@ -14,5 +14,5 @@
 +  }
 +
    # ChromeOS also defines linux but their memory-monitors conflict.
-   if (is_chromeos) {
+   if (is_chromeos_ash) {
      sources += [
diff --git a/www/chromium/files/patch-content_browser_browser__main__loop.cc b/www/chromium/files/patch-content_browser_browser__main__loop.cc
index 6efb4bb2..7df3fd47 100644
--- a/www/chromium/files/patch-content_browser_browser__main__loop.cc
+++ b/www/chromium/files/patch-content_browser_browser__main__loop.cc
@@ -1,15 +1,15 @@
---- content/browser/browser_main_loop.cc.orig	2021-01-18 21:28:57 UTC
+--- content/browser/browser_main_loop.cc.orig	2021-03-12 23:57:24 UTC
 +++ content/browser/browser_main_loop.cc
-@@ -366,7 +366,7 @@ std::unique_ptr<base::MemoryPressureMonitor> CreateMem
+@@ -368,7 +368,7 @@ std::unique_ptr<base::MemoryPressureMonitor> CreateMem
    if (chromeos::switches::MemoryPressureHandlingEnabled())
      monitor = std::make_unique<util::MultiSourceMemoryPressureMonitor>();
  #elif defined(OS_MAC) || defined(OS_WIN) || defined(OS_FUCHSIA) || \
--    (defined(OS_LINUX) && !defined(OS_CHROMEOS) && !BUILDFLAG(IS_CHROMECAST))
-+    (defined(OS_LINUX) && !defined(OS_CHROMEOS) && !BUILDFLAG(IS_CHROMECAST)) || defined(OS_BSD)
+-    ((defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) &&       \
++    defined(OS_BSD) || ((defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \
+      !BUILDFLAG(IS_CHROMECAST))
    monitor = std::make_unique<util::MultiSourceMemoryPressureMonitor>();
  #endif
-   // No memory monitor on other platforms...
-@@ -611,7 +611,7 @@ int BrowserMainLoop::EarlyInitialization() {
+@@ -566,7 +566,7 @@ int BrowserMainLoop::EarlyInitialization() {
  
    // Up the priority of the UI thread unless it was already high (since Mac
    // and recent versions of Android (O+) do this automatically).
@@ -18,7 +18,7 @@
    if (base::FeatureList::IsEnabled(
            features::kBrowserUseDisplayThreadPriority) &&
        base::PlatformThread::GetCurrentThreadPriority() <
-@@ -621,7 +621,7 @@ int BrowserMainLoop::EarlyInitialization() {
+@@ -576,7 +576,7 @@ int BrowserMainLoop::EarlyInitialization() {
    }
  #endif  // !defined(OS_MAC)
  
@@ -27,7 +27,7 @@
      defined(OS_ANDROID)
    // We use quite a few file descriptors for our IPC as well as disk the disk
    // cache,and the default limit on the Mac is low (256), so bump it up.
-@@ -631,7 +631,7 @@ int BrowserMainLoop::EarlyInitialization() {
+@@ -586,7 +586,7 @@ int BrowserMainLoop::EarlyInitialization() {
    // users can easily hit this limit with many open tabs. Bump up the limit to
    // an arbitrarily high number. See https://crbug.com/539567
    base::IncreaseFdLimitTo(8192);
diff --git a/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc b/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc
index b45e7a8c..7aa3655a 100644
--- a/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc
+++ b/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc
@@ -1,4 +1,4 @@
---- content/browser/child_process_launcher_helper_linux.cc.orig	2020-11-13 06:36:42 UTC
+--- content/browser/child_process_launcher_helper_linux.cc.orig	2021-03-12 23:57:24 UTC
 +++ content/browser/child_process_launcher_helper_linux.cc
 @@ -18,9 +18,12 @@
  #include "content/public/common/content_switches.h"
diff --git a/www/chromium/files/patch-content_browser_compositor_viz__process__transport__factory.cc b/www/chromium/files/patch-content_browser_compositor_viz__process__transport__factory.cc
index 005f4103..540c1641 100644
--- a/www/chromium/files/patch-content_browser_compositor_viz__process__transport__factory.cc
+++ b/www/chromium/files/patch-content_browser_compositor_viz__process__transport__factory.cc
@@ -1,11 +1,11 @@
---- content/browser/compositor/viz_process_transport_factory.cc.orig	2020-11-13 06:36:42 UTC
+--- content/browser/compositor/viz_process_transport_factory.cc.orig	2021-03-12 23:57:24 UTC
 +++ content/browser/compositor/viz_process_transport_factory.cc
-@@ -108,7 +108,7 @@ class HostDisplayClient : public viz::HostDisplayClien
-   HostDisplayClient& operator=(const HostDisplayClient&) = delete;
- 
+@@ -111,7 +111,7 @@ class HostDisplayClient : public viz::HostDisplayClien
    // viz::HostDisplayClient:
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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)
    void DidCompleteSwapWithNewSize(const gfx::Size& size) override {
      compositor_->OnCompleteSwapWithNewSize(size);
    }
diff --git a/www/chromium/files/patch-content_browser_devtools_protocol_system__info__handler.cc b/www/chromium/files/patch-content_browser_devtools_protocol_system__info__handler.cc
index f08535e7..27f06f39 100644
--- a/www/chromium/files/patch-content_browser_devtools_protocol_system__info__handler.cc
+++ b/www/chromium/files/patch-content_browser_devtools_protocol_system__info__handler.cc
@@ -1,11 +1,13 @@
---- content/browser/devtools/protocol/system_info_handler.cc.orig	2020-11-13 06:36:42 UTC
+--- content/browser/devtools/protocol/system_info_handler.cc.orig	2021-03-12 23:57:24 UTC
 +++ content/browser/devtools/protocol/system_info_handler.cc
-@@ -47,7 +47,7 @@ std::unique_ptr<SystemInfo::Size> GfxSizeToSystemInfoS
- // Give the GPU process a few seconds to provide GPU info.
- // Linux Debug builds need more time -- see Issue 796437 and 1046598.
+@@ -49,8 +49,8 @@ std::unique_ptr<SystemInfo::Size> GfxSizeToSystemInfoS
+ // Linux and Mac Debug builds need more time -- see Issue 796437, 1046598, and
+ // 1153667.
  // Windows builds need more time -- see Issue 873112 and 1004472.
--#if ((defined(OS_LINUX) || defined(OS_CHROMEOS)) && !defined(NDEBUG)) || \
-+#if ((defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && !defined(NDEBUG)) || \
+-#if ((defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC)) && \
+-     !defined(NDEBUG)) ||                                              \
++#if ((defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD)) && \
++     !defined(NDEBUG)) ||                                                                 \
      defined(OS_WIN)
  const int kGPUInfoWatchdogTimeoutMs = 30000;
  #else
diff --git a/www/chromium/files/patch-content_browser_download_download__manager__impl.cc b/www/chromium/files/patch-content_browser_download_download__manager__impl.cc
index 77358e43..c53048d6 100644
--- a/www/chromium/files/patch-content_browser_download_download__manager__impl.cc
+++ b/www/chromium/files/patch-content_browser_download_download__manager__impl.cc
@@ -1,6 +1,6 @@
---- content/browser/download/download_manager_impl.cc.orig	2021-01-19 11:34:47 UTC
+--- content/browser/download/download_manager_impl.cc.orig	2021-03-12 23:57:24 UTC
 +++ content/browser/download/download_manager_impl.cc
-@@ -82,7 +82,7 @@
+@@ -83,7 +83,7 @@
  #include "third_party/blink/public/common/loader/referrer_utils.h"
  #include "third_party/blink/public/common/loader/throttling_url_loader.h"
  
@@ -9,7 +9,7 @@
  #include "base/nix/xdg_util.h"
  #endif
  
-@@ -218,7 +218,7 @@ class DownloadItemFactoryImpl : public download::Downl
+@@ -219,7 +219,7 @@ class DownloadItemFactoryImpl : public download::Downl
    }
  };
  
@@ -18,7 +18,7 @@
  base::FilePath GetTemporaryDownloadDirectory() {
    std::unique_ptr<base::Environment> env(base::Environment::Create());
    return base::nix::GetXDGDirectory(env.get(), "XDG_DATA_HOME", ".local/share");
-@@ -559,7 +559,7 @@ bool DownloadManagerImpl::InterceptDownload(
+@@ -560,7 +560,7 @@ bool DownloadManagerImpl::InterceptDownload(
  
  base::FilePath DownloadManagerImpl::GetDefaultDownloadDirectory() {
    base::FilePath default_download_directory;
diff --git a/www/chromium/files/patch-content_browser_font__access_font__enumeration__cache.h b/www/chromium/files/patch-content_browser_font__access_font__enumeration__cache.h
index 8a5d2c7e..4fd64dcc 100644
--- a/www/chromium/files/patch-content_browser_font__access_font__enumeration__cache.h
+++ b/www/chromium/files/patch-content_browser_font__access_font__enumeration__cache.h
@@ -1,4 +1,4 @@
---- content/browser/font_access/font_enumeration_cache.h.orig	2021-01-18 21:28:57 UTC
+--- content/browser/font_access/font_enumeration_cache.h.orig	2021-03-12 23:57:24 UTC
 +++ content/browser/font_access/font_enumeration_cache.h
 @@ -16,7 +16,7 @@
  #include "third_party/blink/public/common/font_access/font_enumeration_table.pb.h"
diff --git a/www/chromium/files/patch-content_browser_gpu_compositor__util.cc b/www/chromium/files/patch-content_browser_gpu_compositor__util.cc
index e4d3a0c1..ce79007d 100644
--- a/www/chromium/files/patch-content_browser_gpu_compositor__util.cc
+++ b/www/chromium/files/patch-content_browser_gpu_compositor__util.cc
@@ -1,16 +1,16 @@
---- content/browser/gpu/compositor_util.cc.orig	2020-11-16 14:31:58 UTC
+--- content/browser/gpu/compositor_util.cc.orig	2021-03-12 23:57:24 UTC
 +++ content/browser/gpu/compositor_util.cc
-@@ -131,11 +131,11 @@ const GpuFeatureData GetGpuFeatureData(
+@@ -127,11 +127,11 @@ const GpuFeatureData GetGpuFeatureData(
      {"video_decode",
       SafeGetFeatureStatus(gpu_feature_info,
                            gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE),
--#if defined(OS_LINUX) && !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_ANDROID) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
-      !command_line.HasSwitch(switches::kEnableAcceleratedVideoDecode),
+-#if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && !defined(OS_ANDROID)
++#if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) && !defined(OS_ANDROID)
+      !base::FeatureList::IsEnabled(media::kVaapiVideoDecodeLinux),
  #else
       command_line.HasSwitch(switches::kDisableAcceleratedVideoDecode),
--#endif  // defined(OS_LINUX) && !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
-+#endif  // (defined(OS_LINUX) && !defined(OS_ANDROID) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+-#endif  // ((defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) &&
++#endif  // ((defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) &&
+         // !defined(OS_ANDROID)
       DisableInfo::Problem(
           "Accelerated video decode has been disabled, either via blocklist, "
-          "about:flags or the command line."),
diff --git a/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc b/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc
index 8975da33..6d0a7b87 100644
--- a/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc
+++ b/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc
@@ -1,15 +1,17 @@
---- content/browser/gpu/gpu_process_host.cc.orig	2021-01-18 21:28:57 UTC
+--- content/browser/gpu/gpu_process_host.cc.orig	2021-03-12 23:57:24 UTC
 +++ content/browser/gpu/gpu_process_host.cc
-@@ -228,7 +228,7 @@ static const char* const kSwitchNames[] = {
-     sandbox::policy::switches::kGpuSandboxFailuresFatal,
-     sandbox::policy::switches::kDisableGpuSandbox,
+@@ -230,8 +230,8 @@ static const char* const kSwitchNames[] = {
      sandbox::policy::switches::kNoSandbox,
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !BUILDFLAG(IS_LACROS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS) && !BUILDFLAG(IS_LACROS)) || defined(OS_BSD)
+ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // of lacros-chrome is complete.
+-#if defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_ASH) && \
+-    !BUILDFLAG(IS_CHROMEOS_LACROS)
++#if defined(OS_BSD) || (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_ASH) && \
++    !BUILDFLAG(IS_CHROMEOS_LACROS))
      switches::kDisableDevShmUsage,
  #endif
  #if defined(OS_WIN)
-@@ -1135,7 +1135,7 @@ bool GpuProcessHost::LaunchGpuProcess() {
+@@ -1143,7 +1143,7 @@ bool GpuProcessHost::LaunchGpuProcess() {
    std::unique_ptr<base::CommandLine> cmd_line =
        std::make_unique<base::CommandLine>(base::CommandLine::NO_PROGRAM);
  #else
diff --git a/www/chromium/files/patch-content_browser_memory_swap__metrics__driver__impl__linux.cc b/www/chromium/files/patch-content_browser_memory_swap__metrics__driver__impl__linux.cc
index e6ed81eb..9f452c89 100644
--- a/www/chromium/files/patch-content_browser_memory_swap__metrics__driver__impl__linux.cc
+++ b/www/chromium/files/patch-content_browser_memory_swap__metrics__driver__impl__linux.cc
@@ -1,4 +1,4 @@
---- content/browser/memory/swap_metrics_driver_impl_linux.cc.orig	2020-11-13 06:36:42 UTC
+--- content/browser/memory/swap_metrics_driver_impl_linux.cc.orig	2021-03-12 23:57:24 UTC
 +++ content/browser/memory/swap_metrics_driver_impl_linux.cc
 @@ -43,6 +43,7 @@ SwapMetricsDriverImplLinux::~SwapMetricsDriverImplLinu
  
diff --git a/www/chromium/files/patch-content_browser_ppapi__plugin__process__host.cc b/www/chromium/files/patch-content_browser_ppapi__plugin__process__host.cc
index 0d82cce8..38ce5579 100644
--- a/www/chromium/files/patch-content_browser_ppapi__plugin__process__host.cc
+++ b/www/chromium/files/patch-content_browser_ppapi__plugin__process__host.cc
@@ -1,6 +1,6 @@
---- content/browser/ppapi_plugin_process_host.cc.orig	2021-01-18 21:28:57 UTC
+--- content/browser/ppapi_plugin_process_host.cc.orig	2021-03-12 23:57:24 UTC
 +++ content/browser/ppapi_plugin_process_host.cc
-@@ -304,7 +304,7 @@ bool PpapiPluginProcessHost::Init(const PepperPluginIn
+@@ -303,7 +303,7 @@ bool PpapiPluginProcessHost::Init(const PepperPluginIn
    base::CommandLine::StringType plugin_launcher =
        browser_command_line.GetSwitchValueNative(switches::kPpapiPluginLauncher);
  
diff --git a/www/chromium/files/patch-content_browser_ppapi__plugin__process__host__receiver__bindings.cc b/www/chromium/files/patch-content_browser_ppapi__plugin__process__host__receiver__bindings.cc
index a874131a..9a10a98d 100644
--- a/www/chromium/files/patch-content_browser_ppapi__plugin__process__host__receiver__bindings.cc
+++ b/www/chromium/files/patch-content_browser_ppapi__plugin__process__host__receiver__bindings.cc
@@ -1,4 +1,4 @@
---- content/browser/ppapi_plugin_process_host_receiver_bindings.cc.orig	2020-11-13 06:36:42 UTC
+--- content/browser/ppapi_plugin_process_host_receiver_bindings.cc.orig	2021-03-12 23:57:24 UTC
 +++ content/browser/ppapi_plugin_process_host_receiver_bindings.cc
 @@ -8,7 +8,7 @@
  
diff --git a/www/chromium/files/patch-content_browser_renderer__host_delegated__frame__host.cc b/www/chromium/files/patch-content_browser_renderer__host_delegated__frame__host.cc
index 262461b6..d8bb31d9 100644
--- a/www/chromium/files/patch-content_browser_renderer__host_delegated__frame__host.cc
+++ b/www/chromium/files/patch-content_browser_renderer__host_delegated__frame__host.cc
@@ -1,6 +1,6 @@
---- content/browser/renderer_host/delegated_frame_host.cc.orig	2021-01-18 21:28:57 UTC
+--- content/browser/renderer_host/delegated_frame_host.cc.orig	2021-03-12 23:57:24 UTC
 +++ content/browser/renderer_host/delegated_frame_host.cc
-@@ -244,7 +244,7 @@ void DelegatedFrameHost::EmbedSurface(
+@@ -258,7 +258,7 @@ void DelegatedFrameHost::EmbedSurface(
  
    if (!primary_surface_id ||
        primary_surface_id->local_surface_id() != local_surface_id_) {
diff --git a/www/chromium/files/patch-content_browser_renderer__host_input_input__device__change__observer.cc b/www/chromium/files/patch-content_browser_renderer__host_input_input__device__change__observer.cc
index abca0094..efcbbeb0 100644
--- a/www/chromium/files/patch-content_browser_renderer__host_input_input__device__change__observer.cc
+++ b/www/chromium/files/patch-content_browser_renderer__host_input_input__device__change__observer.cc
@@ -1,4 +1,4 @@
---- content/browser/renderer_host/input/input_device_change_observer.cc.orig	2020-11-13 06:36:42 UTC
+--- content/browser/renderer_host/input/input_device_change_observer.cc.orig	2021-03-12 23:57:24 UTC
 +++ content/browser/renderer_host/input/input_device_change_observer.cc
 @@ -9,7 +9,7 @@
  
diff --git a/www/chromium/files/patch-content_browser_renderer__host_pepper_pepper__file__io__host.cc b/www/chromium/files/patch-content_browser_renderer__host_pepper_pepper__file__io__host.cc
index 52f44c3f..3d0aa820 100644
--- a/www/chromium/files/patch-content_browser_renderer__host_pepper_pepper__file__io__host.cc
+++ b/www/chromium/files/patch-content_browser_renderer__host_pepper_pepper__file__io__host.cc
@@ -1,4 +1,4 @@
---- content/browser/renderer_host/pepper/pepper_file_io_host.cc.orig	2021-01-18 21:28:57 UTC
+--- content/browser/renderer_host/pepper/pepper_file_io_host.cc.orig	2021-03-12 23:57:24 UTC
 +++ content/browser/renderer_host/pepper/pepper_file_io_host.cc
 @@ -437,7 +437,7 @@ void PepperFileIOHost::OnLocalFileOpened(
      ppapi::host::ReplyMessageContext reply_context,
diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.cc b/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.cc
index 94ee3379..b4af6ea3 100644
--- a/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.cc
+++ b/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.cc
@@ -1,4 +1,4 @@
---- content/browser/renderer_host/render_message_filter.cc.orig	2021-01-18 21:28:57 UTC
+--- content/browser/renderer_host/render_message_filter.cc.orig	2021-03-12 23:57:24 UTC
 +++ content/browser/renderer_host/render_message_filter.cc
 @@ -69,7 +69,7 @@
  #if defined(OS_MAC)
diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.h b/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.h
index 2d6a9757..4b40280f 100644
--- a/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.h
+++ b/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.h
@@ -1,4 +1,4 @@
---- content/browser/renderer_host/render_message_filter.h.orig	2021-01-18 21:28:57 UTC
+--- content/browser/renderer_host/render_message_filter.h.orig	2021-03-12 23:57:24 UTC
 +++ content/browser/renderer_host/render_message_filter.h
 @@ -80,14 +80,14 @@ class CONTENT_EXPORT RenderMessageFilter
    void GenerateRoutingID(GenerateRoutingIDCallback routing_id) override;
diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc
index 630bf525..f580c67e 100644
--- a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc
+++ b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc
@@ -1,6 +1,6 @@
---- content/browser/renderer_host/render_process_host_impl.cc.orig	2021-01-18 21:28:57 UTC
+--- content/browser/renderer_host/render_process_host_impl.cc.orig	2021-03-12 23:57:24 UTC
 +++ content/browser/renderer_host/render_process_host_impl.cc
-@@ -235,7 +235,7 @@
+@@ -229,7 +229,7 @@
  #include "third_party/blink/public/mojom/android_font_lookup/android_font_lookup.mojom.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include <sys/resource.h>
  #include <sys/time.h>
  
-@@ -1219,7 +1219,7 @@ static constexpr size_t kUnknownPlatformProcessLimit =
+@@ -1205,7 +1205,7 @@ static constexpr size_t kUnknownPlatformProcessLimit =
  // to indicate failure and std::numeric_limits<size_t>::max() to indicate
  // unlimited.
  size_t GetPlatformProcessLimit() {
@@ -18,7 +18,7 @@
    struct rlimit limit;
    if (getrlimit(RLIMIT_NPROC, &limit) != 0)
      return kUnknownPlatformProcessLimit;
-@@ -1230,7 +1230,7 @@ size_t GetPlatformProcessLimit() {
+@@ -1216,7 +1216,7 @@ size_t GetPlatformProcessLimit() {
  #else
    // TODO(https://crbug.com/104689): Implement on other platforms.
    return kUnknownPlatformProcessLimit;
@@ -27,7 +27,7 @@
  }
  #endif  // !defined(OS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH)
  
-@@ -1315,7 +1315,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public
+@@ -1290,7 +1290,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public
          return;
      }
  
@@ -36,7 +36,7 @@
      if (auto font_receiver = receiver.As<font_service::mojom::FontService>()) {
        ConnectToFontService(std::move(font_receiver));
        return;
-@@ -1747,7 +1747,7 @@ bool RenderProcessHostImpl::Init() {
+@@ -1720,7 +1720,7 @@ bool RenderProcessHostImpl::Init() {
    renderer_prefix =
        browser_command_line.GetSwitchValueNative(switches::kRendererCmdPrefix);
  
@@ -45,7 +45,7 @@
    int flags = renderer_prefix.empty() ? ChildProcessHost::CHILD_ALLOW_SELF
                                        : ChildProcessHost::CHILD_NORMAL;
  #elif defined(OS_MAC)
-@@ -3254,11 +3254,11 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin
+@@ -3161,8 +3161,8 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin
      switches::kDisableInProcessStackTraces,
      sandbox::policy::switches::kDisableSeccompFilterSandbox,
      sandbox::policy::switches::kNoSandbox,
@@ -55,8 +55,4 @@
 +    !BUILDFLAG(IS_CHROMEOS_LACROS))
      switches::kDisableDevShmUsage,
  #endif
--#if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && !defined(OS_ANDROID)
-+#if ((defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && !defined(OS_ANDROID)) || defined(OS_BSD)
-     switches::kEnableAcceleratedVideoDecode,
- #endif
  #if defined(OS_MAC)
diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc b/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc
index fdc28c4b..c923bbca 100644
--- a/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc
+++ b/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc
@@ -1,6 +1,6 @@
---- content/browser/renderer_host/render_view_host_impl.cc.orig	2021-01-18 21:28:57 UTC
+--- content/browser/renderer_host/render_view_host_impl.cc.orig	2021-03-12 23:57:24 UTC
 +++ content/browser/renderer_host/render_view_host_impl.cc
-@@ -261,7 +261,7 @@ void RenderViewHostImpl::GetPlatformSpecificPrefs(
+@@ -258,7 +258,7 @@ void RenderViewHostImpl::GetPlatformSpecificPrefs(
        display::win::ScreenWin::GetSystemMetricsInDIP(SM_CYVSCROLL);
    prefs->arrow_bitmap_width_horizontal_scroll_bar_in_dips =
        display::win::ScreenWin::GetSystemMetricsInDIP(SM_CXHSCROLL);
diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc
index 477fedd5..c32d9bbd 100644
--- a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc
+++ b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc
@@ -1,4 +1,4 @@
---- content/browser/renderer_host/render_widget_host_view_aura.cc.orig	2021-01-18 21:28:57 UTC
+--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig	2021-03-12 23:57:24 UTC
 +++ content/browser/renderer_host/render_widget_host_view_aura.cc
 @@ -111,7 +111,7 @@
  #include "ui/gfx/gdi_util.h"
@@ -9,7 +9,7 @@
  #include "content/browser/accessibility/browser_accessibility_auralinux.h"
  #include "ui/base/ime/linux/text_edit_command_auralinux.h"
  #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h"
-@@ -492,7 +492,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge
+@@ -474,7 +474,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge
    if (manager)
      return ToBrowserAccessibilityWin(manager->GetRoot())->GetCOM();
  
@@ -18,7 +18,7 @@
    BrowserAccessibilityManager* manager =
        host()->GetOrCreateRootBrowserAccessibilityManager();
    if (manager && manager->GetRoot())
-@@ -2234,7 +2234,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() {
+@@ -2188,7 +2188,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() {
  }
  
  bool RenderWidgetHostViewAura::NeedsMouseCapture() {
@@ -27,7 +27,7 @@
    return NeedsInputGrab();
  #else
    return false;
-@@ -2398,7 +2398,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit
+@@ -2354,7 +2354,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit
    if (!target_host)
      return;
  
diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc
index 080b2c52..022717cb 100644
--- a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc
+++ b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc
@@ -1,6 +1,6 @@
---- content/browser/renderer_host/render_widget_host_view_event_handler.cc.orig	2020-11-13 06:36:42 UTC
+--- content/browser/renderer_host/render_widget_host_view_event_handler.cc.orig	2021-03-12 23:57:24 UTC
 +++ content/browser/renderer_host/render_widget_host_view_event_handler.cc
-@@ -716,7 +716,7 @@ bool RenderWidgetHostViewEventHandler::CanRendererHand
+@@ -700,7 +700,7 @@ bool RenderWidgetHostViewEventHandler::CanRendererHand
    if (event->type() == ui::ET_MOUSE_EXITED) {
      if (mouse_locked || selection_popup)
        return false;
diff --git a/www/chromium/files/patch-content_browser_scheduler_responsiveness_jank__monitor__impl.cc b/www/chromium/files/patch-content_browser_scheduler_responsiveness_jank__monitor__impl.cc
index 02a17be9..6fef54fc 100644
--- a/www/chromium/files/patch-content_browser_scheduler_responsiveness_jank__monitor__impl.cc
+++ b/www/chromium/files/patch-content_browser_scheduler_responsiveness_jank__monitor__impl.cc
@@ -1,11 +1,11 @@
---- content/browser/scheduler/responsiveness/jank_monitor_impl.cc.orig	2020-11-16 14:34:07 UTC
+--- content/browser/scheduler/responsiveness/jank_monitor_impl.cc.orig	2021-03-12 23:57:24 UTC
 +++ content/browser/scheduler/responsiveness/jank_monitor_impl.cc
-@@ -332,7 +332,7 @@ void JankMonitorImpl::ThreadExecutionState::DidRunTask
+@@ -333,7 +333,7 @@ void JankMonitorImpl::ThreadExecutionState::DidRunTask
      // in context menus, among others). Simply ignore the mismatches for now.
      // See https://crbug.com/929813 for the details of why the mismatch
      // happens.
--#if !defined(OS_CHROMEOS) && defined(OS_LINUX) && defined(USE_OZONE)
-+#if !defined(OS_CHROMEOS) && (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_OZONE)
+-#if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && defined(USE_OZONE)
++#if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) && defined(USE_OZONE)
      task_execution_metadata_.clear();
  #endif
      return;
diff --git a/www/chromium/files/patch-content_browser_scheduler_responsiveness_native__event__observer.cc b/www/chromium/files/patch-content_browser_scheduler_responsiveness_native__event__observer.cc
index c36d7ff3..b7d473ff 100644
--- a/www/chromium/files/patch-content_browser_scheduler_responsiveness_native__event__observer.cc
+++ b/www/chromium/files/patch-content_browser_scheduler_responsiveness_native__event__observer.cc
@@ -1,4 +1,4 @@
---- content/browser/scheduler/responsiveness/native_event_observer.cc.orig	2020-11-13 06:36:42 UTC
+--- content/browser/scheduler/responsiveness/native_event_observer.cc.orig	2021-03-12 23:57:24 UTC
 +++ content/browser/scheduler/responsiveness/native_event_observer.cc
 @@ -15,7 +15,7 @@
  
diff --git a/www/chromium/files/patch-content_browser_scheduler_responsiveness_native__event__observer.h b/www/chromium/files/patch-content_browser_scheduler_responsiveness_native__event__observer.h
index d0149b73..5b7fce43 100644
--- a/www/chromium/files/patch-content_browser_scheduler_responsiveness_native__event__observer.h
+++ b/www/chromium/files/patch-content_browser_scheduler_responsiveness_native__event__observer.h
@@ -1,4 +1,4 @@
---- content/browser/scheduler/responsiveness/native_event_observer.h.orig	2020-11-13 06:36:42 UTC
+--- content/browser/scheduler/responsiveness/native_event_observer.h.orig	2021-03-12 23:57:24 UTC
 +++ content/browser/scheduler/responsiveness/native_event_observer.h
 @@ -14,7 +14,7 @@
  #include "content/public/browser/native_event_processor_observer_mac.h"
diff --git a/www/chromium/files/patch-content_browser_utility__process__host.cc b/www/chromium/files/patch-content_browser_utility__process__host.cc
index b584df93..8bc1c8a1 100644
--- a/www/chromium/files/patch-content_browser_utility__process__host.cc
+++ b/www/chromium/files/patch-content_browser_utility__process__host.cc
@@ -1,4 +1,4 @@
---- content/browser/utility_process_host.cc.orig	2020-11-13 06:36:42 UTC
+--- content/browser/utility_process_host.cc.orig	2021-03-12 23:57:24 UTC
 +++ content/browser/utility_process_host.cc
 @@ -58,7 +58,7 @@ UtilityProcessHost::UtilityProcessHost()
  
@@ -9,3 +9,14 @@
        child_flags_(ChildProcessHost::CHILD_ALLOW_SELF),
  #else
        child_flags_(ChildProcessHost::CHILD_NORMAL),
+@@ -227,8 +227,8 @@ bool UtilityProcessHost::StartProcess() {
+       sandbox::policy::switches::kNoSandbox,
+ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // of lacros-chrome is complete.
+-#if defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_ASH) && \
+-    !BUILDFLAG(IS_CHROMEOS_LACROS)
++#if defined(OS_BSD) || (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_ASH) && \
++    !BUILDFLAG(IS_CHROMEOS_LACROS))
+       switches::kDisableDevShmUsage,
+ #endif
+ #if defined(OS_MAC)
diff --git a/www/chromium/files/patch-content_browser_utility__process__host__receiver__bindings.cc b/www/chromium/files/patch-content_browser_utility__process__host__receiver__bindings.cc
index 53239a70..8d272bdf 100644
--- a/www/chromium/files/patch-content_browser_utility__process__host__receiver__bindings.cc
+++ b/www/chromium/files/patch-content_browser_utility__process__host__receiver__bindings.cc
@@ -1,4 +1,4 @@
---- content/browser/utility_process_host_receiver_bindings.cc.orig	2020-11-13 06:36:42 UTC
+--- content/browser/utility_process_host_receiver_bindings.cc.orig	2021-03-12 23:57:24 UTC
 +++ content/browser/utility_process_host_receiver_bindings.cc
 @@ -10,7 +10,7 @@
  #include "content/public/browser/content_browser_client.h"
diff --git a/www/chromium/files/patch-content_browser_v8__snapshot__files.cc b/www/chromium/files/patch-content_browser_v8__snapshot__files.cc
index ed0f0135..659f1b98 100644
--- a/www/chromium/files/patch-content_browser_v8__snapshot__files.cc
+++ b/www/chromium/files/patch-content_browser_v8__snapshot__files.cc
@@ -1,4 +1,4 @@
---- content/browser/v8_snapshot_files.cc.orig	2020-11-13 06:36:42 UTC
+--- content/browser/v8_snapshot_files.cc.orig	2021-03-12 23:57:24 UTC
 +++ content/browser/v8_snapshot_files.cc
 @@ -10,7 +10,7 @@
  namespace content {
diff --git a/www/chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc b/www/chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc
index abebef80..b7d8d384 100644
--- a/www/chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc
+++ b/www/chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc
@@ -1,6 +1,24 @@
---- content/browser/web_contents/web_contents_view_aura.cc.orig	2021-01-18 21:28:57 UTC
+--- content/browser/web_contents/web_contents_view_aura.cc.orig	2021-03-12 23:57:24 UTC
 +++ content/browser/web_contents/web_contents_view_aura.cc
-@@ -1198,7 +1198,7 @@ void WebContentsViewAura::OnMouseEvent(ui::MouseEvent*
+@@ -157,7 +157,7 @@ class WebDragSourceAura : public NotificationObserver 
+   DISALLOW_COPY_AND_ASSIGN(WebDragSourceAura);
+ };
+ 
+-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN)
++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_BSD)
+ // Fill out the OSExchangeData with a file contents, synthesizing a name if
+ // necessary.
+ void PrepareDragForFileContents(const DropData& drop_data,
+@@ -243,7 +243,7 @@ void PrepareDragData(const DropData& drop_data,
+   if (!drop_data.download_metadata.empty())
+     PrepareDragForDownload(drop_data, provider, web_contents);
+ #endif
+-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN)
++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_BSD)
+   // We set the file contents before the URL because the URL also sets file
+   // contents (to a .URL shortcut).  We want to prefer file content data over
+   // a shortcut so we add it first.
+@@ -1213,7 +1213,7 @@ void WebContentsViewAura::OnMouseEvent(ui::MouseEvent*
      // Linux window managers like to handle raise-on-click themselves.  If we
      // raise-on-click manually, this may override user settings that prevent
      // focus-stealing.
diff --git a/www/chromium/files/patch-content_browser_webui_web__ui__main__frame__observer.cc b/www/chromium/files/patch-content_browser_webui_web__ui__main__frame__observer.cc
deleted file mode 100644
index fdda6429..00000000
--- a/www/chromium/files/patch-content_browser_webui_web__ui__main__frame__observer.cc
+++ /dev/null
@@ -1,28 +0,0 @@
---- content/browser/webui/web_ui_main_frame_observer.cc.orig	2021-01-18 21:28:57 UTC
-+++ content/browser/webui/web_ui_main_frame_observer.cc
-@@ -10,7 +10,7 @@
- #include "content/browser/webui/web_ui_impl.h"
- #include "content/public/browser/navigation_handle.h"
- 
--#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
- #include "base/callback_helpers.h"
- #include "base/feature_list.h"
- #include "base/logging.h"
-@@ -41,7 +41,7 @@ void WebUIMainFrameObserver::DidFinishNavigation(
-   web_ui_->DisallowJavascriptOnAllHandlers();
- }
- 
--#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
- void WebUIMainFrameObserver::OnDidAddMessageToConsole(
-     RenderFrameHost* source_frame,
-     blink::mojom::ConsoleMessageLevel log_level,
-@@ -101,6 +101,6 @@ void WebUIMainFrameObserver::OnDidAddMessageToConsole(
-   processor->SendErrorReport(std::move(report), base::DoNothing(),
-                              web_contents()->GetBrowserContext());
- }
--#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
- 
- }  // namespace content
diff --git a/www/chromium/files/patch-content_browser_webui_web__ui__main__frame__observer.h b/www/chromium/files/patch-content_browser_webui_web__ui__main__frame__observer.h
deleted file mode 100644
index ede64936..00000000
--- a/www/chromium/files/patch-content_browser_webui_web__ui__main__frame__observer.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- content/browser/webui/web_ui_main_frame_observer.h.orig	2021-01-19 11:37:39 UTC
-+++ content/browser/webui/web_ui_main_frame_observer.h
-@@ -40,7 +40,7 @@ class CONTENT_EXPORT WebUIMainFrameObserver : public W
- 
- // TODO(crbug.com/1129544) This is currently disabled due to Windows DLL
- // thunking issues. Fix & re-enable.
--#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
-   // On official Google builds, capture and report JavaScript error messages on
-   // WebUI surfaces back to Google. This allows us to fix JavaScript errors and
-   // exceptions.
-@@ -49,7 +49,7 @@ class CONTENT_EXPORT WebUIMainFrameObserver : public W
-                                 const base::string16& message,
-                                 int32_t line_no,
-                                 const base::string16& source_id) override;
--#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
- 
-  private:
-   WebUIImpl* web_ui_;
diff --git a/www/chromium/files/patch-content_browser_zygote__host_zygote__host__impl__linux.cc b/www/chromium/files/patch-content_browser_zygote__host_zygote__host__impl__linux.cc
index bc6602d9..d3750d5e 100644
--- a/www/chromium/files/patch-content_browser_zygote__host_zygote__host__impl__linux.cc
+++ b/www/chromium/files/patch-content_browser_zygote__host_zygote__host__impl__linux.cc
@@ -1,4 +1,4 @@
---- content/browser/zygote_host/zygote_host_impl_linux.cc.orig	2020-11-18 15:42:24 UTC
+--- content/browser/zygote_host/zygote_host_impl_linux.cc.orig	2021-03-12 23:57:24 UTC
 +++ content/browser/zygote_host/zygote_host_impl_linux.cc
 @@ -73,6 +73,7 @@ ZygoteHostImpl* ZygoteHostImpl::GetInstance() {
  }
diff --git a/www/chromium/files/patch-content_browser_zygote__host_zygote__host__impl__linux.h b/www/chromium/files/patch-content_browser_zygote__host_zygote__host__impl__linux.h
index a848b32d..e8811b9d 100644
--- a/www/chromium/files/patch-content_browser_zygote__host_zygote__host__impl__linux.h
+++ b/www/chromium/files/patch-content_browser_zygote__host_zygote__host__impl__linux.h
@@ -1,4 +1,4 @@
---- content/browser/zygote_host/zygote_host_impl_linux.h.orig	2020-11-13 06:36:42 UTC
+--- content/browser/zygote_host/zygote_host_impl_linux.h.orig	2021-03-12 23:57:24 UTC
 +++ content/browser/zygote_host/zygote_host_impl_linux.h
 @@ -42,8 +42,10 @@ class CONTENT_EXPORT ZygoteHostImpl : public ZygoteHos
                       base::ScopedFD* control_fd,
diff --git a/www/chromium/files/patch-content_child_child__process.cc b/www/chromium/files/patch-content_child_child__process.cc
index 988c9236..87930c1c 100644
--- a/www/chromium/files/patch-content_child_child__process.cc
+++ b/www/chromium/files/patch-content_child_child__process.cc
@@ -1,4 +1,4 @@
---- content/child/child_process.cc.orig	2021-01-18 21:28:57 UTC
+--- content/child/child_process.cc.orig	2021-03-12 23:57:24 UTC
 +++ content/child/child_process.cc
 @@ -52,7 +52,7 @@ ChildProcess::ChildProcess(base::ThreadPriority io_thr
    DCHECK(!g_lazy_child_process_tls.Pointer()->Get());
diff --git a/www/chromium/files/patch-content_common_BUILD.gn b/www/chromium/files/patch-content_common_BUILD.gn
index c8133965..e8c88a21 100644
--- a/www/chromium/files/patch-content_common_BUILD.gn
+++ b/www/chromium/files/patch-content_common_BUILD.gn
@@ -1,6 +1,6 @@
---- content/common/BUILD.gn.orig	2021-01-18 21:28:57 UTC
+--- content/common/BUILD.gn.orig	2021-03-12 23:57:24 UTC
 +++ content/common/BUILD.gn
-@@ -341,7 +341,7 @@ source_set("common") {
+@@ -340,7 +340,7 @@ source_set("common") {
      sources -= [ "cursors/webcursor_aura.cc" ]
    }
  
@@ -9,7 +9,7 @@
      sources += [
        "common_sandbox_support_linux.cc",
        "sandbox_init_linux.cc",
-@@ -357,6 +357,15 @@ source_set("common") {
+@@ -356,6 +356,15 @@ source_set("common") {
      ]
    }
  
@@ -25,7 +25,7 @@
    if (use_zygote_handle) {
      sources += [
        "zygote/zygote_handle_impl_linux.h",
-@@ -410,7 +419,7 @@ source_set("common") {
+@@ -409,7 +418,7 @@ source_set("common") {
    }
  }
  
diff --git a/www/chromium/files/patch-content_common_common__sandbox__support__linux.cc b/www/chromium/files/patch-content_common_common__sandbox__support__linux.cc
index 512ca6a3..de9d1636 100644
--- a/www/chromium/files/patch-content_common_common__sandbox__support__linux.cc
+++ b/www/chromium/files/patch-content_common_common__sandbox__support__linux.cc
@@ -1,4 +1,4 @@
---- content/common/common_sandbox_support_linux.cc.orig	2020-11-13 06:36:42 UTC
+--- content/common/common_sandbox_support_linux.cc.orig	2021-03-12 23:57:24 UTC
 +++ content/common/common_sandbox_support_linux.cc
 @@ -5,6 +5,7 @@
  #include "content/public/common/common_sandbox_support_linux.h"
diff --git a/www/chromium/files/patch-content_common_mojo__core__library__support.cc b/www/chromium/files/patch-content_common_mojo__core__library__support.cc
index abdbd42a..4e27fee3 100644
--- a/www/chromium/files/patch-content_common_mojo__core__library__support.cc
+++ b/www/chromium/files/patch-content_common_mojo__core__library__support.cc
@@ -1,4 +1,4 @@
---- content/common/mojo_core_library_support.cc.orig	2020-11-16 14:35:51 UTC
+--- content/common/mojo_core_library_support.cc.orig	2021-03-12 23:57:24 UTC
 +++ content/common/mojo_core_library_support.cc
 @@ -15,7 +15,7 @@ bool IsMojoCoreSharedLibraryEnabled() {
  }
diff --git a/www/chromium/files/patch-content_common_user__agent.cc b/www/chromium/files/patch-content_common_user__agent.cc
index fb2fb867..377c3c01 100644
--- a/www/chromium/files/patch-content_common_user__agent.cc
+++ b/www/chromium/files/patch-content_common_user__agent.cc
@@ -1,4 +1,4 @@
---- content/common/user_agent.cc.orig	2021-01-18 21:28:57 UTC
+--- content/common/user_agent.cc.orig	2021-03-12 23:57:24 UTC
 +++ content/common/user_agent.cc
 @@ -213,6 +213,14 @@ std::string BuildOSCpuInfoFromOSVersionAndCpuType(cons
    );
diff --git a/www/chromium/files/patch-content_gpu_BUILD.gn b/www/chromium/files/patch-content_gpu_BUILD.gn
index 2d97c09a..19a5a3e2 100644
--- a/www/chromium/files/patch-content_gpu_BUILD.gn
+++ b/www/chromium/files/patch-content_gpu_BUILD.gn
@@ -1,9 +1,9 @@
---- content/gpu/BUILD.gn.orig	2021-01-18 21:28:57 UTC
+--- content/gpu/BUILD.gn.orig	2021-03-12 23:57:24 UTC
 +++ content/gpu/BUILD.gn
-@@ -128,7 +128,7 @@ target(link_target_type, "gpu_sources") {
- 
+@@ -137,7 +137,7 @@ target(link_target_type, "gpu_sources") {
    # Use DRI on desktop Linux builds.
-   if (current_cpu != "s390x" && current_cpu != "ppc64" && is_linux &&
+   if (current_cpu != "s390x" && current_cpu != "ppc64" &&
+       (is_linux || is_chromeos_lacros) &&
 -      (!is_chromecast || is_cast_desktop_build)) {
 +      (!is_chromecast || is_cast_desktop_build) && !is_bsd) {
      configs += [ "//build/config/linux/dri" ]
diff --git a/www/chromium/files/patch-content_gpu_gpu__main.cc b/www/chromium/files/patch-content_gpu_gpu__main.cc
index dec493c2..2eb1ee85 100644
--- a/www/chromium/files/patch-content_gpu_gpu__main.cc
+++ b/www/chromium/files/patch-content_gpu_gpu__main.cc
@@ -1,6 +1,6 @@
---- content/gpu/gpu_main.cc.orig	2021-01-18 21:28:57 UTC
+--- content/gpu/gpu_main.cc.orig	2021-03-12 23:57:24 UTC
 +++ content/gpu/gpu_main.cc
-@@ -84,7 +84,7 @@
+@@ -85,7 +85,7 @@
  #include "ui/gfx/x/x11_switches.h"                       // nogncheck
  #endif
  
@@ -9,7 +9,7 @@
  #include "content/gpu/gpu_sandbox_hook_linux.h"
  #include "content/public/common/sandbox_init.h"
  #include "sandbox/policy/linux/sandbox_linux.h"
-@@ -305,7 +305,7 @@ int GpuMain(const MainFunctionParams& parameters) {
+@@ -306,7 +306,7 @@ int GpuMain(const MainFunctionParams& parameters) {
                gpu_preferences.message_pump_type);
      }
  #endif
diff --git a/www/chromium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc b/www/chromium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc
index 6030ca9c..cd11a3ce 100644
--- a/www/chromium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc
+++ b/www/chromium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc
@@ -1,6 +1,6 @@
---- content/gpu/gpu_sandbox_hook_linux.cc.orig	2020-11-19 08:18:33 UTC
+--- content/gpu/gpu_sandbox_hook_linux.cc.orig	2021-03-12 23:57:24 UTC
 +++ content/gpu/gpu_sandbox_hook_linux.cc
-@@ -361,6 +361,7 @@ std::vector<BrokerFilePermission> FilePermissionsForGp
+@@ -362,6 +362,7 @@ std::vector<BrokerFilePermission> FilePermissionsForGp
  }
  
  void LoadArmGpuLibraries() {
@@ -8,7 +8,7 @@
    // Preload the Mali library.
    if (UseChromecastSandboxAllowlist()) {
      for (const char* path : kAllowedChromecastPaths) {
-@@ -375,6 +376,7 @@ void LoadArmGpuLibraries() {
+@@ -376,6 +377,7 @@ void LoadArmGpuLibraries() {
      // Preload the Tegra V4L2 (video decode acceleration) library.
      dlopen(kLibTegraPath, dlopen_flag);
    }
diff --git a/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc b/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc
index 97540244..fd6d9d24 100644
--- a/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc
+++ b/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc
@@ -1,4 +1,4 @@
---- content/ppapi_plugin/ppapi_blink_platform_impl.cc.orig	2020-11-13 06:36:43 UTC
+--- content/ppapi_plugin/ppapi_blink_platform_impl.cc.orig	2021-03-12 23:57:24 UTC
 +++ content/ppapi_plugin/ppapi_blink_platform_impl.cc
 @@ -19,7 +19,7 @@
  
diff --git a/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h b/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h
index d85f9dff..0ccfb335 100644
--- a/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h
+++ b/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h
@@ -1,4 +1,4 @@
---- content/ppapi_plugin/ppapi_blink_platform_impl.h.orig	2020-11-13 06:36:43 UTC
+--- content/ppapi_plugin/ppapi_blink_platform_impl.h.orig	2021-03-12 23:57:24 UTC
 +++ content/ppapi_plugin/ppapi_blink_platform_impl.h
 @@ -13,7 +13,7 @@
  #include "build/build_config.h"
diff --git a/www/chromium/files/patch-content_public_app_content__main__delegate.cc b/www/chromium/files/patch-content_public_app_content__main__delegate.cc
index 15ee833b..9257e404 100644
--- a/www/chromium/files/patch-content_public_app_content__main__delegate.cc
+++ b/www/chromium/files/patch-content_public_app_content__main__delegate.cc
@@ -1,4 +1,4 @@
---- content/public/app/content_main_delegate.cc.orig	2020-11-13 06:36:43 UTC
+--- content/public/app/content_main_delegate.cc.orig	2021-03-12 23:57:24 UTC
 +++ content/public/app/content_main_delegate.cc
 @@ -24,12 +24,12 @@ int ContentMainDelegate::RunProcess(
    return -1;
diff --git a/www/chromium/files/patch-content_public_app_content__main__delegate.h b/www/chromium/files/patch-content_public_app_content__main__delegate.h
index 89c7b802..82f285a3 100644
--- a/www/chromium/files/patch-content_public_app_content__main__delegate.h
+++ b/www/chromium/files/patch-content_public_app_content__main__delegate.h
@@ -1,4 +1,4 @@
---- content/public/app/content_main_delegate.h.orig	2020-11-13 06:36:43 UTC
+--- content/public/app/content_main_delegate.h.orig	2021-03-12 23:57:24 UTC
 +++ content/public/app/content_main_delegate.h
 @@ -49,7 +49,7 @@ class CONTENT_EXPORT ContentMainDelegate {
    // Called right before the process exits.
diff --git a/www/chromium/files/patch-content_public_browser_font__access__context.h b/www/chromium/files/patch-content_public_browser_font__access__context.h
new file mode 100644
index 00000000..6a1ffb58
--- /dev/null
+++ b/www/chromium/files/patch-content_public_browser_font__access__context.h
@@ -0,0 +1,11 @@
+--- content/public/browser/font_access_context.h.orig	2021-03-12 23:57:24 UTC
++++ content/public/browser/font_access_context.h
+@@ -10,7 +10,7 @@
+ #include "content/common/content_export.h"
+ #include "third_party/blink/public/mojom/font_access/font_access.mojom.h"
+ 
+-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \
++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \
+     defined(OS_MAC)
+ #define PLATFORM_HAS_LOCAL_FONT_ENUMERATION_IMPL 1
+ #endif
diff --git a/www/chromium/files/patch-content_public_browser_zygote__host_zygote__host__linux.h b/www/chromium/files/patch-content_public_browser_zygote__host_zygote__host__linux.h
index 4cf5a018..21cc144d 100644
--- a/www/chromium/files/patch-content_public_browser_zygote__host_zygote__host__linux.h
+++ b/www/chromium/files/patch-content_public_browser_zygote__host_zygote__host__linux.h
@@ -1,4 +1,4 @@
---- content/public/browser/zygote_host/zygote_host_linux.h.orig	2020-11-13 06:36:43 UTC
+--- content/public/browser/zygote_host/zygote_host_linux.h.orig	2021-03-12 23:57:24 UTC
 +++ content/public/browser/zygote_host/zygote_host_linux.h
 @@ -30,11 +30,13 @@ class ZygoteHost {
    // after the first render has been forked.
diff --git a/www/chromium/files/patch-content_public_common_child__process__host.h b/www/chromium/files/patch-content_public_common_child__process__host.h
index be7ccfdb..5fb4b2cb 100644
--- a/www/chromium/files/patch-content_public_common_child__process__host.h
+++ b/www/chromium/files/patch-content_public_common_child__process__host.h
@@ -1,4 +1,4 @@
---- content/public/common/child_process_host.h.orig	2020-11-13 06:36:43 UTC
+--- content/public/common/child_process_host.h.orig	2021-03-12 23:57:24 UTC
 +++ content/public/common/child_process_host.h
 @@ -81,7 +81,7 @@ class CONTENT_EXPORT ChildProcessHost : public IPC::Se
      // No special behavior requested.
diff --git a/www/chromium/files/patch-content_public_common_common__param__traits__macros.h b/www/chromium/files/patch-content_public_common_common__param__traits__macros.h
index e00e939b..5a1dea8f 100644
--- a/www/chromium/files/patch-content_public_common_common__param__traits__macros.h
+++ b/www/chromium/files/patch-content_public_common_common__param__traits__macros.h
@@ -1,11 +1,11 @@
---- content/public/common/common_param_traits_macros.h.orig	2021-01-18 21:28:57 UTC
+--- content/public/common/common_param_traits_macros.h.orig	2021-03-12 23:57:24 UTC
 +++ content/public/common/common_param_traits_macros.h
-@@ -134,7 +134,7 @@ IPC_STRUCT_TRAITS_BEGIN(blink::RendererPreferences)
+@@ -129,7 +129,7 @@ IPC_STRUCT_TRAITS_BEGIN(blink::RendererPreferences)
    IPC_STRUCT_TRAITS_MEMBER(accept_languages)
    IPC_STRUCT_TRAITS_MEMBER(plugin_fullscreen_allowed)
    IPC_STRUCT_TRAITS_MEMBER(caret_browsing_enabled)
 -#if defined(OS_LINUX) || defined(OS_CHROMEOS)
 +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
    IPC_STRUCT_TRAITS_MEMBER(system_font_family_name)
-   IPC_STRUCT_TRAITS_MEMBER(selection_clipboard_buffer_available)
  #endif
+ #if defined(OS_WIN)
diff --git a/www/chromium/files/patch-content_public_common_content__constants.cc b/www/chromium/files/patch-content_public_common_content__constants.cc
index 282478d9..fbbf6863 100644
--- a/www/chromium/files/patch-content_public_common_content__constants.cc
+++ b/www/chromium/files/patch-content_public_common_content__constants.cc
@@ -1,4 +1,4 @@
---- content/public/common/content_constants.cc.orig	2021-01-18 21:28:57 UTC
+--- content/public/common/content_constants.cc.orig	2021-03-12 23:57:24 UTC
 +++ content/public/common/content_constants.cc
 @@ -50,7 +50,7 @@ std::string GetCorsExemptRequestedWithHeaderName() {
    return base::JoinString(pieces, "-");
diff --git a/www/chromium/files/patch-content_public_common_content__constants.h b/www/chromium/files/patch-content_public_common_content__constants.h
index 3b866a0e..525c6100 100644
--- a/www/chromium/files/patch-content_public_common_content__constants.h
+++ b/www/chromium/files/patch-content_public_common_content__constants.h
@@ -1,4 +1,4 @@
---- content/public/common/content_constants.h.orig	2021-01-18 21:28:57 UTC
+--- content/public/common/content_constants.h.orig	2021-03-12 23:57:24 UTC
 +++ content/public/common/content_constants.h
 @@ -64,7 +64,7 @@ CONTENT_EXPORT extern const char kCorsExemptPurposeHea
  // it at run time.
diff --git a/www/chromium/files/patch-content_public_common_content__features.cc b/www/chromium/files/patch-content_public_common_content__features.cc
index 5b52891e..875a7fab 100644
--- a/www/chromium/files/patch-content_public_common_content__features.cc
+++ b/www/chromium/files/patch-content_public_common_content__features.cc
@@ -1,15 +1,15 @@
---- content/public/common/content_features.cc.orig	2021-01-18 21:28:57 UTC
+--- content/public/common/content_features.cc.orig	2021-03-12 23:57:24 UTC
 +++ content/public/common/content_features.cc
-@@ -49,7 +49,7 @@ const base::Feature kAudioServiceLaunchOnStartup{
- const base::Feature kAudioServiceOutOfProcess {
-   "AudioServiceOutOfProcess",
+@@ -45,7 +45,7 @@ const base::Feature kAudioServiceOutOfProcess {
+ // 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) && !defined(OS_CHROMEOS))
-+    (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+-    (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
++    (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD)
        base::FEATURE_ENABLED_BY_DEFAULT
  #else
        base::FEATURE_DISABLED_BY_DEFAULT
-@@ -758,8 +758,8 @@ const base::Feature kWebAssemblyThreads {
+@@ -773,8 +773,8 @@ const base::Feature kWebAssemblyThreads {
  };
  
  // Enable WebAssembly trap handler.
@@ -20,12 +20,12 @@
      defined(ARCH_CPU_X86_64)
  const base::Feature kWebAssemblyTrapHandler{"WebAssemblyTrapHandler",
                                              base::FEATURE_ENABLED_BY_DEFAULT};
-@@ -789,7 +789,7 @@ const base::Feature kWebAuth{"WebAuthentication",
- // https://w3c.github.io/webauthn
- const base::Feature kWebAuthCable {
+@@ -795,7 +795,7 @@ const base::Feature kWebAuthCable {
    "WebAuthenticationCable",
--#if !defined(OS_CHROMEOS) && defined(OS_LINUX)
-+#if (!defined(OS_CHROMEOS) && defined(OS_LINUX)) || defined(OS_BSD)
+ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // of lacros-chrome is complete.
+-#if BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_LINUX)
++#if BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_LINUX) || defined(OS_BSD)
        base::FEATURE_DISABLED_BY_DEFAULT
  #else
        base::FEATURE_ENABLED_BY_DEFAULT
diff --git a/www/chromium/files/patch-content_public_common_content__switches.cc b/www/chromium/files/patch-content_public_common_content__switches.cc
index 7a59374c..5217ea45 100644
--- a/www/chromium/files/patch-content_public_common_content__switches.cc
+++ b/www/chromium/files/patch-content_public_common_content__switches.cc
@@ -1,20 +1,11 @@
---- content/public/common/content_switches.cc.orig	2021-01-18 21:28:57 UTC
+--- content/public/common/content_switches.cc.orig	2021-03-12 23:57:24 UTC
 +++ content/public/common/content_switches.cc
-@@ -895,7 +895,7 @@ const char kWebXrRuntimeWMR[] = "windows-mixed-reality
- const char kDisableAcceleratedVideoDecode[] =
-     "disable-accelerated-video-decode";
+@@ -955,7 +955,7 @@ const char kEnableAutomation[] = "enable-automation";
  
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)) || defined(OS_BSD)
- // Enables hardware acceleration of video decoding on linux. (defaults to off)
- const char kEnableAcceleratedVideoDecode[] = "enable-accelerated-video-decode";
- #endif
-@@ -959,7 +959,7 @@ const char kEnableAggressiveDOMStorageFlushing[] =
- // Enable indication that browser is controlled by automation.
- const char kEnableAutomation[] = "enable-automation";
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_FREEBSD)
+ // 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)
  // Allows sending text-to-speech requests to speech-dispatcher, a common
  // Linux speech service. Because it's buggy, the user must explicitly
  // enable it so that visiting a random webpage can't cause instability.
diff --git a/www/chromium/files/patch-content_public_common_content__switches.h b/www/chromium/files/patch-content_public_common_content__switches.h
index 66e21308..4588f13d 100644
--- a/www/chromium/files/patch-content_public_common_content__switches.h
+++ b/www/chromium/files/patch-content_public_common_content__switches.h
@@ -1,20 +1,20 @@
---- content/public/common/content_switches.h.orig	2021-01-18 21:28:57 UTC
+--- content/public/common/content_switches.h.orig	2021-03-12 23:57:24 UTC
 +++ content/public/common/content_switches.h
 @@ -245,7 +245,7 @@ CONTENT_EXPORT extern const char kWebXrRuntimeOrientat
  CONTENT_EXPORT extern const char kWebXrRuntimeOpenXr[];
  CONTENT_EXPORT extern const char kWebXrRuntimeWMR[];
  
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)) || defined(OS_BSD)
+-#if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && !defined(OS_ANDROID)
++#if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) && !defined(OS_ANDROID)
  CONTENT_EXPORT extern const char kEnableAcceleratedVideoDecode[];
  #endif
  CONTENT_EXPORT extern const char kDisableAcceleratedVideoDecode[];
-@@ -266,7 +266,7 @@ CONTENT_EXPORT extern const char kRemoteDebuggingSocke
- CONTENT_EXPORT extern const char kRendererWaitForJavaDebugger[];
- #endif
+@@ -268,7 +268,7 @@ CONTENT_EXPORT extern const char kRendererWaitForJavaD
  
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_FREEBSD)
+ // 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)
  CONTENT_EXPORT extern const char kEnableSpeechDispatcher[];
  #endif
  
diff --git a/www/chromium/files/patch-content_public_common_use__zoom__for__dsf__policy.cc b/www/chromium/files/patch-content_public_common_use__zoom__for__dsf__policy.cc
index 604ce8e2..7d4fdbbb 100644
--- a/www/chromium/files/patch-content_public_common_use__zoom__for__dsf__policy.cc
+++ b/www/chromium/files/patch-content_public_common_use__zoom__for__dsf__policy.cc
@@ -1,4 +1,4 @@
---- content/public/common/use_zoom_for_dsf_policy.cc.orig	2020-11-13 06:36:43 UTC
+--- content/public/common/use_zoom_for_dsf_policy.cc.orig	2021-03-12 23:57:24 UTC
 +++ content/public/common/use_zoom_for_dsf_policy.cc
 @@ -25,7 +25,7 @@ const base::Feature kUseZoomForDsfEnabledByDefault{
  #endif
diff --git a/www/chromium/files/patch-content_public_common_zygote_features.gni b/www/chromium/files/patch-content_public_common_zygote_features.gni
index 3778ba0f..2fd54a10 100644
--- a/www/chromium/files/patch-content_public_common_zygote_features.gni
+++ b/www/chromium/files/patch-content_public_common_zygote_features.gni
@@ -1,4 +1,4 @@
---- content/public/common/zygote/features.gni.orig	2020-11-13 06:36:43 UTC
+--- content/public/common/zygote/features.gni.orig	2021-03-12 23:57:24 UTC
 +++ content/public/common/zygote/features.gni
 @@ -2,4 +2,4 @@
  # Use of this source code is governed by a BSD-style license that can be
diff --git a/www/chromium/files/patch-content_public_test_browser__test__base.cc b/www/chromium/files/patch-content_public_test_browser__test__base.cc
index 29c1791c..33410f30 100644
--- a/www/chromium/files/patch-content_public_test_browser__test__base.cc
+++ b/www/chromium/files/patch-content_public_test_browser__test__base.cc
@@ -1,6 +1,6 @@
---- content/public/test/browser_test_base.cc.orig	2021-01-18 21:28:57 UTC
+--- content/public/test/browser_test_base.cc.orig	2021-03-12 23:57:24 UTC
 +++ content/public/test/browser_test_base.cc
-@@ -106,6 +106,10 @@
+@@ -109,6 +109,10 @@
  #include "ui/views/test/event_generator_delegate_mac.h"
  #endif
  
diff --git a/www/chromium/files/patch-content_public_test_content__browser__test.cc b/www/chromium/files/patch-content_public_test_content__browser__test.cc
index b2d6867f..aac17000 100644
--- a/www/chromium/files/patch-content_public_test_content__browser__test.cc
+++ b/www/chromium/files/patch-content_public_test_content__browser__test.cc
@@ -1,29 +1,29 @@
---- content/public/test/content_browser_test.cc.orig	2020-11-13 06:36:43 UTC
+--- content/public/test/content_browser_test.cc.orig	2021-03-12 23:57:24 UTC
 +++ content/public/test/content_browser_test.cc
-@@ -26,7 +26,7 @@
- #include "base/mac/foundation_util.h"
- #endif
+@@ -29,7 +29,7 @@
  
--#if !defined(OS_CHROMEOS) && defined(OS_LINUX)
-+#if (!defined(OS_CHROMEOS) && defined(OS_LINUX)) || defined(OS_BSD)
+ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // of lacros-chrome is complete.
+-#if BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_LINUX)
++#if BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_LINUX) || defined(OS_BSD)
  #include "ui/base/ime/init/input_method_initializer.h"
  #endif
  
-@@ -87,7 +87,7 @@ void ContentBrowserTest::SetUp() {
- #endif
- 
+@@ -92,7 +92,7 @@ void ContentBrowserTest::SetUp() {
    // LinuxInputMethodContextFactory has to be initialized.
--#if !defined(OS_CHROMEOS) && defined(OS_LINUX)
-+#if (!defined(OS_CHROMEOS) && defined(OS_LINUX)) || defined(OS_BSD)
+ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // of lacros-chrome is complete.
+-#if BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_LINUX)
++#if BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_LINUX) || defined(OS_BSD)
    ui::InitializeInputMethodForTesting();
  #endif
  
-@@ -100,7 +100,7 @@ void ContentBrowserTest::TearDown() {
-   BrowserTestBase::TearDown();
- 
+@@ -107,7 +107,7 @@ void ContentBrowserTest::TearDown() {
    // LinuxInputMethodContextFactory has to be shutdown.
--#if !defined(OS_CHROMEOS) && defined(OS_LINUX)
-+#if (!defined(OS_CHROMEOS) && defined(OS_LINUX)) || defined(OS_BSD)
+ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // of lacros-chrome is complete.
+-#if BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_LINUX)
++#if BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_LINUX) || defined(OS_BSD)
    ui::ShutdownInputMethodForTesting();
  #endif
  }
diff --git a/www/chromium/files/patch-content_public_test_mock__render__thread.cc b/www/chromium/files/patch-content_public_test_mock__render__thread.cc
index 33a9b78a..d5851acf 100644
--- a/www/chromium/files/patch-content_public_test_mock__render__thread.cc
+++ b/www/chromium/files/patch-content_public_test_mock__render__thread.cc
@@ -1,4 +1,4 @@
---- content/public/test/mock_render_thread.cc.orig	2021-01-18 21:28:57 UTC
+--- content/public/test/mock_render_thread.cc.orig	2021-03-12 23:57:24 UTC
 +++ content/public/test/mock_render_thread.cc
 @@ -60,7 +60,7 @@ class MockRenderMessageFilterImpl : public mojom::Rend
      std::move(callback).Run(false);
diff --git a/www/chromium/files/patch-content_renderer_render__process__impl.cc b/www/chromium/files/patch-content_renderer_render__process__impl.cc
index 252d03eb..cc094c07 100644
--- a/www/chromium/files/patch-content_renderer_render__process__impl.cc
+++ b/www/chromium/files/patch-content_renderer_render__process__impl.cc
@@ -1,4 +1,4 @@
---- content/renderer/render_process_impl.cc.orig	2021-01-18 21:28:58 UTC
+--- content/renderer/render_process_impl.cc.orig	2021-03-12 23:57:24 UTC
 +++ content/renderer/render_process_impl.cc
 @@ -45,7 +45,7 @@
  #if defined(OS_WIN)
@@ -9,7 +9,7 @@
  #include "v8/include/v8-wasm-trap-handler-posix.h"
  #endif
  namespace {
-@@ -178,7 +178,7 @@ RenderProcessImpl::RenderProcessImpl()
+@@ -186,7 +186,7 @@ RenderProcessImpl::RenderProcessImpl()
  
    SetV8FlagIfNotFeature(features::kWebAssemblyTrapHandler,
                          "--no-wasm-trap-handler");
diff --git a/www/chromium/files/patch-content_renderer_render__thread__impl.cc b/www/chromium/files/patch-content_renderer_render__thread__impl.cc
index f7637579..a80dd4cf 100644
--- a/www/chromium/files/patch-content_renderer_render__thread__impl.cc
+++ b/www/chromium/files/patch-content_renderer_render__thread__impl.cc
@@ -1,6 +1,6 @@
---- content/renderer/render_thread_impl.cc.orig	2021-01-18 21:28:58 UTC
+--- content/renderer/render_thread_impl.cc.orig	2021-03-12 23:57:24 UTC
 +++ content/renderer/render_thread_impl.cc
-@@ -170,7 +170,7 @@
+@@ -174,7 +174,7 @@
  
  #if defined(OS_MAC)
  #include <malloc/malloc.h>
@@ -9,7 +9,7 @@
  #include <malloc.h>
  #endif
  
-@@ -705,7 +705,7 @@ void RenderThreadImpl::Init() {
+@@ -687,7 +687,7 @@ void RenderThreadImpl::Init() {
    DCHECK(parsed_num_raster_threads) << string_value;
    DCHECK_GT(num_raster_threads, 0);
  
@@ -18,7 +18,7 @@
    categorized_worker_pool_->SetBackgroundingCallback(
        main_thread_scheduler_->DefaultTaskRunner(),
        base::BindOnce(
-@@ -728,7 +728,7 @@ void RenderThreadImpl::Init() {
+@@ -710,7 +710,7 @@ void RenderThreadImpl::Init() {
    base::DiscardableMemoryAllocator::SetInstance(
        discardable_memory_allocator_.get());
  
@@ -27,21 +27,21 @@
    if (base::FeatureList::IsEnabled(
            blink::features::kBlinkCompositorUseDisplayThreadPriority)) {
      render_message_filter()->SetThreadPriority(
-@@ -1103,11 +1103,11 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
-           kGpuStreamPriorityMedia);
- 
+@@ -1079,11 +1079,11 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
    const bool enable_video_accelerator =
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
-       cmd_line->HasSwitch(switches::kEnableAcceleratedVideoDecode) &&
+ // 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)
+       base::FeatureList::IsEnabled(media::kVaapiVideoDecodeLinux) &&
  #else
        !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode) &&
--#endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#endif  // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+-#endif  // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#endif  // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
        (gpu_channel_host->gpu_feature_info()
             .status_values[gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE] ==
         gpu::kGpuFeatureStatusEnabled);
-@@ -1117,7 +1117,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
+@@ -1093,7 +1093,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
        !cmd_line->HasSwitch(switches::kDisableGpuMemoryBufferVideoFrames);
  #else
        cmd_line->HasSwitch(switches::kEnableGpuMemoryBufferVideoFrames);
diff --git a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc
index 44fb68dd..13d9e816 100644
--- a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc
+++ b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc
@@ -1,4 +1,4 @@
---- content/renderer/renderer_blink_platform_impl.cc.orig	2021-01-18 21:28:58 UTC
+--- content/renderer/renderer_blink_platform_impl.cc.orig	2021-03-12 23:57:24 UTC
 +++ content/renderer/renderer_blink_platform_impl.cc
 @@ -102,7 +102,7 @@
  
@@ -27,15 +27,15 @@
    if (sandboxEnabled()) {
  #if defined(OS_MAC)
      sandbox_support_ = std::make_unique<WebSandboxSupportMac>();
-@@ -235,7 +235,7 @@ RendererBlinkPlatformImpl::WrapSharedURLLoaderFactory(
+@@ -233,7 +233,7 @@ RendererBlinkPlatformImpl::WrapSharedURLLoaderFactory(
+       std::move(factory));
+ }
  
- void RendererBlinkPlatformImpl::SetDisplayThreadPriority(
-     base::PlatformThreadId thread_id) {
 -#if defined(OS_LINUX) || defined(OS_CHROMEOS)
 +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+ void RendererBlinkPlatformImpl::SetDisplayThreadPriority(
+     base::PlatformThreadId thread_id) {
    if (RenderThreadImpl* render_thread = RenderThreadImpl::current()) {
-     render_thread->render_message_filter()->SetThreadPriority(
-         thread_id, base::ThreadPriority::DISPLAY);
 @@ -248,7 +248,7 @@ blink::BlameContext* RendererBlinkPlatformImpl::GetTop
  }
  
diff --git a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h
index 4084771e..0941de29 100644
--- a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h
+++ b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h
@@ -1,4 +1,4 @@
---- content/renderer/renderer_blink_platform_impl.h.orig	2021-01-18 21:28:58 UTC
+--- content/renderer/renderer_blink_platform_impl.h.orig	2021-03-12 23:57:24 UTC
 +++ content/renderer/renderer_blink_platform_impl.h
 @@ -29,7 +29,7 @@
  #include "third_party/blink/public/mojom/cache_storage/cache_storage.mojom.h"
@@ -9,7 +9,16 @@
  #include "components/services/font/public/cpp/font_loader.h"  // nogncheck
  #include "third_party/skia/include/core/SkRefCnt.h"           // nogncheck
  #endif
-@@ -223,7 +223,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
+@@ -183,7 +183,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
+       const blink::WebURL& top_document_web_url) override;
+   gpu::GpuMemoryBufferManager* GetGpuMemoryBufferManager() override;
+   blink::WebString ConvertIDNToUnicode(const blink::WebString& host) override;
+-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+   void SetDisplayThreadPriority(base::PlatformThreadId thread_id) override;
+ #endif
+   blink::BlameContext* GetTopLevelBlameContext() override;
+@@ -228,7 +228,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
    // Return the mojo interface for making CodeCache calls.
    blink::mojom::CodeCacheHost& GetCodeCacheHost();
  
@@ -18,7 +27,7 @@
    std::unique_ptr<blink::WebSandboxSupport> sandbox_support_;
  #endif
  
-@@ -244,7 +244,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
+@@ -249,7 +249,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
    mojo::PendingRemote<blink::mojom::CodeCacheHost> code_cache_host_remote_;
    mojo::SharedRemote<blink::mojom::CodeCacheHost> code_cache_host_;
  
diff --git a/www/chromium/files/patch-content_renderer_renderer__main__platform__delegate__linux.cc b/www/chromium/files/patch-content_renderer_renderer__main__platform__delegate__linux.cc
index 0b64b208..73853c56 100644
--- a/www/chromium/files/patch-content_renderer_renderer__main__platform__delegate__linux.cc
+++ b/www/chromium/files/patch-content_renderer_renderer__main__platform__delegate__linux.cc
@@ -1,4 +1,4 @@
---- content/renderer/renderer_main_platform_delegate_linux.cc.orig	2020-11-13 06:36:43 UTC
+--- content/renderer/renderer_main_platform_delegate_linux.cc.orig	2021-03-12 23:57:24 UTC
 +++ content/renderer/renderer_main_platform_delegate_linux.cc
 @@ -30,6 +30,7 @@ void RendererMainPlatformDelegate::PlatformUninitializ
  }
diff --git a/www/chromium/files/patch-content_shell_BUILD.gn b/www/chromium/files/patch-content_shell_BUILD.gn
index f27f00c5..3c10deb1 100644
--- a/www/chromium/files/patch-content_shell_BUILD.gn
+++ b/www/chromium/files/patch-content_shell_BUILD.gn
@@ -1,6 +1,6 @@
---- content/shell/BUILD.gn.orig	2021-01-18 21:28:58 UTC
+--- content/shell/BUILD.gn.orig	2021-03-12 23:57:24 UTC
 +++ content/shell/BUILD.gn
-@@ -86,7 +86,7 @@ static_library("content_shell_app") {
+@@ -87,7 +87,7 @@ static_library("content_shell_app") {
        "//content/web_test:web_test_renderer",
      ]
    }
@@ -9,7 +9,7 @@
      deps += [
        "//components/crash/core/app",
        "//components/crash/core/app:test_support",
-@@ -266,7 +266,7 @@ static_library("content_shell_lib") {
+@@ -267,7 +267,7 @@ static_library("content_shell_lib") {
  
    if (is_fuchsia) {
      deps += [ "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.ui.policy" ]
@@ -18,7 +18,7 @@
      deps += [
        "//components/crash/content/browser",
        "//components/crash/core/app",
-@@ -517,7 +517,7 @@ if (is_android) {
+@@ -521,7 +521,7 @@ if (is_android) {
        }
      }
  
@@ -27,7 +27,7 @@
        data_deps +=
            [ "//third_party/crashpad/crashpad/handler:crashpad_handler" ]
      }
-@@ -801,7 +801,7 @@ group("content_shell_crash_test") {
+@@ -805,7 +805,7 @@ group("content_shell_crash_test") {
        mac_bin_path + "otool",
      ]
    }
@@ -36,7 +36,7 @@
      data += [
        "//components/crash/content/tools/generate_breakpad_symbols.py",
        "//components/crash/content/tools/dmp2minidump.py",
-@@ -810,7 +810,7 @@ group("content_shell_crash_test") {
+@@ -814,7 +814,7 @@ group("content_shell_crash_test") {
    if (is_win) {
      data_deps += [ "//build/win:copy_cdb_to_output" ]
    }
diff --git a/www/chromium/files/patch-content_shell_app_shell__main__delegate.cc b/www/chromium/files/patch-content_shell_app_shell__main__delegate.cc
index d7508e19..0b678081 100644
--- a/www/chromium/files/patch-content_shell_app_shell__main__delegate.cc
+++ b/www/chromium/files/patch-content_shell_app_shell__main__delegate.cc
@@ -1,4 +1,4 @@
---- content/shell/app/shell_main_delegate.cc.orig	2020-11-13 06:36:43 UTC
+--- content/shell/app/shell_main_delegate.cc.orig	2021-03-12 23:57:24 UTC
 +++ content/shell/app/shell_main_delegate.cc
 @@ -186,7 +186,7 @@ bool ShellMainDelegate::BasicStartupComplete(int* exit
  
diff --git a/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc b/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc
index 9ca13a82..719f1a4e 100644
--- a/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc
+++ b/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc
@@ -1,4 +1,4 @@
---- content/shell/browser/shell_browser_context.cc.orig	2020-11-13 06:36:43 UTC
+--- content/shell/browser/shell_browser_context.cc.orig	2021-03-12 23:57:24 UTC
 +++ content/shell/browser/shell_browser_context.cc
 @@ -31,7 +31,7 @@
  
diff --git a/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc b/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc
index 8cddfe54..1a3da51a 100644
--- a/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc
+++ b/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc
@@ -1,20 +1,20 @@
---- content/shell/browser/shell_browser_main_parts.cc.orig	2021-01-18 21:28:58 UTC
+--- content/shell/browser/shell_browser_main_parts.cc.orig	2021-03-12 23:57:24 UTC
 +++ content/shell/browser/shell_browser_main_parts.cc
-@@ -54,7 +54,7 @@
+@@ -55,7 +55,7 @@
  #if defined(USE_AURA) && defined(USE_X11)
  #include "ui/events/devices/x11/touch_factory_x11.h"  // nogncheck
  #endif
--#if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX)
-+#if !defined(OS_CHROMEOS) && defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_BSD))
+-#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))
  #include "ui/base/ime/init/input_method_initializer.h"
  #endif
- #if defined(OS_CHROMEOS)
-@@ -136,7 +136,7 @@ void ShellBrowserMainParts::PostMainMessageLoopStart()
+ #if BUILDFLAG(IS_CHROMEOS_ASH)
+@@ -137,7 +137,7 @@ void ShellBrowserMainParts::PostMainMessageLoopStart()
  }
  
  int ShellBrowserMainParts::PreEarlyInitialization() {
--#if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX)
-+#if (!defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX)) || defined(OS_BSD)
+-#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))
    ui::InitializeInputMethodForTesting();
  #endif
  #if defined(OS_ANDROID)
diff --git a/www/chromium/files/patch-content_test_BUILD.gn b/www/chromium/files/patch-content_test_BUILD.gn
index 308bfc28..c43186bf 100644
--- a/www/chromium/files/patch-content_test_BUILD.gn
+++ b/www/chromium/files/patch-content_test_BUILD.gn
@@ -1,6 +1,6 @@
---- content/test/BUILD.gn.orig	2021-01-18 21:28:58 UTC
+--- content/test/BUILD.gn.orig	2021-03-12 23:57:24 UTC
 +++ content/test/BUILD.gn
-@@ -1443,10 +1443,12 @@ test("content_browsertests") {
+@@ -1459,10 +1459,12 @@ test("content_browsertests") {
    }
  
    if (is_linux || is_chromeos) {
@@ -17,7 +17,7 @@
      deps += [ "//ui/gfx:test_support" ]
  
      if (use_atk) {
-@@ -1685,7 +1687,7 @@ static_library("run_all_unittests") {
+@@ -1699,7 +1701,7 @@ static_library("run_all_unittests") {
      ":test_support",
      "//base/test:test_support",
    ]
@@ -26,7 +26,7 @@
      deps += [ "//content/common:set_process_title_linux" ]
    }
  }
-@@ -2510,7 +2512,7 @@ test("content_unittests") {
+@@ -2532,7 +2534,7 @@ test("content_unittests") {
      deps += [ "//ui/gfx/x" ]
    }
  
diff --git a/www/chromium/files/patch-content_test_content__test__suite.cc b/www/chromium/files/patch-content_test_content__test__suite.cc
index 8991a23b..1050c6a0 100644
--- a/www/chromium/files/patch-content_test_content__test__suite.cc
+++ b/www/chromium/files/patch-content_test_content__test__suite.cc
@@ -1,4 +1,4 @@
---- content/test/content_test_suite.cc.orig	2021-01-18 21:28:58 UTC
+--- content/test/content_test_suite.cc.orig	2021-03-12 23:57:24 UTC
 +++ content/test/content_test_suite.cc
 @@ -83,6 +83,7 @@ void ContentTestSuite::Initialize() {
    // to initialize GL, so don't do it here.
diff --git a/www/chromium/files/patch-content_utility_BUILD.gn b/www/chromium/files/patch-content_utility_BUILD.gn
index d6217cc7..0d5f53a1 100644
--- a/www/chromium/files/patch-content_utility_BUILD.gn
+++ b/www/chromium/files/patch-content_utility_BUILD.gn
@@ -1,6 +1,6 @@
---- content/utility/BUILD.gn.orig	2020-11-17 10:17:48 UTC
+--- content/utility/BUILD.gn.orig	2021-03-12 23:57:24 UTC
 +++ content/utility/BUILD.gn
-@@ -84,7 +84,7 @@ source_set("utility") {
+@@ -93,7 +93,7 @@ source_set("utility") {
      deps += [ "//services/proxy_resolver:lib" ]
    }
  
diff --git a/www/chromium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.cc b/www/chromium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.cc
index 2827d487..895e37ea 100644
--- a/www/chromium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.cc
+++ b/www/chromium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.cc
@@ -1,4 +1,4 @@
---- content/utility/utility_blink_platform_with_sandbox_support_impl.cc.orig	2020-11-13 06:36:43 UTC
+--- content/utility/utility_blink_platform_with_sandbox_support_impl.cc.orig	2021-03-12 23:57:24 UTC
 +++ content/utility/utility_blink_platform_with_sandbox_support_impl.cc
 @@ -9,7 +9,7 @@
  
diff --git a/www/chromium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.h b/www/chromium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.h
index 16b3bee5..00e8d0d4 100644
--- a/www/chromium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.h
+++ b/www/chromium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.h
@@ -1,4 +1,4 @@
---- content/utility/utility_blink_platform_with_sandbox_support_impl.h.orig	2020-11-13 06:36:43 UTC
+--- content/utility/utility_blink_platform_with_sandbox_support_impl.h.orig	2021-03-12 23:57:24 UTC
 +++ content/utility/utility_blink_platform_with_sandbox_support_impl.h
 @@ -11,7 +11,7 @@
  #include "build/build_config.h"
diff --git a/www/chromium/files/patch-content_zygote_zygote__linux.cc b/www/chromium/files/patch-content_zygote_zygote__linux.cc
index a88eb2cc..2f48fda2 100644
--- a/www/chromium/files/patch-content_zygote_zygote__linux.cc
+++ b/www/chromium/files/patch-content_zygote_zygote__linux.cc
@@ -1,4 +1,4 @@
---- content/zygote/zygote_linux.cc.orig	2020-11-13 06:36:43 UTC
+--- content/zygote/zygote_linux.cc.orig	2021-03-12 23:57:24 UTC
 +++ content/zygote/zygote_linux.cc
 @@ -1,7 +1,7 @@
  // Copyright (c) 2012 The Chromium Authors. All rights reserved.
@@ -9,7 +9,7 @@
  #include "content/zygote/zygote_linux.h"
  
  #include <errno.h>
-@@ -650,3 +650,4 @@ bool Zygote::HandleGetSandboxStatus(int fd, base::Pick
+@@ -651,3 +651,4 @@ bool Zygote::HandleGetSandboxStatus(int fd, base::Pick
  }
  
  }  // namespace content
diff --git a/www/chromium/files/patch-content_zygote_zygote__main__linux.cc b/www/chromium/files/patch-content_zygote_zygote__main__linux.cc
index eac44788..1c6c5e94 100644
--- a/www/chromium/files/patch-content_zygote_zygote__main__linux.cc
+++ b/www/chromium/files/patch-content_zygote_zygote__main__linux.cc
@@ -1,4 +1,4 @@
---- content/zygote/zygote_main_linux.cc.orig	2020-11-13 06:36:43 UTC
+--- content/zygote/zygote_main_linux.cc.orig	2021-03-12 23:57:24 UTC
 +++ content/zygote/zygote_main_linux.cc
 @@ -11,7 +11,9 @@
  #include <stddef.h>
diff --git a/www/chromium/files/patch-device_bluetooth_BUILD.gn b/www/chromium/files/patch-device_bluetooth_BUILD.gn
index a86ad201..0c6f9224 100644
--- a/www/chromium/files/patch-device_bluetooth_BUILD.gn
+++ b/www/chromium/files/patch-device_bluetooth_BUILD.gn
@@ -1,15 +1,15 @@
---- device/bluetooth/BUILD.gn.orig	2021-01-18 21:28:58 UTC
+--- device/bluetooth/BUILD.gn.orig	2021-03-12 23:57:25 UTC
 +++ device/bluetooth/BUILD.gn
 @@ -9,7 +9,7 @@ if (is_android) {
  }
- if (is_ash) {
+ if (is_chromeos_ash) {
    import("//chromeos/dbus/use_real_dbus_clients.gni")
 -} else if (use_dbus) {
 +} else if (use_dbus && !is_bsd) {
    use_real_dbus_clients = false
  }
  
-@@ -296,7 +296,7 @@ component("bluetooth") {
+@@ -303,7 +303,7 @@ component("bluetooth") {
      ]
    }
  
diff --git a/www/chromium/files/patch-device_gamepad_gamepad__provider.cc b/www/chromium/files/patch-device_gamepad_gamepad__provider.cc
index 4bb83b9e..9b628ba3 100644
--- a/www/chromium/files/patch-device_gamepad_gamepad__provider.cc
+++ b/www/chromium/files/patch-device_gamepad_gamepad__provider.cc
@@ -1,4 +1,4 @@
---- device/gamepad/gamepad_provider.cc.orig	2020-11-13 06:36:43 UTC
+--- device/gamepad/gamepad_provider.cc.orig	2021-03-12 23:57:25 UTC
 +++ device/gamepad/gamepad_provider.cc
 @@ -149,7 +149,7 @@ void GamepadProvider::Initialize(std::unique_ptr<Gamep
  
diff --git a/www/chromium/files/patch-device_gamepad_hid__writer__linux.cc b/www/chromium/files/patch-device_gamepad_hid__writer__linux.cc
index 6c3d10eb..27a80a5a 100644
--- a/www/chromium/files/patch-device_gamepad_hid__writer__linux.cc
+++ b/www/chromium/files/patch-device_gamepad_hid__writer__linux.cc
@@ -1,4 +1,4 @@
---- device/gamepad/hid_writer_linux.cc.orig	2020-11-13 06:36:43 UTC
+--- device/gamepad/hid_writer_linux.cc.orig	2021-03-12 23:57:25 UTC
 +++ device/gamepad/hid_writer_linux.cc
 @@ -4,6 +4,8 @@
  
diff --git a/www/chromium/files/patch-extensions_browser_api_declarative__webrequest_webrequest__action.cc b/www/chromium/files/patch-extensions_browser_api_declarative__webrequest_webrequest__action.cc
index 44d5b84a..ca2aefe8 100644
--- a/www/chromium/files/patch-extensions_browser_api_declarative__webrequest_webrequest__action.cc
+++ b/www/chromium/files/patch-extensions_browser_api_declarative__webrequest_webrequest__action.cc
@@ -1,4 +1,4 @@
---- extensions/browser/api/declarative_webrequest/webrequest_action.cc.orig	2020-11-13 06:36:43 UTC
+--- extensions/browser/api/declarative_webrequest/webrequest_action.cc.orig	2021-03-12 23:57:25 UTC
 +++ extensions/browser/api/declarative_webrequest/webrequest_action.cc
 @@ -28,7 +28,11 @@
  #include "extensions/common/extension.h"
diff --git a/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc b/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc
index e933f06e..c746c3b5 100644
--- a/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc
+++ b/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc
@@ -1,4 +1,4 @@
---- extensions/browser/api/messaging/message_service.cc.orig	2020-11-13 06:36:43 UTC
+--- extensions/browser/api/messaging/message_service.cc.orig	2021-03-12 23:57:25 UTC
 +++ extensions/browser/api/messaging/message_service.cc
 @@ -61,7 +61,7 @@ namespace {
  
diff --git a/www/chromium/files/patch-extensions_browser_api_networking__private_networking__private__delegate__factory.cc b/www/chromium/files/patch-extensions_browser_api_networking__private_networking__private__delegate__factory.cc
index f386022a..248ff3a8 100644
--- a/www/chromium/files/patch-extensions_browser_api_networking__private_networking__private__delegate__factory.cc
+++ b/www/chromium/files/patch-extensions_browser_api_networking__private_networking__private__delegate__factory.cc
@@ -1,4 +1,4 @@
---- extensions/browser/api/networking_private/networking_private_delegate_factory.cc.orig	2021-01-18 21:28:59 UTC
+--- extensions/browser/api/networking_private/networking_private_delegate_factory.cc.orig	2021-03-12 23:57:25 UTC
 +++ extensions/browser/api/networking_private/networking_private_delegate_factory.cc
 @@ -12,7 +12,7 @@
  
diff --git a/www/chromium/files/patch-extensions_browser_api_web__request_form__data__parser.cc b/www/chromium/files/patch-extensions_browser_api_web__request_form__data__parser.cc
index 1a4fe35c..5d4dad74 100644
--- a/www/chromium/files/patch-extensions_browser_api_web__request_form__data__parser.cc
+++ b/www/chromium/files/patch-extensions_browser_api_web__request_form__data__parser.cc
@@ -1,4 +1,4 @@
---- extensions/browser/api/web_request/form_data_parser.cc.orig	2020-11-13 06:36:43 UTC
+--- extensions/browser/api/web_request/form_data_parser.cc.orig	2021-03-12 23:57:25 UTC
 +++ extensions/browser/api/web_request/form_data_parser.cc
 @@ -16,7 +16,11 @@
  #include "base/values.h"
diff --git a/www/chromium/files/patch-extensions_browser_browser__context__keyed__service__factories.cc b/www/chromium/files/patch-extensions_browser_browser__context__keyed__service__factories.cc
index 46d4f7c5..c528a0c9 100644
--- a/www/chromium/files/patch-extensions_browser_browser__context__keyed__service__factories.cc
+++ b/www/chromium/files/patch-extensions_browser_browser__context__keyed__service__factories.cc
@@ -1,6 +1,6 @@
---- extensions/browser/browser_context_keyed_service_factories.cc.orig	2021-01-18 21:28:59 UTC
+--- extensions/browser/browser_context_keyed_service_factories.cc.orig	2021-03-12 23:57:25 UTC
 +++ extensions/browser/browser_context_keyed_service_factories.cc
-@@ -93,7 +93,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() 
+@@ -88,7 +88,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() 
    HidDeviceManager::GetFactoryInstance();
    IdleManagerFactory::GetInstance();
    ManagementAPI::GetFactoryInstance();
diff --git a/www/chromium/files/patch-extensions_common_api___permission__features.json b/www/chromium/files/patch-extensions_common_api___permission__features.json
index bcdc000c..3cea3bf0 100644
--- a/www/chromium/files/patch-extensions_common_api___permission__features.json
+++ b/www/chromium/files/patch-extensions_common_api___permission__features.json
@@ -1,4 +1,4 @@
---- extensions/common/api/_permission_features.json.orig	2021-01-18 21:28:59 UTC
+--- extensions/common/api/_permission_features.json.orig	2021-03-12 23:57:25 UTC
 +++ extensions/common/api/_permission_features.json
 @@ -135,7 +135,7 @@
      {
diff --git a/www/chromium/files/patch-extensions_common_api_runtime.json b/www/chromium/files/patch-extensions_common_api_runtime.json
index 4d1942d0..45d8eb55 100644
--- a/www/chromium/files/patch-extensions_common_api_runtime.json
+++ b/www/chromium/files/patch-extensions_common_api_runtime.json
@@ -1,4 +1,4 @@
---- extensions/common/api/runtime.json.orig	2020-11-13 06:36:43 UTC
+--- extensions/common/api/runtime.json.orig	2021-03-12 23:57:25 UTC
 +++ extensions/common/api/runtime.json
 @@ -68,7 +68,7 @@
          "id": "PlatformOs",
diff --git a/www/chromium/files/patch-extensions_common_feature__switch.cc b/www/chromium/files/patch-extensions_common_feature__switch.cc
index 23e2b07f..5c4b001e 100644
--- a/www/chromium/files/patch-extensions_common_feature__switch.cc
+++ b/www/chromium/files/patch-extensions_common_feature__switch.cc
@@ -1,4 +1,4 @@
---- extensions/common/feature_switch.cc.orig	2020-11-13 06:36:43 UTC
+--- extensions/common/feature_switch.cc.orig	2021-03-12 23:57:25 UTC
 +++ extensions/common/feature_switch.cc
 @@ -39,11 +39,11 @@ class CommonSwitches {
                           FeatureSwitch::DEFAULT_ENABLED),
diff --git a/www/chromium/files/patch-extensions_common_features_feature.cc b/www/chromium/files/patch-extensions_common_features_feature.cc
index d4b4a119..ba58d91d 100644
--- a/www/chromium/files/patch-extensions_common_features_feature.cc
+++ b/www/chromium/files/patch-extensions_common_features_feature.cc
@@ -1,4 +1,4 @@
---- extensions/common/features/feature.cc.orig	2021-01-18 21:28:59 UTC
+--- extensions/common/features/feature.cc.orig	2021-03-12 23:57:25 UTC
 +++ extensions/common/features/feature.cc
 @@ -26,7 +26,7 @@ Feature::Platform Feature::GetCurrentPlatform() {
    return LACROS_PLATFORM;
diff --git a/www/chromium/files/patch-extensions_common_image__util.cc b/www/chromium/files/patch-extensions_common_image__util.cc
index 38860031..c0c32be5 100644
--- a/www/chromium/files/patch-extensions_common_image__util.cc
+++ b/www/chromium/files/patch-extensions_common_image__util.cc
@@ -1,4 +1,4 @@
---- extensions/common/image_util.cc.orig	2020-11-13 06:36:43 UTC
+--- extensions/common/image_util.cc.orig	2021-03-12 23:57:25 UTC
 +++ extensions/common/image_util.cc
 @@ -20,7 +20,11 @@
  #include "base/strings/stringprintf.h"
diff --git a/www/chromium/files/patch-extensions_common_stack__frame.cc b/www/chromium/files/patch-extensions_common_stack__frame.cc
index 16a02654..9caff567 100644
--- a/www/chromium/files/patch-extensions_common_stack__frame.cc
+++ b/www/chromium/files/patch-extensions_common_stack__frame.cc
@@ -1,4 +1,4 @@
---- extensions/common/stack_frame.cc.orig	2020-11-13 06:36:43 UTC
+--- extensions/common/stack_frame.cc.orig	2021-03-12 23:57:25 UTC
 +++ extensions/common/stack_frame.cc
 @@ -7,7 +7,11 @@
  #include <string>
diff --git a/www/chromium/files/patch-extensions_renderer_bindings_api__binding__util.cc b/www/chromium/files/patch-extensions_renderer_bindings_api__binding__util.cc
index 428eec29..a04e8bad 100644
--- a/www/chromium/files/patch-extensions_renderer_bindings_api__binding__util.cc
+++ b/www/chromium/files/patch-extensions_renderer_bindings_api__binding__util.cc
@@ -1,4 +1,4 @@
---- extensions/renderer/bindings/api_binding_util.cc.orig	2021-01-18 21:28:59 UTC
+--- extensions/renderer/bindings/api_binding_util.cc.orig	2021-03-12 23:57:25 UTC
 +++ extensions/renderer/bindings/api_binding_util.cc
 @@ -131,6 +131,8 @@ std::string GetPlatformString() {
    return "mac";
diff --git a/www/chromium/files/patch-extensions_shell_BUILD.gn b/www/chromium/files/patch-extensions_shell_BUILD.gn
index 00eadd30..e3095609 100644
--- a/www/chromium/files/patch-extensions_shell_BUILD.gn
+++ b/www/chromium/files/patch-extensions_shell_BUILD.gn
@@ -1,6 +1,6 @@
---- extensions/shell/BUILD.gn.orig	2021-01-18 21:28:59 UTC
+--- extensions/shell/BUILD.gn.orig	2021-03-12 23:57:25 UTC
 +++ extensions/shell/BUILD.gn
-@@ -209,16 +209,24 @@ source_set("app_shell_lib") {
+@@ -205,16 +205,24 @@ source_set("app_shell_lib") {
    }
  
    if (is_linux || is_chromeos_lacros) {
diff --git a/www/chromium/files/patch-extensions_shell_app_shell__main__delegate.cc b/www/chromium/files/patch-extensions_shell_app_shell__main__delegate.cc
index b28ee277..b15bb6e1 100644
--- a/www/chromium/files/patch-extensions_shell_app_shell__main__delegate.cc
+++ b/www/chromium/files/patch-extensions_shell_app_shell__main__delegate.cc
@@ -1,6 +1,6 @@
---- extensions/shell/app/shell_main_delegate.cc.orig	2021-01-18 21:28:59 UTC
+--- extensions/shell/app/shell_main_delegate.cc.orig	2021-03-12 23:57:25 UTC
 +++ extensions/shell/app/shell_main_delegate.cc
-@@ -38,7 +38,7 @@
+@@ -39,7 +39,7 @@
  
  #if defined(OS_WIN)
  #include "base/base_paths_win.h"
@@ -9,7 +9,7 @@
  #include "base/nix/xdg_util.h"
  #elif defined(OS_MAC)
  #include "base/base_paths_mac.h"
-@@ -74,7 +74,7 @@ base::FilePath GetDataPath() {
+@@ -75,7 +75,7 @@ base::FilePath GetDataPath() {
      return cmd_line->GetSwitchValuePath(switches::kContentShellDataPath);
  
    base::FilePath data_dir;
diff --git a/www/chromium/files/patch-extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc b/www/chromium/files/patch-extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc
index 64980b0b..dac90521 100644
--- a/www/chromium/files/patch-extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc
+++ b/www/chromium/files/patch-extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc
@@ -1,6 +1,6 @@
---- extensions/shell/browser/api/runtime/shell_runtime_api_delegate.cc.orig	2021-01-18 21:28:59 UTC
+--- extensions/shell/browser/api/runtime/shell_runtime_api_delegate.cc.orig	2021-03-12 23:57:25 UTC
 +++ extensions/shell/browser/api/runtime/shell_runtime_api_delegate.cc
-@@ -46,7 +46,7 @@ void ShellRuntimeAPIDelegate::OpenURL(const GURL& unin
+@@ -45,7 +45,7 @@ void ShellRuntimeAPIDelegate::OpenURL(const GURL& unin
  bool ShellRuntimeAPIDelegate::GetPlatformInfo(PlatformInfo* info) {
  #if BUILDFLAG(IS_CHROMEOS_ASH)
    info->os = api::runtime::PLATFORM_OS_CROS;
diff --git a/www/chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.cc b/www/chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.cc
index 36a912e9..8f2d1f73 100644
--- a/www/chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.cc
+++ b/www/chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.cc
@@ -1,4 +1,4 @@
---- extensions/shell/browser/shell_extensions_api_client.cc.orig	2021-01-18 21:28:59 UTC
+--- extensions/shell/browser/shell_extensions_api_client.cc.orig	2021-03-12 23:57:25 UTC
 +++ extensions/shell/browser/shell_extensions_api_client.cc
 @@ -19,7 +19,7 @@
  
diff --git a/www/chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.h b/www/chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.h
index 9774dca8..442fb496 100644
--- a/www/chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.h
+++ b/www/chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.h
@@ -1,4 +1,4 @@
---- extensions/shell/browser/shell_extensions_api_client.h.orig	2021-01-18 21:28:59 UTC
+--- extensions/shell/browser/shell_extensions_api_client.h.orig	2021-03-12 23:57:25 UTC
 +++ extensions/shell/browser/shell_extensions_api_client.h
 @@ -36,7 +36,7 @@ class ShellExtensionsAPIClient : public ExtensionsAPIC
        const override;
diff --git a/www/chromium/files/patch-google__apis_gcm_engine_heartbeat__manager.cc b/www/chromium/files/patch-google__apis_gcm_engine_heartbeat__manager.cc
index a051cb47..2a6fffaf 100644
--- a/www/chromium/files/patch-google__apis_gcm_engine_heartbeat__manager.cc
+++ b/www/chromium/files/patch-google__apis_gcm_engine_heartbeat__manager.cc
@@ -1,18 +1,18 @@
---- google_apis/gcm/engine/heartbeat_manager.cc.orig	2021-01-18 21:28:59 UTC
+--- google_apis/gcm/engine/heartbeat_manager.cc.orig	2021-03-12 23:57:25 UTC
 +++ google_apis/gcm/engine/heartbeat_manager.cc
 @@ -32,13 +32,13 @@ const int kMinClientHeartbeatIntervalMs = 1000 * 30;  
  // Minimum time spent sleeping before we force a new heartbeat.
  const int kMinSuspendTimeMs = 1000 * 10; // 10 seconds.
  
--#if defined(OS_LINUX) || BUILDFLAG(IS_LACROS)
-+#if defined(OS_LINUX) || BUILDFLAG(IS_LACROS) || defined(OS_BSD)
+-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
  // The period at which to check if the heartbeat time has passed. Used to
  // protect against platforms where the timer is delayed by the system being
  // suspended.  Only needed on linux because the other OSes provide a standard
  // way to be notified of system suspend and resume events.
  const int kHeartbeatMissedCheckMs = 1000 * 60 * 5;  // 5 minutes.
--#endif  // defined(OS_LINUX) || BUILDFLAG(IS_LACROS)
-+#endif  // defined(OS_LINUX) || BUILDFLAG(IS_LACROS) || defined(OS_BSD)
+-#endif  // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#endif  // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
  
  }  // namespace
  
@@ -20,8 +20,8 @@
        base::BindRepeating(&HeartbeatManager::OnHeartbeatTriggered,
                            weak_ptr_factory_.GetWeakPtr()));
  
--#if defined(OS_LINUX) || BUILDFLAG(IS_LACROS)
-+#if defined(OS_LINUX) || BUILDFLAG(IS_LACROS) || defined(OS_BSD)
+-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
    // Windows, Mac, Android, iOS, and Chrome OS all provide a way to be notified
    // when the system is suspending or resuming.  The only one that does not is
    // Linux so we need to poll to check for missed heartbeats.
@@ -29,8 +29,8 @@
        base::BindOnce(&HeartbeatManager::CheckForMissedHeartbeat,
                       weak_ptr_factory_.GetWeakPtr()),
        base::TimeDelta::FromMilliseconds(kHeartbeatMissedCheckMs));
--#endif  // defined(OS_LINUX) || BUILDFLAG(IS_LACROS)
-+#endif  // defined(OS_LINUX) || BUILDFLAG(IS_LACROS) || defined(OS_BSD)
+-#endif  // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#endif  // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
  }
  
  void HeartbeatManager::CheckForMissedHeartbeat() {
@@ -38,16 +38,16 @@
      return;
    }
  
--#if defined(OS_LINUX) || BUILDFLAG(IS_LACROS)
-+#if defined(OS_LINUX) || BUILDFLAG(IS_LACROS) || defined(OS_BSD)
+-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
    // Otherwise check again later.
    io_task_runner_->PostDelayedTask(
        FROM_HERE,
        base::BindOnce(&HeartbeatManager::CheckForMissedHeartbeat,
                       weak_ptr_factory_.GetWeakPtr()),
        base::TimeDelta::FromMilliseconds(kHeartbeatMissedCheckMs));
--#endif  // defined(OS_LINUX) || BUILDFLAG(IS_LACROS)
-+#endif  // defined(OS_LINUX) || BUILDFLAG(IS_LACROS) || defined(OS_BSD)
+-#endif  // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#endif  // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
  }
  
  void HeartbeatManager::UpdateHeartbeatInterval() {
diff --git a/www/chromium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc b/www/chromium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc
index 41954dc9..e4939c58 100644
--- a/www/chromium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc
+++ b/www/chromium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc
@@ -1,4 +1,4 @@
---- gpu/command_buffer/common/gpu_memory_buffer_support.cc.orig	2020-11-13 06:36:43 UTC
+--- gpu/command_buffer/common/gpu_memory_buffer_support.cc.orig	2021-03-12 23:57:25 UTC
 +++ gpu/command_buffer/common/gpu_memory_buffer_support.cc
 @@ -55,7 +55,7 @@ bool IsImageSizeValidForGpuMemoryBufferFormat(const gf
  uint32_t GetPlatformSpecificTextureTarget() {
diff --git a/www/chromium/files/patch-gpu_command__buffer_service_external__semaphore.cc b/www/chromium/files/patch-gpu_command__buffer_service_external__semaphore.cc
index 0592463f..c96d220f 100644
--- a/www/chromium/files/patch-gpu_command__buffer_service_external__semaphore.cc
+++ b/www/chromium/files/patch-gpu_command__buffer_service_external__semaphore.cc
@@ -1,4 +1,4 @@
---- gpu/command_buffer/service/external_semaphore.cc.orig	2020-11-16 14:42:25 UTC
+--- gpu/command_buffer/service/external_semaphore.cc.orig	2021-03-12 23:57:25 UTC
 +++ gpu/command_buffer/service/external_semaphore.cc
 @@ -39,7 +39,7 @@ GLuint ImportSemaphoreHandleToGLSemaphore(SemaphoreHan
        },
diff --git a/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc b/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc
index f32843ec..0603a8b2 100644
--- a/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc
+++ b/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc
@@ -1,4 +1,4 @@
---- gpu/command_buffer/service/external_vk_image_backing.cc.orig	2021-01-18 21:28:59 UTC
+--- gpu/command_buffer/service/external_vk_image_backing.cc.orig	2021-03-12 23:57:25 UTC
 +++ gpu/command_buffer/service/external_vk_image_backing.cc
 @@ -30,7 +30,7 @@
  #include "ui/gl/gl_version_info.h"
@@ -9,7 +9,7 @@
  #include "gpu/command_buffer/service/external_vk_image_dawn_representation.h"
  #endif
  
-@@ -606,7 +606,7 @@ std::unique_ptr<SharedImageRepresentationDawn>
+@@ -616,7 +616,7 @@ std::unique_ptr<SharedImageRepresentationDawn>
  ExternalVkImageBacking::ProduceDawn(SharedImageManager* manager,
                                      MemoryTypeTracker* tracker,
                                      WGPUDevice wgpuDevice) {
@@ -18,7 +18,7 @@
    auto wgpu_format = viz::ToWGPUFormat(format());
  
    if (wgpu_format == WGPUTextureFormat_Undefined) {
-@@ -625,7 +625,7 @@ ExternalVkImageBacking::ProduceDawn(SharedImageManager
+@@ -635,7 +635,7 @@ ExternalVkImageBacking::ProduceDawn(SharedImageManager
  
    return std::make_unique<ExternalVkImageDawnRepresentation>(
        manager, this, tracker, wgpuDevice, wgpu_format, std::move(memory_fd));
@@ -27,7 +27,7 @@
    NOTIMPLEMENTED_LOG_ONCE();
    return nullptr;
  #endif
-@@ -638,7 +638,7 @@ GLuint ExternalVkImageBacking::ProduceGLTextureInterna
+@@ -648,7 +648,7 @@ GLuint ExternalVkImageBacking::ProduceGLTextureInterna
    gl::GLApi* api = gl::g_current_gl_context;
    base::Optional<ScopedDedicatedMemoryObject> memory_object;
    if (!use_separate_gl_texture()) {
diff --git a/www/chromium/files/patch-gpu_command__buffer_service_program__manager.cc b/www/chromium/files/patch-gpu_command__buffer_service_program__manager.cc
index 8eeac5d0..e40f0e9c 100644
--- a/www/chromium/files/patch-gpu_command__buffer_service_program__manager.cc
+++ b/www/chromium/files/patch-gpu_command__buffer_service_program__manager.cc
@@ -1,4 +1,4 @@
---- gpu/command_buffer/service/program_manager.cc.orig	2020-11-13 06:36:44 UTC
+--- gpu/command_buffer/service/program_manager.cc.orig	2021-03-12 23:57:25 UTC
 +++ gpu/command_buffer/service/program_manager.cc
 @@ -30,7 +30,11 @@
  #include "gpu/command_buffer/service/program_cache.h"
diff --git a/www/chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc b/www/chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc
index 348db28a..1fef57d8 100644
--- a/www/chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc
+++ b/www/chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc
@@ -1,6 +1,6 @@
---- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig	2021-01-19 11:45:10 UTC
+--- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig	2021-03-12 23:57:25 UTC
 +++ gpu/command_buffer/service/webgpu_decoder_impl.cc
-@@ -929,12 +929,12 @@ error::Error WebGPUDecoderImpl::HandleRequestAdapter(
+@@ -946,12 +946,12 @@ error::Error WebGPUDecoderImpl::HandleRequestAdapter(
        static_cast<DawnRequestAdapterSerial>(c.request_adapter_serial);
  
    if (gr_context_type_ != GrContextType::kVulkan) {
diff --git a/www/chromium/files/patch-gpu_command__buffer_tests_gl__copy__texture__CHROMIUM__unittest.cc b/www/chromium/files/patch-gpu_command__buffer_tests_gl__copy__texture__CHROMIUM__unittest.cc
index 642ae9c8..a47727ef 100644
--- a/www/chromium/files/patch-gpu_command__buffer_tests_gl__copy__texture__CHROMIUM__unittest.cc
+++ b/www/chromium/files/patch-gpu_command__buffer_tests_gl__copy__texture__CHROMIUM__unittest.cc
@@ -1,4 +1,4 @@
---- gpu/command_buffer/tests/gl_copy_texture_CHROMIUM_unittest.cc.orig	2021-01-18 21:28:59 UTC
+--- gpu/command_buffer/tests/gl_copy_texture_CHROMIUM_unittest.cc.orig	2021-03-12 23:57:25 UTC
 +++ gpu/command_buffer/tests/gl_copy_texture_CHROMIUM_unittest.cc
 @@ -258,7 +258,7 @@ void getExpectedColorAndMask(GLenum src_internal_forma
  
diff --git a/www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.cc b/www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.cc
index 05cd8a85..814fff36 100644
--- a/www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.cc
+++ b/www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.cc
@@ -1,4 +1,4 @@
---- gpu/command_buffer/tests/gl_test_utils.cc.orig	2020-11-13 06:36:44 UTC
+--- gpu/command_buffer/tests/gl_test_utils.cc.orig	2021-03-12 23:57:25 UTC
 +++ gpu/command_buffer/tests/gl_test_utils.cc
 @@ -24,7 +24,7 @@
  #include "ui/gl/gl_version_info.h"
diff --git a/www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.h b/www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.h
index 04e23c35..f886da38 100644
--- a/www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.h
+++ b/www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.h
@@ -1,4 +1,4 @@
---- gpu/command_buffer/tests/gl_test_utils.h.orig	2020-11-13 06:36:44 UTC
+--- gpu/command_buffer/tests/gl_test_utils.h.orig	2021-03-12 23:57:25 UTC
 +++ gpu/command_buffer/tests/gl_test_utils.h
 @@ -120,7 +120,7 @@ class GpuCommandBufferTestEGL {
      return gfx::HasExtension(gl_extensions_, extension);
diff --git a/www/chromium/files/patch-gpu_command__buffer_tests_webgpu__test.cc b/www/chromium/files/patch-gpu_command__buffer_tests_webgpu__test.cc
index 7effee35..c615936e 100644
--- a/www/chromium/files/patch-gpu_command__buffer_tests_webgpu__test.cc
+++ b/www/chromium/files/patch-gpu_command__buffer_tests_webgpu__test.cc
@@ -1,4 +1,4 @@
---- gpu/command_buffer/tests/webgpu_test.cc.orig	2021-01-18 21:28:59 UTC
+--- gpu/command_buffer/tests/webgpu_test.cc.orig	2021-03-12 23:57:25 UTC
 +++ gpu/command_buffer/tests/webgpu_test.cc
 @@ -51,8 +51,8 @@ bool WebGPUTest::WebGPUSupported() const {
  
diff --git a/www/chromium/files/patch-gpu_config_gpu__control__list.cc b/www/chromium/files/patch-gpu_config_gpu__control__list.cc
index 694ae992..65c205bd 100644
--- a/www/chromium/files/patch-gpu_config_gpu__control__list.cc
+++ b/www/chromium/files/patch-gpu_config_gpu__control__list.cc
@@ -1,4 +1,4 @@
---- gpu/config/gpu_control_list.cc.orig	2021-01-18 21:28:59 UTC
+--- gpu/config/gpu_control_list.cc.orig	2021-03-12 23:57:25 UTC
 +++ gpu/config/gpu_control_list.cc
 @@ -18,7 +18,11 @@
  #include "build/build_config.h"
@@ -14,7 +14,7 @@
  namespace {
 @@ -276,7 +280,7 @@ bool GpuControlList::More::GLVersionInfoMismatch(
  GpuControlList::GLType GpuControlList::More::GetDefaultGLType() {
- #if BUILDFLAG(IS_ASH)
+ #if BUILDFLAG(IS_CHROMEOS_ASH)
    return kGLTypeGL;
 -#elif defined(OS_LINUX) || defined(OS_OPENBSD)
 +#elif defined(OS_LINUX) || defined(OS_BSD)
diff --git a/www/chromium/files/patch-gpu_config_gpu__test__config.cc b/www/chromium/files/patch-gpu_config_gpu__test__config.cc
index 3297dcaf..2e0f839e 100644
--- a/www/chromium/files/patch-gpu_config_gpu__test__config.cc
+++ b/www/chromium/files/patch-gpu_config_gpu__test__config.cc
@@ -1,8 +1,8 @@
---- gpu/config/gpu_test_config.cc.orig	2021-01-18 21:28:59 UTC
+--- gpu/config/gpu_test_config.cc.orig	2021-03-12 23:57:25 UTC
 +++ gpu/config/gpu_test_config.cc
 @@ -28,7 +28,7 @@ namespace {
  GPUTestConfig::OS GetCurrentOS() {
- #if BUILDFLAG(IS_ASH)
+ #if BUILDFLAG(IS_CHROMEOS_ASH)
    return GPUTestConfig::kOsChromeOS;
 -#elif defined(OS_LINUX) || defined(OS_OPENBSD)
 +#elif defined(OS_LINUX) || defined(OS_BSD)
diff --git a/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.cc b/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.cc
index 55edf9b8..7489b2ba 100644
--- a/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.cc
+++ b/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.cc
@@ -1,4 +1,4 @@
---- gpu/ipc/common/gpu_memory_buffer_support.cc.orig	2021-01-18 21:28:59 UTC
+--- gpu/ipc/common/gpu_memory_buffer_support.cc.orig	2021-03-12 23:57:25 UTC
 +++ gpu/ipc/common/gpu_memory_buffer_support.cc
 @@ -16,7 +16,7 @@
  #include "gpu/ipc/common/gpu_memory_buffer_impl_io_surface.h"
diff --git a/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.h b/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.h
index f9b58c51..64808c7b 100644
--- a/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.h
+++ b/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.h
@@ -1,4 +1,4 @@
---- gpu/ipc/common/gpu_memory_buffer_support.h.orig	2020-11-13 06:36:44 UTC
+--- gpu/ipc/common/gpu_memory_buffer_support.h.orig	2021-03-12 23:57:25 UTC
 +++ gpu/ipc/common/gpu_memory_buffer_support.h
 @@ -16,7 +16,7 @@
  #include "ui/gfx/geometry/size.h"
diff --git a/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc b/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc
index 61282034..2c9c98fb 100644
--- a/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc
+++ b/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc
@@ -1,34 +1,33 @@
---- gpu/ipc/service/gpu_init.cc.orig	2021-01-18 21:28:59 UTC
+--- gpu/ipc/service/gpu_init.cc.orig	2021-03-12 23:57:25 UTC
 +++ gpu/ipc/service/gpu_init.cc
-@@ -107,7 +107,7 @@ void InitializePlatformOverlaySettings(GPUInfo* gpu_in
- #endif
+@@ -108,7 +108,7 @@ void InitializePlatformOverlaySettings(GPUInfo* gpu_in
  }
  
--#if BUILDFLAG(IS_LACROS) || (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMECAST))
-+#if BUILDFLAG(IS_LACROS) || (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMECAST)) || defined(OS_BSD)
+ #if BUILDFLAG(IS_CHROMEOS_LACROS) || \
+-    (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMECAST))
++    (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMECAST)) || defined(OS_BSD)
  bool CanAccessNvidiaDeviceFile() {
    bool res = true;
    base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
-@@ -118,8 +118,7 @@ bool CanAccessNvidiaDeviceFile() {
+@@ -119,7 +119,7 @@ bool CanAccessNvidiaDeviceFile() {
    }
    return res;
  }
--#endif  // BUILDFLAG(IS_LACROS) || (defined(OS_LINUX)  &&
--        // !BUILDFLAG(IS_CHROMECAST))
-+#endif  // BUILDFLAG(IS_LACROS) || (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMECAST)) || defined(OS_BSD)
+-#endif  // BUILDFLAG(IS_CHROMEOS_LACROS) || (defined(OS_LINUX)  &&
++#endif  // BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) || (defined(OS_LINUX)  &&
+         // !BUILDFLAG(IS_CHROMECAST))
  
  class GpuWatchdogInit {
-  public:
-@@ -205,7 +204,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -206,7 +206,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
      device_perf_info_ = device_perf_info;
    }
  
--#if defined(OS_LINUX) || BUILDFLAG(IS_LACROS)
-+#if defined(OS_LINUX) || BUILDFLAG(IS_LACROS) || defined(OS_BSD)
+-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
    if (gpu_info_.gpu.vendor_id == 0x10de &&  // NVIDIA
        gpu_info_.gpu.driver_vendor == "NVIDIA" && !CanAccessNvidiaDeviceFile())
      return false;
-@@ -257,7 +256,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -258,7 +258,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
    delayed_watchdog_enable = true;
  #endif
  
@@ -37,7 +36,7 @@
    // PreSandbox is mainly for resource handling and not related to the GPU
    // driver, it doesn't need the GPU watchdog. The loadLibrary may take long
    // time that killing and restarting the GPU process will not help.
-@@ -297,7 +296,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -298,7 +298,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
    }
  
    bool attempted_startsandbox = false;
@@ -46,7 +45,7 @@
    // On Chrome OS ARM Mali, GPU driver userspace creates threads when
    // initializing a GL context, so start the sandbox early.
    // TODO(zmo): Need to collect OS version before this.
-@@ -306,7 +305,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -307,7 +307,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
          watchdog_thread_.get(), &gpu_info_, gpu_preferences_);
      attempted_startsandbox = true;
    }
@@ -55,7 +54,7 @@
  
    base::TimeTicks before_initialize_one_off = base::TimeTicks::Now();
  
-@@ -334,14 +333,14 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -345,7 +345,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
    }
    if (gl_initialized && gl_use_swiftshader_ &&
        gl::GetGLImplementation() != gl::kGLImplementationSwiftShaderGL) {
@@ -64,7 +63,8 @@
      VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly "
              << "on Linux";
      return false;
- #else
+@@ -353,7 +353,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+     SaveHardwareGpuInfoAndGpuFeatureInfo();
      gl::init::ShutdownGL(true);
      gl_initialized = false;
 -#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS)
@@ -72,7 +72,7 @@
    }
  
    if (!gl_initialized) {
-@@ -367,7 +366,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -379,7 +379,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
      }
    }
  
@@ -81,7 +81,7 @@
    // The ContentSandboxHelper is currently the only one implementation of
    // GpuSandboxHelper and it has no dependency. Except on Linux where
    // VaapiWrapper checks the GL implementation to determine which display
-@@ -421,7 +420,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -433,7 +433,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
            command_line, gpu_feature_info_,
            gpu_preferences_.disable_software_rasterizer, false);
        if (gl_use_swiftshader_) {
@@ -90,7 +90,7 @@
          VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly "
                  << "on Linux";
          return false;
-@@ -435,7 +434,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -448,7 +448,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
                << "failed";
            return false;
          }
@@ -99,7 +99,7 @@
        }
      } else {  // gl_use_swiftshader_ == true
        switch (gpu_preferences_.use_vulkan) {
-@@ -511,7 +510,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -524,7 +524,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
  
    InitializePlatformOverlaySettings(&gpu_info_, gpu_feature_info_);
  
@@ -108,7 +108,7 @@
    // Driver may create a compatibility profile context when collect graphics
    // information on Linux platform. Try to collect graphics information
    // based on core profile context after disabling platform extensions.
-@@ -530,7 +529,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -543,7 +543,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
        return false;
      }
    }
@@ -117,7 +117,7 @@
  
    if (gl_use_swiftshader_) {
      AdjustInfoToSwiftShader();
-@@ -700,7 +699,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
+@@ -726,7 +726,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
  
    InitializePlatformOverlaySettings(&gpu_info_, gpu_feature_info_);
  
@@ -126,7 +126,7 @@
    // Driver may create a compatibility profile context when collect graphics
    // information on Linux platform. Try to collect graphics information
    // based on core profile context after disabling platform extensions.
-@@ -720,7 +719,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
+@@ -747,7 +747,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
        }
      }
    }
diff --git a/www/chromium/files/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc b/www/chromium/files/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc
index a76d05b6..5a627855 100644
--- a/www/chromium/files/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc
+++ b/www/chromium/files/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc
@@ -1,4 +1,4 @@
---- gpu/ipc/service/gpu_memory_buffer_factory.cc.orig	2020-11-13 06:36:44 UTC
+--- gpu/ipc/service/gpu_memory_buffer_factory.cc.orig	2021-03-12 23:57:25 UTC
 +++ gpu/ipc/service/gpu_memory_buffer_factory.cc
 @@ -12,7 +12,7 @@
  #include "gpu/ipc/service/gpu_memory_buffer_factory_io_surface.h"
diff --git a/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.cc b/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.cc
index ea9def5f..a4657e30 100644
--- a/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.cc
+++ b/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.cc
@@ -1,6 +1,6 @@
---- gpu/ipc/service/gpu_watchdog_thread.cc.orig	2021-01-18 21:28:59 UTC
+--- gpu/ipc/service/gpu_watchdog_thread.cc.orig	2021-03-12 23:57:25 UTC
 +++ gpu/ipc/service/gpu_watchdog_thread.cc
-@@ -77,7 +77,7 @@ GpuWatchdogThread::GpuWatchdogThread(base::TimeDelta t
+@@ -73,7 +73,7 @@ GpuWatchdogThread::GpuWatchdogThread(base::TimeDelta t
    }
  #endif
  
@@ -9,7 +9,7 @@
    tty_file_ = base::OpenFile(
        base::FilePath(FILE_PATH_LITERAL("/sys/class/tty/tty0/active")), "r");
    UpdateActiveTTY();
-@@ -105,7 +105,7 @@ GpuWatchdogThread::~GpuWatchdogThread() {
+@@ -101,7 +101,7 @@ GpuWatchdogThread::~GpuWatchdogThread() {
      CloseHandle(watched_thread_handle_);
  #endif
  
@@ -18,7 +18,7 @@
    if (tty_file_)
      fclose(tty_file_);
  #endif
-@@ -476,7 +476,7 @@ void GpuWatchdogThread::OnWatchdogTimeout() {
+@@ -440,7 +440,7 @@ void GpuWatchdogThread::OnWatchdogTimeout() {
    if (foregrounded_event_)
      num_of_timeout_after_foregrounded_++;
  
@@ -27,7 +27,7 @@
    UpdateActiveTTY();
  #endif
  
-@@ -869,7 +869,7 @@ bool GpuWatchdogThread::WithinOneMinFromForegrounded()
+@@ -773,7 +773,7 @@ bool GpuWatchdogThread::WithinOneMinFromForegrounded()
    return foregrounded_event_ && num_of_timeout_after_foregrounded_ <= count;
  }
  
@@ -36,7 +36,7 @@
  void GpuWatchdogThread::UpdateActiveTTY() {
    last_active_tty_ = active_tty_;
  
-@@ -886,7 +886,7 @@ void GpuWatchdogThread::UpdateActiveTTY() {
+@@ -790,7 +790,7 @@ void GpuWatchdogThread::UpdateActiveTTY() {
  #endif
  
  bool GpuWatchdogThread::ContinueOnNonHostX11ServerTty() {
diff --git a/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.h b/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.h
index 17f0cf51..7ec145c4 100644
--- a/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.h
+++ b/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.h
@@ -1,6 +1,6 @@
---- gpu/ipc/service/gpu_watchdog_thread.h.orig	2021-01-18 21:28:59 UTC
+--- gpu/ipc/service/gpu_watchdog_thread.h.orig	2021-03-12 23:57:25 UTC
 +++ gpu/ipc/service/gpu_watchdog_thread.h
-@@ -206,7 +206,7 @@ class GPU_IPC_SERVICE_EXPORT GpuWatchdogThread : publi
+@@ -198,7 +198,7 @@ class GPU_IPC_SERVICE_EXPORT GpuWatchdogThread : publi
    bool WithinOneMinFromPowerResumed();
    bool WithinOneMinFromForegrounded();
  
@@ -9,7 +9,7 @@
    void UpdateActiveTTY();
  #endif
    // The watchdog continues when it's not on the TTY of our host X11 server.
-@@ -278,7 +278,7 @@ class GPU_IPC_SERVICE_EXPORT GpuWatchdogThread : publi
+@@ -270,7 +270,7 @@ class GPU_IPC_SERVICE_EXPORT GpuWatchdogThread : publi
    bool less_than_full_thread_time_after_capped_ = false;
  #endif
  
diff --git a/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc b/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc
index a157b639..10932960 100644
--- a/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc
+++ b/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc
@@ -1,6 +1,6 @@
---- gpu/vulkan/vulkan_function_pointers.cc.orig	2020-11-13 06:36:44 UTC
+--- gpu/vulkan/vulkan_function_pointers.cc.orig	2021-03-12 23:57:25 UTC
 +++ gpu/vulkan/vulkan_function_pointers.cc
-@@ -862,7 +862,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer
+@@ -890,7 +890,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer
    }
  #endif  // defined(OS_ANDROID)
  
@@ -9,7 +9,7 @@
    if (gfx::HasExtension(enabled_extensions,
                          VK_KHR_EXTERNAL_SEMAPHORE_FD_EXTENSION_NAME)) {
      vkGetSemaphoreFdKHR = reinterpret_cast<PFN_vkGetSemaphoreFdKHR>(
-@@ -881,7 +881,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer
+@@ -909,7 +909,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer
        return false;
      }
    }
@@ -18,7 +18,7 @@
  
  #if defined(OS_WIN)
    if (gfx::HasExtension(enabled_extensions,
-@@ -906,7 +906,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer
+@@ -934,7 +934,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer
    }
  #endif  // defined(OS_WIN)
  
@@ -27,7 +27,7 @@
    if (gfx::HasExtension(enabled_extensions,
                          VK_KHR_EXTERNAL_MEMORY_FD_EXTENSION_NAME)) {
      vkGetMemoryFdKHR = reinterpret_cast<PFN_vkGetMemoryFdKHR>(
-@@ -926,7 +926,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer
+@@ -954,7 +954,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer
        return false;
      }
    }
@@ -36,3 +36,21 @@
  
  #if defined(OS_WIN)
    if (gfx::HasExtension(enabled_extensions,
+@@ -1103,7 +1103,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer
+     }
+   }
+ 
+-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+   if (gfx::HasExtension(enabled_extensions,
+                         VK_EXT_IMAGE_DRM_FORMAT_MODIFIER_EXTENSION_NAME)) {
+     vkGetImageDrmFormatModifierPropertiesEXT =
+@@ -1116,7 +1116,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer
+       return false;
+     }
+   }
+-#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS)
++#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+ 
+   return true;
+ }
diff --git a/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h b/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h
index 80384a93..5bdfdbaa 100644
--- a/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h
+++ b/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h
@@ -1,6 +1,6 @@
---- gpu/vulkan/vulkan_function_pointers.h.orig	2021-01-18 21:28:59 UTC
+--- gpu/vulkan/vulkan_function_pointers.h.orig	2021-03-12 23:57:25 UTC
 +++ gpu/vulkan/vulkan_function_pointers.h
-@@ -235,10 +235,10 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers
+@@ -240,10 +240,10 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers
        vkGetAndroidHardwareBufferPropertiesANDROID;
  #endif  // defined(OS_ANDROID)
  
@@ -13,7 +13,7 @@
  
  #if defined(OS_WIN)
    VulkanFunction<PFN_vkGetSemaphoreWin32HandleKHR> vkGetSemaphoreWin32HandleKHR;
-@@ -246,10 +246,10 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers
+@@ -251,10 +251,10 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers
        vkImportSemaphoreWin32HandleKHR;
  #endif  // defined(OS_WIN)
  
@@ -26,7 +26,20 @@
  
  #if defined(OS_WIN)
    VulkanFunction<PFN_vkGetMemoryWin32HandleKHR> vkGetMemoryWin32HandleKHR;
-@@ -954,7 +954,7 @@ ALWAYS_INLINE VkResult vkGetAndroidHardwareBufferPrope
+@@ -291,10 +291,10 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers
+   VulkanFunction<PFN_vkGetSwapchainImagesKHR> vkGetSwapchainImagesKHR;
+   VulkanFunction<PFN_vkQueuePresentKHR> vkQueuePresentKHR;
+ 
+-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+   VulkanFunction<PFN_vkGetImageDrmFormatModifierPropertiesEXT>
+       vkGetImageDrmFormatModifierPropertiesEXT;
+-#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS)
++#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+ };
+ 
+ }  // namespace gpu
+@@ -985,7 +985,7 @@ ALWAYS_INLINE VkResult vkGetAndroidHardwareBufferPrope
  }
  #endif  // defined(OS_ANDROID)
  
@@ -35,7 +48,7 @@
  ALWAYS_INLINE VkResult
  vkGetSemaphoreFdKHR(VkDevice device,
                      const VkSemaphoreGetFdInfoKHR* pGetFdInfo,
-@@ -968,7 +968,7 @@ ALWAYS_INLINE VkResult vkImportSemaphoreFdKHR(
+@@ -999,7 +999,7 @@ ALWAYS_INLINE VkResult vkImportSemaphoreFdKHR(
    return gpu::GetVulkanFunctionPointers()->vkImportSemaphoreFdKHR(
        device, pImportSemaphoreFdInfo);
  }
@@ -44,7 +57,7 @@
  
  #if defined(OS_WIN)
  ALWAYS_INLINE VkResult vkGetSemaphoreWin32HandleKHR(
-@@ -987,7 +987,7 @@ vkImportSemaphoreWin32HandleKHR(VkDevice device,
+@@ -1018,7 +1018,7 @@ vkImportSemaphoreWin32HandleKHR(VkDevice device,
  }
  #endif  // defined(OS_WIN)
  
@@ -53,7 +66,7 @@
  ALWAYS_INLINE VkResult vkGetMemoryFdKHR(VkDevice device,
                                          const VkMemoryGetFdInfoKHR* pGetFdInfo,
                                          int* pFd) {
-@@ -1002,7 +1002,7 @@ vkGetMemoryFdPropertiesKHR(VkDevice device,
+@@ -1033,7 +1033,7 @@ vkGetMemoryFdPropertiesKHR(VkDevice device,
    return gpu::GetVulkanFunctionPointers()->vkGetMemoryFdPropertiesKHR(
        device, handleType, fd, pMemoryFdProperties);
  }
@@ -62,10 +75,22 @@
  
  #if defined(OS_WIN)
  ALWAYS_INLINE VkResult vkGetMemoryWin32HandleKHR(
-@@ -1082,4 +1082,4 @@ ALWAYS_INLINE VkResult vkQueuePresentKHR(VkQueue queue
+@@ -1113,7 +1113,7 @@ ALWAYS_INLINE VkResult vkQueuePresentKHR(VkQueue queue
                                                               pPresentInfo);
  }
  
+-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+ ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierPropertiesEXT(
+     VkDevice device,
+     VkImage image,
+@@ -1121,6 +1121,6 @@ ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierProp
+   return gpu::GetVulkanFunctionPointers()
+       ->vkGetImageDrmFormatModifierPropertiesEXT(device, image, pProperties);
+ }
+-#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS)
++#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+ 
 -#endif  // GPU_VULKAN_VULKAN_FUNCTION_POINTERS_H_
 \ No newline at end of file
 +#endif  // GPU_VULKAN_VULKAN_FUNCTION_POINTERS_H_
diff --git a/www/chromium/files/patch-gpu_vulkan_vulkan__image.cc b/www/chromium/files/patch-gpu_vulkan_vulkan__image.cc
new file mode 100644
index 00000000..c27aa916
--- /dev/null
+++ b/www/chromium/files/patch-gpu_vulkan_vulkan__image.cc
@@ -0,0 +1,11 @@
+--- gpu/vulkan/vulkan_image.cc.orig	2021-03-12 23:57:25 UTC
++++ gpu/vulkan/vulkan_image.cc
+@@ -320,7 +320,7 @@ bool VulkanImage::InitializeWithExternalMemory(
+   };
+   format_info_2.pNext = &external_info;
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   VkPhysicalDeviceImageDrmFormatModifierInfoEXT modifier_info = {
+       .sType =
+           VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_DRM_FORMAT_MODIFIER_INFO_EXT,
diff --git a/www/chromium/files/patch-gpu_vulkan_vulkan__image.h b/www/chromium/files/patch-gpu_vulkan_vulkan__image.h
new file mode 100644
index 00000000..e9fd9456
--- /dev/null
+++ b/www/chromium/files/patch-gpu_vulkan_vulkan__image.h
@@ -0,0 +1,20 @@
+--- gpu/vulkan/vulkan_image.h.orig	2021-03-12 23:57:25 UTC
++++ gpu/vulkan/vulkan_image.h
+@@ -84,7 +84,7 @@ class COMPONENT_EXPORT(VULKAN) VulkanImage {
+       VkImageUsageFlags usage,
+       VkImageCreateFlags flags);
+ 
+-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+   static std::unique_ptr<VulkanImage> CreateWithExternalMemoryAndModifiers(
+       VulkanDeviceQueue* device_queue,
+       const gfx::Size& size,
+@@ -166,7 +166,7 @@ class COMPONENT_EXPORT(VULKAN) VulkanImage {
+       VkImageCreateFlags flags,
+       VkImageTiling image_tiling);
+ 
+-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+   bool InitializeWithExternalMemoryAndModifiers(VulkanDeviceQueue* device_queue,
+                                                 const gfx::Size& size,
+                                                 VkFormat format,
diff --git a/www/chromium/files/patch-headless_BUILD.gn b/www/chromium/files/patch-headless_BUILD.gn
index 5f2a1002..bdab004e 100644
--- a/www/chromium/files/patch-headless_BUILD.gn
+++ b/www/chromium/files/patch-headless_BUILD.gn
@@ -1,6 +1,6 @@
---- headless/BUILD.gn.orig	2021-01-18 21:28:59 UTC
+--- headless/BUILD.gn.orig	2021-03-12 23:57:25 UTC
 +++ headless/BUILD.gn
-@@ -271,7 +271,7 @@ source_set("headless_shared_sources") {
+@@ -272,7 +272,7 @@ source_set("headless_shared_sources") {
    sources += generated_devtools_api
    sources += get_target_outputs(":protocol_sources")
  
@@ -18,7 +18,7 @@
      deps += [ "//components/crash/content/browser" ]
    }
    if (is_component_build && is_win) {
-@@ -455,7 +455,7 @@ component("headless_non_renderer") {
+@@ -459,7 +459,7 @@ component("headless_non_renderer") {
        "//v8",
      ]
  
@@ -27,7 +27,7 @@
        deps += [ "//components/crash/content/browser" ]
      }
      if (is_win) {
-@@ -746,7 +746,7 @@ static_library("headless_shell_lib") {
+@@ -772,7 +772,7 @@ static_library("headless_shell_lib") {
      public_deps += [ ":headless_non_renderer" ]
    }
  
diff --git a/www/chromium/files/patch-headless_lib_browser_headless__browser__main__parts.h b/www/chromium/files/patch-headless_lib_browser_headless__browser__main__parts.h
index 0fb4e2bd..d261ded0 100644
--- a/www/chromium/files/patch-headless_lib_browser_headless__browser__main__parts.h
+++ b/www/chromium/files/patch-headless_lib_browser_headless__browser__main__parts.h
@@ -1,6 +1,6 @@
---- headless/lib/browser/headless_browser_main_parts.h.orig	2020-11-13 06:36:44 UTC
+--- headless/lib/browser/headless_browser_main_parts.h.orig	2021-03-12 23:57:25 UTC
 +++ headless/lib/browser/headless_browser_main_parts.h
-@@ -32,7 +32,7 @@ class HeadlessBrowserMainParts : public content::Brows
+@@ -37,7 +37,7 @@ class HeadlessBrowserMainParts : public content::Brows
  #if defined(OS_MAC)
    void PreMainMessageLoopStart() override;
  #endif
diff --git a/www/chromium/files/patch-headless_lib_browser_headless__browser__main__parts__linux.cc b/www/chromium/files/patch-headless_lib_browser_headless__browser__main__parts__linux.cc
index 7c0d138c..2dff4ab7 100644
--- a/www/chromium/files/patch-headless_lib_browser_headless__browser__main__parts__linux.cc
+++ b/www/chromium/files/patch-headless_lib_browser_headless__browser__main__parts__linux.cc
@@ -1,11 +1,11 @@
---- headless/lib/browser/headless_browser_main_parts_linux.cc.orig	2020-11-13 06:36:44 UTC
+--- headless/lib/browser/headless_browser_main_parts_linux.cc.orig	2021-03-12 23:57:25 UTC
 +++ headless/lib/browser/headless_browser_main_parts_linux.cc
-@@ -10,7 +10,7 @@
+@@ -11,7 +11,7 @@
  namespace headless {
  
  void HeadlessBrowserMainParts::PostMainMessageLoopStart() {
--#if defined(USE_DBUS) && !defined(OS_CHROMEOS)
-+#if defined(USE_DBUS) && !defined(OS_CHROMEOS) && !defined(OS_BSD)
+-#if defined(USE_DBUS) && !BUILDFLAG(IS_CHROMEOS_ASH)
++#if defined(USE_DBUS) && !BUILDFLAG(IS_CHROMEOS_ASH) && !defined(OS_BSD)
    bluez::BluezDBusManager::Initialize(/*system_bus=*/nullptr);
  #endif
  }
diff --git a/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc b/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc
index 5fc8a565..643ad065 100644
--- a/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc
+++ b/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc
@@ -1,6 +1,6 @@
---- headless/lib/browser/headless_content_browser_client.cc.orig	2020-11-13 06:36:44 UTC
+--- headless/lib/browser/headless_content_browser_client.cc.orig	2021-03-12 23:57:25 UTC
 +++ headless/lib/browser/headless_content_browser_client.cc
-@@ -241,7 +241,7 @@ void HeadlessContentBrowserClient::AppendExtraCommandL
+@@ -278,7 +278,7 @@ void HeadlessContentBrowserClient::AppendExtraCommandL
                                              process_type, child_process_id);
    }
  
diff --git a/www/chromium/files/patch-headless_lib_browser_headless__request__context__manager.cc b/www/chromium/files/patch-headless_lib_browser_headless__request__context__manager.cc
index d8b85496..fab8516d 100644
--- a/www/chromium/files/patch-headless_lib_browser_headless__request__context__manager.cc
+++ b/www/chromium/files/patch-headless_lib_browser_headless__request__context__manager.cc
@@ -1,29 +1,20 @@
---- headless/lib/browser/headless_request_context_manager.cc.orig	2021-01-18 21:28:59 UTC
+--- headless/lib/browser/headless_request_context_manager.cc.orig	2021-03-12 23:57:25 UTC
 +++ headless/lib/browser/headless_request_context_manager.cc
-@@ -26,7 +26,7 @@ namespace headless {
+@@ -34,7 +34,7 @@ namespace {
  
- namespace {
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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)
  constexpr char kProductName[] = "HeadlessChrome";
  #endif
  
-@@ -56,7 +56,7 @@ net::NetworkTrafficAnnotationTag GetProxyConfigTraffic
-   return traffic_annotation;
- }
+@@ -72,7 +72,7 @@ void SetCryptConfigOnce(const base::FilePath& user_dat
  
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
- ::network::mojom::CryptConfigPtr BuildCryptConfigOnce(
-     const base::FilePath& user_data_path) {
-   static bool done_once = false;
-@@ -218,7 +218,7 @@ HeadlessRequestContextManager::HeadlessRequestContextM
-           base::ThreadTaskRunnerHandle::Get());
-     }
-   }
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
-   auto crypt_config = BuildCryptConfigOnce(user_data_path_);
-   if (crypt_config)
-     content::GetNetworkService()->SetCryptConfig(std::move(crypt_config));
+ // 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)
+   ::network::mojom::CryptConfigPtr config =
+       ::network::mojom::CryptConfig::New();
+   config->store = base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
diff --git a/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc b/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc
index 41eab8ea..c5bdf450 100644
--- a/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc
+++ b/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc
@@ -1,4 +1,4 @@
---- headless/lib/headless_content_main_delegate.cc.orig	2021-01-18 21:28:59 UTC
+--- headless/lib/headless_content_main_delegate.cc.orig	2021-03-12 23:57:25 UTC
 +++ headless/lib/headless_content_main_delegate.cc
 @@ -326,7 +326,7 @@ void HeadlessContentMainDelegate::InitCrashReporter(
      const base::CommandLine& command_line) {
diff --git a/www/chromium/files/patch-headless_lib_headless__macros.h b/www/chromium/files/patch-headless_lib_headless__macros.h
index af529b47..3025a0df 100644
--- a/www/chromium/files/patch-headless_lib_headless__macros.h
+++ b/www/chromium/files/patch-headless_lib_headless__macros.h
@@ -1,4 +1,4 @@
---- headless/lib/headless_macros.h.orig	2020-11-13 06:36:44 UTC
+--- headless/lib/headless_macros.h.orig	2021-03-12 23:57:25 UTC
 +++ headless/lib/headless_macros.h
 @@ -7,8 +7,8 @@
  
diff --git a/www/chromium/files/patch-ipc_ipc__channel.h b/www/chromium/files/patch-ipc_ipc__channel.h
index 57333348..98790331 100644
--- a/www/chromium/files/patch-ipc_ipc__channel.h
+++ b/www/chromium/files/patch-ipc_ipc__channel.h
@@ -1,4 +1,4 @@
---- ipc/ipc_channel.h.orig	2020-11-13 06:36:44 UTC
+--- ipc/ipc_channel.h.orig	2021-03-12 23:57:26 UTC
 +++ ipc/ipc_channel.h
 @@ -244,7 +244,7 @@ class COMPONENT_EXPORT(IPC) Channel : public Sender {
    static std::string GenerateUniqueRandomChannelID();
diff --git a/www/chromium/files/patch-ipc_ipc__channel__common.cc b/www/chromium/files/patch-ipc_ipc__channel__common.cc
index 5a4c61e1..696c3384 100644
--- a/www/chromium/files/patch-ipc_ipc__channel__common.cc
+++ b/www/chromium/files/patch-ipc_ipc__channel__common.cc
@@ -1,4 +1,4 @@
---- ipc/ipc_channel_common.cc.orig	2020-11-13 06:36:44 UTC
+--- ipc/ipc_channel_common.cc.orig	2021-03-12 23:57:26 UTC
 +++ ipc/ipc_channel_common.cc
 @@ -10,7 +10,7 @@
  
diff --git a/www/chromium/files/patch-ipc_ipc__channel__mojo.cc b/www/chromium/files/patch-ipc_ipc__channel__mojo.cc
index 15d97206..769f853c 100644
--- a/www/chromium/files/patch-ipc_ipc__channel__mojo.cc
+++ b/www/chromium/files/patch-ipc_ipc__channel__mojo.cc
@@ -1,4 +1,4 @@
---- ipc/ipc_channel_mojo.cc.orig	2020-11-13 06:36:44 UTC
+--- ipc/ipc_channel_mojo.cc.orig	2021-03-12 23:57:26 UTC
 +++ ipc/ipc_channel_mojo.cc
 @@ -74,10 +74,10 @@ class MojoChannelFactory : public ChannelFactory {
  };
diff --git a/www/chromium/files/patch-ipc_ipc__message__utils.cc b/www/chromium/files/patch-ipc_ipc__message__utils.cc
index 1350bb0d..78dd072e 100644
--- a/www/chromium/files/patch-ipc_ipc__message__utils.cc
+++ b/www/chromium/files/patch-ipc_ipc__message__utils.cc
@@ -1,4 +1,4 @@
---- ipc/ipc_message_utils.cc.orig	2021-01-18 21:29:00 UTC
+--- ipc/ipc_message_utils.cc.orig	2021-03-12 23:57:26 UTC
 +++ ipc/ipc_message_utils.cc
 @@ -357,7 +357,7 @@ void ParamTraits<unsigned int>::Log(const param_type& 
    l->append(base::NumberToString(p));
diff --git a/www/chromium/files/patch-ipc_ipc__message__utils.h b/www/chromium/files/patch-ipc_ipc__message__utils.h
index bd39e70a..dcbde487 100644
--- a/www/chromium/files/patch-ipc_ipc__message__utils.h
+++ b/www/chromium/files/patch-ipc_ipc__message__utils.h
@@ -1,4 +1,4 @@
---- ipc/ipc_message_utils.h.orig	2020-11-13 06:36:44 UTC
+--- ipc/ipc_message_utils.h.orig	2021-03-12 23:57:26 UTC
 +++ ipc/ipc_message_utils.h
 @@ -209,7 +209,7 @@ struct ParamTraits<unsigned int> {
  //   3) Android 64 bit and Fuchsia also have int64_t typedef'd to long.
diff --git a/www/chromium/files/patch-media_BUILD.gn b/www/chromium/files/patch-media_BUILD.gn
index 6c982394..5be638b3 100644
--- a/www/chromium/files/patch-media_BUILD.gn
+++ b/www/chromium/files/patch-media_BUILD.gn
@@ -1,4 +1,4 @@
---- media/BUILD.gn.orig	2021-01-18 21:29:00 UTC
+--- media/BUILD.gn.orig	2021-03-12 23:57:26 UTC
 +++ media/BUILD.gn
 @@ -66,6 +66,9 @@ config("media_config") {
        defines += [ "DLOPEN_PULSEAUDIO" ]
diff --git a/www/chromium/files/patch-media_audio_BUILD.gn b/www/chromium/files/patch-media_audio_BUILD.gn
index b6a9e938..ea77f822 100644
--- a/www/chromium/files/patch-media_audio_BUILD.gn
+++ b/www/chromium/files/patch-media_audio_BUILD.gn
@@ -1,4 +1,4 @@
---- media/audio/BUILD.gn.orig	2021-01-18 21:29:00 UTC
+--- media/audio/BUILD.gn.orig	2021-03-12 23:57:26 UTC
 +++ media/audio/BUILD.gn
 @@ -238,7 +238,7 @@ source_set("audio") {
      ]
diff --git a/www/chromium/files/patch-media_audio_alsa_audio__manager__alsa.cc b/www/chromium/files/patch-media_audio_alsa_audio__manager__alsa.cc
index d47fe4f2..e9663b09 100644
--- a/www/chromium/files/patch-media_audio_alsa_audio__manager__alsa.cc
+++ b/www/chromium/files/patch-media_audio_alsa_audio__manager__alsa.cc
@@ -1,4 +1,4 @@
---- media/audio/alsa/audio_manager_alsa.cc.orig	2020-11-13 06:36:44 UTC
+--- media/audio/alsa/audio_manager_alsa.cc.orig	2021-03-12 23:57:26 UTC
 +++ media/audio/alsa/audio_manager_alsa.cc
 @@ -89,7 +89,9 @@ void AudioManagerAlsa::GetAlsaAudioDevices(StreamType 
    int card = -1;
diff --git a/www/chromium/files/patch-media_audio_audio__features.cc b/www/chromium/files/patch-media_audio_audio__features.cc
index bb2dcdca..f59e4205 100644
--- a/www/chromium/files/patch-media_audio_audio__features.cc
+++ b/www/chromium/files/patch-media_audio_audio__features.cc
@@ -1,4 +1,4 @@
---- media/audio/audio_features.cc.orig	2021-01-18 21:29:00 UTC
+--- media/audio/audio_features.cc.orig	2021-03-12 23:57:26 UTC
 +++ media/audio/audio_features.cc
 @@ -12,7 +12,7 @@ namespace features {
  // detected. It will be restarted when needed.
diff --git a/www/chromium/files/patch-media_audio_audio__input__device.cc b/www/chromium/files/patch-media_audio_audio__input__device.cc
index a86c8fae..961c75fe 100644
--- a/www/chromium/files/patch-media_audio_audio__input__device.cc
+++ b/www/chromium/files/patch-media_audio_audio__input__device.cc
@@ -1,4 +1,4 @@
---- media/audio/audio_input_device.cc.orig	2020-11-13 06:36:44 UTC
+--- media/audio/audio_input_device.cc.orig	2021-03-12 23:57:26 UTC
 +++ media/audio/audio_input_device.cc
 @@ -253,7 +253,7 @@ void AudioInputDevice::OnStreamCreated(
  // here. See comments in AliveChecker and PowerObserverHelper for details and
diff --git a/www/chromium/files/patch-media_audio_audio__manager.cc b/www/chromium/files/patch-media_audio_audio__manager.cc
index f57712a6..c8a4e8a5 100644
--- a/www/chromium/files/patch-media_audio_audio__manager.cc
+++ b/www/chromium/files/patch-media_audio_audio__manager.cc
@@ -1,4 +1,4 @@
---- media/audio/audio_manager.cc.orig	2020-11-13 06:36:44 UTC
+--- media/audio/audio_manager.cc.orig	2021-03-12 23:57:26 UTC
 +++ media/audio/audio_manager.cc
 @@ -48,7 +48,7 @@ class AudioManagerHelper {
    }
diff --git a/www/chromium/files/patch-media_audio_audio__manager.h b/www/chromium/files/patch-media_audio_audio__manager.h
index 9e8b152c..9fa7f850 100644
--- a/www/chromium/files/patch-media_audio_audio__manager.h
+++ b/www/chromium/files/patch-media_audio_audio__manager.h
@@ -1,4 +1,4 @@
---- media/audio/audio_manager.h.orig	2020-11-13 06:36:44 UTC
+--- media/audio/audio_manager.h.orig	2021-03-12 23:57:26 UTC
 +++ media/audio/audio_manager.h
 @@ -60,7 +60,7 @@ class MEDIA_EXPORT AudioManager {
    static std::unique_ptr<AudioManager> CreateForTesting(
diff --git a/www/chromium/files/patch-media_audio_audio__output__proxy__unittest.cc b/www/chromium/files/patch-media_audio_audio__output__proxy__unittest.cc
index 8589a043..7799b933 100644
--- a/www/chromium/files/patch-media_audio_audio__output__proxy__unittest.cc
+++ b/www/chromium/files/patch-media_audio_audio__output__proxy__unittest.cc
@@ -1,4 +1,4 @@
---- media/audio/audio_output_proxy_unittest.cc.orig	2020-11-13 06:36:44 UTC
+--- media/audio/audio_output_proxy_unittest.cc.orig	2021-03-12 23:57:26 UTC
 +++ media/audio/audio_output_proxy_unittest.cc
 @@ -412,7 +412,7 @@ class AudioOutputProxyTest : public testing::Test {
      // |stream| is closed at this point. Start() should reopen it again.
diff --git a/www/chromium/files/patch-media_base_audio__latency.cc b/www/chromium/files/patch-media_base_audio__latency.cc
index 7dbb84aa..6ad4b16d 100644
--- a/www/chromium/files/patch-media_base_audio__latency.cc
+++ b/www/chromium/files/patch-media_base_audio__latency.cc
@@ -1,4 +1,4 @@
---- media/base/audio_latency.cc.orig	2021-01-18 21:29:00 UTC
+--- media/base/audio_latency.cc.orig	2021-03-12 23:57:26 UTC
 +++ media/base/audio_latency.cc
 @@ -114,7 +114,7 @@ int AudioLatency::GetRtcBufferSize(int sample_rate, in
      return frames_per_buffer;
diff --git a/www/chromium/files/patch-media_base_media__switches.cc b/www/chromium/files/patch-media_base_media__switches.cc
index 172e017a..c67a1f38 100644
--- a/www/chromium/files/patch-media_base_media__switches.cc
+++ b/www/chromium/files/patch-media_base_media__switches.cc
@@ -1,20 +1,20 @@
---- media/base/media_switches.cc.orig	2021-01-18 21:29:00 UTC
+--- media/base/media_switches.cc.orig	2021-03-12 23:57:26 UTC
 +++ media/base/media_switches.cc
-@@ -348,7 +348,7 @@ const base::Feature kGav1VideoDecoder{"Gav1VideoDecode
+@@ -370,7 +370,7 @@ const base::Feature kGav1VideoDecoder{"Gav1VideoDecode
  // Show toolbar button that opens dialog for controlling media sessions.
  const base::Feature kGlobalMediaControls {
    "GlobalMediaControls",
 -#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
 +#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \
-     BUILDFLAG(IS_LACROS)
+     BUILDFLAG(IS_CHROMEOS_LACROS)
        base::FEATURE_ENABLED_BY_DEFAULT
  #else
-@@ -390,7 +390,7 @@ const base::Feature kGlobalMediaControlsOverlayControl
+@@ -412,7 +412,7 @@ const base::Feature kGlobalMediaControlsOverlayControl
  // Show picture-in-picture button in Global Media Controls.
  const base::Feature kGlobalMediaControlsPictureInPicture {
    "GlobalMediaControlsPictureInPicture",
 -#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
 +#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \
-     BUILDFLAG(IS_LACROS)
+     BUILDFLAG(IS_CHROMEOS_LACROS)
        base::FEATURE_ENABLED_BY_DEFAULT
  #else
diff --git a/www/chromium/files/patch-media_base_scopedfd__helper.h b/www/chromium/files/patch-media_base_scopedfd__helper.h
index 12a98b3f..01e24df4 100644
--- a/www/chromium/files/patch-media_base_scopedfd__helper.h
+++ b/www/chromium/files/patch-media_base_scopedfd__helper.h
@@ -1,4 +1,4 @@
---- media/base/scopedfd_helper.h.orig	2020-11-13 06:36:44 UTC
+--- media/base/scopedfd_helper.h.orig	2021-03-12 23:57:26 UTC
 +++ media/base/scopedfd_helper.h
 @@ -14,14 +14,14 @@ namespace media {
  // since the only current user is V4L2 we are limiting the scope to OS_LINUX so
diff --git a/www/chromium/files/patch-media_base_status.cc b/www/chromium/files/patch-media_base_status.cc
deleted file mode 100644
index 7a444801..00000000
--- a/www/chromium/files/patch-media_base_status.cc
+++ /dev/null
@@ -1,12 +0,0 @@
---- media/base/status.cc.orig	2020-11-13 06:36:44 UTC
-+++ media/base/status.cc
-@@ -70,7 +70,9 @@ Status&& Status::AddCause(Status&& cause) && {
- 
- void Status::AddFrame(const base::Location& location) {
-   DCHECK(data_);
-+#if SUPPORTS_LOCATION_BUILTINS
-   data_->frames.push_back(MediaSerialize(location));
-+#endif
- }
- 
- Status OkStatus() {
diff --git a/www/chromium/files/patch-media_base_vector__math.cc b/www/chromium/files/patch-media_base_vector__math.cc
new file mode 100644
index 00000000..e003bb92
--- /dev/null
+++ b/www/chromium/files/patch-media_base_vector__math.cc
@@ -0,0 +1,11 @@
+--- media/base/vector_math.cc.orig	2021-03-12 23:57:26 UTC
++++ media/base/vector_math.cc
+@@ -18,7 +18,7 @@
+ // better, which is anywhere clang is used.
+ // TODO(pcc): Linux currently uses ThinLTO which has broken auto-vectorization
+ // in clang, so use our intrinsic version for now. http://crbug.com/738085
+-#if !defined(__clang__) || defined(OS_LINUX) || defined(OS_CHROMEOS)
++#if !defined(__clang__) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+ #define FMAC_FUNC FMAC_SSE
+ #define FMUL_FUNC FMUL_SSE
+ #else
diff --git a/www/chromium/files/patch-media_base_video__frame.cc b/www/chromium/files/patch-media_base_video__frame.cc
index 397c394e..7812a7b0 100644
--- a/www/chromium/files/patch-media_base_video__frame.cc
+++ b/www/chromium/files/patch-media_base_video__frame.cc
@@ -1,4 +1,4 @@
---- media/base/video_frame.cc.orig	2021-01-18 21:29:00 UTC
+--- media/base/video_frame.cc.orig	2021-03-12 23:57:26 UTC
 +++ media/base/video_frame.cc
 @@ -60,7 +60,7 @@ std::string VideoFrame::StorageTypeToString(
        return "OWNED_MEMORY";
@@ -18,7 +18,7 @@
        // This is not strictly needed but makes explicit that, at VideoFrame
        // level, DmaBufs are not mappable from userspace.
        storage_type != VideoFrame::STORAGE_DMABUFS &&
-@@ -262,7 +262,7 @@ static base::Optional<VideoFrameLayout> GetDefaultLayo
+@@ -263,7 +263,7 @@ static base::Optional<VideoFrameLayout> GetDefaultLayo
    return VideoFrameLayout::CreateWithPlanes(format, coded_size, planes);
  }
  
@@ -27,7 +27,7 @@
  // This class allows us to embed a vector<ScopedFD> into a scoped_refptr, and
  // thus to have several VideoFrames share the same set of DMABUF FDs.
  class VideoFrame::DmabufHolder
-@@ -280,7 +280,7 @@ class VideoFrame::DmabufHolder
+@@ -281,7 +281,7 @@ class VideoFrame::DmabufHolder
    friend class base::RefCountedThreadSafe<DmabufHolder>;
    ~DmabufHolder() = default;
  };
@@ -36,7 +36,7 @@
  
  // static
  bool VideoFrame::IsValidConfig(VideoPixelFormat format,
-@@ -612,7 +612,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM
+@@ -613,7 +613,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM
    for (size_t i = 0; i < num_planes; ++i)
      planes[i].stride = gpu_memory_buffer->stride(i);
    uint64_t modifier = gfx::NativePixmapHandle::kNoModifier;
@@ -45,7 +45,7 @@
    if (gpu_memory_buffer->GetType() == gfx::NATIVE_PIXMAP) {
      const auto gmb_handle = gpu_memory_buffer->CloneHandle();
      if (gmb_handle.is_null() ||
-@@ -657,7 +657,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM
+@@ -658,7 +658,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM
    return frame;
  }
  
@@ -54,7 +54,7 @@
  // static
  scoped_refptr<VideoFrame> VideoFrame::WrapExternalDmabufs(
      const VideoFrameLayout& layout,
-@@ -858,7 +858,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapVideoFrame(
+@@ -859,7 +859,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapVideoFrame(
      }
    }
  
@@ -63,7 +63,7 @@
    DCHECK(frame->dmabuf_fds_);
    // If there are any |dmabuf_fds_| plugged in, we should refer them too.
    wrapping_frame->dmabuf_fds_ = frame->dmabuf_fds_;
-@@ -1198,7 +1198,7 @@ VideoFrame::mailbox_holder(size_t texture_index) const
+@@ -1199,7 +1199,7 @@ VideoFrame::mailbox_holder(size_t texture_index) const
                          : mailbox_holders_[texture_index];
  }
  
@@ -72,7 +72,7 @@
  const std::vector<base::ScopedFD>& VideoFrame::DmabufFds() const {
    DCHECK_EQ(storage_type_, STORAGE_DMABUFS);
  
-@@ -1281,7 +1281,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout,
+@@ -1284,7 +1284,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout,
        storage_type_(storage_type),
        visible_rect_(Intersection(visible_rect, gfx::Rect(layout.coded_size()))),
        natural_size_(natural_size),
diff --git a/www/chromium/files/patch-media_base_video__frame.h b/www/chromium/files/patch-media_base_video__frame.h
index 47fb06e3..5ed0089d 100644
--- a/www/chromium/files/patch-media_base_video__frame.h
+++ b/www/chromium/files/patch-media_base_video__frame.h
@@ -1,4 +1,4 @@
---- media/base/video_frame.h.orig	2021-01-18 21:29:00 UTC
+--- media/base/video_frame.h.orig	2021-03-12 23:57:26 UTC
 +++ media/base/video_frame.h
 @@ -40,9 +40,9 @@
  #include "base/mac/scoped_cftyperef.h"
@@ -39,7 +39,7 @@
    // Returns a vector containing the backing DmaBufs for this frame. The number
    // of returned DmaBufs will be equal or less than the number of planes of
    // the frame. If there are less, this means that the last FD contains the
-@@ -695,7 +695,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
+@@ -693,7 +693,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
    // GPU memory buffer, if this frame is STORAGE_GPU_MEMORY_BUFFER.
    std::unique_ptr<gfx::GpuMemoryBuffer> gpu_memory_buffer_;
  
diff --git a/www/chromium/files/patch-media_capture_video_create__video__capture__device__factory.cc b/www/chromium/files/patch-media_capture_video_create__video__capture__device__factory.cc
index 26a92c7f..a571dd53 100644
--- a/www/chromium/files/patch-media_capture_video_create__video__capture__device__factory.cc
+++ b/www/chromium/files/patch-media_capture_video_create__video__capture__device__factory.cc
@@ -1,20 +1,20 @@
---- media/capture/video/create_video_capture_device_factory.cc.orig	2021-01-18 21:29:00 UTC
+--- media/capture/video/create_video_capture_device_factory.cc.orig	2021-03-12 23:57:26 UTC
 +++ media/capture/video/create_video_capture_device_factory.cc
 @@ -11,7 +11,7 @@
  #include "media/capture/video/fake_video_capture_device_factory.h"
  #include "media/capture/video/file_video_capture_device_factory.h"
  
--#if defined(OS_LINUX) || BUILDFLAG(IS_LACROS)
-+#if defined(OS_LINUX) || BUILDFLAG(IS_LACROS) || defined(OS_BSD)
+-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
  #include "media/capture/video/linux/video_capture_device_factory_linux.h"
- #elif BUILDFLAG(IS_ASH)
+ #elif BUILDFLAG(IS_CHROMEOS_ASH)
  #include "media/capture/video/chromeos/camera_app_device_bridge_impl.h"
 @@ -83,7 +83,7 @@ CreateChromeOSVideoCaptureDeviceFactory(
  std::unique_ptr<VideoCaptureDeviceFactory>
  CreatePlatformSpecificVideoCaptureDeviceFactory(
      scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) {
--#if defined(OS_LINUX) || BUILDFLAG(IS_LACROS)
-+#if defined(OS_LINUX) || BUILDFLAG(IS_LACROS) || defined(OS_BSD)
+-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
    return std::make_unique<VideoCaptureDeviceFactoryLinux>(ui_task_runner);
- #elif BUILDFLAG(IS_ASH)
+ #elif BUILDFLAG(IS_CHROMEOS_ASH)
    return CreateChromeOSVideoCaptureDeviceFactory(ui_task_runner, {});
diff --git a/www/chromium/files/patch-media_capture_video_fake__video__capture__device__factory.cc b/www/chromium/files/patch-media_capture_video_fake__video__capture__device__factory.cc
index 3d8955a0..82b0106c 100644
--- a/www/chromium/files/patch-media_capture_video_fake__video__capture__device__factory.cc
+++ b/www/chromium/files/patch-media_capture_video_fake__video__capture__device__factory.cc
@@ -1,4 +1,4 @@
---- media/capture/video/fake_video_capture_device_factory.cc.orig	2020-11-13 06:36:44 UTC
+--- media/capture/video/fake_video_capture_device_factory.cc.orig	2021-03-12 23:57:26 UTC
 +++ media/capture/video/fake_video_capture_device_factory.cc
 @@ -208,7 +208,7 @@ void FakeVideoCaptureDeviceFactory::GetDevicesInfo(
    int entry_index = 0;
diff --git a/www/chromium/files/patch-media_capture_video_file__video__capture__device__factory.cc b/www/chromium/files/patch-media_capture_video_file__video__capture__device__factory.cc
index 62f27a92..46fb5f49 100644
--- a/www/chromium/files/patch-media_capture_video_file__video__capture__device__factory.cc
+++ b/www/chromium/files/patch-media_capture_video_file__video__capture__device__factory.cc
@@ -1,4 +1,4 @@
---- media/capture/video/file_video_capture_device_factory.cc.orig	2020-11-13 06:36:44 UTC
+--- media/capture/video/file_video_capture_device_factory.cc.orig	2021-03-12 23:57:26 UTC
 +++ media/capture/video/file_video_capture_device_factory.cc
 @@ -52,7 +52,7 @@ void FileVideoCaptureDeviceFactory::GetDevicesInfo(
        VideoCaptureApi::WIN_DIRECT_SHOW;
diff --git a/www/chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc b/www/chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc
index 022ce49c..ea61313b 100644
--- a/www/chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc
+++ b/www/chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc
@@ -1,4 +1,4 @@
---- media/capture/video/linux/v4l2_capture_delegate.cc.orig	2020-11-13 06:36:44 UTC
+--- media/capture/video/linux/v4l2_capture_delegate.cc.orig	2021-03-12 23:57:26 UTC
 +++ media/capture/video/linux/v4l2_capture_delegate.cc
 @@ -4,8 +4,10 @@
  
diff --git a/www/chromium/files/patch-media_capture_video_video__capture__buffer__pool__impl.cc b/www/chromium/files/patch-media_capture_video_video__capture__buffer__pool__impl.cc
index 56c2b763..e4f983cc 100644
--- a/www/chromium/files/patch-media_capture_video_video__capture__buffer__pool__impl.cc
+++ b/www/chromium/files/patch-media_capture_video_video__capture__buffer__pool__impl.cc
@@ -1,4 +1,4 @@
---- media/capture/video/video_capture_buffer_pool_impl.cc.orig	2020-11-13 06:36:44 UTC
+--- media/capture/video/video_capture_buffer_pool_impl.cc.orig	2021-03-12 23:57:26 UTC
 +++ media/capture/video/video_capture_buffer_pool_impl.cc
 @@ -58,7 +58,7 @@ VideoCaptureBufferPoolImpl::CreateSharedMemoryViaRawFi
      int buffer_id) {
diff --git a/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc b/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc
index 8b546992..519a45b5 100644
--- a/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc
+++ b/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc
@@ -1,4 +1,4 @@
---- media/capture/video/video_capture_device_client.cc.orig	2021-01-18 21:29:00 UTC
+--- media/capture/video/video_capture_device_client.cc.orig	2021-03-12 23:57:26 UTC
 +++ media/capture/video/video_capture_device_client.cc
 @@ -319,7 +319,7 @@ void VideoCaptureDeviceClient::OnIncomingCapturedData(
  // see http://linuxtv.org/downloads/v4l-dvb-apis/packed-rgb.html.
diff --git a/www/chromium/files/patch-media_filters_vp9__parser.h b/www/chromium/files/patch-media_filters_vp9__parser.h
index d79b2653..92395bb0 100644
--- a/www/chromium/files/patch-media_filters_vp9__parser.h
+++ b/www/chromium/files/patch-media_filters_vp9__parser.h
@@ -1,4 +1,4 @@
---- media/filters/vp9_parser.h.orig	2020-11-13 06:36:44 UTC
+--- media/filters/vp9_parser.h.orig	2021-03-12 23:57:26 UTC
 +++ media/filters/vp9_parser.h
 @@ -14,6 +14,7 @@
  
diff --git a/www/chromium/files/patch-media_formats_common_offset__byte__queue.cc b/www/chromium/files/patch-media_formats_common_offset__byte__queue.cc
index 678d6b00..275f2c27 100644
--- a/www/chromium/files/patch-media_formats_common_offset__byte__queue.cc
+++ b/www/chromium/files/patch-media_formats_common_offset__byte__queue.cc
@@ -1,4 +1,4 @@
---- media/formats/common/offset_byte_queue.cc.orig	2020-11-13 06:36:44 UTC
+--- media/formats/common/offset_byte_queue.cc.orig	2021-03-12 23:57:26 UTC
 +++ media/formats/common/offset_byte_queue.cc
 @@ -47,13 +47,13 @@ void OffsetByteQueue::PeekAt(int64_t offset, const uin
    *size = tail() - offset;
diff --git a/www/chromium/files/patch-media_formats_common_offset__byte__queue.h b/www/chromium/files/patch-media_formats_common_offset__byte__queue.h
index 041713da..18bccfd7 100644
--- a/www/chromium/files/patch-media_formats_common_offset__byte__queue.h
+++ b/www/chromium/files/patch-media_formats_common_offset__byte__queue.h
@@ -1,4 +1,4 @@
---- media/formats/common/offset_byte_queue.h.orig	2020-11-13 06:36:44 UTC
+--- media/formats/common/offset_byte_queue.h.orig	2021-03-12 23:57:26 UTC
 +++ media/formats/common/offset_byte_queue.h
 @@ -36,15 +36,15 @@ class MEDIA_EXPORT OffsetByteQueue {
    // a null |buf| and a |size| of zero.
diff --git a/www/chromium/files/patch-media_formats_mp2t_es__parser__adts.cc b/www/chromium/files/patch-media_formats_mp2t_es__parser__adts.cc
index 968e0e6d..84f74be9 100644
--- a/www/chromium/files/patch-media_formats_mp2t_es__parser__adts.cc
+++ b/www/chromium/files/patch-media_formats_mp2t_es__parser__adts.cc
@@ -1,4 +1,4 @@
---- media/formats/mp2t/es_parser_adts.cc.orig	2020-11-13 06:36:44 UTC
+--- media/formats/mp2t/es_parser_adts.cc.orig	2021-03-12 23:57:26 UTC
 +++ media/formats/mp2t/es_parser_adts.cc
 @@ -62,11 +62,11 @@ bool EsParserAdts::LookForAdtsFrame(AdtsFrame* adts_fr
    const uint8_t* es;
diff --git a/www/chromium/files/patch-media_formats_mp2t_es__parser__mpeg1audio.cc b/www/chromium/files/patch-media_formats_mp2t_es__parser__mpeg1audio.cc
index aa349dc9..82a9efa7 100644
--- a/www/chromium/files/patch-media_formats_mp2t_es__parser__mpeg1audio.cc
+++ b/www/chromium/files/patch-media_formats_mp2t_es__parser__mpeg1audio.cc
@@ -1,4 +1,4 @@
---- media/formats/mp2t/es_parser_mpeg1audio.cc.orig	2021-01-18 21:29:00 UTC
+--- media/formats/mp2t/es_parser_mpeg1audio.cc.orig	2021-03-12 23:57:26 UTC
 +++ media/formats/mp2t/es_parser_mpeg1audio.cc
 @@ -108,11 +108,11 @@ bool EsParserMpeg1Audio::LookForMpeg1AudioFrame(
    const uint8_t* es;
diff --git a/www/chromium/files/patch-media_gpu_buffer__validation.cc b/www/chromium/files/patch-media_gpu_buffer__validation.cc
index b1846b45..d8a8edc9 100644
--- a/www/chromium/files/patch-media_gpu_buffer__validation.cc
+++ b/www/chromium/files/patch-media_gpu_buffer__validation.cc
@@ -1,4 +1,4 @@
---- media/gpu/buffer_validation.cc.orig	2020-11-13 06:36:44 UTC
+--- media/gpu/buffer_validation.cc.orig	2021-03-12 23:57:26 UTC
 +++ media/gpu/buffer_validation.cc
 @@ -12,15 +12,15 @@
  #include "ui/gfx/geometry/size.h"
diff --git a/www/chromium/files/patch-media_media__options.gni b/www/chromium/files/patch-media_media__options.gni
index 4d2d1ffb..9d663fcf 100644
--- a/www/chromium/files/patch-media_media__options.gni
+++ b/www/chromium/files/patch-media_media__options.gni
@@ -1,4 +1,4 @@
---- media/media_options.gni.orig	2021-01-18 21:29:00 UTC
+--- media/media_options.gni.orig	2021-03-12 23:57:26 UTC
 +++ media/media_options.gni
 @@ -123,6 +123,9 @@ declare_args() {
    # Enables runtime selection of ALSA library for audio.
diff --git a/www/chromium/files/patch-media_mojo_clients_mojo__video__encode__accelerator.cc b/www/chromium/files/patch-media_mojo_clients_mojo__video__encode__accelerator.cc
index 6e56e5bf..c19bce72 100644
--- a/www/chromium/files/patch-media_mojo_clients_mojo__video__encode__accelerator.cc
+++ b/www/chromium/files/patch-media_mojo_clients_mojo__video__encode__accelerator.cc
@@ -1,4 +1,4 @@
---- media/mojo/clients/mojo_video_encode_accelerator.cc.orig	2021-01-18 21:29:00 UTC
+--- media/mojo/clients/mojo_video_encode_accelerator.cc.orig	2021-03-12 23:57:26 UTC
 +++ media/mojo/clients/mojo_video_encode_accelerator.cc
 @@ -134,7 +134,7 @@ void MojoVideoEncodeAccelerator::Encode(scoped_refptr<
    DCHECK_EQ(num_planes, frame->layout().num_planes());
diff --git a/www/chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc b/www/chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc
index 02da073d..33aef6e0 100644
--- a/www/chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc
+++ b/www/chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc
@@ -1,4 +1,4 @@
---- media/mojo/mojom/video_frame_mojom_traits.cc.orig	2021-01-18 21:29:00 UTC
+--- media/mojo/mojom/video_frame_mojom_traits.cc.orig	2021-03-12 23:57:26 UTC
 +++ media/mojo/mojom/video_frame_mojom_traits.cc
 @@ -21,9 +21,9 @@
  #include "ui/gfx/mojom/color_space_mojom_traits.h"
diff --git a/www/chromium/files/patch-media_mojo_services_gpu__mojo__media__client.cc b/www/chromium/files/patch-media_mojo_services_gpu__mojo__media__client.cc
index a4dc0b3c..91587d05 100644
--- a/www/chromium/files/patch-media_mojo_services_gpu__mojo__media__client.cc
+++ b/www/chromium/files/patch-media_mojo_services_gpu__mojo__media__client.cc
@@ -1,6 +1,6 @@
---- media/mojo/services/gpu_mojo_media_client.cc.orig	2021-01-18 21:29:00 UTC
+--- media/mojo/services/gpu_mojo_media_client.cc.orig	2021-03-12 23:57:26 UTC
 +++ media/mojo/services/gpu_mojo_media_client.cc
-@@ -68,7 +68,7 @@ namespace media {
+@@ -67,7 +67,7 @@ namespace media {
  namespace {
  
  #if defined(OS_ANDROID) || defined(OS_CHROMEOS) || defined(OS_MAC) || \
@@ -9,7 +9,7 @@
  gpu::CommandBufferStub* GetCommandBufferStub(
      scoped_refptr<base::SingleThreadTaskRunner> gpu_task_runner,
      base::WeakPtr<MediaGpuChannelManager> media_gpu_channel_manager,
-@@ -299,7 +299,7 @@ std::unique_ptr<VideoDecoder> GpuMojoMediaClient::Crea
+@@ -289,7 +289,7 @@ std::unique_ptr<VideoDecoder> GpuMojoMediaClient::Crea
                                  command_buffer_id->route_id));
        }
  
diff --git a/www/chromium/files/patch-media_video_fake__gpu__memory__buffer.cc b/www/chromium/files/patch-media_video_fake__gpu__memory__buffer.cc
index 7c2f053d..4f5fcbf1 100644
--- a/www/chromium/files/patch-media_video_fake__gpu__memory__buffer.cc
+++ b/www/chromium/files/patch-media_video_fake__gpu__memory__buffer.cc
@@ -1,4 +1,4 @@
---- media/video/fake_gpu_memory_buffer.cc.orig	2020-11-13 06:36:45 UTC
+--- media/video/fake_gpu_memory_buffer.cc.orig	2021-03-12 23:57:27 UTC
 +++ media/video/fake_gpu_memory_buffer.cc
 @@ -10,7 +10,7 @@
  #include "media/base/format_utils.h"
diff --git a/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc b/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc
index 8dc533ef..ac0dbd0d 100644
--- a/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc
+++ b/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc
@@ -1,6 +1,6 @@
---- media/video/gpu_memory_buffer_video_frame_pool.cc.orig	2021-01-18 21:29:01 UTC
+--- media/video/gpu_memory_buffer_video_frame_pool.cc.orig	2021-03-12 23:57:27 UTC
 +++ media/video/gpu_memory_buffer_video_frame_pool.cc
-@@ -633,7 +633,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa
+@@ -649,7 +649,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa
    }
  
    bool is_software_backed_video_frame = !video_frame->HasTextures();
diff --git a/www/chromium/files/patch-media_video_video__encode__accelerator__adapter.cc b/www/chromium/files/patch-media_video_video__encode__accelerator__adapter.cc
index 0588a23a..fe1dbe58 100644
--- a/www/chromium/files/patch-media_video_video__encode__accelerator__adapter.cc
+++ b/www/chromium/files/patch-media_video_video__encode__accelerator__adapter.cc
@@ -1,20 +1,20 @@
---- media/video/video_encode_accelerator_adapter.cc.orig	2021-01-22 12:10:35 UTC
+--- media/video/video_encode_accelerator_adapter.cc.orig	2021-03-12 23:57:27 UTC
 +++ media/video/video_encode_accelerator_adapter.cc
-@@ -40,7 +40,7 @@ VideoEncodeAccelerator::Config SetUpVeaConfig(
-       opts.bitrate.value_or(opts.frame_size.width() * opts.frame_size.height() *
-                             kVEADefaultBitratePerPixel));
+@@ -50,7 +50,7 @@ VideoEncodeAccelerator::Config SetUpVeaConfig(
+   if (is_rgb)
+     config.input_format = PIXEL_FORMAT_I420;
  
 -#if defined(OS_LINUX) || defined(OS_CHROMEOS)
 +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
    if (storage_type == VideoFrame::STORAGE_DMABUFS ||
        storage_type == VideoFrame::STORAGE_GPU_MEMORY_BUFFER) {
-     config.storage_type = VideoEncodeAccelerator::Config::StorageType::kDmabuf;
-@@ -269,7 +269,7 @@ void VideoEncodeAcceleratorAdapter::EncodeOnAccelerato
-     return;
-   }
+     if (is_rgb)
+@@ -253,7 +253,7 @@ void VideoEncodeAcceleratorAdapter::InitializeInternal
+   auto vea_config =
+       SetUpVeaConfig(profile_, options_, format, first_frame->storage_type());
  
 -#if defined(OS_LINUX) || defined(OS_CHROMEOS)
 +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
    // Linux/ChromeOS require a special configuration to use dmabuf storage.
-   const bool is_same_storage_type = storage_type_ == frame->storage_type();
- #else
+   // We need to keep sending frames the same way the first frame was sent.
+   // Other platforms will happily mix GpuMemoryBuffer storage with regular
diff --git a/www/chromium/files/patch-media_video_video__encode__accelerator__adapter__test.cc b/www/chromium/files/patch-media_video_video__encode__accelerator__adapter__test.cc
new file mode 100644
index 00000000..7ae27afd
--- /dev/null
+++ b/www/chromium/files/patch-media_video_video__encode__accelerator__adapter__test.cc
@@ -0,0 +1,11 @@
+--- media/video/video_encode_accelerator_adapter_test.cc.orig	2021-03-12 23:57:27 UTC
++++ media/video/video_encode_accelerator_adapter_test.cc
+@@ -285,7 +285,7 @@ TEST_P(VideoEncodeAcceleratorAdapterTest, TwoFramesRes
+ 
+   vea()->SetEncodingCallback(base::BindLambdaForTesting(
+       [&](BitstreamBuffer&, bool keyframe, scoped_refptr<VideoFrame> frame) {
+-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+         EXPECT_EQ(frame->format(),
+                   IsYuvPlanar(pixel_format) ? pixel_format : PIXEL_FORMAT_I420);
+ #else
diff --git a/www/chromium/files/patch-mojo_public_c_system_thunks.cc b/www/chromium/files/patch-mojo_public_c_system_thunks.cc
index f7f4a476..e4170119 100644
--- a/www/chromium/files/patch-mojo_public_c_system_thunks.cc
+++ b/www/chromium/files/patch-mojo_public_c_system_thunks.cc
@@ -1,4 +1,4 @@
---- mojo/public/c/system/thunks.cc.orig	2020-11-13 06:36:45 UTC
+--- mojo/public/c/system/thunks.cc.orig	2021-03-12 23:57:27 UTC
 +++ mojo/public/c/system/thunks.cc
 @@ -20,7 +20,7 @@
  #include "mojo/public/c/system/core.h"
diff --git a/www/chromium/files/patch-mojo_public_js_mojo__bindings__resources.grd b/www/chromium/files/patch-mojo_public_js_mojo__bindings__resources.grd
index 537e0507..802ff63c 100644
--- a/www/chromium/files/patch-mojo_public_js_mojo__bindings__resources.grd
+++ b/www/chromium/files/patch-mojo_public_js_mojo__bindings__resources.grd
@@ -1,8 +1,8 @@
---- mojo/public/js/mojo_bindings_resources.grd.orig	2021-01-18 21:29:01 UTC
+--- mojo/public/js/mojo_bindings_resources.grd.orig	2021-03-12 23:57:27 UTC
 +++ mojo/public/js/mojo_bindings_resources.grd
-@@ -80,7 +80,7 @@
+@@ -85,7 +85,7 @@
            use_base_dir="false"
-           resource_path="mojo/mojo/public/mojom/base/text_direction.mojom-lite.js"
+           resource_path="mojo/mojo/public/mojom/base/unguessable_token.mojom-webui.js"
            type="BINDATA" />
 -      <if expr="is_win or is_macosx or is_linux or is_android">
 +      <if expr="is_win or is_macosx or is_posix or is_android">
diff --git a/www/chromium/files/patch-net_BUILD.gn b/www/chromium/files/patch-net_BUILD.gn
index 091c6f75..36338159 100644
--- a/www/chromium/files/patch-net_BUILD.gn
+++ b/www/chromium/files/patch-net_BUILD.gn
@@ -1,6 +1,6 @@
---- net/BUILD.gn.orig	2021-01-18 21:29:01 UTC
+--- net/BUILD.gn.orig	2021-03-12 23:57:27 UTC
 +++ net/BUILD.gn
-@@ -99,7 +99,7 @@ net_configs = [
+@@ -100,7 +100,7 @@ net_configs = [
    "//build/config/compiler:wexit_time_destructors",
  ]
  
@@ -9,7 +9,7 @@
    net_configs += [ "//build/config/linux:libresolv" ]
  }
  
-@@ -1249,6 +1249,16 @@ component("net") {
+@@ -1252,6 +1252,16 @@ component("net") {
        ]
      }
  
@@ -26,16 +26,16 @@
      if (is_mac) {
        sources += [
          "base/network_notification_thread_mac.cc",
-@@ -1385,7 +1395,7 @@ component("net") {
+@@ -1388,7 +1398,7 @@ component("net") {
        }
      }
  
--    if (is_android || is_chromeos) {
-+    if (is_android || is_chromeos || is_bsd) {
+-    if (is_android || is_chromeos_ash) {
++    if (is_android || is_chromeos_ash || is_bsd) {
        sources += [
          "base/network_change_notifier_posix.cc",
          "base/network_change_notifier_posix.h",
-@@ -1418,7 +1428,7 @@ component("net") {
+@@ -1421,7 +1431,7 @@ component("net") {
      }
  
      # Use getifaddrs() on POSIX platforms, except Linux.
@@ -44,7 +44,7 @@
        sources += [
          "base/network_interfaces_getifaddrs.cc",
          "base/network_interfaces_getifaddrs.h",
-@@ -4759,7 +4769,7 @@ test("net_unittests") {
+@@ -4755,7 +4765,7 @@ test("net_unittests") {
    }
  
    # Use getifaddrs() on POSIX platforms, except Linux and Android.
diff --git a/www/chromium/files/patch-net_base_address__tracker__linux.cc b/www/chromium/files/patch-net_base_address__tracker__linux.cc
index 12099411..98ba5973 100644
--- a/www/chromium/files/patch-net_base_address__tracker__linux.cc
+++ b/www/chromium/files/patch-net_base_address__tracker__linux.cc
@@ -1,4 +1,4 @@
---- net/base/address_tracker_linux.cc.orig	2020-11-13 06:36:45 UTC
+--- net/base/address_tracker_linux.cc.orig	2021-03-12 23:57:27 UTC
 +++ net/base/address_tracker_linux.cc
 @@ -5,7 +5,9 @@
  #include "net/base/address_tracker_linux.h"
@@ -18,15 +18,18 @@
    netlink_fd_.reset(socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE));
    if (!netlink_fd_.is_valid()) {
      PLOG(ERROR) << "Could not create NETLINK socket";
-@@ -274,6 +277,7 @@ void AddressTrackerLinux::Init() {
+@@ -274,6 +277,10 @@ void AddressTrackerLinux::Init() {
          base::BindRepeating(&AddressTrackerLinux::OnFileCanReadWithoutBlocking,
                              base::Unretained(this)));
    }
++#else  // !OS_FREEBSD
++  NOTIMPLEMENTED();
++  AbortAndForceOnline();
 +#endif // !OS_FREEBSD
  }
  
  void AddressTrackerLinux::AbortAndForceOnline() {
-@@ -285,6 +289,7 @@ void AddressTrackerLinux::AbortAndForceOnline() {
+@@ -285,6 +292,7 @@ void AddressTrackerLinux::AbortAndForceOnline() {
    connection_type_initialized_cv_.Broadcast();
  }
  
@@ -34,7 +37,7 @@
  AddressTrackerLinux::AddressMap AddressTrackerLinux::GetAddressMap() const {
    AddressTrackerAutoLock lock(*this, address_map_lock_);
    return address_map_;
-@@ -303,6 +308,7 @@ bool AddressTrackerLinux::IsInterfaceIgnored(int inter
+@@ -303,6 +311,7 @@ bool AddressTrackerLinux::IsInterfaceIgnored(int inter
    const char* interface_name = get_interface_name_(interface_index, buf);
    return ignored_interfaces_.find(interface_name) != ignored_interfaces_.end();
  }
@@ -42,7 +45,7 @@
  
  NetworkChangeNotifier::ConnectionType
  AddressTrackerLinux::GetCurrentConnectionType() {
-@@ -361,6 +367,7 @@ void AddressTrackerLinux::HandleMessage(const char* bu
+@@ -361,6 +370,7 @@ void AddressTrackerLinux::HandleMessage(const char* bu
                                          bool* address_changed,
                                          bool* link_changed,
                                          bool* tunnel_changed) {
@@ -50,18 +53,17 @@
    DCHECK(buffer);
    // Note that NLMSG_NEXT decrements |length| to reflect the number of bytes
    // remaining in |buffer|.
-@@ -473,6 +480,10 @@ void AddressTrackerLinux::HandleMessage(const char* bu
+@@ -473,6 +483,9 @@ void AddressTrackerLinux::HandleMessage(const char* bu
          break;
      }
    }
 +#else  // !OS_FREEBSD
 +  NOTIMPLEMENTED();
-+  AbortAndForceOnline();
 +#endif // !OS_FREEBSD
  }
  
  void AddressTrackerLinux::OnFileCanReadWithoutBlocking() {
-@@ -500,6 +511,7 @@ bool AddressTrackerLinux::IsTunnelInterfaceName(const 
+@@ -500,6 +513,7 @@ bool AddressTrackerLinux::IsTunnelInterfaceName(const 
  }
  
  void AddressTrackerLinux::UpdateCurrentConnectionType() {
@@ -69,7 +71,7 @@
    AddressTrackerLinux::AddressMap address_map = GetAddressMap();
    std::unordered_set<int> online_links = GetOnlineLinks();
  
-@@ -525,6 +537,9 @@ void AddressTrackerLinux::UpdateCurrentConnectionType(
+@@ -525,6 +539,9 @@ void AddressTrackerLinux::UpdateCurrentConnectionType(
  
    AddressTrackerAutoLock lock(*this, connection_type_lock_);
    current_connection_type_ = type;
diff --git a/www/chromium/files/patch-net_base_address__tracker__linux.h b/www/chromium/files/patch-net_base_address__tracker__linux.h
index 19d6f2df..c0cad3d9 100644
--- a/www/chromium/files/patch-net_base_address__tracker__linux.h
+++ b/www/chromium/files/patch-net_base_address__tracker__linux.h
@@ -1,4 +1,4 @@
---- net/base/address_tracker_linux.h.orig	2020-11-13 06:36:45 UTC
+--- net/base/address_tracker_linux.h.orig	2021-03-12 23:57:27 UTC
 +++ net/base/address_tracker_linux.h
 @@ -7,9 +7,6 @@
  
diff --git a/www/chromium/files/patch-net_base_address__tracker__linux__unittest.cc b/www/chromium/files/patch-net_base_address__tracker__linux__unittest.cc
index 34f963ee..eed32fd9 100644
--- a/www/chromium/files/patch-net_base_address__tracker__linux__unittest.cc
+++ b/www/chromium/files/patch-net_base_address__tracker__linux__unittest.cc
@@ -1,4 +1,4 @@
---- net/base/address_tracker_linux_unittest.cc.orig	2020-11-13 06:36:45 UTC
+--- net/base/address_tracker_linux_unittest.cc.orig	2021-03-12 23:57:27 UTC
 +++ net/base/address_tracker_linux_unittest.cc
 @@ -4,7 +4,11 @@
  
diff --git a/www/chromium/files/patch-net_base_network__change__notifier.cc b/www/chromium/files/patch-net_base_network__change__notifier.cc
index f106c24e..8cf652c5 100644
--- a/www/chromium/files/patch-net_base_network__change__notifier.cc
+++ b/www/chromium/files/patch-net_base_network__change__notifier.cc
@@ -1,24 +1,20 @@
---- net/base/network_change_notifier.cc.orig	2021-01-18 21:29:01 UTC
+--- net/base/network_change_notifier.cc.orig	2021-03-12 23:57:27 UTC
 +++ net/base/network_change_notifier.cc
-@@ -35,7 +35,7 @@
+@@ -38,7 +38,7 @@
  #include "net/base/network_change_notifier_linux.h"
  #elif defined(OS_APPLE)
  #include "net/base/network_change_notifier_mac.h"
--#elif defined(OS_CHROMEOS) || defined(OS_ANDROID)
-+#elif defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD)
+-#elif BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_ANDROID)
++#elif BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_ANDROID) || defined(OS_BSD)
  #include "net/base/network_change_notifier_posix.h"
  #elif defined(OS_FUCHSIA)
  #include "net/base/network_change_notifier_fuchsia.h"
-@@ -249,8 +249,11 @@ std::unique_ptr<NetworkChangeNotifier> NetworkChangeNo
- #elif defined(OS_FUCHSIA)
-   return std::make_unique<NetworkChangeNotifierFuchsia>(
-       fuchsia::hardware::ethernet::Features());
-+#elif defined(OS_BSD)
-+  return std::make_unique<MockNetworkChangeNotifier>(
-+      std::make_unique<SystemDnsConfigChangeNotifier>(
-+          nullptr /* task_runner */, nullptr /* dns_config_service */));
- #else
--  NOTIMPLEMENTED();
-   return NULL;
- #endif
- }
+@@ -241,7 +241,7 @@ std::unique_ptr<NetworkChangeNotifier> NetworkChangeNo
+   // service in a separate process.
+   return std::make_unique<NetworkChangeNotifierPosix>(initial_type,
+                                                       initial_subtype);
+-#elif BUILDFLAG(IS_CHROMEOS_ASH)
++#elif BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_BSD)
+   return std::make_unique<NetworkChangeNotifierPosix>(initial_type,
+                                                       initial_subtype);
+ #elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
diff --git a/www/chromium/files/patch-net_base_network__change__notifier__posix.cc b/www/chromium/files/patch-net_base_network__change__notifier__posix.cc
new file mode 100644
index 00000000..3f7f4d1e
--- /dev/null
+++ b/www/chromium/files/patch-net_base_network__change__notifier__posix.cc
@@ -0,0 +1,11 @@
+--- net/base/network_change_notifier_posix.cc.orig	2021-03-24 15:19:43 UTC
++++ net/base/network_change_notifier_posix.cc
+@@ -93,7 +93,7 @@ void NetworkChangeNotifierPosix::GetCurrentMaxBandwidt
+ NetworkChangeNotifier::NetworkChangeCalculatorParams
+ NetworkChangeNotifierPosix::NetworkChangeCalculatorParamsPosix() {
+   NetworkChangeCalculatorParams params;
+-#if BUILDFLAG(IS_CHROMEOS_ASH)
++#if BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_BSD)
+   // Delay values arrived at by simple experimentation and adjusted so as to
+   // produce a single signal when switching between network connections.
+   params.ip_address_offline_delay_ = base::TimeDelta::FromMilliseconds(4000);
diff --git a/www/chromium/files/patch-net_base_network__interfaces__posix.cc b/www/chromium/files/patch-net_base_network__interfaces__posix.cc
new file mode 100644
index 00000000..7863a05a
--- /dev/null
+++ b/www/chromium/files/patch-net_base_network__interfaces__posix.cc
@@ -0,0 +1,17 @@
+--- net/base/network_interfaces_posix.cc.orig	2021-03-24 15:22:56 UTC
++++ net/base/network_interfaces_posix.cc
+@@ -4,8 +4,14 @@
+ 
+ #include "net/base/network_interfaces_posix.h"
+ 
++#include "build/build_config.h"
++
+ #include <netinet/in.h>
+ #include <sys/types.h>
++
++#if defined(OS_BSD)
++#include <sys/socket.h>
++#endif
+ 
+ #include <memory>
+ #include <set>
diff --git a/www/chromium/files/patch-net_base_network__interfaces__posix.h b/www/chromium/files/patch-net_base_network__interfaces__posix.h
deleted file mode 100644
index 7df6b718..00000000
--- a/www/chromium/files/patch-net_base_network__interfaces__posix.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- net/base/network_interfaces_posix.h.orig	2020-11-13 06:36:45 UTC
-+++ net/base/network_interfaces_posix.h
-@@ -8,6 +8,8 @@
- // This file provides some basic functionality shared between
- // network_interfaces_linux.cc and network_interfaces_getifaddrs.cc.
- 
-+#include <sys/socket.h>
-+
- #include <string>
- 
- struct sockaddr;
diff --git a/www/chromium/files/patch-net_cert_cert__verifier.cc b/www/chromium/files/patch-net_cert_cert__verifier.cc
index 446d86f5..1c8a9152 100644
--- a/www/chromium/files/patch-net_cert_cert__verifier.cc
+++ b/www/chromium/files/patch-net_cert_cert__verifier.cc
@@ -1,4 +1,4 @@
---- net/cert/cert_verifier.cc.orig	2020-11-13 06:36:45 UTC
+--- net/cert/cert_verifier.cc.orig	2021-03-12 23:57:27 UTC
 +++ net/cert/cert_verifier.cc
 @@ -87,7 +87,7 @@ std::unique_ptr<CertVerifier> CertVerifier::CreateDefa
    return std::unique_ptr<CertVerifier>();
diff --git a/www/chromium/files/patch-net_cert_cert__verify__proc.cc b/www/chromium/files/patch-net_cert_cert__verify__proc.cc
index eb52c78c..6cb9e00c 100644
--- a/www/chromium/files/patch-net_cert_cert__verify__proc.cc
+++ b/www/chromium/files/patch-net_cert_cert__verify__proc.cc
@@ -1,4 +1,4 @@
---- net/cert/cert_verify_proc.cc.orig	2020-11-13 06:36:45 UTC
+--- net/cert/cert_verify_proc.cc.orig	2021-03-12 23:57:27 UTC
 +++ net/cert/cert_verify_proc.cc
 @@ -493,7 +493,7 @@ base::Value CertVerifyParams(X509Certificate* cert,
  
diff --git a/www/chromium/files/patch-net_cert_cert__verify__proc.h b/www/chromium/files/patch-net_cert_cert__verify__proc.h
index 5b064028..b0a0e90d 100644
--- a/www/chromium/files/patch-net_cert_cert__verify__proc.h
+++ b/www/chromium/files/patch-net_cert_cert__verify__proc.h
@@ -1,4 +1,4 @@
---- net/cert/cert_verify_proc.h.orig	2020-11-13 06:36:45 UTC
+--- net/cert/cert_verify_proc.h.orig	2021-03-12 23:57:27 UTC
 +++ net/cert/cert_verify_proc.h
 @@ -66,7 +66,7 @@ class NET_EXPORT CertVerifyProc
      kMaxValue = kChainLengthOne
diff --git a/www/chromium/files/patch-net_cert_test__root__certs.h b/www/chromium/files/patch-net_cert_test__root__certs.h
index 17734ab7..4df94685 100644
--- a/www/chromium/files/patch-net_cert_test__root__certs.h
+++ b/www/chromium/files/patch-net_cert_test__root__certs.h
@@ -1,4 +1,4 @@
---- net/cert/test_root_certs.h.orig	2020-11-13 06:36:45 UTC
+--- net/cert/test_root_certs.h.orig	2021-03-12 23:57:27 UTC
 +++ net/cert/test_root_certs.h
 @@ -75,7 +75,7 @@ class NET_EXPORT TestRootCerts {
    // engine is appropriate. The caller is responsible for freeing the
diff --git a/www/chromium/files/patch-net_disk__cache_blockfile_disk__format.h b/www/chromium/files/patch-net_disk__cache_blockfile_disk__format.h
index f2361be7..890e74f4 100644
--- a/www/chromium/files/patch-net_disk__cache_blockfile_disk__format.h
+++ b/www/chromium/files/patch-net_disk__cache_blockfile_disk__format.h
@@ -1,4 +1,4 @@
---- net/disk_cache/blockfile/disk_format.h.orig	2020-11-13 06:36:45 UTC
+--- net/disk_cache/blockfile/disk_format.h.orig	2021-03-12 23:57:27 UTC
 +++ net/disk_cache/blockfile/disk_format.h
 @@ -149,7 +149,9 @@ struct RankingsNode {
  };
diff --git a/www/chromium/files/patch-net_dns_address__sorter__posix.cc b/www/chromium/files/patch-net_dns_address__sorter__posix.cc
index f41d2963..e26634e2 100644
--- a/www/chromium/files/patch-net_dns_address__sorter__posix.cc
+++ b/www/chromium/files/patch-net_dns_address__sorter__posix.cc
@@ -1,4 +1,4 @@
---- net/dns/address_sorter_posix.cc.orig	2020-11-13 06:36:45 UTC
+--- net/dns/address_sorter_posix.cc.orig	2021-03-12 23:57:27 UTC
 +++ net/dns/address_sorter_posix.cc
 @@ -13,7 +13,9 @@
  #include <sys/socket.h>  // Must be included before ifaddrs.h.
diff --git a/www/chromium/files/patch-net_dns_dns__config__service__posix__unittest.cc b/www/chromium/files/patch-net_dns_dns__config__service__posix__unittest.cc
index bf12c27d..b2796671 100644
--- a/www/chromium/files/patch-net_dns_dns__config__service__posix__unittest.cc
+++ b/www/chromium/files/patch-net_dns_dns__config__service__posix__unittest.cc
@@ -1,4 +1,4 @@
---- net/dns/dns_config_service_posix_unittest.cc.orig	2020-11-13 06:36:45 UTC
+--- net/dns/dns_config_service_posix_unittest.cc.orig	2021-03-12 23:57:27 UTC
 +++ net/dns/dns_config_service_posix_unittest.cc
 @@ -2,8 +2,6 @@
  // Use of this source code is governed by a BSD-style license that can be
diff --git a/www/chromium/files/patch-net_dns_dns__reloader.cc b/www/chromium/files/patch-net_dns_dns__reloader.cc
index 40f73362..458fba42 100644
--- a/www/chromium/files/patch-net_dns_dns__reloader.cc
+++ b/www/chromium/files/patch-net_dns_dns__reloader.cc
@@ -1,4 +1,4 @@
---- net/dns/dns_reloader.cc.orig	2020-11-13 06:36:45 UTC
+--- net/dns/dns_reloader.cc.orig	2021-03-12 23:57:27 UTC
 +++ net/dns/dns_reloader.cc
 @@ -7,6 +7,10 @@
  #if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && \
diff --git a/www/chromium/files/patch-net_dns_dns__util.cc b/www/chromium/files/patch-net_dns_dns__util.cc
index 8e46f139..d8aa611e 100644
--- a/www/chromium/files/patch-net_dns_dns__util.cc
+++ b/www/chromium/files/patch-net_dns_dns__util.cc
@@ -1,4 +1,4 @@
---- net/dns/dns_util.cc.orig	2021-01-18 21:29:02 UTC
+--- net/dns/dns_util.cc.orig	2021-03-12 23:57:27 UTC
 +++ net/dns/dns_util.cc
 @@ -28,6 +28,8 @@
  #include "net/third_party/uri_template/uri_template.h"
diff --git a/www/chromium/files/patch-net_dns_host__resolver__proc.cc b/www/chromium/files/patch-net_dns_host__resolver__proc.cc
index 38a8b5af..a8cb455b 100644
--- a/www/chromium/files/patch-net_dns_host__resolver__proc.cc
+++ b/www/chromium/files/patch-net_dns_host__resolver__proc.cc
@@ -1,4 +1,4 @@
---- net/dns/host_resolver_proc.cc.orig	2020-11-13 06:36:45 UTC
+--- net/dns/host_resolver_proc.cc.orig	2021-03-12 23:57:27 UTC
 +++ net/dns/host_resolver_proc.cc
 @@ -159,7 +159,7 @@ int SystemHostResolverCall(const std::string& host,
    base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
diff --git a/www/chromium/files/patch-net_http_http__auth__gssapi__posix.cc b/www/chromium/files/patch-net_http_http__auth__gssapi__posix.cc
index 977ea221..b0d936c5 100644
--- a/www/chromium/files/patch-net_http_http__auth__gssapi__posix.cc
+++ b/www/chromium/files/patch-net_http_http__auth__gssapi__posix.cc
@@ -1,4 +1,4 @@
---- net/http/http_auth_gssapi_posix.cc.orig	2020-11-13 06:36:45 UTC
+--- net/http/http_auth_gssapi_posix.cc.orig	2021-03-12 23:57:27 UTC
 +++ net/http/http_auth_gssapi_posix.cc
 @@ -367,8 +367,9 @@ base::NativeLibrary GSSAPISharedLibrary::LoadSharedLib
      static const char* const kDefaultLibraryNames[] = {
diff --git a/www/chromium/files/patch-net_http_http__auth__gssapi__posix.h b/www/chromium/files/patch-net_http_http__auth__gssapi__posix.h
index 0572dbf7..3a7a22f0 100644
--- a/www/chromium/files/patch-net_http_http__auth__gssapi__posix.h
+++ b/www/chromium/files/patch-net_http_http__auth__gssapi__posix.h
@@ -1,4 +1,4 @@
---- net/http/http_auth_gssapi_posix.h.orig	2020-11-13 06:36:45 UTC
+--- net/http/http_auth_gssapi_posix.h.orig	2021-03-12 23:57:27 UTC
 +++ net/http/http_auth_gssapi_posix.h
 @@ -21,6 +21,9 @@
  #include <GSS/gssapi.h>
diff --git a/www/chromium/files/patch-net_nqe_network__quality__estimator.cc b/www/chromium/files/patch-net_nqe_network__quality__estimator.cc
index 61d161af..42dfd6f6 100644
--- a/www/chromium/files/patch-net_nqe_network__quality__estimator.cc
+++ b/www/chromium/files/patch-net_nqe_network__quality__estimator.cc
@@ -1,6 +1,6 @@
---- net/nqe/network_quality_estimator.cc.orig	2020-11-13 06:36:46 UTC
+--- net/nqe/network_quality_estimator.cc.orig	2021-03-12 23:57:27 UTC
 +++ net/nqe/network_quality_estimator.cc
-@@ -108,7 +108,7 @@ nqe::internal::NetworkID DoGetCurrentNetworkID(
+@@ -109,7 +109,7 @@ nqe::internal::NetworkID DoGetCurrentNetworkID(
        case NetworkChangeNotifier::ConnectionType::CONNECTION_ETHERNET:
          break;
        case NetworkChangeNotifier::ConnectionType::CONNECTION_WIFI:
diff --git a/www/chromium/files/patch-net_nqe_network__quality__estimator__unittest.cc b/www/chromium/files/patch-net_nqe_network__quality__estimator__unittest.cc
index 80c8b2e6..7d4e912e 100644
--- a/www/chromium/files/patch-net_nqe_network__quality__estimator__unittest.cc
+++ b/www/chromium/files/patch-net_nqe_network__quality__estimator__unittest.cc
@@ -1,11 +1,15 @@
---- net/nqe/network_quality_estimator_unittest.cc.orig	2021-01-18 21:29:02 UTC
+--- net/nqe/network_quality_estimator_unittest.cc.orig	2021-03-12 23:57:27 UTC
 +++ net/nqe/network_quality_estimator_unittest.cc
-@@ -2129,7 +2129,7 @@ TEST_F(NetworkQualityEstimatorTest, TestGlobalSocketWa
- // TestTCPSocketRTT requires kernel support for tcp_info struct, and so it is
- // enabled only on certain platforms.
+@@ -2180,9 +2180,9 @@ TEST_F(NetworkQualityEstimatorTest, TestGlobalSocketWa
  // ChromeOS is disabled due to crbug.com/986904
--#if (defined(TCP_INFO) || defined(OS_LINUX) || defined(OS_ANDROID)) && \
-+#if (defined(TCP_INFO) || defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)) && \
+ // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
+ // complete.
+-#if (defined(TCP_INFO) ||                                    \
+-     (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
+-     defined(OS_ANDROID)) &&                                 \
++#if (defined(TCP_INFO) ||                                                       \
++     (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) || \
++     defined(OS_ANDROID)) &&                                                    \
      !defined(OS_CHROMEOS)
  #define MAYBE_TestTCPSocketRTT TestTCPSocketRTT
  #else
diff --git a/www/chromium/files/patch-net_proxy__resolution_configured__proxy__resolution__service.cc b/www/chromium/files/patch-net_proxy__resolution_configured__proxy__resolution__service.cc
index 2780242e..4d8b25e5 100644
--- a/www/chromium/files/patch-net_proxy__resolution_configured__proxy__resolution__service.cc
+++ b/www/chromium/files/patch-net_proxy__resolution_configured__proxy__resolution__service.cc
@@ -1,29 +1,29 @@
---- net/proxy_resolution/configured_proxy_resolution_service.cc.orig	2021-01-18 21:29:02 UTC
+--- net/proxy_resolution/configured_proxy_resolution_service.cc.orig	2021-03-12 23:57:27 UTC
 +++ net/proxy_resolution/configured_proxy_resolution_service.cc
-@@ -47,7 +47,7 @@
- #elif defined(OS_MAC)
- #include "net/proxy_resolution/proxy_config_service_mac.h"
+@@ -50,7 +50,7 @@
  #include "net/proxy_resolution/proxy_resolver_mac.h"
--#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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)
  #include "net/proxy_resolution/proxy_config_service_linux.h"
  #elif defined(OS_ANDROID)
  #include "net/proxy_resolution/proxy_config_service_android.h"
-@@ -61,7 +61,7 @@ namespace net {
- namespace {
- 
+@@ -66,7 +66,7 @@ namespace {
+ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // of lacros-chrome is complete.
  #if defined(OS_WIN) || defined(OS_APPLE) || \
--    (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+    (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+-    (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
++    (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD)
  constexpr net::NetworkTrafficAnnotationTag kSystemProxyConfigTrafficAnnotation =
      net::DefineNetworkTrafficAnnotation("proxy_config_system", R"(
        semantics {
-@@ -1408,7 +1408,7 @@ ConfiguredProxyResolutionService::CreateSystemProxyCon
+@@ -1413,7 +1413,7 @@ ConfiguredProxyResolutionService::CreateSystemProxyCon
               << "profile_io_data.cc::CreateProxyConfigService and this should "
               << "be used only for examples.";
    return std::make_unique<UnsetProxyConfigService>();
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
+-#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
    std::unique_ptr<ProxyConfigServiceLinux> linux_config_service(
        new ProxyConfigServiceLinux());
  
diff --git a/www/chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc b/www/chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc
index 0aabe8b3..646b95fe 100644
--- a/www/chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc
+++ b/www/chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc
@@ -1,4 +1,4 @@
---- net/proxy_resolution/proxy_config_service_linux.cc.orig	2020-11-13 06:36:46 UTC
+--- net/proxy_resolution/proxy_config_service_linux.cc.orig	2021-03-12 23:57:27 UTC
 +++ net/proxy_resolution/proxy_config_service_linux.cc
 @@ -6,7 +6,9 @@
  
diff --git a/www/chromium/files/patch-net_socket_socket__posix.cc b/www/chromium/files/patch-net_socket_socket__posix.cc
index ba32bb36..c314726c 100644
--- a/www/chromium/files/patch-net_socket_socket__posix.cc
+++ b/www/chromium/files/patch-net_socket_socket__posix.cc
@@ -1,4 +1,4 @@
---- net/socket/socket_posix.cc.orig	2020-11-13 06:36:46 UTC
+--- net/socket/socket_posix.cc.orig	2021-03-12 23:57:27 UTC
 +++ net/socket/socket_posix.cc
 @@ -517,7 +517,7 @@ void SocketPosix::ReadCompleted() {
  }
diff --git a/www/chromium/files/patch-net_socket_socks5__client__socket.cc b/www/chromium/files/patch-net_socket_socks5__client__socket.cc
index 5746c854..a488d2f9 100644
--- a/www/chromium/files/patch-net_socket_socks5__client__socket.cc
+++ b/www/chromium/files/patch-net_socket_socks5__client__socket.cc
@@ -1,4 +1,4 @@
---- net/socket/socks5_client_socket.cc.orig	2020-11-13 06:36:46 UTC
+--- net/socket/socks5_client_socket.cc.orig	2021-03-12 23:57:27 UTC
 +++ net/socket/socks5_client_socket.cc
 @@ -4,6 +4,10 @@
  
diff --git a/www/chromium/files/patch-net_socket_tcp__socket__posix.cc b/www/chromium/files/patch-net_socket_tcp__socket__posix.cc
index a5d447ab..ecdef04a 100644
--- a/www/chromium/files/patch-net_socket_tcp__socket__posix.cc
+++ b/www/chromium/files/patch-net_socket_tcp__socket__posix.cc
@@ -1,4 +1,4 @@
---- net/socket/tcp_socket_posix.cc.orig	2020-11-13 06:36:46 UTC
+--- net/socket/tcp_socket_posix.cc.orig	2021-03-12 23:57:27 UTC
 +++ net/socket/tcp_socket_posix.cc
 @@ -88,6 +88,17 @@ bool SetTCPKeepAlive(int fd, bool enable, int delay) {
      PLOG(ERROR) << "Failed to set TCP_KEEPALIVE on fd: " << fd;
diff --git a/www/chromium/files/patch-net_socket_udp__socket__posix.cc b/www/chromium/files/patch-net_socket_udp__socket__posix.cc
index 9eb52404..e50b28b2 100644
--- a/www/chromium/files/patch-net_socket_udp__socket__posix.cc
+++ b/www/chromium/files/patch-net_socket_udp__socket__posix.cc
@@ -1,6 +1,6 @@
---- net/socket/udp_socket_posix.cc.orig	2020-11-13 06:36:46 UTC
+--- net/socket/udp_socket_posix.cc.orig	2021-03-12 23:57:27 UTC
 +++ net/socket/udp_socket_posix.cc
-@@ -70,6 +70,32 @@ const int kActivityMonitorMinimumSamplesForThroughputE
+@@ -71,6 +71,32 @@ const int kActivityMonitorMinimumSamplesForThroughputE
  const base::TimeDelta kActivityMonitorMsThreshold =
      base::TimeDelta::FromMilliseconds(100);
  
@@ -33,7 +33,7 @@
  #if defined(OS_MAC)
  
  // On OSX the file descriptor is guarded to detect the cause of
-@@ -622,13 +648,13 @@ int UDPSocketPosix::SetDoNotFragment() {
+@@ -623,13 +649,13 @@ int UDPSocketPosix::SetDoNotFragment() {
  }
  
  void UDPSocketPosix::SetMsgConfirm(bool confirm) {
@@ -49,7 +49,7 @@
  }
  
  int UDPSocketPosix::AllowAddressReuse() {
-@@ -917,7 +943,11 @@ int UDPSocketPosix::SetMulticastOptions() {
+@@ -918,7 +944,11 @@ int UDPSocketPosix::SetMulticastOptions() {
          mreq.imr_ifindex = multicast_interface_;
          mreq.imr_address.s_addr = htonl(INADDR_ANY);
          int rv = setsockopt(socket_, IPPROTO_IP, IP_MULTICAST_IF,
@@ -61,7 +61,7 @@
          if (rv)
            return MapSystemError(errno);
          break;
-@@ -1018,9 +1048,18 @@ int UDPSocketPosix::LeaveGroup(const IPAddress& group_
+@@ -1019,9 +1049,18 @@ int UDPSocketPosix::LeaveGroup(const IPAddress& group_
      case IPAddress::kIPv4AddressSize: {
        if (addr_family_ != AF_INET)
          return ERR_ADDRESS_INVALID;
diff --git a/www/chromium/files/patch-net_socket_udp__socket__posix.h b/www/chromium/files/patch-net_socket_udp__socket__posix.h
index 1bfe271a..9939694f 100644
--- a/www/chromium/files/patch-net_socket_udp__socket__posix.h
+++ b/www/chromium/files/patch-net_socket_udp__socket__posix.h
@@ -1,4 +1,4 @@
---- net/socket/udp_socket_posix.h.orig	2020-11-13 06:36:46 UTC
+--- net/socket/udp_socket_posix.h.orig	2021-03-12 23:57:27 UTC
 +++ net/socket/udp_socket_posix.h
 @@ -35,7 +35,7 @@
  
diff --git a/www/chromium/files/patch-net_socket_unix__domain__client__socket__posix.cc b/www/chromium/files/patch-net_socket_unix__domain__client__socket__posix.cc
index 0527d804..6e969dc8 100644
--- a/www/chromium/files/patch-net_socket_unix__domain__client__socket__posix.cc
+++ b/www/chromium/files/patch-net_socket_unix__domain__client__socket__posix.cc
@@ -1,4 +1,4 @@
---- net/socket/unix_domain_client_socket_posix.cc.orig	2020-11-13 06:36:46 UTC
+--- net/socket/unix_domain_client_socket_posix.cc.orig	2021-03-12 23:57:27 UTC
 +++ net/socket/unix_domain_client_socket_posix.cc
 @@ -57,7 +57,7 @@ bool UnixDomainClientSocket::FillAddress(const std::st
      return true;
diff --git a/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc b/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc
index 0acb3dd1..1975142e 100644
--- a/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc
+++ b/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc
@@ -1,4 +1,4 @@
---- net/tools/cert_verify_tool/cert_verify_tool.cc.orig	2020-11-13 06:36:46 UTC
+--- net/tools/cert_verify_tool/cert_verify_tool.cc.orig	2021-03-12 23:57:27 UTC
 +++ net/tools/cert_verify_tool/cert_verify_tool.cc
 @@ -29,7 +29,7 @@
  #include "net/url_request/url_request_context_builder.h"
diff --git a/www/chromium/files/patch-net_tools_quic_quic__http__proxy__backend.cc b/www/chromium/files/patch-net_tools_quic_quic__http__proxy__backend.cc
index 8e4684ae..8b2db73a 100644
--- a/www/chromium/files/patch-net_tools_quic_quic__http__proxy__backend.cc
+++ b/www/chromium/files/patch-net_tools_quic_quic__http__proxy__backend.cc
@@ -1,4 +1,4 @@
---- net/tools/quic/quic_http_proxy_backend.cc.orig	2020-11-13 06:36:46 UTC
+--- net/tools/quic/quic_http_proxy_backend.cc.orig	2021-03-12 23:57:27 UTC
 +++ net/tools/quic/quic_http_proxy_backend.cc
 @@ -162,7 +162,7 @@ void QuicHttpProxyBackend::InitializeURLRequestContext
    // Enable HTTP2, but disable QUIC on the backend
diff --git a/www/chromium/files/patch-net_traffic__annotation_network__traffic__annotation.h b/www/chromium/files/patch-net_traffic__annotation_network__traffic__annotation.h
index 5eee818c..07f3931a 100644
--- a/www/chromium/files/patch-net_traffic__annotation_network__traffic__annotation.h
+++ b/www/chromium/files/patch-net_traffic__annotation_network__traffic__annotation.h
@@ -1,6 +1,6 @@
---- net/traffic_annotation/network_traffic_annotation.h.orig	2020-11-13 06:36:46 UTC
+--- net/traffic_annotation/network_traffic_annotation.h.orig	2021-03-12 23:57:27 UTC
 +++ net/traffic_annotation/network_traffic_annotation.h
-@@ -359,7 +359,7 @@ struct MutablePartialNetworkTrafficAnnotationTag {
+@@ -360,7 +360,7 @@ struct MutablePartialNetworkTrafficAnnotationTag {
  }  // namespace net
  
  // Placeholder for unannotated usages.
@@ -9,12 +9,12 @@
  #define TRAFFIC_ANNOTATION_WITHOUT_PROTO(ANNOTATION_ID) \
    net::DefineNetworkTrafficAnnotation(ANNOTATION_ID, "No proto yet.")
  #endif
-@@ -370,7 +370,7 @@ struct MutablePartialNetworkTrafficAnnotationTag {
- //
- // On Linux and Windows, use MISSING_TRAFFIC_ANNOTATION or
+@@ -373,7 +373,7 @@ struct MutablePartialNetworkTrafficAnnotationTag {
  // TRAFFIC_ANNOTATION_FOR_TESTS.
--#if (!defined(OS_WIN) && !defined(OS_LINUX)) || defined(OS_CHROMEOS)
-+#if (!defined(OS_WIN) && !defined(OS_LINUX) && !defined(OS_BSD)) || defined(OS_CHROMEOS)
+ // 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))
+ 
  #define NO_TRAFFIC_ANNOTATION_YET \
    net::DefineNetworkTrafficAnnotation("undefined", "Nothing here yet.")
- 
diff --git a/www/chromium/files/patch-net_url__request_url__fetcher.cc b/www/chromium/files/patch-net_url__request_url__fetcher.cc
index 01968d36..e442ddc1 100644
--- a/www/chromium/files/patch-net_url__request_url__fetcher.cc
+++ b/www/chromium/files/patch-net_url__request_url__fetcher.cc
@@ -1,11 +1,11 @@
---- net/url_request/url_fetcher.cc.orig	2020-11-13 06:36:46 UTC
+--- net/url_request/url_fetcher.cc.orig	2021-03-12 23:57:27 UTC
 +++ net/url_request/url_fetcher.cc
-@@ -21,7 +21,7 @@ void URLFetcher::SetIgnoreCertificateRequests(bool ign
-   URLFetcherImpl::SetIgnoreCertificateRequests(ignored);
- }
+@@ -24,7 +24,7 @@ void URLFetcher::SetIgnoreCertificateRequests(bool ign
  
--#if (!defined(OS_WIN) && !defined(OS_LINUX)) || defined(OS_CHROMEOS)
-+#if (!defined(OS_WIN) && !defined(OS_LINUX) && !defined(OS_BSD)) || defined(OS_CHROMEOS)
+ // 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))
  // static
  std::unique_ptr<URLFetcher> URLFetcher::Create(
      const GURL& url,
diff --git a/www/chromium/files/patch-net_url__request_url__fetcher.h b/www/chromium/files/patch-net_url__request_url__fetcher.h
index 4e3a3d93..f31544eb 100644
--- a/www/chromium/files/patch-net_url__request_url__fetcher.h
+++ b/www/chromium/files/patch-net_url__request_url__fetcher.h
@@ -1,11 +1,13 @@
---- net/url_request/url_fetcher.h.orig	2020-11-13 06:36:46 UTC
+--- net/url_request/url_fetcher.h.orig	2021-03-12 23:57:27 UTC
 +++ net/url_request/url_fetcher.h
-@@ -355,7 +355,7 @@ class NET_EXPORT URLFetcher {
-   // The unannotated Create() methods are not available on desktop Linux +
-   // Windows. They are available on other platforms, since we only audit network
+@@ -352,8 +352,8 @@ class NET_EXPORT URLFetcher {
    // annotations on Linux & Windows.
--#if (!defined(OS_WIN) && !defined(OS_LINUX)) || defined(OS_CHROMEOS)
-+#if (!defined(OS_WIN) && !defined(OS_LINUX) && !defined(OS_BSD)) || defined(OS_CHROMEOS)
+ // 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))) || \
+     defined(OS_CHROMEOS)
    // |url| is the URL to send the request to. It must be valid.
    // |request_type| is the type of request to make.
-   // |d| the object that will receive the callback on fetch completion.
diff --git a/www/chromium/files/patch-net_url__request_url__request__context.cc b/www/chromium/files/patch-net_url__request_url__request__context.cc
index 1ea01133..bd1e6b51 100644
--- a/www/chromium/files/patch-net_url__request_url__request__context.cc
+++ b/www/chromium/files/patch-net_url__request_url__request__context.cc
@@ -1,11 +1,11 @@
---- net/url_request/url_request_context.cc.orig	2020-11-13 06:36:46 UTC
+--- net/url_request/url_request_context.cc.orig	2021-03-12 23:57:27 UTC
 +++ net/url_request/url_request_context.cc
-@@ -91,7 +91,7 @@ const HttpNetworkSession::Context* URLRequestContext::
-   return &network_session->context();
- }
+@@ -93,7 +93,7 @@ const HttpNetworkSession::Context* URLRequestContext::
  
--#if (!defined(OS_WIN) && !defined(OS_LINUX)) || defined(OS_CHROMEOS)
-+#if (!defined(OS_WIN) && !defined(OS_LINUX) && !defined(OS_BSD)) || defined(OS_CHROMEOS)
+ // 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))
  std::unique_ptr<URLRequest> URLRequestContext::CreateRequest(
      const GURL& url,
      RequestPriority priority,
diff --git a/www/chromium/files/patch-net_url__request_url__request__context.h b/www/chromium/files/patch-net_url__request_url__request__context.h
index a66630e1..8d609464 100644
--- a/www/chromium/files/patch-net_url__request_url__request__context.h
+++ b/www/chromium/files/patch-net_url__request_url__request__context.h
@@ -1,11 +1,11 @@
---- net/url_request/url_request_context.h.orig	2020-11-13 06:36:46 UTC
+--- net/url_request/url_request_context.h.orig	2021-03-12 23:57:27 UTC
 +++ net/url_request/url_request_context.h
-@@ -83,7 +83,7 @@ class NET_EXPORT URLRequestContext
-   // session.
-   const HttpNetworkSession::Context* GetNetworkSessionContext() const;
+@@ -85,7 +85,7 @@ class NET_EXPORT URLRequestContext
  
--#if (!defined(OS_WIN) && !defined(OS_LINUX)) || defined(OS_CHROMEOS)
-+#if (!defined(OS_WIN) && !defined(OS_LINUX) && !defined(OS_BSD)) || defined(OS_CHROMEOS)
+ // 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))
    // This function should not be used in Chromium, please use the version with
    // NetworkTrafficAnnotationTag in the future.
    //
diff --git a/www/chromium/files/patch-net_url__request_url__request__context__builder.cc b/www/chromium/files/patch-net_url__request_url__request__context__builder.cc
index dc8e0846..2a3ab619 100644
--- a/www/chromium/files/patch-net_url__request_url__request__context__builder.cc
+++ b/www/chromium/files/patch-net_url__request_url__request__context__builder.cc
@@ -1,6 +1,6 @@
---- net/url_request/url_request_context_builder.cc.orig	2020-11-13 06:36:46 UTC
+--- net/url_request/url_request_context_builder.cc.orig	2021-03-12 23:57:27 UTC
 +++ net/url_request/url_request_context_builder.cc
-@@ -497,7 +497,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu
+@@ -484,7 +484,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu
    }
  
    if (!proxy_resolution_service_) {
@@ -9,7 +9,7 @@
      // TODO(willchan): Switch to using this code when
      // ConfiguredProxyResolutionService::CreateSystemProxyConfigService()'s
      // signature doesn't suck.
-@@ -506,7 +506,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu
+@@ -493,7 +493,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu
            ConfiguredProxyResolutionService::CreateSystemProxyConfigService(
                base::ThreadTaskRunnerHandle::Get().get());
      }
diff --git a/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc b/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc
index c28e3197..3c34450f 100644
--- a/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc
+++ b/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc
@@ -1,6 +1,6 @@
---- pdf/pdfium/pdfium_engine.cc.orig	2021-01-18 21:29:02 UTC
+--- pdf/pdfium/pdfium_engine.cc.orig	2021-03-12 23:57:28 UTC
 +++ pdf/pdfium/pdfium_engine.cc
-@@ -68,7 +68,7 @@
+@@ -71,7 +71,7 @@
  #include "ui/gfx/geometry/vector2d.h"
  #include "v8/include/v8.h"
  
@@ -9,7 +9,7 @@
  #include "pdf/pdfium/pdfium_font_linux.h"
  #endif
  
-@@ -400,7 +400,7 @@ void InitializeSDK(bool enable_v8) {
+@@ -468,7 +468,7 @@ void InitializeSDK(bool enable_v8) {
  
    FPDF_InitLibraryWithConfig(&config);
  
@@ -18,7 +18,7 @@
    InitializeLinuxFontMapper();
  #endif
  
-@@ -459,7 +459,7 @@ PDFiumEngine::PDFiumEngine(PDFEngine::Client* client,
+@@ -527,7 +527,7 @@ PDFiumEngine::PDFiumEngine(PDFEngine::Client* client,
    IFSDK_PAUSE::user = nullptr;
    IFSDK_PAUSE::NeedToPauseNow = Pause_NeedToPauseNow;
  
@@ -27,7 +27,7 @@
    // PreviewModeClient does not know its pp::Instance.
    SetLastInstance(client_->GetPluginInstance());
  #endif
-@@ -924,7 +924,7 @@ pp::Buffer_Dev PDFiumEngine::PrintPagesAsRasterPdf(
+@@ -992,7 +992,7 @@ pp::Buffer_Dev PDFiumEngine::PrintPagesAsRasterPdf(
  
    KillFormFocus();
  
@@ -36,7 +36,7 @@
    SetLastInstance(client_->GetPluginInstance());
  #endif
  
-@@ -3019,7 +3019,7 @@ bool PDFiumEngine::ContinuePaint(int progressive_index
+@@ -3123,7 +3123,7 @@ bool PDFiumEngine::ContinuePaint(int progressive_index
    DCHECK_LT(static_cast<size_t>(progressive_index), progressive_paints_.size());
  
    last_progressive_start_time_ = base::Time::Now();
@@ -45,7 +45,7 @@
    SetLastInstance(client_->GetPluginInstance());
  #endif
  
-@@ -3506,7 +3506,7 @@ void PDFiumEngine::SetCurrentPage(int index) {
+@@ -3610,7 +3610,7 @@ void PDFiumEngine::SetCurrentPage(int index) {
      FORM_DoPageAAction(old_page, form(), FPDFPAGE_AACTION_CLOSE);
    }
    most_visible_page_ = index;
diff --git a/www/chromium/files/patch-ppapi_proxy_file__io__resource.cc b/www/chromium/files/patch-ppapi_proxy_file__io__resource.cc
index fc27ddf3..be74b92d 100644
--- a/www/chromium/files/patch-ppapi_proxy_file__io__resource.cc
+++ b/www/chromium/files/patch-ppapi_proxy_file__io__resource.cc
@@ -1,4 +1,4 @@
---- ppapi/proxy/file_io_resource.cc.orig	2020-11-13 06:36:46 UTC
+--- ppapi/proxy/file_io_resource.cc.orig	2021-03-12 23:57:28 UTC
 +++ ppapi/proxy/file_io_resource.cc
 @@ -284,17 +284,19 @@ int32_t FileIOResource::Write(int64_t offset,
  
diff --git a/www/chromium/files/patch-printing_cups__config__helper.py b/www/chromium/files/patch-printing_cups__config__helper.py
index 96478de5..f7d55edd 100644
--- a/www/chromium/files/patch-printing_cups__config__helper.py
+++ b/www/chromium/files/patch-printing_cups__config__helper.py
@@ -1,4 +1,4 @@
---- printing/cups_config_helper.py.orig	2020-11-13 06:36:46 UTC
+--- printing/cups_config_helper.py.orig	2021-03-12 23:57:28 UTC
 +++ printing/cups_config_helper.py
 @@ -67,7 +67,7 @@ def main():
    mode = sys.argv[1]
diff --git a/www/chromium/files/patch-printing_print__settings.cc b/www/chromium/files/patch-printing_print__settings.cc
index 156cae4c..d6294ba3 100644
--- a/www/chromium/files/patch-printing_print__settings.cc
+++ b/www/chromium/files/patch-printing_print__settings.cc
@@ -1,4 +1,4 @@
---- printing/print_settings.cc.orig	2021-01-18 21:29:02 UTC
+--- printing/print_settings.cc.orig	2021-03-12 23:57:28 UTC
 +++ printing/print_settings.cc
 @@ -278,9 +278,9 @@ void PrintSettings::Clear() {
  #endif
@@ -9,6 +9,6 @@
    advanced_settings_.clear();
 -#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS)
 +#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
- #if BUILDFLAG(IS_ASH)
+ #if BUILDFLAG(IS_CHROMEOS_ASH)
    send_user_info_ = false;
    username_.clear();
diff --git a/www/chromium/files/patch-printing_print__settings.h b/www/chromium/files/patch-printing_print__settings.h
index 45901a22..b744037a 100644
--- a/www/chromium/files/patch-printing_print__settings.h
+++ b/www/chromium/files/patch-printing_print__settings.h
@@ -1,4 +1,4 @@
---- printing/print_settings.h.orig	2021-01-18 21:29:02 UTC
+--- printing/print_settings.h.orig	2021-03-12 23:57:28 UTC
 +++ printing/print_settings.h
 @@ -20,11 +20,11 @@
  #include "ui/gfx/geometry/rect.h"
@@ -39,7 +39,7 @@
 -#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS)
 +#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
  
- #if BUILDFLAG(IS_ASH)
+ #if BUILDFLAG(IS_CHROMEOS_ASH)
    void set_send_user_info(bool send_user_info) {
 @@ -321,10 +321,10 @@ class PRINTING_EXPORT PrintSettings {
    // Number of pages per sheet.
@@ -52,5 +52,5 @@
 -#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS)
 +#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
  
- #if BUILDFLAG(IS_ASH)
+ #if BUILDFLAG(IS_CHROMEOS_ASH)
    // Whether to send user info.
diff --git a/www/chromium/files/patch-printing_print__settings__conversion.cc b/www/chromium/files/patch-printing_print__settings__conversion.cc
index d526bb23..bef8942a 100644
--- a/www/chromium/files/patch-printing_print__settings__conversion.cc
+++ b/www/chromium/files/patch-printing_print__settings__conversion.cc
@@ -1,19 +1,22 @@
---- printing/print_settings_conversion.cc.orig	2021-01-18 21:29:02 UTC
+--- printing/print_settings_conversion.cc.orig	2021-03-12 23:57:28 UTC
 +++ printing/print_settings_conversion.cc
-@@ -211,14 +211,14 @@ std::unique_ptr<PrintSettings> PrintSettingsFromJobSet
- #endif
-   }
+@@ -213,8 +213,8 @@ std::unique_ptr<PrintSettings> PrintSettingsFromJobSet
  
--#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && defined(USE_CUPS))
-+#if defined(OS_CHROMEOS) || ((defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_CUPS))
+ // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
+ // complete.
+-#if defined(OS_CHROMEOS) ||                                  \
+-    ((defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \
++#if defined(OS_CHROMEOS) ||                                                     \
++    ((defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) && \
+      defined(USE_CUPS))
    const base::Value* advanced_settings =
        job_settings.FindDictKey(kSettingAdvancedSettings);
-   if (advanced_settings) {
+@@ -222,7 +222,7 @@ std::unique_ptr<PrintSettings> PrintSettingsFromJobSet
      for (const auto& item : advanced_settings->DictItems())
        settings->advanced_settings().emplace(item.first, item.second.Clone());
    }
--#endif  // defined(OS_CHROMEOS) || (defined(OS_LINUX) && defined(USE_CUPS))
-+#endif  // defined(OS_CHROMEOS) || ((defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_CUPS))
+-#endif  // defined(OS_CHROMEOS) || ((defined(OS_LINUX) ||
++#endif  // defined(OS_CHROMEOS) || ((defined(OS_LINUX) || defined(OS_BSD) ||
+         // BUILDFLAG(IS_CHROMEOS_LACROS)) && defined(USE_CUPS))
  
- #if BUILDFLAG(IS_ASH)
-   bool send_user_info =
+ #if BUILDFLAG(IS_CHROMEOS_ASH)
diff --git a/www/chromium/files/patch-printing_printing__features.cc b/www/chromium/files/patch-printing_printing__features.cc
index 37d89b5f..5943616a 100644
--- a/www/chromium/files/patch-printing_printing__features.cc
+++ b/www/chromium/files/patch-printing_printing__features.cc
@@ -1,4 +1,4 @@
---- printing/printing_features.cc.orig	2021-01-18 21:29:02 UTC
+--- printing/printing_features.cc.orig	2021-03-12 23:57:28 UTC
 +++ printing/printing_features.cc
 @@ -49,13 +49,13 @@ bool ShouldPrintUsingXps(bool source_is_pdf) {
  }
diff --git a/www/chromium/files/patch-printing_printing__features.h b/www/chromium/files/patch-printing_printing__features.h
index 12e34db3..dbb295ec 100644
--- a/www/chromium/files/patch-printing_printing__features.h
+++ b/www/chromium/files/patch-printing_printing__features.h
@@ -1,4 +1,4 @@
---- printing/printing_features.h.orig	2021-01-18 21:29:02 UTC
+--- printing/printing_features.h.orig	2021-03-12 23:57:28 UTC
 +++ printing/printing_features.h
 @@ -38,10 +38,10 @@ PRINTING_EXPORT bool IsXpsPrintCapabilityRequired();
  PRINTING_EXPORT bool ShouldPrintUsingXps(bool source_is_pdf);
diff --git a/www/chromium/files/patch-remoting_base_chromoting__event.cc b/www/chromium/files/patch-remoting_base_chromoting__event.cc
index 44282a11..cae2c064 100644
--- a/www/chromium/files/patch-remoting_base_chromoting__event.cc
+++ b/www/chromium/files/patch-remoting_base_chromoting__event.cc
@@ -1,11 +1,11 @@
---- remoting/base/chromoting_event.cc.orig	2020-11-13 06:36:46 UTC
+--- remoting/base/chromoting_event.cc.orig	2021-03-12 23:57:28 UTC
 +++ remoting/base/chromoting_event.cc
-@@ -188,7 +188,7 @@ void ChromotingEvent::AddSystemInfo() {
+@@ -189,7 +189,7 @@ void ChromotingEvent::AddSystemInfo() {
    SetString(kCpuKey, base::SysInfo::OperatingSystemArchitecture());
    SetString(kOsVersionKey, base::SysInfo::OperatingSystemVersion());
    SetString(kWebAppVersionKey, STRINGIZE(VERSION));
 -#if defined(OS_LINUX) || defined(OS_CHROMEOS)
 +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
    Os os = Os::CHROMOTING_LINUX;
- #elif defined(OS_CHROMEOS)
+ #elif BUILDFLAG(IS_CHROMEOS_ASH)
    Os os = Os::CHROMOTING_CHROMEOS;
diff --git a/www/chromium/files/patch-remoting_client_display_sys__opengl.h b/www/chromium/files/patch-remoting_client_display_sys__opengl.h
index ee211a92..9025d206 100644
--- a/www/chromium/files/patch-remoting_client_display_sys__opengl.h
+++ b/www/chromium/files/patch-remoting_client_display_sys__opengl.h
@@ -1,4 +1,4 @@
---- remoting/client/display/sys_opengl.h.orig	2020-11-13 06:36:46 UTC
+--- remoting/client/display/sys_opengl.h.orig	2021-03-12 23:57:28 UTC
 +++ remoting/client/display/sys_opengl.h
 @@ -9,7 +9,7 @@
  
diff --git a/www/chromium/files/patch-remoting_codec_webrtc__video__encoder__vpx.cc b/www/chromium/files/patch-remoting_codec_webrtc__video__encoder__vpx.cc
new file mode 100644
index 00000000..6788bc3a
--- /dev/null
+++ b/www/chromium/files/patch-remoting_codec_webrtc__video__encoder__vpx.cc
@@ -0,0 +1,16 @@
+--- remoting/codec/webrtc_video_encoder_vpx.cc.orig	2021-03-12 23:57:28 UTC
++++ remoting/codec/webrtc_video_encoder_vpx.cc
+@@ -85,11 +85,11 @@ void SetVp8CodecParameters(vpx_codec_enc_cfg_t* config
+                            const webrtc::DesktopSize& size) {
+   SetCommonCodecParameters(config, size);
+ 
+-#if defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)
++#if defined(OS_BSD) || (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS))
+   // On Linux, using too many threads for VP8 encoding has been linked to high
+   // CPU usage on machines that are under stress. See http://crbug.com/1151148.
+   config->g_threads = std::min(config->g_threads, 2U);
+-#endif  // defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)
++#endif  // defined(OS_BSD) || (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS))
+ 
+   // Value of 2 means using the real time profile. This is basically a
+   // redundant option since we explicitly select real time mode when doing
diff --git a/www/chromium/files/patch-remoting_host_desktop__resizer__ozone.cc b/www/chromium/files/patch-remoting_host_desktop__resizer__ozone.cc
index b778c451..7f315b77 100644
--- a/www/chromium/files/patch-remoting_host_desktop__resizer__ozone.cc
+++ b/www/chromium/files/patch-remoting_host_desktop__resizer__ozone.cc
@@ -1,4 +1,4 @@
---- remoting/host/desktop_resizer_ozone.cc.orig	2020-11-16 14:51:21 UTC
+--- remoting/host/desktop_resizer_ozone.cc.orig	2021-03-12 23:57:28 UTC
 +++ remoting/host/desktop_resizer_ozone.cc
 @@ -32,7 +32,7 @@ void DesktopResizerOzone::RestoreResolution(const Scre
  // To avoid multiple definitions when use_x11 && use_ozone is true, disable this
diff --git a/www/chromium/files/patch-remoting_host_evaluate__capability.cc b/www/chromium/files/patch-remoting_host_evaluate__capability.cc
index e4941a2e..895dce71 100644
--- a/www/chromium/files/patch-remoting_host_evaluate__capability.cc
+++ b/www/chromium/files/patch-remoting_host_evaluate__capability.cc
@@ -1,6 +1,6 @@
---- remoting/host/evaluate_capability.cc.orig	2020-11-13 06:36:46 UTC
+--- remoting/host/evaluate_capability.cc.orig	2021-03-12 23:57:28 UTC
 +++ remoting/host/evaluate_capability.cc
-@@ -51,7 +51,7 @@ base::FilePath BuildHostBinaryPath() {
+@@ -55,7 +55,7 @@ base::FilePath BuildHostBinaryPath() {
    }
  #endif
  
diff --git a/www/chromium/files/patch-remoting_host_heartbeat__sender.cc b/www/chromium/files/patch-remoting_host_heartbeat__sender.cc
index f81007bd..d2c95ff4 100644
--- a/www/chromium/files/patch-remoting_host_heartbeat__sender.cc
+++ b/www/chromium/files/patch-remoting_host_heartbeat__sender.cc
@@ -1,11 +1,11 @@
---- remoting/host/heartbeat_sender.cc.orig	2021-01-19 11:48:10 UTC
+--- remoting/host/heartbeat_sender.cc.orig	2021-03-12 23:57:28 UTC
 +++ remoting/host/heartbeat_sender.cc
-@@ -109,7 +109,7 @@ const net::BackoffEntry::Policy kBackoffPolicy = {
- };
- 
+@@ -112,7 +112,7 @@ const net::BackoffEntry::Policy kBackoffPolicy = {
  std::string GetHostname() {
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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)
    return net::GetHostName();
  #elif defined(OS_WIN)
    wchar_t buffer[MAX_PATH] = {0};
diff --git a/www/chromium/files/patch-remoting_host_host__attributes.cc b/www/chromium/files/patch-remoting_host_host__attributes.cc
index 3dda092d..eea7f92e 100644
--- a/www/chromium/files/patch-remoting_host_host__attributes.cc
+++ b/www/chromium/files/patch-remoting_host_host__attributes.cc
@@ -1,4 +1,4 @@
---- remoting/host/host_attributes.cc.orig	2020-11-13 06:36:46 UTC
+--- remoting/host/host_attributes.cc.orig	2021-03-12 23:57:28 UTC
 +++ remoting/host/host_attributes.cc
 @@ -120,7 +120,7 @@ std::string GetHostAttributes() {
        media::InitializeMediaFoundation()) {
diff --git a/www/chromium/files/patch-remoting_host_host__details.cc b/www/chromium/files/patch-remoting_host_host__details.cc
index be26a2e9..316499dc 100644
--- a/www/chromium/files/patch-remoting_host_host__details.cc
+++ b/www/chromium/files/patch-remoting_host_host__details.cc
@@ -1,11 +1,11 @@
---- remoting/host/host_details.cc.orig	2020-11-13 06:36:46 UTC
+--- remoting/host/host_details.cc.orig	2021-03-12 23:57:28 UTC
 +++ remoting/host/host_details.cc
-@@ -22,7 +22,7 @@ std::string GetHostOperatingSystemName() {
-   return "Mac";
- #elif defined(OS_CHROMEOS)
+@@ -25,6 +25,8 @@ std::string GetHostOperatingSystemName() {
    return "ChromeOS";
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
+ #elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
    return "Linux";
++#elif defined(OS_FREEBSD)
++  return "FreeBSD";
  #elif defined(OS_ANDROID)
    return "Android";
+ #else
diff --git a/www/chromium/files/patch-remoting_host_host__main.cc b/www/chromium/files/patch-remoting_host_host__main.cc
index 98eebc54..f2316c59 100644
--- a/www/chromium/files/patch-remoting_host_host__main.cc
+++ b/www/chromium/files/patch-remoting_host_host__main.cc
@@ -1,4 +1,4 @@
---- remoting/host/host_main.cc.orig	2020-11-13 06:36:46 UTC
+--- remoting/host/host_main.cc.orig	2021-03-12 23:57:28 UTC
 +++ remoting/host/host_main.cc
 @@ -48,9 +48,9 @@ int DesktopProcessMain();
  int FileChooserMain();
@@ -12,7 +12,24 @@
  
  namespace {
  
-@@ -143,10 +143,10 @@ MainRoutineFn SelectMainRoutine(const std::string& pro
+@@ -61,10 +61,14 @@ const char kUsageMessage[] =
+     "\n"
+     "Options:\n"
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_FREEBSD)
+     "  --audio-pipe-name=<pipe> - Sets the pipe name to capture audio on "
++#if defined(OS_LINUX)
+     "Linux.\n"
+-#endif  // defined(OS_LINUX)
++#else
++    "FreeBSD.\n"
++#endif
++#endif  // defined(OS_LINUX) || defined(OS_FREEBSD)
+ 
+ #if defined(OS_APPLE)
+     "  --list-audio-devices     - List all audio devices and their device "
+@@ -152,10 +156,10 @@ MainRoutineFn SelectMainRoutine(const std::string& pro
    } else if (process_type == kProcessTypeRdpDesktopSession) {
      main_routine = &RdpDesktopSessionMain;
  #endif  // defined(OS_WIN)
diff --git a/www/chromium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc b/www/chromium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc
index 99b924dd..91a3a59e 100644
--- a/www/chromium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc
+++ b/www/chromium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc
@@ -1,6 +1,6 @@
---- remoting/host/it2me/it2me_native_messaging_host_main.cc.orig	2021-01-18 21:29:02 UTC
+--- remoting/host/it2me/it2me_native_messaging_host_main.cc.orig	2021-03-12 23:57:28 UTC
 +++ remoting/host/it2me/it2me_native_messaging_host_main.cc
-@@ -29,12 +29,12 @@
+@@ -30,12 +30,12 @@
  #include "remoting/host/switches.h"
  #include "remoting/host/usage_stats_consent.h"
  
@@ -15,7 +15,7 @@
  
  #if defined(OS_APPLE)
  #include "base/mac/mac_util.h"
-@@ -112,7 +112,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv
+@@ -114,7 +114,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv
  
    remoting::LoadResources("");
  
@@ -24,7 +24,7 @@
    // Create an X11EventSource so the global X11 connection
    // (x11::Connection::Get()) can dispatch X events.
    auto event_source =
-@@ -130,7 +130,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv
+@@ -132,7 +132,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv
    // Need to prime the host OS version value for linux to prevent IO on the
    // network thread. base::GetLinuxDistro() caches the result.
    base::GetLinuxDistro();
diff --git a/www/chromium/files/patch-remoting_host_me2me__desktop__environment.cc b/www/chromium/files/patch-remoting_host_me2me__desktop__environment.cc
index eff53ba2..ba666cb8 100644
--- a/www/chromium/files/patch-remoting_host_me2me__desktop__environment.cc
+++ b/www/chromium/files/patch-remoting_host_me2me__desktop__environment.cc
@@ -1,4 +1,4 @@
---- remoting/host/me2me_desktop_environment.cc.orig	2020-11-13 06:36:46 UTC
+--- remoting/host/me2me_desktop_environment.cc.orig	2021-03-12 23:57:28 UTC
 +++ remoting/host/me2me_desktop_environment.cc
 @@ -130,7 +130,7 @@ bool Me2MeDesktopEnvironment::InitializeSecurity(
  
diff --git a/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc b/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc
index 42521401..8f6c5447 100644
--- a/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc
+++ b/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc
@@ -1,6 +1,6 @@
---- remoting/host/remoting_me2me_host.cc.orig	2021-01-18 21:29:02 UTC
+--- remoting/host/remoting_me2me_host.cc.orig	2021-03-12 23:57:28 UTC
 +++ remoting/host/remoting_me2me_host.cc
-@@ -118,14 +118,14 @@
+@@ -120,14 +120,14 @@
  #include "remoting/host/mac/permission_utils.h"
  #endif  // defined(OS_APPLE)
  
@@ -17,7 +17,7 @@
  
  #if defined(OS_WIN)
  #include <commctrl.h>
-@@ -160,11 +160,11 @@ const char kApplicationName[] = "chromoting";
+@@ -162,11 +162,11 @@ const char kApplicationName[] = "chromoting";
  const char kStdinConfigPath[] = "-";
  #endif  // !defined(REMOTING_MULTI_PROCESS)
  
@@ -31,7 +31,7 @@
  
  #if defined(OS_POSIX)
  // The command line switch used to pass name of the unix domain socket used to
-@@ -362,7 +362,7 @@ class HostProcess : public ConfigWatcher::Delegate,
+@@ -359,7 +359,7 @@ class HostProcess : public ConfigWatcher::Delegate,
  
    std::unique_ptr<ChromotingHostContext> context_;
  
@@ -40,7 +40,7 @@
    // Watch for certificate changes and kill the host when changes occur
    std::unique_ptr<CertificateWatcher> cert_watcher_;
  #endif
-@@ -763,7 +763,7 @@ void HostProcess::CreateAuthenticatorFactory() {
+@@ -772,7 +772,7 @@ void HostProcess::CreateAuthenticatorFactory() {
      DCHECK(third_party_auth_config_.token_url.is_valid());
      DCHECK(third_party_auth_config_.token_validation_url.is_valid());
  
@@ -49,7 +49,7 @@
      if (!cert_watcher_) {
        cert_watcher_ = std::make_unique<CertificateWatcher>(
            base::BindRepeating(&HostProcess::ShutdownHost, this,
-@@ -850,7 +850,7 @@ void HostProcess::StartOnUiThread() {
+@@ -861,7 +861,7 @@ void HostProcess::StartOnUiThread() {
        base::BindRepeating(&HostProcess::OnPolicyUpdate, base::Unretained(this)),
        base::BindRepeating(&HostProcess::OnPolicyError, base::Unretained(this)));
  
@@ -58,7 +58,7 @@
    // If an audio pipe is specific on the command-line then initialize
    // AudioCapturerLinux to capture from it.
    base::FilePath audio_pipe_name = base::CommandLine::ForCurrentProcess()->
-@@ -859,7 +859,7 @@ void HostProcess::StartOnUiThread() {
+@@ -870,7 +870,7 @@ void HostProcess::StartOnUiThread() {
      remoting::AudioCapturerLinux::InitializePipeReader(
          context_->audio_task_runner(), audio_pipe_name);
    }
@@ -67,7 +67,7 @@
  
  #if defined(OS_POSIX)
    base::FilePath security_key_socket_name =
-@@ -908,7 +908,7 @@ void HostProcess::ShutdownOnUiThread() {
+@@ -919,7 +919,7 @@ void HostProcess::ShutdownOnUiThread() {
    // It is now safe for the HostProcess to be deleted.
    self_ = nullptr;
  
@@ -76,16 +76,16 @@
    // Cause the global AudioPipeReader to be freed, otherwise the audio
    // thread will remain in-use and prevent the process from exiting.
    // TODO(wez): DesktopEnvironmentFactory should own the pipe reader.
-@@ -1547,7 +1547,7 @@ void HostProcess::StartHost() {
+@@ -1591,7 +1591,7 @@ void HostProcess::StartHost() {
    host_->AddExtension(std::make_unique<TestEchoExtension>());
  
-   // TODO(simonmorris): Get the maximum session duration from a policy.
+   // TODO(joedow): Remove in M90.
 -#if defined(OS_LINUX) || defined(OS_CHROMEOS)
 +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
    host_->SetMaximumSessionDuration(base::TimeDelta::FromHours(20));
  #endif
  
-@@ -1722,7 +1722,7 @@ void HostProcess::OnCrash(const std::string& function_
+@@ -1768,7 +1768,7 @@ void HostProcess::OnCrash(const std::string& function_
  int HostProcessMain() {
    HOST_LOG << "Starting host process: version " << STRINGIZE(VERSION);
  
diff --git a/www/chromium/files/patch-remoting_host_switches.cc b/www/chromium/files/patch-remoting_host_switches.cc
index d5ffd7a5..43057ced 100644
--- a/www/chromium/files/patch-remoting_host_switches.cc
+++ b/www/chromium/files/patch-remoting_host_switches.cc
@@ -1,4 +1,4 @@
---- remoting/host/switches.cc.orig	2020-11-13 06:36:46 UTC
+--- remoting/host/switches.cc.orig	2021-03-12 23:57:28 UTC
 +++ remoting/host/switches.cc
 @@ -21,9 +21,9 @@ const char kProcessTypeHost[] = "host";
  const char kProcessTypeRdpDesktopSession[] = "rdp_desktop_session";
diff --git a/www/chromium/files/patch-remoting_host_switches.h b/www/chromium/files/patch-remoting_host_switches.h
index f962c05b..4d5126cf 100644
--- a/www/chromium/files/patch-remoting_host_switches.h
+++ b/www/chromium/files/patch-remoting_host_switches.h
@@ -1,4 +1,4 @@
---- remoting/host/switches.h.orig	2020-11-13 06:36:46 UTC
+--- remoting/host/switches.h.orig	2021-03-12 23:57:28 UTC
 +++ remoting/host/switches.h
 @@ -34,9 +34,9 @@ extern const char kProcessTypeHost[];
  extern const char kProcessTypeRdpDesktopSession[];
diff --git a/www/chromium/files/patch-remoting_resources_remoting__strings.grd b/www/chromium/files/patch-remoting_resources_remoting__strings.grd
index 81b9eb06..090d87d0 100644
--- a/www/chromium/files/patch-remoting_resources_remoting__strings.grd
+++ b/www/chromium/files/patch-remoting_resources_remoting__strings.grd
@@ -1,6 +1,6 @@
---- remoting/resources/remoting_strings.grd.orig	2020-11-13 06:36:46 UTC
+--- remoting/resources/remoting_strings.grd.orig	2021-03-12 23:57:28 UTC
 +++ remoting/resources/remoting_strings.grd
-@@ -880,7 +880,7 @@ If '<ph name="SERVICE_SCRIPT_NAME">$3<ex>org.chromium.
+@@ -889,7 +889,7 @@ If '<ph name="SERVICE_SCRIPT_NAME">$3<ex>org.chromium.
            Open Screen Recording Preferences
          </message>
        </if>
@@ -9,7 +9,7 @@
          <message name="IDS_SESSION_DIALOG_MESSAGE" desc="The message to show at the top of the session-selection dialog.">
            Select a session to launch within your Chrome Remote Desktop environment. (Note that some session types may not support running within Chrome Remote Desktop and on the local console simultaneously.)
          </message>
-@@ -896,7 +896,7 @@ If '<ph name="SERVICE_SCRIPT_NAME">$3<ex>org.chromium.
+@@ -905,7 +905,7 @@ If '<ph name="SERVICE_SCRIPT_NAME">$3<ex>org.chromium.
          <message name="IDS_SESSION_DIALOG_DEFAULT_SESSION_COMMENT" desc="The comment for the entry to launch the default session.">
            Launch the default XSession
          </message>
diff --git a/www/chromium/files/patch-remoting_test_it2me__standalone__host.cc b/www/chromium/files/patch-remoting_test_it2me__standalone__host.cc
index f5c71ceb..a2df38a1 100644
--- a/www/chromium/files/patch-remoting_test_it2me__standalone__host.cc
+++ b/www/chromium/files/patch-remoting_test_it2me__standalone__host.cc
@@ -1,4 +1,4 @@
---- remoting/test/it2me_standalone_host.cc.orig	2020-11-13 06:36:46 UTC
+--- remoting/test/it2me_standalone_host.cc.orig	2021-03-12 23:57:28 UTC
 +++ remoting/test/it2me_standalone_host.cc
 @@ -49,7 +49,7 @@ It2MeStandaloneHost::It2MeStandaloneHost()
                 context_->ui_task_runner()),
diff --git a/www/chromium/files/patch-remoting_test_it2me__standalone__host__main.cc b/www/chromium/files/patch-remoting_test_it2me__standalone__host__main.cc
index dd072f90..c89b865b 100644
--- a/www/chromium/files/patch-remoting_test_it2me__standalone__host__main.cc
+++ b/www/chromium/files/patch-remoting_test_it2me__standalone__host__main.cc
@@ -1,4 +1,4 @@
---- remoting/test/it2me_standalone_host_main.cc.orig	2021-01-18 21:29:02 UTC
+--- remoting/test/it2me_standalone_host_main.cc.orig	2021-03-12 23:57:28 UTC
 +++ remoting/test/it2me_standalone_host_main.cc
 @@ -9,19 +9,19 @@
  #include "remoting/proto/event.pb.h"
diff --git a/www/chromium/files/patch-sandbox_BUILD.gn b/www/chromium/files/patch-sandbox_BUILD.gn
index 5a4a1d9d..b3ac8574 100644
--- a/www/chromium/files/patch-sandbox_BUILD.gn
+++ b/www/chromium/files/patch-sandbox_BUILD.gn
@@ -1,4 +1,4 @@
---- sandbox/BUILD.gn.orig	2020-11-17 10:04:06 UTC
+--- sandbox/BUILD.gn.orig	2021-03-12 23:57:28 UTC
 +++ sandbox/BUILD.gn
 @@ -27,7 +27,7 @@ group("sandbox") {
        "//sandbox/mac:system_services",
diff --git a/www/chromium/files/patch-sandbox_features.gni b/www/chromium/files/patch-sandbox_features.gni
index 87ef9a8c..af3920c7 100644
--- a/www/chromium/files/patch-sandbox_features.gni
+++ b/www/chromium/files/patch-sandbox_features.gni
@@ -1,4 +1,4 @@
---- sandbox/features.gni.orig	2020-11-13 06:36:46 UTC
+--- sandbox/features.gni.orig	2021-03-12 23:57:28 UTC
 +++ sandbox/features.gni
 @@ -8,7 +8,7 @@ import("//build/config/nacl/config.gni")
  # currently.
diff --git a/www/chromium/files/patch-sandbox_linux_BUILD.gn b/www/chromium/files/patch-sandbox_linux_BUILD.gn
index 7c9271b5..cf3d200f 100644
--- a/www/chromium/files/patch-sandbox_linux_BUILD.gn
+++ b/www/chromium/files/patch-sandbox_linux_BUILD.gn
@@ -1,4 +1,4 @@
---- sandbox/linux/BUILD.gn.orig	2020-11-13 06:36:46 UTC
+--- sandbox/linux/BUILD.gn.orig	2021-03-12 23:57:28 UTC
 +++ sandbox/linux/BUILD.gn
 @@ -386,7 +386,7 @@ component("sandbox_services") {
      public_deps += [ ":sandbox_services_headers" ]
diff --git a/www/chromium/files/patch-sandbox_linux_services_init__process__reaper.cc b/www/chromium/files/patch-sandbox_linux_services_init__process__reaper.cc
index 2b6e26b4..b90373ab 100644
--- a/www/chromium/files/patch-sandbox_linux_services_init__process__reaper.cc
+++ b/www/chromium/files/patch-sandbox_linux_services_init__process__reaper.cc
@@ -1,4 +1,4 @@
---- sandbox/linux/services/init_process_reaper.cc.orig	2020-11-13 06:36:46 UTC
+--- sandbox/linux/services/init_process_reaper.cc.orig	2021-03-12 23:57:28 UTC
 +++ sandbox/linux/services/init_process_reaper.cc
 @@ -1,6 +1,7 @@
  // Copyright 2013 The Chromium Authors. All rights reserved.
diff --git a/www/chromium/files/patch-sandbox_linux_services_libc__interceptor.cc b/www/chromium/files/patch-sandbox_linux_services_libc__interceptor.cc
index f0bccd61..c7ecc446 100644
--- a/www/chromium/files/patch-sandbox_linux_services_libc__interceptor.cc
+++ b/www/chromium/files/patch-sandbox_linux_services_libc__interceptor.cc
@@ -1,4 +1,4 @@
---- sandbox/linux/services/libc_interceptor.cc.orig	2020-11-13 06:36:46 UTC
+--- sandbox/linux/services/libc_interceptor.cc.orig	2021-03-12 23:57:28 UTC
 +++ sandbox/linux/services/libc_interceptor.cc
 @@ -11,7 +11,9 @@
  #include <stddef.h>
diff --git a/www/chromium/files/patch-sandbox_policy_BUILD.gn b/www/chromium/files/patch-sandbox_policy_BUILD.gn
index 02f61374..1fb51a55 100644
--- a/www/chromium/files/patch-sandbox_policy_BUILD.gn
+++ b/www/chromium/files/patch-sandbox_policy_BUILD.gn
@@ -1,4 +1,4 @@
---- sandbox/policy/BUILD.gn.orig	2021-01-18 21:29:02 UTC
+--- sandbox/policy/BUILD.gn.orig	2021-03-12 23:57:28 UTC
 +++ sandbox/policy/BUILD.gn
 @@ -29,7 +29,7 @@ component("policy") {
      "//sandbox:common",
diff --git a/www/chromium/files/patch-sandbox_policy_switches.cc b/www/chromium/files/patch-sandbox_policy_switches.cc
index 1cb0054e..bb806787 100644
--- a/www/chromium/files/patch-sandbox_policy_switches.cc
+++ b/www/chromium/files/patch-sandbox_policy_switches.cc
@@ -1,4 +1,4 @@
---- sandbox/policy/switches.cc.orig	2021-01-18 21:29:02 UTC
+--- sandbox/policy/switches.cc.orig	2021-03-12 23:57:28 UTC
 +++ sandbox/policy/switches.cc
 @@ -82,7 +82,7 @@ const char kGpuSandboxFailuresFatal[] = "gpu-sandbox-f
  // Meant to be used as a browser-level switch for testing purposes only.
diff --git a/www/chromium/files/patch-sandbox_policy_switches.h b/www/chromium/files/patch-sandbox_policy_switches.h
index 2bf645be..1964c0b1 100644
--- a/www/chromium/files/patch-sandbox_policy_switches.h
+++ b/www/chromium/files/patch-sandbox_policy_switches.h
@@ -1,4 +1,4 @@
---- sandbox/policy/switches.h.orig	2021-01-18 21:29:02 UTC
+--- sandbox/policy/switches.h.orig	2021-03-12 23:57:28 UTC
 +++ sandbox/policy/switches.h
 @@ -54,7 +54,7 @@ SANDBOX_POLICY_EXPORT extern const char kDisableSetuid
  SANDBOX_POLICY_EXPORT extern const char kGpuSandboxAllowSysVShm[];
diff --git a/www/chromium/files/patch-services_audio_BUILD.gn b/www/chromium/files/patch-services_audio_BUILD.gn
index eaab2815..6da28e1a 100644
--- a/www/chromium/files/patch-services_audio_BUILD.gn
+++ b/www/chromium/files/patch-services_audio_BUILD.gn
@@ -1,4 +1,4 @@
---- services/audio/BUILD.gn.orig	2021-01-18 21:29:02 UTC
+--- services/audio/BUILD.gn.orig	2021-03-12 23:57:28 UTC
 +++ services/audio/BUILD.gn
 @@ -75,7 +75,7 @@ source_set("audio") {
      "//services/audio/public/mojom",
diff --git a/www/chromium/files/patch-services_device_geolocation_location__arbitrator.cc b/www/chromium/files/patch-services_device_geolocation_location__arbitrator.cc
index 224466f3..aa7241b0 100644
--- a/www/chromium/files/patch-services_device_geolocation_location__arbitrator.cc
+++ b/www/chromium/files/patch-services_device_geolocation_location__arbitrator.cc
@@ -1,4 +1,4 @@
---- services/device/geolocation/location_arbitrator.cc.orig	2020-11-13 06:36:46 UTC
+--- services/device/geolocation/location_arbitrator.cc.orig	2021-03-12 23:57:28 UTC
 +++ services/device/geolocation/location_arbitrator.cc
 @@ -156,7 +156,7 @@ LocationArbitrator::NewNetworkLocationProvider(
  
diff --git a/www/chromium/files/patch-services_device_hid_BUILD.gn b/www/chromium/files/patch-services_device_hid_BUILD.gn
index 6d1eb719..def8acca 100644
--- a/www/chromium/files/patch-services_device_hid_BUILD.gn
+++ b/www/chromium/files/patch-services_device_hid_BUILD.gn
@@ -1,4 +1,4 @@
---- services/device/hid/BUILD.gn.orig	2021-01-18 21:29:02 UTC
+--- services/device/hid/BUILD.gn.orig	2021-03-12 23:57:28 UTC
 +++ services/device/hid/BUILD.gn
 @@ -45,6 +45,15 @@ source_set("hid") {
      deps += [ "//device/udev_linux" ]
@@ -13,6 +13,6 @@
 +    ]
 +  }
 +
-   if (is_ash) {
+   if (is_chromeos_ash) {
      deps += [ "//chromeos/dbus/permission_broker" ]
    }
diff --git a/www/chromium/files/patch-services_device_hid_hid__connection__freebsd.cc b/www/chromium/files/patch-services_device_hid_hid__connection__freebsd.cc
index f845e499..66589262 100644
--- a/www/chromium/files/patch-services_device_hid_hid__connection__freebsd.cc
+++ b/www/chromium/files/patch-services_device_hid_hid__connection__freebsd.cc
@@ -1,6 +1,6 @@
---- services/device/hid/hid_connection_freebsd.cc.orig	2020-11-16 10:08:51 UTC
+--- services/device/hid/hid_connection_freebsd.cc.orig	2021-03-15 11:01:24 UTC
 +++ services/device/hid/hid_connection_freebsd.cc
-@@ -0,0 +1,240 @@
+@@ -0,0 +1,241 @@
 +// Copyright (c) 2014 The Chromium Authors. All rights reserved.
 +// Use of this source code is governed by a BSD-style license that can be
 +// found in the LICENSE file.
@@ -182,8 +182,9 @@
 +HidConnectionFreeBSD::HidConnectionFreeBSD(
 +    scoped_refptr<HidDeviceInfo> device_info,
 +    base::ScopedFD fd,
-+    scoped_refptr<base::SequencedTaskRunner> blocking_task_runner)
-+    : HidConnection(device_info),
++    scoped_refptr<base::SequencedTaskRunner> blocking_task_runner,
++    bool allow_protected_reports)
++    : HidConnection(device_info, allow_protected_reports),
 +      helper_(nullptr, base::OnTaskRunnerDeleter(blocking_task_runner)),
 +      blocking_task_runner_(std::move(blocking_task_runner)) {
 +  helper_.reset(new BlockingTaskRunnerHelper(std::move(fd), device_info,
diff --git a/www/chromium/files/patch-services_device_hid_hid__connection__freebsd.h b/www/chromium/files/patch-services_device_hid_hid__connection__freebsd.h
index 87cd6a67..76387ff9 100644
--- a/www/chromium/files/patch-services_device_hid_hid__connection__freebsd.h
+++ b/www/chromium/files/patch-services_device_hid_hid__connection__freebsd.h
@@ -1,6 +1,6 @@
---- services/device/hid/hid_connection_freebsd.h.orig	2020-11-16 10:08:51 UTC
+--- services/device/hid/hid_connection_freebsd.h.orig	2021-03-15 11:01:24 UTC
 +++ services/device/hid/hid_connection_freebsd.h
-@@ -0,0 +1,65 @@
+@@ -0,0 +1,66 @@
 +// Copyright (c) 2014 The Chromium Authors. All rights reserved.
 +// Use of this source code is governed by a BSD-style license that can be
 +// found in the LICENSE file.
@@ -33,7 +33,8 @@
 +  HidConnectionFreeBSD(
 +      scoped_refptr<HidDeviceInfo> device_info,
 +      base::ScopedFD fd,
-+      scoped_refptr<base::SequencedTaskRunner> blocking_task_runner);
++      scoped_refptr<base::SequencedTaskRunner> blocking_task_runner,
++      bool allow_protected_reports);
 +
 + private:
 +  friend class base::RefCountedThreadSafe<HidConnectionFreeBSD>;
diff --git a/www/chromium/files/patch-services_device_hid_hid__service.cc b/www/chromium/files/patch-services_device_hid_hid__service.cc
index 8b180637..213fd2a5 100644
--- a/www/chromium/files/patch-services_device_hid_hid__service.cc
+++ b/www/chromium/files/patch-services_device_hid_hid__service.cc
@@ -1,6 +1,6 @@
---- services/device/hid/hid_service.cc.orig	2020-11-13 06:36:46 UTC
+--- services/device/hid/hid_service.cc.orig	2021-03-12 23:57:28 UTC
 +++ services/device/hid/hid_service.cc
-@@ -16,6 +16,8 @@
+@@ -18,6 +18,8 @@
  
  #if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(USE_UDEV)
  #include "services/device/hid/hid_service_linux.h"
@@ -9,7 +9,7 @@
  #elif defined(OS_MAC)
  #include "services/device/hid/hid_service_mac.h"
  #elif defined(OS_WIN)
-@@ -36,6 +38,8 @@ constexpr base::TaskTraits HidService::kBlockingTaskTr
+@@ -58,6 +60,8 @@ constexpr base::TaskTraits HidService::kBlockingTaskTr
  std::unique_ptr<HidService> HidService::Create() {
  #if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(USE_UDEV)
    return base::WrapUnique(new HidServiceLinux());
diff --git a/www/chromium/files/patch-services_device_hid_hid__service__freebsd.cc b/www/chromium/files/patch-services_device_hid_hid__service__freebsd.cc
index 3528e642..e4b52263 100644
--- a/www/chromium/files/patch-services_device_hid_hid__service__freebsd.cc
+++ b/www/chromium/files/patch-services_device_hid_hid__service__freebsd.cc
@@ -1,6 +1,6 @@
---- services/device/hid/hid_service_freebsd.cc.orig	2020-11-16 10:08:51 UTC
+--- services/device/hid/hid_service_freebsd.cc.orig	2021-03-15 11:01:24 UTC
 +++ services/device/hid/hid_service_freebsd.cc
-@@ -0,0 +1,382 @@
+@@ -0,0 +1,389 @@
 +// Copyright 2014 The Chromium Authors. All rights reserved.
 +// Use of this source code is governed by a BSD-style license that can be
 +// found in the LICENSE file.
@@ -43,8 +43,10 @@
 +
 +struct HidServiceFreeBSD::ConnectParams {
 +  ConnectParams(scoped_refptr<HidDeviceInfo> device_info,
++                bool allow_protected_reports,
 +                ConnectCallback callback)
 +      : device_info(std::move(device_info)),
++	allow_protected_reports(allow_protected_reports),
 +        callback(std::move(callback)),
 +        task_runner(base::ThreadTaskRunnerHandle::Get()),
 +        blocking_task_runner(
@@ -52,6 +54,7 @@
 +  ~ConnectParams() {}
 +
 +  scoped_refptr<HidDeviceInfo> device_info;
++  bool allow_protected_reports;
 +  ConnectCallback callback;
 +  scoped_refptr<base::SequencedTaskRunner> task_runner;
 +  scoped_refptr<base::SequencedTaskRunner> blocking_task_runner;
@@ -345,7 +348,8 @@
 +}
 +
 +void HidServiceFreeBSD::Connect(const std::string& device_guid,
-+                            ConnectCallback callback) {
++                                bool allow_protected_reports,
++                                ConnectCallback callback) {
 +  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
 +
 +  const auto& map_entry = devices().find(device_guid);
@@ -357,7 +361,9 @@
 +
 +  scoped_refptr<HidDeviceInfo> device_info = map_entry->second;
 +
-+  auto params = std::make_unique<ConnectParams>(device_info, std::move(callback));
++  auto params = std::make_unique<ConnectParams>(device_info,
++                                                allow_protected_reports,
++						std::move(callback));
 +  scoped_refptr<base::SequencedTaskRunner> blocking_task_runner =
 +      params->blocking_task_runner;
 +
@@ -378,7 +384,8 @@
 +  std::move(params->callback).Run(base::MakeRefCounted<HidConnectionFreeBSD>(
 +    std::move(params->device_info),
 +    std::move(params->fd),
-+    std::move(params->blocking_task_runner)
++    std::move(params->blocking_task_runner),
++    params->allow_protected_reports
 +  ));
 +}
 +
diff --git a/www/chromium/files/patch-services_device_hid_hid__service__freebsd.h b/www/chromium/files/patch-services_device_hid_hid__service__freebsd.h
index 59c71be3..9027b2e0 100644
--- a/www/chromium/files/patch-services_device_hid_hid__service__freebsd.h
+++ b/www/chromium/files/patch-services_device_hid_hid__service__freebsd.h
@@ -1,6 +1,6 @@
---- services/device/hid/hid_service_freebsd.h.orig	2020-11-16 10:08:51 UTC
+--- services/device/hid/hid_service_freebsd.h.orig	2021-03-15 11:01:24 UTC
 +++ services/device/hid/hid_service_freebsd.h
-@@ -0,0 +1,46 @@
+@@ -0,0 +1,47 @@
 +// Copyright 2014 The Chromium Authors. All rights reserved.
 +// Use of this source code is governed by a BSD-style license that can be
 +// found in the LICENSE file.
@@ -25,6 +25,7 @@
 +  ~HidServiceFreeBSD() override;
 +
 +  void Connect(const std::string& device_guid,
++               bool allow_protected_reports,
 +               ConnectCallback connect) override;
 +  base::WeakPtr<HidService> GetWeakPtr() override;
 +
diff --git a/www/chromium/files/patch-services_device_serial_BUILD.gn b/www/chromium/files/patch-services_device_serial_BUILD.gn
index b392ba45..dc10036e 100644
--- a/www/chromium/files/patch-services_device_serial_BUILD.gn
+++ b/www/chromium/files/patch-services_device_serial_BUILD.gn
@@ -1,4 +1,4 @@
---- services/device/serial/BUILD.gn.orig	2021-01-18 21:29:02 UTC
+--- services/device/serial/BUILD.gn.orig	2021-03-12 23:57:28 UTC
 +++ services/device/serial/BUILD.gn
 @@ -5,7 +5,7 @@
  import("//build/config/chromeos/ui_mode.gni")
diff --git a/www/chromium/files/patch-services_device_serial_serial__device__enumerator.cc b/www/chromium/files/patch-services_device_serial_serial__device__enumerator.cc
index 4a2f6433..8f88b4ab 100644
--- a/www/chromium/files/patch-services_device_serial_serial__device__enumerator.cc
+++ b/www/chromium/files/patch-services_device_serial_serial__device__enumerator.cc
@@ -1,4 +1,4 @@
---- services/device/serial/serial_device_enumerator.cc.orig	2020-11-13 06:36:46 UTC
+--- services/device/serial/serial_device_enumerator.cc.orig	2021-03-12 23:57:28 UTC
 +++ services/device/serial/serial_device_enumerator.cc
 @@ -10,7 +10,7 @@
  #include "build/build_config.h"
diff --git a/www/chromium/files/patch-services_device_serial_serial__io__handler__posix.cc b/www/chromium/files/patch-services_device_serial_serial__io__handler__posix.cc
index 24bc299c..127a4fdf 100644
--- a/www/chromium/files/patch-services_device_serial_serial__io__handler__posix.cc
+++ b/www/chromium/files/patch-services_device_serial_serial__io__handler__posix.cc
@@ -1,4 +1,4 @@
---- services/device/serial/serial_io_handler_posix.cc.orig	2021-01-18 21:29:02 UTC
+--- services/device/serial/serial_io_handler_posix.cc.orig	2021-03-12 23:57:28 UTC
 +++ services/device/serial/serial_io_handler_posix.cc
 @@ -38,6 +38,10 @@ struct termios2 {
  
diff --git a/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc b/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc
index 8325c344..e029914a 100644
--- a/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc
+++ b/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc
@@ -1,4 +1,4 @@
---- services/device/time_zone_monitor/time_zone_monitor_linux.cc.orig	2021-01-18 21:29:02 UTC
+--- services/device/time_zone_monitor/time_zone_monitor_linux.cc.orig	2021-03-12 23:57:28 UTC
 +++ services/device/time_zone_monitor/time_zone_monitor_linux.cc
 @@ -125,7 +125,11 @@ class TimeZoneMonitorLinuxImpl
      // false positives are harmless, assuming the false positive rate is
diff --git a/www/chromium/files/patch-services_device_usb_BUILD.gn b/www/chromium/files/patch-services_device_usb_BUILD.gn
index e6814a7e..c2edf69e 100644
--- a/www/chromium/files/patch-services_device_usb_BUILD.gn
+++ b/www/chromium/files/patch-services_device_usb_BUILD.gn
@@ -1,4 +1,4 @@
---- services/device/usb/BUILD.gn.orig	2021-01-18 21:29:02 UTC
+--- services/device/usb/BUILD.gn.orig	2021-03-12 23:57:28 UTC
 +++ services/device/usb/BUILD.gn
 @@ -142,7 +142,7 @@ static_library("usb") {
      deps += [ "//third_party/re2" ]
diff --git a/www/chromium/files/patch-services_network_BUILD.gn b/www/chromium/files/patch-services_network_BUILD.gn
index 286f8a2e..dc1e918e 100644
--- a/www/chromium/files/patch-services_network_BUILD.gn
+++ b/www/chromium/files/patch-services_network_BUILD.gn
@@ -1,7 +1,7 @@
---- services/network/BUILD.gn.orig	2021-01-18 21:29:02 UTC
+--- services/network/BUILD.gn.orig	2021-03-12 23:57:28 UTC
 +++ services/network/BUILD.gn
-@@ -263,9 +263,15 @@ component("network_service") {
-     deps += [ "//components/certificate_transparency" ]
+@@ -273,9 +273,15 @@ component("network_service") {
+     ]
    }
  
 -  if (is_linux || is_chromeos) {
diff --git a/www/chromium/files/patch-services_network_network__context.cc b/www/chromium/files/patch-services_network_network__context.cc
deleted file mode 100644
index 02ca7976..00000000
--- a/www/chromium/files/patch-services_network_network__context.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- services/network/network_context.cc.orig	2021-01-18 21:29:02 UTC
-+++ services/network/network_context.cc
-@@ -2292,7 +2292,7 @@ NetworkContext::MakeSessionCleanupCookieStore() const 
- 
-   net::CookieCryptoDelegate* crypto_delegate = nullptr;
-   if (params_->enable_encrypted_cookies) {
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !BUILDFLAG(IS_CHROMECAST)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS) && !BUILDFLAG(IS_CHROMECAST)) || defined(OS_BSD)
-     DCHECK(network_service_->os_crypt_config_set())
-         << "NetworkService::SetCryptConfig must be called before creating a "
-            "NetworkContext with encrypted cookies.";
diff --git a/www/chromium/files/patch-services_network_network__sandbox__hook__linux.cc b/www/chromium/files/patch-services_network_network__sandbox__hook__linux.cc
index d62bb574..1ec99c3b 100644
--- a/www/chromium/files/patch-services_network_network__sandbox__hook__linux.cc
+++ b/www/chromium/files/patch-services_network_network__sandbox__hook__linux.cc
@@ -1,4 +1,4 @@
---- services/network/network_sandbox_hook_linux.cc.orig	2020-11-13 06:36:46 UTC
+--- services/network/network_sandbox_hook_linux.cc.orig	2021-03-12 23:57:28 UTC
 +++ services/network/network_sandbox_hook_linux.cc
 @@ -14,6 +14,7 @@ using sandbox::syscall_broker::MakeBrokerCommandSet;
  namespace network {
diff --git a/www/chromium/files/patch-services_network_network__service.cc b/www/chromium/files/patch-services_network_network__service.cc
index a8db15a9..d731565f 100644
--- a/www/chromium/files/patch-services_network_network__service.cc
+++ b/www/chromium/files/patch-services_network_network__service.cc
@@ -1,20 +1,20 @@
---- services/network/network_service.cc.orig	2021-01-18 21:29:02 UTC
+--- services/network/network_service.cc.orig	2021-03-12 23:57:28 UTC
 +++ services/network/network_service.cc
 @@ -73,7 +73,7 @@
  #include "third_party/boringssl/src/include/openssl/cpu.h"
  #endif
  
--#if (defined(OS_LINUX) || BUILDFLAG(IS_LACROS)) && !BUILDFLAG(IS_CHROMECAST)
-+#if ((defined(OS_LINUX) || BUILDFLAG(IS_LACROS)) && !BUILDFLAG(IS_CHROMECAST)) || defined(OS_BSD)
+-#if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \
++#if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) && \
+     !BUILDFLAG(IS_CHROMECAST)
  #include "components/os_crypt/key_storage_config_linux.h"
  #endif
- 
-@@ -678,7 +678,7 @@ void NetworkService::OnCertDBChanged() {
+@@ -680,7 +680,7 @@ void NetworkService::OnCertDBChanged() {
    net::CertDatabase::GetInstance()->NotifyObserversCertDBChanged();
  }
  
--#if defined(OS_LINUX) || BUILDFLAG(IS_LACROS)
-+#if defined(OS_LINUX) || BUILDFLAG(IS_LACROS) || defined(OS_BSD)
+-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
  void NetworkService::SetCryptConfig(mojom::CryptConfigPtr crypt_config) {
  #if !BUILDFLAG(IS_CHROMECAST)
    DCHECK(!os_crypt_config_set_);
diff --git a/www/chromium/files/patch-services_network_network__service.h b/www/chromium/files/patch-services_network_network__service.h
index 5d222e78..f5676b77 100644
--- a/www/chromium/files/patch-services_network_network__service.h
+++ b/www/chromium/files/patch-services_network_network__service.h
@@ -1,11 +1,11 @@
---- services/network/network_service.h.orig	2021-01-18 21:29:02 UTC
+--- services/network/network_service.h.orig	2021-03-12 23:57:28 UTC
 +++ services/network/network_service.h
 @@ -197,7 +197,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService
        base::span<const uint8_t> config,
        mojom::NetworkService::UpdateLegacyTLSConfigCallback callback) override;
    void OnCertDBChanged() override;
--#if defined(OS_LINUX) || BUILDFLAG(IS_LACROS)
-+#if defined(OS_LINUX) || BUILDFLAG(IS_LACROS) || defined(OS_BSD)
+-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
    void SetCryptConfig(mojom::CryptConfigPtr crypt_config) override;
  #endif
  #if defined(OS_WIN) || defined(OS_MAC)
diff --git a/www/chromium/files/patch-services_network_public_cpp_cert__verifier_cert__verifier__creation.cc b/www/chromium/files/patch-services_network_public_cpp_cert__verifier_cert__verifier__creation.cc
index 0026f13e..ce397d84 100644
--- a/www/chromium/files/patch-services_network_public_cpp_cert__verifier_cert__verifier__creation.cc
+++ b/www/chromium/files/patch-services_network_public_cpp_cert__verifier_cert__verifier__creation.cc
@@ -1,4 +1,4 @@
---- services/network/public/cpp/cert_verifier/cert_verifier_creation.cc.orig	2021-01-18 21:29:02 UTC
+--- services/network/public/cpp/cert_verifier/cert_verifier_creation.cc.orig	2021-03-12 23:57:28 UTC
 +++ services/network/public/cpp/cert_verifier/cert_verifier_creation.cc
 @@ -71,7 +71,7 @@ scoped_refptr<net::CertVerifyProc> CreateCertVerifyPro
  
diff --git a/www/chromium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc b/www/chromium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc
index edd471f2..6aa4128a 100644
--- a/www/chromium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc
+++ b/www/chromium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc
@@ -1,4 +1,4 @@
---- services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc.orig	2021-01-18 21:29:02 UTC
+--- services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc.orig	2021-03-12 23:57:28 UTC
 +++ services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc
 @@ -50,7 +50,7 @@ namespace {
  uint32_t CalculatePrivateFootprintKb(const mojom::RawOSMemDump& os_dump,
diff --git a/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h b/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h
index 2f43090d..cfbdd603 100644
--- a/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h
+++ b/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h
@@ -1,4 +1,4 @@
---- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h.orig	2020-11-13 06:36:46 UTC
+--- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h.orig	2021-03-12 23:57:28 UTC
 +++ services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h
 @@ -45,9 +45,9 @@ class COMPONENT_EXPORT(
                                      mojom::RawOSMemDump*);
diff --git a/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__linux.cc b/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__linux.cc
index f4c067dc..b18914ac 100644
--- a/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__linux.cc
+++ b/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__linux.cc
@@ -1,4 +1,4 @@
---- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_linux.cc.orig	2020-11-13 06:36:46 UTC
+--- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_linux.cc.orig	2021-03-12 23:57:28 UTC
 +++ services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_linux.cc
 @@ -5,7 +5,6 @@
  #include <dlfcn.h>
diff --git a/www/chromium/files/patch-services_service__manager_BUILD.gn b/www/chromium/files/patch-services_service__manager_BUILD.gn
index 698821fc..e3397aad 100644
--- a/www/chromium/files/patch-services_service__manager_BUILD.gn
+++ b/www/chromium/files/patch-services_service__manager_BUILD.gn
@@ -1,4 +1,4 @@
---- services/service_manager/BUILD.gn.orig	2021-01-18 21:29:03 UTC
+--- services/service_manager/BUILD.gn.orig	2021-03-12 23:57:28 UTC
 +++ services/service_manager/BUILD.gn
 @@ -66,7 +66,7 @@ source_set("service_manager") {
      ]
diff --git a/www/chromium/files/patch-services_service__manager_public_cpp_service__executable_BUILD.gn b/www/chromium/files/patch-services_service__manager_public_cpp_service__executable_BUILD.gn
index 188da9d7..ba84b812 100644
--- a/www/chromium/files/patch-services_service__manager_public_cpp_service__executable_BUILD.gn
+++ b/www/chromium/files/patch-services_service__manager_public_cpp_service__executable_BUILD.gn
@@ -1,4 +1,4 @@
---- services/service_manager/public/cpp/service_executable/BUILD.gn.orig	2020-11-13 06:36:46 UTC
+--- services/service_manager/public/cpp/service_executable/BUILD.gn.orig	2021-03-12 23:57:28 UTC
 +++ services/service_manager/public/cpp/service_executable/BUILD.gn
 @@ -22,7 +22,7 @@ source_set("support") {
      "//services/service_manager/public/mojom",
diff --git a/www/chromium/files/patch-services_tracing_public_cpp_perfetto_trace__time.cc b/www/chromium/files/patch-services_tracing_public_cpp_perfetto_trace__time.cc
index 8857145d..42ef4892 100644
--- a/www/chromium/files/patch-services_tracing_public_cpp_perfetto_trace__time.cc
+++ b/www/chromium/files/patch-services_tracing_public_cpp_perfetto_trace__time.cc
@@ -1,4 +1,4 @@
---- services/tracing/public/cpp/perfetto/trace_time.cc.orig	2020-11-13 06:36:46 UTC
+--- services/tracing/public/cpp/perfetto/trace_time.cc.orig	2021-03-12 23:57:28 UTC
 +++ services/tracing/public/cpp/perfetto/trace_time.cc
 @@ -12,14 +12,18 @@ namespace tracing {
  
diff --git a/www/chromium/files/patch-services_tracing_public_cpp_stack__sampling_tracing__sampler__profiler.cc b/www/chromium/files/patch-services_tracing_public_cpp_stack__sampling_tracing__sampler__profiler.cc
index cae3a3bc..a4a18e66 100644
--- a/www/chromium/files/patch-services_tracing_public_cpp_stack__sampling_tracing__sampler__profiler.cc
+++ b/www/chromium/files/patch-services_tracing_public_cpp_stack__sampling_tracing__sampler__profiler.cc
@@ -1,4 +1,4 @@
---- services/tracing/public/cpp/stack_sampling/tracing_sampler_profiler.cc.orig	2020-11-13 06:36:46 UTC
+--- services/tracing/public/cpp/stack_sampling/tracing_sampler_profiler.cc.orig	2021-03-12 23:57:28 UTC
 +++ services/tracing/public/cpp/stack_sampling/tracing_sampler_profiler.cc
 @@ -546,7 +546,7 @@ void TracingSamplerProfiler::TracingProfileBuilder::Sa
  
diff --git a/www/chromium/files/patch-services_video__capture_broadcasting__receiver.cc b/www/chromium/files/patch-services_video__capture_broadcasting__receiver.cc
index f58bf0ac..d18d350d 100644
--- a/www/chromium/files/patch-services_video__capture_broadcasting__receiver.cc
+++ b/www/chromium/files/patch-services_video__capture_broadcasting__receiver.cc
@@ -1,4 +1,4 @@
---- services/video_capture/broadcasting_receiver.cc.orig	2020-11-13 06:36:46 UTC
+--- services/video_capture/broadcasting_receiver.cc.orig	2021-03-12 23:57:28 UTC
 +++ services/video_capture/broadcasting_receiver.cc
 @@ -39,7 +39,7 @@ void CloneSharedBufferHandle(const mojo::ScopedSharedB
  void CloneSharedBufferToRawFileDescriptorHandle(
diff --git a/www/chromium/files/patch-skia_ext_SkMemory__new__handler.cpp b/www/chromium/files/patch-skia_ext_SkMemory__new__handler.cpp
index f1f9e801..ac10874b 100644
--- a/www/chromium/files/patch-skia_ext_SkMemory__new__handler.cpp
+++ b/www/chromium/files/patch-skia_ext_SkMemory__new__handler.cpp
@@ -1,4 +1,4 @@
---- skia/ext/SkMemory_new_handler.cpp.orig	2020-11-13 06:36:46 UTC
+--- skia/ext/SkMemory_new_handler.cpp.orig	2021-03-12 23:57:28 UTC
 +++ skia/ext/SkMemory_new_handler.cpp
 @@ -78,7 +78,7 @@ static void* malloc_nothrow(size_t size) {
    // TODO(b.kelemen): we should always use UncheckedMalloc but currently it
diff --git a/www/chromium/files/patch-third__party_angle_BUILD.gn b/www/chromium/files/patch-third__party_angle_BUILD.gn
index a364e657..61fe8677 100644
--- a/www/chromium/files/patch-third__party_angle_BUILD.gn
+++ b/www/chromium/files/patch-third__party_angle_BUILD.gn
@@ -1,34 +1,15 @@
---- third_party/angle/BUILD.gn.orig	2021-01-18 21:31:44 UTC
+--- third_party/angle/BUILD.gn.orig	2021-03-13 00:03:31 UTC
 +++ third_party/angle/BUILD.gn
-@@ -162,10 +162,17 @@ config("extra_warnings") {
+@@ -194,7 +194,7 @@ config("extra_warnings") {
+       "-Wunreachable-code",
+       "-Wshorten-64-to-32",
      ]
-   }
-   if (is_clang) {
-+    if (!is_bsd) {
-+      cflags += [
-+        "-Wdeprecated-copy",
-+        "-Wsuggest-destructor-override",
-+        "-Wsuggest-override",
-+      ]
-+    }
-+
-     cflags += [
-       "-Wbad-function-cast",
-       "-Wconditional-uninitialized",
--      "-Wdeprecated-copy",
-       "-Wextra-semi-stmt",
-       "-Wfloat-conversion",
-       "-Winconsistent-missing-destructor-override",
-@@ -175,8 +182,6 @@ config("extra_warnings") {
-       "-Wredundant-parens",
-       "-Wreturn-std-move-in-c++11",
-       "-Wshadow-field",
--      "-Wsuggest-destructor-override",
--      "-Wsuggest-override",
-       "-Wtautological-type-limit-compare",
-       "-Wundefined-reinterpret-cast",
-       "-Wunneeded-internal-declaration",
-@@ -425,6 +430,7 @@ angle_static_library("angle_gpu_info_util") {
+-    if (!use_xcode_clang) {
++    if (!use_xcode_clang && !is_bsd) {
+       # Mac catalyst uses a clang version that doesn't have these.
+       cflags += [
+         "-Wdeprecated-copy",
+@@ -433,6 +433,7 @@ angle_static_library("angle_gpu_info_util") {
          "X11",
          "Xi",
          "Xext",
diff --git a/www/chromium/files/patch-third__party_angle_src_common_debug.h b/www/chromium/files/patch-third__party_angle_src_common_debug.h
new file mode 100644
index 00000000..369897f1
--- /dev/null
+++ b/www/chromium/files/patch-third__party_angle_src_common_debug.h
@@ -0,0 +1,11 @@
+--- third_party/angle/src/common/debug.h.orig	2021-03-17 09:49:33 UTC
++++ third_party/angle/src/common/debug.h
+@@ -392,7 +392,7 @@ std::ostream &FmtHex(std::ostream &os, T value)
+ #    define ANGLE_DISABLE_STRUCT_PADDING_WARNINGS
+ #endif
+ 
+-#if defined(__clang__)
++#if defined(__clang__) && !defined(__FreeBSD__)
+ #    define ANGLE_DISABLE_SUGGEST_OVERRIDE_WARNINGS                               \
+         _Pragma("clang diagnostic push")                                          \
+             _Pragma("clang diagnostic ignored \"-Wsuggest-destructor-override\"") \
diff --git a/www/chromium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__internal.h b/www/chromium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__internal.h
index de1db9fa..5450a8be 100644
--- a/www/chromium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__internal.h
+++ b/www/chromium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__internal.h
@@ -1,4 +1,4 @@
---- third_party/angle/src/gpu_info_util/SystemInfo_internal.h.orig	2020-11-13 06:42:14 UTC
+--- third_party/angle/src/gpu_info_util/SystemInfo_internal.h.orig	2021-03-13 00:03:31 UTC
 +++ third_party/angle/src/gpu_info_util/SystemInfo_internal.h
 @@ -14,8 +14,13 @@
  namespace angle
diff --git a/www/chromium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__libpci.cpp b/www/chromium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__libpci.cpp
index 18c36e17..7f85dc42 100644
--- a/www/chromium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__libpci.cpp
+++ b/www/chromium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__libpci.cpp
@@ -1,4 +1,4 @@
---- third_party/angle/src/gpu_info_util/SystemInfo_libpci.cpp.orig	2020-11-13 06:42:14 UTC
+--- third_party/angle/src/gpu_info_util/SystemInfo_libpci.cpp.orig	2021-03-13 00:03:31 UTC
 +++ third_party/angle/src/gpu_info_util/SystemInfo_libpci.cpp
 @@ -12,6 +12,11 @@
  #include <pci/pci.h>
diff --git a/www/chromium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__linux.cpp b/www/chromium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__linux.cpp
index 506fed02..2d146a4b 100644
--- a/www/chromium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__linux.cpp
+++ b/www/chromium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__linux.cpp
@@ -1,4 +1,4 @@
---- third_party/angle/src/gpu_info_util/SystemInfo_linux.cpp.orig	2020-11-13 06:42:14 UTC
+--- third_party/angle/src/gpu_info_util/SystemInfo_linux.cpp.orig	2021-03-13 00:03:31 UTC
 +++ third_party/angle/src/gpu_info_util/SystemInfo_linux.cpp
 @@ -71,10 +71,18 @@ bool GetPCIDevicesWithLibPCI(std::vector<GPUDeviceInfo
  
diff --git a/www/chromium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__x11.cpp b/www/chromium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__x11.cpp
index 3454438f..f770fcfd 100644
--- a/www/chromium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__x11.cpp
+++ b/www/chromium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__x11.cpp
@@ -1,4 +1,4 @@
---- third_party/angle/src/gpu_info_util/SystemInfo_x11.cpp.orig	2020-11-13 06:42:14 UTC
+--- third_party/angle/src/gpu_info_util/SystemInfo_x11.cpp.orig	2021-03-13 00:03:31 UTC
 +++ third_party/angle/src/gpu_info_util/SystemInfo_x11.cpp
 @@ -8,6 +8,8 @@
  
diff --git a/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp b/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp
index d591e0b9..dc80fa93 100644
--- a/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp
+++ b/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp
@@ -1,4 +1,4 @@
---- third_party/angle/src/libANGLE/Display.cpp.orig	2021-01-18 21:31:44 UTC
+--- third_party/angle/src/libANGLE/Display.cpp.orig	2021-03-13 00:03:31 UTC
 +++ third_party/angle/src/libANGLE/Display.cpp
 @@ -55,7 +55,7 @@
  #        include "libANGLE/renderer/gl/wgl/DisplayWGL.h"
@@ -36,7 +36,7 @@
  #        if defined(ANGLE_USE_X11)
              if (platformType == EGL_PLATFORM_X11_EXT && rx::IsVulkanXcbDisplayAvailable())
              {
-@@ -1650,7 +1650,7 @@ static ClientExtensions GenerateClientExtensions()
+@@ -1646,7 +1646,7 @@ static ClientExtensions GenerateClientExtensions()
      extensions.x11Visual = true;
  #endif
  
diff --git a/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.cpp b/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.cpp
index 811b8219..ca5e3591 100644
--- a/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.cpp
+++ b/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.cpp
@@ -1,4 +1,4 @@
---- third_party/angle/src/libANGLE/renderer/driver_utils.cpp.orig	2021-01-18 21:31:44 UTC
+--- third_party/angle/src/libANGLE/renderer/driver_utils.cpp.orig	2021-03-13 00:03:31 UTC
 +++ third_party/angle/src/libANGLE/renderer/driver_utils.cpp
 @@ -17,7 +17,7 @@
  #    include <sys/system_properties.h>
diff --git a/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.h b/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.h
index c5240018..116b340c 100644
--- a/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.h
+++ b/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.h
@@ -1,4 +1,4 @@
---- third_party/angle/src/libANGLE/renderer/driver_utils.h.orig	2021-01-18 21:31:44 UTC
+--- third_party/angle/src/libANGLE/renderer/driver_utils.h.orig	2021-03-13 00:03:31 UTC
 +++ third_party/angle/src/libANGLE/renderer/driver_utils.h
 @@ -151,7 +151,7 @@ inline bool IsWindows()
  
diff --git a/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_vulkan_DisplayVk__api.h b/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_vulkan_DisplayVk__api.h
index eb0a23c9..afaedd61 100644
--- a/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_vulkan_DisplayVk__api.h
+++ b/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_vulkan_DisplayVk__api.h
@@ -1,6 +1,6 @@
---- third_party/angle/src/libANGLE/renderer/vulkan/DisplayVk_api.h.orig	2021-01-18 21:31:44 UTC
+--- third_party/angle/src/libANGLE/renderer/vulkan/DisplayVk_api.h.orig	2021-03-13 00:03:31 UTC
 +++ third_party/angle/src/libANGLE/renderer/vulkan/DisplayVk_api.h
-@@ -19,13 +19,13 @@ bool IsVulkanWin32DisplayAvailable();
+@@ -19,7 +19,7 @@ bool IsVulkanWin32DisplayAvailable();
  DisplayImpl *CreateVulkanWin32Display(const egl::DisplayState &state);
  #endif  // defined(ANGLE_PLATFORM_WINDOWS)
  
@@ -9,8 +9,10 @@
  bool IsVulkanXcbDisplayAvailable();
  DisplayImpl *CreateVulkanXcbDisplay(const egl::DisplayState &state);
  
- bool IsVulkanSimpleDisplayAvailable();
- DisplayImpl *CreateVulkanSimpleDisplay(const egl::DisplayState &state);
+@@ -28,7 +28,7 @@ DisplayImpl *CreateVulkanSimpleDisplay(const egl::Disp
+ 
+ bool IsVulkanHeadlessDisplayAvailable();
+ DisplayImpl *CreateVulkanHeadlessDisplay(const egl::DisplayState &state);
 -#endif  // defined(ANGLE_PLATFORM_LINUX)
 +#endif  // defined(ANGLE_PLATFORM_POSIX)
  
diff --git a/www/chromium/files/patch-third__party_angle_third__party_vulkan-loader_src_loader_vk__loader__platform.h b/www/chromium/files/patch-third__party_angle_third__party_vulkan-loader_src_loader_vk__loader__platform.h
deleted file mode 100644
index 455a7835..00000000
--- a/www/chromium/files/patch-third__party_angle_third__party_vulkan-loader_src_loader_vk__loader__platform.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- third_party/angle/third_party/vulkan-loader/src/loader/vk_loader_platform.h.orig	2021-01-18 21:31:55 UTC
-+++ third_party/angle/third_party/vulkan-loader/src/loader/vk_loader_platform.h
-@@ -35,7 +35,7 @@
- #include "vulkan/vk_platform.h"
- #include "vulkan/vk_sdk_platform.h"
- 
--#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__)
-+#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__FreeBSD__)
- /* Linux-specific common code: */
- 
- // Headers:
diff --git a/www/chromium/files/patch-third__party_blink_common_renderer__preferences_renderer__preferences__mojom__traits.cc b/www/chromium/files/patch-third__party_blink_common_renderer__preferences_renderer__preferences__mojom__traits.cc
index 91e7fd18..8547e3f4 100644
--- a/www/chromium/files/patch-third__party_blink_common_renderer__preferences_renderer__preferences__mojom__traits.cc
+++ b/www/chromium/files/patch-third__party_blink_common_renderer__preferences_renderer__preferences__mojom__traits.cc
@@ -1,4 +1,4 @@
---- third_party/blink/common/renderer_preferences/renderer_preferences_mojom_traits.cc.orig	2021-01-19 11:50:03 UTC
+--- third_party/blink/common/renderer_preferences/renderer_preferences_mojom_traits.cc.orig	2021-03-12 23:57:28 UTC
 +++ third_party/blink/common/renderer_preferences/renderer_preferences_mojom_traits.cc
 @@ -64,7 +64,7 @@ bool StructTraits<blink::mojom::RendererPreferencesDat
    if (!data.ReadAcceptLanguages(&out->accept_languages))
diff --git a/www/chromium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences.h b/www/chromium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences.h
index 7a1fe06c..2fa61b42 100644
--- a/www/chromium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences.h
+++ b/www/chromium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences.h
@@ -1,4 +1,4 @@
---- third_party/blink/public/common/renderer_preferences/renderer_preferences.h.orig	2021-01-19 11:50:37 UTC
+--- third_party/blink/public/common/renderer_preferences/renderer_preferences.h.orig	2021-03-12 23:57:29 UTC
 +++ third_party/blink/public/common/renderer_preferences/renderer_preferences.h
 @@ -49,7 +49,7 @@ struct BLINK_COMMON_EXPORT RendererPreferences {
    bool webrtc_allow_legacy_tls_protocols{false};
diff --git a/www/chromium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences__mojom__traits.h b/www/chromium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences__mojom__traits.h
index 4fab1042..b762a8fc 100644
--- a/www/chromium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences__mojom__traits.h
+++ b/www/chromium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences__mojom__traits.h
@@ -1,4 +1,4 @@
---- third_party/blink/public/common/renderer_preferences/renderer_preferences_mojom_traits.h.orig	2021-01-19 11:50:20 UTC
+--- third_party/blink/public/common/renderer_preferences/renderer_preferences_mojom_traits.h.orig	2021-03-12 23:57:29 UTC
 +++ third_party/blink/public/common/renderer_preferences/renderer_preferences_mojom_traits.h
 @@ -154,7 +154,7 @@ struct BLINK_COMMON_EXPORT
      return data.accept_languages;
diff --git a/www/chromium/files/patch-third__party_blink_public_platform_platform.h b/www/chromium/files/patch-third__party_blink_public_platform_platform.h
new file mode 100644
index 00000000..10f8c932
--- /dev/null
+++ b/www/chromium/files/patch-third__party_blink_public_platform_platform.h
@@ -0,0 +1,11 @@
+--- third_party/blink/public/platform/platform.h.orig	2021-03-12 23:57:29 UTC
++++ third_party/blink/public/platform/platform.h
+@@ -393,7 +393,7 @@ class BLINK_PLATFORM_EXPORT Platform {
+     return nullptr;
+   }
+ 
+-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+   // This is called after the compositor thread is created, so the embedder
+   // can initiate an IPC to change its thread priority (on Linux we can't
+   // increase the nice value, so we need to ask the browser process). This
diff --git a/www/chromium/files/patch-third__party_blink_renderer_BUILD.gn b/www/chromium/files/patch-third__party_blink_renderer_BUILD.gn
index df61d7ae..cebfcb34 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_BUILD.gn
+++ b/www/chromium/files/patch-third__party_blink_renderer_BUILD.gn
@@ -1,13 +1,21 @@
---- third_party/blink/renderer/BUILD.gn.orig	2021-01-18 21:29:03 UTC
+--- third_party/blink/renderer/BUILD.gn.orig	2021-03-12 23:57:29 UTC
 +++ third_party/blink/renderer/BUILD.gn
-@@ -46,8 +46,8 @@ config("inside_blink") {
+@@ -46,10 +46,16 @@ config("inside_blink") {
        "-Wconversion",
        "-Wno-float-conversion",
        "-Wno-sign-conversion",
 -      "-Wno-implicit-float-conversion",
 -      "-Wno-implicit-int-conversion",
-+#      "-Wno-implicit-float-conversion",
-+#      "-Wno-implicit-int-conversion",
+       "-Wno-shorten-64-to-32",
      ]
++
++    if (is_bsd) {
++      cflags += [
++        "-Wno-implicit-float-conversion",
++        "-Wno-implicit-int-conversion",
++        "-Wno-implicit-int-float-conversion",
++      ]
++    }
  
-     if (!is_ash || default_toolchain != "//build/toolchain/cros:target") {
+     if (!is_chromeos_ash ||
+         default_toolchain != "//build/toolchain/cros:target") {
diff --git a/www/chromium/files/patch-third__party_blink_renderer_bindings_scripts_bind__gen_style__format.py b/www/chromium/files/patch-third__party_blink_renderer_bindings_scripts_bind__gen_style__format.py
index af95e324..279c282b 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_bindings_scripts_bind__gen_style__format.py
+++ b/www/chromium/files/patch-third__party_blink_renderer_bindings_scripts_bind__gen_style__format.py
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py.orig	2020-11-13 06:36:47 UTC
+--- third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py.orig	2021-03-12 23:57:29 UTC
 +++ third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py
 @@ -29,6 +29,9 @@ def init(root_src_dir):
      elif sys.platform.startswith(("cygwin", "win")):
diff --git a/www/chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc b/www/chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc
index 8ad371ca..d27fae73 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/controller/blink_initializer.cc.orig	2021-01-18 21:29:04 UTC
+--- third_party/blink/renderer/controller/blink_initializer.cc.orig	2021-03-12 23:57:29 UTC
 +++ third_party/blink/renderer/controller/blink_initializer.cc
-@@ -68,11 +68,11 @@
+@@ -67,11 +67,11 @@
  #include "third_party/blink/renderer/controller/oom_intervention_impl.h"
  #endif
  
@@ -14,7 +14,7 @@
      defined(OS_MAC) || defined(OS_WIN)
  #include "third_party/blink/renderer/controller/highest_pmf_reporter.h"
  #include "third_party/blink/renderer/controller/user_level_memory_pressure_signal_generator.h"
-@@ -154,7 +154,7 @@ void InitializeCommon(Platform* platform, mojo::Binder
+@@ -153,7 +153,7 @@ void InitializeCommon(Platform* platform, mojo::Binder
    CrashMemoryMetricsReporterImpl::Instance();
  #endif
  
@@ -23,7 +23,7 @@
      defined(OS_MAC) || defined(OS_WIN)
    // Initialize UserLevelMemoryPressureSignalGenerator so it starts monitoring.
    if (UserLevelMemoryPressureSignalGenerator::Enabled())
-@@ -220,7 +220,7 @@ void BlinkInitializer::RegisterInterfaces(mojo::Binder
+@@ -218,7 +218,7 @@ void BlinkInitializer::RegisterInterfaces(mojo::Binder
                main_thread->GetTaskRunner());
  #endif
  
diff --git a/www/chromium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.cc b/www/chromium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.cc
index 71d1124c..b55ee58f 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.cc
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/controller/memory_usage_monitor_posix.cc.orig	2020-11-13 06:36:47 UTC
+--- third_party/blink/renderer/controller/memory_usage_monitor_posix.cc.orig	2021-03-12 23:57:29 UTC
 +++ third_party/blink/renderer/controller/memory_usage_monitor_posix.cc
 @@ -134,7 +134,7 @@ void MemoryUsageMonitorPosix::SetProcFiles(base::File 
    status_fd_.reset(status_file.TakePlatformFile());
diff --git a/www/chromium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.h b/www/chromium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.h
index d8e874b8..d27e1d86 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.h
+++ b/www/chromium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.h
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/controller/memory_usage_monitor_posix.h.orig	2020-11-13 06:36:47 UTC
+--- third_party/blink/renderer/controller/memory_usage_monitor_posix.h.orig	2021-03-12 23:57:29 UTC
 +++ third_party/blink/renderer/controller/memory_usage_monitor_posix.h
 @@ -12,7 +12,7 @@
  #include "third_party/blink/renderer/controller/controller_export.h"
diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_clipboard_system__clipboard.cc b/www/chromium/files/patch-third__party_blink_renderer_core_clipboard_system__clipboard.cc
index 055a5119..08b0c460 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_core_clipboard_system__clipboard.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_core_clipboard_system__clipboard.cc
@@ -1,15 +1,15 @@
---- third_party/blink/renderer/core/clipboard/system_clipboard.cc.orig	2021-01-18 21:29:04 UTC
+--- third_party/blink/renderer/core/clipboard/system_clipboard.cc.orig	2021-03-12 23:57:29 UTC
 +++ third_party/blink/renderer/core/clipboard/system_clipboard.cc
-@@ -42,10 +42,10 @@ SystemClipboard::SystemClipboard(LocalFrame* frame)
+@@ -43,10 +43,10 @@ SystemClipboard::SystemClipboard(LocalFrame* frame)
    frame->GetBrowserInterfaceBroker().GetInterface(
        clipboard_.BindNewPipeAndPassReceiver(
            frame->GetTaskRunner(TaskType::kUserInteraction)));
--#if defined(OS_LINUX) || BUILDFLAG(IS_LACROS)
-+#if defined(OS_LINUX) || BUILDFLAG(IS_LACROS) || defined(OS_BSD)
+-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
    is_selection_buffer_available_ =
        frame->GetSettings()->GetSelectionClipboardBufferAvailable();
--#endif  // defined(OS_LINUX) || BUILDFLAG(IS_LACROS)
-+#endif  // defined(OS_LINUX) || BUILDFLAG(IS_LACROS) || defined(OS_BSD)
+-#endif  // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#endif  // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
  }
  
  bool SystemClipboard::IsSelectionMode() const {
diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_editing_editing__behavior.cc b/www/chromium/files/patch-third__party_blink_renderer_core_editing_editing__behavior.cc
index 15c245ce..36eb61c8 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_core_editing_editing__behavior.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_core_editing_editing__behavior.cc
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/core/editing/editing_behavior.cc.orig	2020-11-13 06:36:47 UTC
+--- third_party/blink/renderer/core/editing/editing_behavior.cc.orig	2021-03-12 23:57:29 UTC
 +++ third_party/blink/renderer/core/editing/editing_behavior.cc
 @@ -274,7 +274,7 @@ bool EditingBehavior::ShouldInsertCharacter(const Keyb
    // unexpected behaviour
diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc b/www/chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc
index ae0455e2..2a63edff 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/core/exported/web_view_impl.cc.orig	2021-01-19 11:50:55 UTC
+--- third_party/blink/renderer/core/exported/web_view_impl.cc.orig	2021-03-12 23:57:29 UTC
 +++ third_party/blink/renderer/core/exported/web_view_impl.cc
 @@ -410,7 +410,7 @@ ui::mojom::blink::WindowOpenDisposition NavigationPoli
  #if !defined(OS_MAC) && !defined(OS_WIN)
@@ -9,7 +9,7 @@
    if (!prefs.should_antialias_text) {
      // When anti-aliasing is off, GTK maps all non-zero hinting settings to
      // 'Normal' hinting so we do the same. Otherwise, folks who have 'Slight'
-@@ -3185,12 +3185,12 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs
+@@ -3070,12 +3070,12 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs
        gfx::FontRenderParams::SUBPIXEL_RENDERING_NONE);
    WebFontRenderStyle::SetSubpixelPositioning(
        renderer_preferences_.use_subpixel_positioning);
diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc b/www/chromium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc
index aab266a5..d1379d79 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc.orig	2020-11-13 06:36:47 UTC
+--- third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc.orig	2021-03-12 23:57:29 UTC
 +++ third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc
 @@ -43,7 +43,7 @@ constexpr base::TimeDelta kEncodeRowSlackBeforeDeadlin
      base::TimeDelta::FromMicroseconds(100);
diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_html_forms_internal__popup__menu.cc b/www/chromium/files/patch-third__party_blink_renderer_core_html_forms_internal__popup__menu.cc
index 84cc6fd4..5cb52d96 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_core_html_forms_internal__popup__menu.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_core_html_forms_internal__popup__menu.cc
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/core/html/forms/internal_popup_menu.cc.orig	2020-11-13 06:36:47 UTC
+--- third_party/blink/renderer/core/html/forms/internal_popup_menu.cc.orig	2021-03-12 23:57:29 UTC
 +++ third_party/blink/renderer/core/html/forms/internal_popup_menu.cc
 @@ -155,7 +155,7 @@ class InternalPopupMenu::ItemIterationContext {
          is_in_group_(false),
diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc b/www/chromium/files/patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc
index a826b36a..f3935bbe 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/core/inspector/inspector_memory_agent.cc.orig	2020-11-13 06:36:47 UTC
+--- third_party/blink/renderer/core/inspector/inspector_memory_agent.cc.orig	2021-03-12 23:57:30 UTC
 +++ third_party/blink/renderer/core/inspector/inspector_memory_agent.cc
 @@ -186,7 +186,7 @@ InspectorMemoryAgent::GetSamplingProfileById(uint32_t 
  
diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc b/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc
index 4c72c90f..e5a08b38 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/core/layout/layout_view.cc.orig	2021-01-18 21:29:04 UTC
+--- third_party/blink/renderer/core/layout/layout_view.cc.orig	2021-03-12 23:57:30 UTC
 +++ third_party/blink/renderer/core/layout/layout_view.cc
 @@ -61,7 +61,7 @@
  #include "third_party/blink/renderer/platform/instrumentation/tracing/traced_value.h"
diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc b/www/chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc
index 85139cee..aea06bbf 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/core/paint/paint_layer.cc.orig	2020-11-13 06:36:48 UTC
+--- third_party/blink/renderer/core/paint/paint_layer.cc.orig	2021-03-12 23:57:30 UTC
 +++ third_party/blink/renderer/core/paint/paint_layer.cc
 @@ -110,7 +110,7 @@ namespace {
  static CompositingQueryMode g_compositing_query_mode =
diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc b/www/chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc
index 5bd14490..28cd1ee3 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig	2021-01-18 21:29:04 UTC
+--- third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig	2021-03-12 23:57:30 UTC
 +++ third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc
 @@ -137,7 +137,7 @@ bool ScrollbarThemeAura::SupportsDragSnapBack() const 
  // Disable snapback on desktop Linux to better integrate with the desktop
diff --git a/www/chromium/files/patch-third__party_blink_renderer_modules_media_audio_web__audio__device__factory.cc b/www/chromium/files/patch-third__party_blink_renderer_modules_media_audio_web__audio__device__factory.cc
index 689b5f63..ac6eea40 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_modules_media_audio_web__audio__device__factory.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_modules_media_audio_web__audio__device__factory.cc
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/modules/media/audio/web_audio_device_factory.cc.orig	2021-01-18 21:29:05 UTC
+--- third_party/blink/renderer/modules/media/audio/web_audio_device_factory.cc.orig	2021-03-12 23:57:30 UTC
 +++ third_party/blink/renderer/modules/media/audio/web_audio_device_factory.cc
 @@ -33,7 +33,7 @@ WebAudioDeviceFactory* WebAudioDeviceFactory::factory_
  
@@ -6,6 +6,6 @@
  
 -#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
 +#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \
-     BUILDFLAG(IS_LACROS)
+     BUILDFLAG(IS_CHROMEOS_LACROS)
  // Due to driver deadlock issues on Windows (http://crbug/422522) there is a
  // chance device authorization response is never received from the browser side.
diff --git a/www/chromium/files/patch-third__party_blink_renderer_modules_mediastream_processed__local__audio__source.cc b/www/chromium/files/patch-third__party_blink_renderer_modules_mediastream_processed__local__audio__source.cc
index fcd9115b..e4b69b32 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_modules_mediastream_processed__local__audio__source.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_modules_mediastream_processed__local__audio__source.cc
@@ -1,11 +1,11 @@
---- third_party/blink/renderer/modules/mediastream/processed_local_audio_source.cc.orig	2021-01-18 21:29:05 UTC
+--- third_party/blink/renderer/modules/mediastream/processed_local_audio_source.cc.orig	2021-03-12 23:57:30 UTC
 +++ third_party/blink/renderer/modules/mediastream/processed_local_audio_source.cc
 @@ -409,7 +409,7 @@ void ProcessedLocalAudioSource::CaptureUsingProcessor(
      bool key_pressed) {
  #if defined(OS_WIN) || defined(OS_MAC)
    DCHECK_LE(volume, 1.0);
--#elif defined(OS_LINUX) || BUILDFLAG(IS_LACROS) || defined(OS_OPENBSD)
-+#elif defined(OS_LINUX) || BUILDFLAG(IS_LACROS) || defined(OS_BSD)
+-#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_OPENBSD)
++#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_OPENBSD) || defined(OS_BSD)
    // We have a special situation on Linux where the microphone volume can be
    // "higher than maximum". The input volume slider in the sound preference
    // allows the user to set a scaling that is higher than 100%. It means that
diff --git a/www/chromium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc b/www/chromium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc
index b22da5e2..cee6c142 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc
@@ -1,7 +1,7 @@
---- third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc.orig	2021-01-18 21:29:05 UTC
+--- third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc.orig	2021-03-12 23:57:30 UTC
 +++ third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc
-@@ -281,7 +281,7 @@ TEST_F(MAYBE_WebRtcAudioRendererTest, MultipleRenderer
- TEST_F(MAYBE_WebRtcAudioRendererTest, VerifySinkParameters) {
+@@ -283,7 +283,7 @@ TEST_F(MAYBE_WebRtcAudioRendererTest, DISABLED_Multipl
+ TEST_F(MAYBE_WebRtcAudioRendererTest, DISABLED_VerifySinkParameters) {
    SetupRenderer(kDefaultOutputDeviceId);
    renderer_proxy_->Start();
 -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \
diff --git a/www/chromium/files/patch-third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc b/www/chromium/files/patch-third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc
index 2ef085dd..d33e16f2 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/modules/webaudio/audio_worklet_thread_test.cc.orig	2021-01-18 21:29:05 UTC
+--- third_party/blink/renderer/modules/webaudio/audio_worklet_thread_test.cc.orig	2021-03-12 23:57:30 UTC
 +++ third_party/blink/renderer/modules/webaudio/audio_worklet_thread_test.cc
-@@ -431,8 +431,8 @@ class AudioWorkletThreadPriorityTest
+@@ -430,8 +430,8 @@ class AudioWorkletThreadPriorityTest
          base::PlatformThread::GetCurrentThreadPriority();
  
      // TODO(crbug.com/1022888): The worklet thread priority is always NORMAL
diff --git a/www/chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__webcodecs__video__frame.cc b/www/chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__webcodecs__video__frame.cc
new file mode 100644
index 00000000..6c483828
--- /dev/null
+++ b/www/chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__webcodecs__video__frame.cc
@@ -0,0 +1,11 @@
+--- third_party/blink/renderer/modules/webgl/webgl_webcodecs_video_frame.cc.orig	2021-03-12 23:57:30 UTC
++++ third_party/blink/renderer/modules/webgl/webgl_webcodecs_video_frame.cc
+@@ -235,7 +235,7 @@ WebGLExtensionName WebGLWebCodecsVideoFrame::GetName()
+ }
+ 
+ bool WebGLWebCodecsVideoFrame::Supported(WebGLRenderingContextBase* context) {
+-#if defined(OS_LINUX) || defined(OS_FUCHSIA)
++#if defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD)
+   // TODO(jie.a.chen@intel.com): Add Linux support.
+   return false;
+ #else
diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn b/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn
index ba89bfdd..c4f25eb0 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn
+++ b/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/platform/BUILD.gn.orig	2021-01-18 21:29:05 UTC
+--- third_party/blink/renderer/platform/BUILD.gn.orig	2021-03-12 23:57:30 UTC
 +++ third_party/blink/renderer/platform/BUILD.gn
-@@ -104,6 +104,7 @@ executable("character_data_generator") {
+@@ -106,6 +106,7 @@ executable("character_data_generator") {
      "//build/win:default_exe_manifest",
      "//third_party/icu",
    ]
diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc
index 494d457e..6fa06d82 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/platform/fonts/font_cache.cc.orig	2020-11-13 06:36:48 UTC
+--- third_party/blink/renderer/platform/fonts/font_cache.cc.orig	2021-03-12 23:57:30 UTC
 +++ third_party/blink/renderer/platform/fonts/font_cache.cc
 @@ -80,7 +80,7 @@ const char kColorEmojiLocale[] = "und-Zsye";
  
diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h
index 88a53ee3..4754c000 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h
+++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/platform/fonts/font_cache.h.orig	2021-01-18 21:29:05 UTC
+--- third_party/blink/renderer/platform/fonts/font_cache.h.orig	2021-03-12 23:57:30 UTC
 +++ third_party/blink/renderer/platform/fonts/font_cache.h
 @@ -58,7 +58,7 @@
  #include "third_party/skia/include/core/SkFontMgr.h"
diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc
index 6f91e36a..eba69812 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/platform/fonts/font_description.cc.orig	2020-11-13 06:36:48 UTC
+--- third_party/blink/renderer/platform/fonts/font_description.cc.orig	2021-03-12 23:57:30 UTC
 +++ third_party/blink/renderer/platform/fonts/font_description.cc
 @@ -39,7 +39,7 @@
  #include "third_party/blink/renderer/platform/wtf/text/string_hash.h"
diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__metrics.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__metrics.cc
index 7d23e127..9c7b8e78 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__metrics.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__metrics.cc
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/platform/fonts/font_metrics.cc.orig	2020-11-13 06:36:48 UTC
+--- third_party/blink/renderer/platform/fonts/font_metrics.cc.orig	2021-03-12 23:57:30 UTC
 +++ third_party/blink/renderer/platform/fonts/font_metrics.cc
 @@ -38,7 +38,7 @@
  
diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__unique__name__lookup.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__unique__name__lookup.cc
index c8b2a9aa..175899c1 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__unique__name__lookup.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__unique__name__lookup.cc
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/platform/fonts/font_unique_name_lookup.cc.orig	2020-11-13 06:36:48 UTC
+--- third_party/blink/renderer/platform/fonts/font_unique_name_lookup.cc.orig	2021-03-12 23:57:30 UTC
 +++ third_party/blink/renderer/platform/fonts/font_unique_name_lookup.cc
 @@ -8,7 +8,7 @@
  #if defined(OS_ANDROID)
diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_shaping_harfbuzz__shaper__test.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_shaping_harfbuzz__shaper__test.cc
index 6825c3da..8eb4fe4e 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_shaping_harfbuzz__shaper__test.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_shaping_harfbuzz__shaper__test.cc
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/platform/fonts/shaping/harfbuzz_shaper_test.cc.orig	2020-11-13 06:36:48 UTC
+--- third_party/blink/renderer/platform/fonts/shaping/harfbuzz_shaper_test.cc.orig	2021-03-12 23:57:30 UTC
 +++ third_party/blink/renderer/platform/fonts/shaping/harfbuzz_shaper_test.cc
 @@ -651,7 +651,7 @@ TEST_P(ShapeParameterTest, MaxGlyphsClusterDevanagari)
    HarfBuzzShaper shaper(string);
diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc
index aee1b114..bc456501 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc.orig	2020-11-13 06:36:48 UTC
+--- third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc.orig	2021-03-12 23:57:30 UTC
 +++ third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc
 @@ -61,7 +61,7 @@ AtomicString ToAtomicString(const SkString& str) {
    return AtomicString::FromUTF8(str.c_str(), str.size());
diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_image__frame__generator__test.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_image__frame__generator__test.cc
index 3db90c2f..024e8968 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_image__frame__generator__test.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_image__frame__generator__test.cc
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/platform/graphics/image_frame_generator_test.cc.orig	2020-11-13 06:36:48 UTC
+--- third_party/blink/renderer/platform/graphics/image_frame_generator_test.cc.orig	2021-03-12 23:57:30 UTC
 +++ third_party/blink/renderer/platform/graphics/image_frame_generator_test.cc
 @@ -244,14 +244,14 @@ static void DecodeThreadMain(ImageFrameGenerator* gene
                              cc::PaintImage::kDefaultGeneratorClientId);
diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc
index 3b9f1f53..a28bcfed 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/platform/graphics/video_frame_submitter.cc.orig	2020-11-13 06:36:48 UTC
+--- third_party/blink/renderer/platform/graphics/video_frame_submitter.cc.orig	2021-03-12 23:57:30 UTC
 +++ third_party/blink/renderer/platform/graphics/video_frame_submitter.cc
 @@ -192,7 +192,7 @@ void VideoFrameSubmitter::OnBeginFrame(
      if (viz::FrameTokenGT(pair.key, *next_frame_token_))
diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_scheduler_common_thread.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_scheduler_common_thread.cc
new file mode 100644
index 00000000..ad9701a7
--- /dev/null
+++ b/www/chromium/files/patch-third__party_blink_renderer_platform_scheduler_common_thread.cc
@@ -0,0 +1,11 @@
+--- third_party/blink/renderer/platform/scheduler/common/thread.cc.orig	2021-03-12 23:57:30 UTC
++++ third_party/blink/renderer/platform/scheduler/common/thread.cc
+@@ -96,7 +96,7 @@ void Thread::CreateAndSetCompositorThread() {
+       std::make_unique<scheduler::CompositorThread>(params);
+   compositor_thread->Init();
+ 
+-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+   if (base::FeatureList::IsEnabled(
+           features::kBlinkCompositorUseDisplayThreadPriority)) {
+     compositor_thread->GetTaskRunner()->PostTaskAndReplyWithResult(
diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_container__annotations.h b/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_container__annotations.h
index 8cc35c28..894a45bf 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_container__annotations.h
+++ b/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_container__annotations.h
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/platform/wtf/container_annotations.h.orig	2020-11-13 06:36:48 UTC
+--- third_party/blink/renderer/platform/wtf/container_annotations.h.orig	2021-03-12 23:57:30 UTC
 +++ third_party/blink/renderer/platform/wtf/container_annotations.h
 @@ -11,7 +11,7 @@
  // TODO(ochang): Remove the ARCH_CPU_X86_64 condition to enable this for X86
diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_stack__util.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_stack__util.cc
index 08771576..72e3dcc4 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_stack__util.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_stack__util.cc
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/platform/wtf/stack_util.cc.orig	2020-11-13 06:36:48 UTC
+--- third_party/blink/renderer/platform/wtf/stack_util.cc.orig	2021-03-12 23:57:30 UTC
 +++ third_party/blink/renderer/platform/wtf/stack_util.cc
 @@ -18,6 +18,11 @@
  extern "C" void* __libc_stack_end;  // NOLINT
diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_threading__pthreads.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_threading__pthreads.cc
index f542e18d..c6c26083 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_threading__pthreads.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_threading__pthreads.cc
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/platform/wtf/threading_pthreads.cc.orig	2020-11-13 06:36:48 UTC
+--- third_party/blink/renderer/platform/wtf/threading_pthreads.cc.orig	2021-03-12 23:57:30 UTC
 +++ third_party/blink/renderer/platform/wtf/threading_pthreads.cc
 @@ -50,12 +50,17 @@
  #include <objc/objc-auto.h>
diff --git a/www/chromium/files/patch-third__party_boringssl_src_crypto_cpu-aarch64-linux.c b/www/chromium/files/patch-third__party_boringssl_src_crypto_cpu-aarch64-linux.c
index 4204638a..a1d5c26a 100644
--- a/www/chromium/files/patch-third__party_boringssl_src_crypto_cpu-aarch64-linux.c
+++ b/www/chromium/files/patch-third__party_boringssl_src_crypto_cpu-aarch64-linux.c
@@ -1,4 +1,4 @@
---- third_party/boringssl/src/crypto/cpu-aarch64-linux.c.orig	2020-11-13 06:42:13 UTC
+--- third_party/boringssl/src/crypto/cpu-aarch64-linux.c.orig	2021-03-13 00:03:31 UTC
 +++ third_party/boringssl/src/crypto/cpu-aarch64-linux.c
 @@ -14,49 +14,45 @@
  
diff --git a/www/chromium/files/patch-third__party_boringssl_src_crypto_ex__data.c b/www/chromium/files/patch-third__party_boringssl_src_crypto_ex__data.c
index 1c224771..696b883b 100644
--- a/www/chromium/files/patch-third__party_boringssl_src_crypto_ex__data.c
+++ b/www/chromium/files/patch-third__party_boringssl_src_crypto_ex__data.c
@@ -1,4 +1,4 @@
---- third_party/boringssl/src/crypto/ex_data.c.orig	2020-11-13 06:42:13 UTC
+--- third_party/boringssl/src/crypto/ex_data.c.orig	2021-03-13 00:03:31 UTC
 +++ third_party/boringssl/src/crypto/ex_data.c
 @@ -186,7 +186,9 @@ int CRYPTO_set_ex_data(CRYPTO_EX_DATA *ad, int index, 
      }
diff --git a/www/chromium/files/patch-third__party_breakpad_breakpad_src_common_simple__string__dictionary.h b/www/chromium/files/patch-third__party_breakpad_breakpad_src_common_simple__string__dictionary.h
index fa056291..623ee4aa 100644
--- a/www/chromium/files/patch-third__party_breakpad_breakpad_src_common_simple__string__dictionary.h
+++ b/www/chromium/files/patch-third__party_breakpad_breakpad_src_common_simple__string__dictionary.h
@@ -1,4 +1,4 @@
---- third_party/breakpad/breakpad/src/common/simple_string_dictionary.h.orig	2020-11-13 06:42:14 UTC
+--- third_party/breakpad/breakpad/src/common/simple_string_dictionary.h.orig	2021-03-13 00:03:31 UTC
 +++ third_party/breakpad/breakpad/src/common/simple_string_dictionary.h
 @@ -33,7 +33,7 @@
  #include <assert.h>
diff --git a/www/chromium/files/patch-third__party_crashpad_crashpad_client_BUILD.gn b/www/chromium/files/patch-third__party_crashpad_crashpad_client_BUILD.gn
index 5f11235f..1914a550 100644
--- a/www/chromium/files/patch-third__party_crashpad_crashpad_client_BUILD.gn
+++ b/www/chromium/files/patch-third__party_crashpad_crashpad_client_BUILD.gn
@@ -1,4 +1,4 @@
---- third_party/crashpad/crashpad/client/BUILD.gn.orig	2021-01-18 21:29:44 UTC
+--- third_party/crashpad/crashpad/client/BUILD.gn.orig	2021-03-12 23:57:45 UTC
 +++ third_party/crashpad/crashpad/client/BUILD.gn
 @@ -77,6 +77,12 @@ crashpad_static_library("client") {
      sources += [ "crashpad_client_fuchsia.cc" ]
diff --git a/www/chromium/files/patch-third__party_crashpad_crashpad_client_crashpad__client__posix.cc b/www/chromium/files/patch-third__party_crashpad_crashpad_client_crashpad__client__posix.cc
index c7a724d9..62f5956f 100644
--- a/www/chromium/files/patch-third__party_crashpad_crashpad_client_crashpad__client__posix.cc
+++ b/www/chromium/files/patch-third__party_crashpad_crashpad_client_crashpad__client__posix.cc
@@ -1,4 +1,4 @@
---- third_party/crashpad/crashpad/client/crashpad_client_posix.cc.orig	2020-11-16 10:08:53 UTC
+--- third_party/crashpad/crashpad/client/crashpad_client_posix.cc.orig	2021-03-15 11:01:24 UTC
 +++ third_party/crashpad/crashpad/client/crashpad_client_posix.cc
 @@ -0,0 +1,39 @@
 +// Copyright 2017 The Crashpad Authors. All rights reserved.
diff --git a/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_close__multiple.cc b/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_close__multiple.cc
index d1616418..8f0f45a9 100644
--- a/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_close__multiple.cc
+++ b/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_close__multiple.cc
@@ -1,4 +1,4 @@
---- third_party/crashpad/crashpad/util/posix/close_multiple.cc.orig	2020-11-13 06:37:02 UTC
+--- third_party/crashpad/crashpad/util/posix/close_multiple.cc.orig	2021-03-12 23:57:45 UTC
 +++ third_party/crashpad/crashpad/util/posix/close_multiple.cc
 @@ -181,11 +181,37 @@ void CloseMultipleNowOrOnExec(int fd, int preserve_fd)
    }
diff --git a/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_signals.cc b/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_signals.cc
index ab6ae3d9..f85f5670 100644
--- a/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_signals.cc
+++ b/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_signals.cc
@@ -1,4 +1,4 @@
---- third_party/crashpad/crashpad/util/posix/signals.cc.orig	2020-11-13 06:37:02 UTC
+--- third_party/crashpad/crashpad/util/posix/signals.cc.orig	2021-03-12 23:57:45 UTC
 +++ third_party/crashpad/crashpad/util/posix/signals.cc
 @@ -228,8 +228,12 @@ bool Signals::WillSignalReraiseAutonomously(const sigi
           // remains. See 10.12.3 xnu-3789.41.3/bsd/kern/kern_sig.c
diff --git a/www/chromium/files/patch-third__party_crc32c_src_src_crc32c__arm64__linux__check.h b/www/chromium/files/patch-third__party_crc32c_src_src_crc32c__arm64__linux__check.h
index 0d39b7aa..e436e5c1 100644
--- a/www/chromium/files/patch-third__party_crc32c_src_src_crc32c__arm64__linux__check.h
+++ b/www/chromium/files/patch-third__party_crc32c_src_src_crc32c__arm64__linux__check.h
@@ -1,4 +1,4 @@
---- third_party/crc32c/src/src/crc32c_arm64_linux_check.h.orig	2020-11-13 06:42:14 UTC
+--- third_party/crc32c/src/src/crc32c_arm64_linux_check.h.orig	2021-03-13 00:03:32 UTC
 +++ third_party/crc32c/src/src/crc32c_arm64_linux_check.h
 @@ -7,8 +7,6 @@
  #ifndef CRC32C_CRC32C_ARM_LINUX_CHECK_H_
diff --git a/www/chromium/files/patch-third__party_ffmpeg_libavutil_mem.c b/www/chromium/files/patch-third__party_ffmpeg_libavutil_mem.c
index 728c5d27..c08111a1 100644
--- a/www/chromium/files/patch-third__party_ffmpeg_libavutil_mem.c
+++ b/www/chromium/files/patch-third__party_ffmpeg_libavutil_mem.c
@@ -1,4 +1,4 @@
---- third_party/ffmpeg/libavutil/mem.c.orig	2020-11-13 06:42:16 UTC
+--- third_party/ffmpeg/libavutil/mem.c.orig	2021-03-13 00:03:35 UTC
 +++ third_party/ffmpeg/libavutil/mem.c
 @@ -32,9 +32,6 @@
  #include <stdint.h>
diff --git a/www/chromium/files/patch-third__party_googletest_src_googletest_include_gtest_internal_gtest-port.h b/www/chromium/files/patch-third__party_googletest_src_googletest_include_gtest_internal_gtest-port.h
index 64f7d57f..7d372041 100644
--- a/www/chromium/files/patch-third__party_googletest_src_googletest_include_gtest_internal_gtest-port.h
+++ b/www/chromium/files/patch-third__party_googletest_src_googletest_include_gtest_internal_gtest-port.h
@@ -1,4 +1,4 @@
---- third_party/googletest/src/googletest/include/gtest/internal/gtest-port.h.orig	2020-11-13 06:42:16 UTC
+--- third_party/googletest/src/googletest/include/gtest/internal/gtest-port.h.orig	2021-03-13 00:03:34 UTC
 +++ third_party/googletest/src/googletest/include/gtest/internal/gtest-port.h
 @@ -1641,6 +1641,8 @@ class ThreadLocal : public ThreadLocalBase {
  // MutexBase and Mutex implement mutex on pthreads-based platforms.
diff --git a/www/chromium/files/patch-third__party_googletest_src_googletest_src_gtest-port.cc b/www/chromium/files/patch-third__party_googletest_src_googletest_src_gtest-port.cc
index 1123141a..9caa6277 100644
--- a/www/chromium/files/patch-third__party_googletest_src_googletest_src_gtest-port.cc
+++ b/www/chromium/files/patch-third__party_googletest_src_googletest_src_gtest-port.cc
@@ -1,4 +1,4 @@
---- third_party/googletest/src/googletest/src/gtest-port.cc.orig	2020-11-13 06:42:16 UTC
+--- third_party/googletest/src/googletest/src/gtest-port.cc.orig	2021-03-13 00:03:34 UTC
 +++ third_party/googletest/src/googletest/src/gtest-port.cc
 @@ -64,6 +64,11 @@
  # endif
diff --git a/www/chromium/files/patch-third__party_googletest_src_googletest_src_gtest.cc b/www/chromium/files/patch-third__party_googletest_src_googletest_src_gtest.cc
index cb60ddd7..a7851a31 100644
--- a/www/chromium/files/patch-third__party_googletest_src_googletest_src_gtest.cc
+++ b/www/chromium/files/patch-third__party_googletest_src_googletest_src_gtest.cc
@@ -1,4 +1,4 @@
---- third_party/googletest/src/googletest/src/gtest.cc.orig	2020-11-13 06:42:16 UTC
+--- third_party/googletest/src/googletest/src/gtest.cc.orig	2021-03-13 00:03:34 UTC
 +++ third_party/googletest/src/googletest/src/gtest.cc
 @@ -117,6 +117,7 @@
  
diff --git a/www/chromium/files/patch-third__party_harfbuzz-ng_harfbuzz.gni b/www/chromium/files/patch-third__party_harfbuzz-ng_harfbuzz.gni
index 8c069875..8374f958 100644
--- a/www/chromium/files/patch-third__party_harfbuzz-ng_harfbuzz.gni
+++ b/www/chromium/files/patch-third__party_harfbuzz-ng_harfbuzz.gni
@@ -1,4 +1,4 @@
---- third_party/harfbuzz-ng/harfbuzz.gni.orig	2020-11-13 06:37:03 UTC
+--- third_party/harfbuzz-ng/harfbuzz.gni.orig	2021-03-19 11:22:27 UTC
 +++ third_party/harfbuzz-ng/harfbuzz.gni
 @@ -3,10 +3,11 @@
  # found in the LICENSE file.
diff --git a/www/chromium/files/patch-third__party_leveldatabase_env__chromium.cc b/www/chromium/files/patch-third__party_leveldatabase_env__chromium.cc
index 89d69bca..fcc9ba2a 100644
--- a/www/chromium/files/patch-third__party_leveldatabase_env__chromium.cc
+++ b/www/chromium/files/patch-third__party_leveldatabase_env__chromium.cc
@@ -1,6 +1,6 @@
---- third_party/leveldatabase/env_chromium.cc.orig	2021-01-18 21:29:45 UTC
+--- third_party/leveldatabase/env_chromium.cc.orig	2021-03-12 23:57:45 UTC
 +++ third_party/leveldatabase/env_chromium.cc
-@@ -40,7 +40,11 @@
+@@ -39,7 +39,11 @@
  #include "third_party/leveldatabase/leveldb_chrome.h"
  #include "third_party/leveldatabase/leveldb_features.h"
  #include "third_party/leveldatabase/src/include/leveldb/options.h"
diff --git a/www/chromium/files/patch-third__party_libXNVCtrl_NVCtrl.c b/www/chromium/files/patch-third__party_libXNVCtrl_NVCtrl.c
index 7b8eb019..0ea48a67 100644
--- a/www/chromium/files/patch-third__party_libXNVCtrl_NVCtrl.c
+++ b/www/chromium/files/patch-third__party_libXNVCtrl_NVCtrl.c
@@ -1,4 +1,4 @@
---- third_party/libXNVCtrl/NVCtrl.c.orig	2020-11-13 06:37:03 UTC
+--- third_party/libXNVCtrl/NVCtrl.c.orig	2021-03-12 23:57:45 UTC
 +++ third_party/libXNVCtrl/NVCtrl.c
 @@ -27,10 +27,6 @@
   * libXNVCtrl library properly protects the Display connection.
diff --git a/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_memory_singleton.h b/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_memory_singleton.h
index 41fa22d6..90bb6387 100644
--- a/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_memory_singleton.h
+++ b/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_memory_singleton.h
@@ -1,4 +1,4 @@
---- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/memory/singleton.h.orig	2020-11-13 06:42:18 UTC
+--- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/memory/singleton.h.orig	2021-03-13 00:03:37 UTC
 +++ third_party/libphonenumber/dist/cpp/src/phonenumbers/base/memory/singleton.h
 @@ -56,7 +56,7 @@ template <class T> boost::once_flag Singleton<T>::flag
  #include "phonenumbers/base/logging.h"
diff --git a/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_synchronization_lock.h b/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_synchronization_lock.h
index af2aa7bf..fa770888 100644
--- a/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_synchronization_lock.h
+++ b/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_synchronization_lock.h
@@ -1,4 +1,4 @@
---- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/synchronization/lock.h.orig	2020-11-13 06:42:18 UTC
+--- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/synchronization/lock.h.orig	2021-03-13 00:03:37 UTC
 +++ third_party/libphonenumber/dist/cpp/src/phonenumbers/base/synchronization/lock.h
 @@ -63,7 +63,7 @@ class Lock { (private)
  // Dummy lock implementation on non-POSIX platforms. If you are running on a
diff --git a/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_thread__checker.h b/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_thread__checker.h
index 76b97fb0..d9a9d081 100644
--- a/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_thread__checker.h
+++ b/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_thread__checker.h
@@ -1,4 +1,4 @@
---- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/thread_checker.h.orig	2020-11-13 06:42:18 UTC
+--- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/thread_checker.h.orig	2021-03-13 00:03:37 UTC
 +++ third_party/libphonenumber/dist/cpp/src/phonenumbers/base/thread_checker.h
 @@ -23,6 +23,7 @@
  // user of the library know that it can't be used in a thread-safe manner when
diff --git a/www/chromium/files/patch-third__party_libpng_pnglibconf.h b/www/chromium/files/patch-third__party_libpng_pnglibconf.h
index 45b8be9c..a0f64a39 100644
--- a/www/chromium/files/patch-third__party_libpng_pnglibconf.h
+++ b/www/chromium/files/patch-third__party_libpng_pnglibconf.h
@@ -1,4 +1,4 @@
---- third_party/libpng/pnglibconf.h.orig	2020-11-13 06:37:03 UTC
+--- third_party/libpng/pnglibconf.h.orig	2021-03-12 23:57:45 UTC
 +++ third_party/libpng/pnglibconf.h
 @@ -230,8 +230,11 @@
   * This is necessary to build multiple copies of libpng.  We need this while pdfium builds
diff --git a/www/chromium/files/patch-third__party_libyuv_include_libyuv_row.h b/www/chromium/files/patch-third__party_libyuv_include_libyuv_row.h
index 6cb44912..12b4b274 100644
--- a/www/chromium/files/patch-third__party_libyuv_include_libyuv_row.h
+++ b/www/chromium/files/patch-third__party_libyuv_include_libyuv_row.h
@@ -1,4 +1,4 @@
---- third_party/libyuv/include/libyuv/row.h.orig	2021-01-18 21:31:49 UTC
+--- third_party/libyuv/include/libyuv/row.h.orig	2021-03-13 00:03:37 UTC
 +++ third_party/libyuv/include/libyuv/row.h
 @@ -158,10 +158,14 @@ extern "C" {
  #define HAS_ARGBSHADEROW_SSE2
diff --git a/www/chromium/files/patch-third__party_nasm_config_config-linux.h b/www/chromium/files/patch-third__party_nasm_config_config-linux.h
index 4f24245f..582b1913 100644
--- a/www/chromium/files/patch-third__party_nasm_config_config-linux.h
+++ b/www/chromium/files/patch-third__party_nasm_config_config-linux.h
@@ -1,4 +1,4 @@
---- third_party/nasm/config/config-linux.h.orig	2020-11-13 06:42:20 UTC
+--- third_party/nasm/config/config-linux.h.orig	2021-03-13 00:03:38 UTC
 +++ third_party/nasm/config/config-linux.h
 @@ -139,7 +139,7 @@
  #define HAVE_ACCESS 1
diff --git a/www/chromium/files/patch-third__party_node_node.py b/www/chromium/files/patch-third__party_node_node.py
index df3b2252..666f825f 100644
--- a/www/chromium/files/patch-third__party_node_node.py
+++ b/www/chromium/files/patch-third__party_node_node.py
@@ -1,4 +1,4 @@
---- third_party/node/node.py.orig	2020-11-13 06:37:03 UTC
+--- third_party/node/node.py.orig	2021-03-12 23:57:46 UTC
 +++ third_party/node/node.py
 @@ -13,6 +13,7 @@ import os
  def GetBinaryPath():
diff --git a/www/chromium/files/patch-third__party_openscreen_src_platform_impl_udp__socket__posix.cc b/www/chromium/files/patch-third__party_openscreen_src_platform_impl_udp__socket__posix.cc
index cf120d6f..94b43b35 100644
--- a/www/chromium/files/patch-third__party_openscreen_src_platform_impl_udp__socket__posix.cc
+++ b/www/chromium/files/patch-third__party_openscreen_src_platform_impl_udp__socket__posix.cc
@@ -1,4 +1,4 @@
---- third_party/openscreen/src/platform/impl/udp_socket_posix.cc.orig	2020-11-16 14:56:16 UTC
+--- third_party/openscreen/src/platform/impl/udp_socket_posix.cc.orig	2021-03-13 00:03:38 UTC
 +++ third_party/openscreen/src/platform/impl/udp_socket_posix.cc
 @@ -31,7 +31,7 @@ namespace openscreen {
  namespace {
diff --git a/www/chromium/files/patch-third__party_pdfium_core_fxcrt_cfx__datetime.cpp b/www/chromium/files/patch-third__party_pdfium_core_fxcrt_cfx__datetime.cpp
index a452d599..a422ad9e 100644
--- a/www/chromium/files/patch-third__party_pdfium_core_fxcrt_cfx__datetime.cpp
+++ b/www/chromium/files/patch-third__party_pdfium_core_fxcrt_cfx__datetime.cpp
@@ -1,4 +1,4 @@
---- third_party/pdfium/core/fxcrt/cfx_datetime.cpp.orig	2020-11-13 06:42:20 UTC
+--- third_party/pdfium/core/fxcrt/cfx_datetime.cpp.orig	2021-03-13 00:03:38 UTC
 +++ third_party/pdfium/core/fxcrt/cfx_datetime.cpp
 @@ -9,7 +9,7 @@
  #include "build/build_config.h"
diff --git a/www/chromium/files/patch-third__party_pdfium_core_fxge_cfx__fontmapper.cpp b/www/chromium/files/patch-third__party_pdfium_core_fxge_cfx__fontmapper.cpp
index ba462c25..4fa88912 100644
--- a/www/chromium/files/patch-third__party_pdfium_core_fxge_cfx__fontmapper.cpp
+++ b/www/chromium/files/patch-third__party_pdfium_core_fxge_cfx__fontmapper.cpp
@@ -1,4 +1,4 @@
---- third_party/pdfium/core/fxge/cfx_fontmapper.cpp.orig	2020-11-16 14:56:57 UTC
+--- third_party/pdfium/core/fxge/cfx_fontmapper.cpp.orig	2021-03-13 00:03:39 UTC
 +++ third_party/pdfium/core/fxge/cfx_fontmapper.cpp
 @@ -154,13 +154,13 @@ const AltFontFamily g_AltFontFamilies[] = {
      {"ForteMT", "Forte"},
diff --git a/www/chromium/files/patch-third__party_pdfium_core_fxge_fx__ge__linux.cpp b/www/chromium/files/patch-third__party_pdfium_core_fxge_fx__ge__linux.cpp
index a260146b..a4734338 100644
--- a/www/chromium/files/patch-third__party_pdfium_core_fxge_fx__ge__linux.cpp
+++ b/www/chromium/files/patch-third__party_pdfium_core_fxge_fx__ge__linux.cpp
@@ -1,4 +1,4 @@
---- third_party/pdfium/core/fxge/fx_ge_linux.cpp.orig	2020-11-13 06:42:20 UTC
+--- third_party/pdfium/core/fxge/fx_ge_linux.cpp.orig	2021-03-13 00:03:39 UTC
 +++ third_party/pdfium/core/fxge/fx_ge_linux.cpp
 @@ -16,7 +16,7 @@
  #include "core/fxge/systemfontinfo_iface.h"
diff --git a/www/chromium/files/patch-third__party_pdfium_fxjs_cjs__publicmethods.cpp b/www/chromium/files/patch-third__party_pdfium_fxjs_cjs__publicmethods.cpp
index eb0da1d4..bd8f0f7d 100644
--- a/www/chromium/files/patch-third__party_pdfium_fxjs_cjs__publicmethods.cpp
+++ b/www/chromium/files/patch-third__party_pdfium_fxjs_cjs__publicmethods.cpp
@@ -1,4 +1,4 @@
---- third_party/pdfium/fxjs/cjs_publicmethods.cpp.orig	2020-11-13 06:42:21 UTC
+--- third_party/pdfium/fxjs/cjs_publicmethods.cpp.orig	2021-03-13 00:03:39 UTC
 +++ third_party/pdfium/fxjs/cjs_publicmethods.cpp
 @@ -87,6 +87,103 @@ constexpr const wchar_t* kDateFormats[] = {L"m/d",
  constexpr const wchar_t* kTimeFormats[] = {L"HH:MM", L"h:MM tt", L"HH:MM:ss",
diff --git a/www/chromium/files/patch-third__party_pdfium_fxjs_fx__date__helpers.cpp b/www/chromium/files/patch-third__party_pdfium_fxjs_fx__date__helpers.cpp
index 160bb309..55dce85e 100644
--- a/www/chromium/files/patch-third__party_pdfium_fxjs_fx__date__helpers.cpp
+++ b/www/chromium/files/patch-third__party_pdfium_fxjs_fx__date__helpers.cpp
@@ -1,4 +1,4 @@
---- third_party/pdfium/fxjs/fx_date_helpers.cpp.orig	2020-11-13 06:42:21 UTC
+--- third_party/pdfium/fxjs/fx_date_helpers.cpp.orig	2021-03-13 00:03:39 UTC
 +++ third_party/pdfium/fxjs/fx_date_helpers.cpp
 @@ -36,6 +36,11 @@ double GetLocalTZA() {
      return 0;
diff --git a/www/chromium/files/patch-third__party_perfetto_gn_BUILD.gn b/www/chromium/files/patch-third__party_perfetto_gn_BUILD.gn
new file mode 100644
index 00000000..67f2308e
--- /dev/null
+++ b/www/chromium/files/patch-third__party_perfetto_gn_BUILD.gn
@@ -0,0 +1,19 @@
+--- third_party/perfetto/gn/BUILD.gn.orig	2021-03-15 13:24:18 UTC
++++ third_party/perfetto/gn/BUILD.gn
+@@ -48,13 +48,15 @@ action("gen_buildflags") {
+   # we run the tools/gen_xxx generators.
+   if (enable_perfetto_watchdog) {
+     perfetto_watchdog = "PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() || " +
+-                        "PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX()"
++                        "PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() || " +
++                        "PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FREEBSD()"
+   } else {
+     perfetto_watchdog = "0"
+   }
+   if (enable_perfetto_tools) {
+     perfetto_local_symbolizer =
+         "PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() || " +
++        "PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FREEBSD() || " +
+         "PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MAC() ||" +
+         "PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN()"
+   } else {
diff --git a/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_build__config.h b/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_build__config.h
index 58f272e9..53cda18f 100644
--- a/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_build__config.h
+++ b/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_build__config.h
@@ -1,4 +1,4 @@
---- third_party/perfetto/include/perfetto/base/build_config.h.orig	2020-11-13 06:42:20 UTC
+--- third_party/perfetto/include/perfetto/base/build_config.h.orig	2021-03-13 00:03:38 UTC
 +++ third_party/perfetto/include/perfetto/base/build_config.h
 @@ -27,6 +27,7 @@
  #if defined(__ANDROID__)
@@ -30,7 +30,7 @@
  #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_NACL() 0
 +#elif defined(__FreeBSD__)
 +#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0
-+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 1
++#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 0
 +#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FREEBSD() 1
 +#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0
 +#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_APPLE() 0
diff --git a/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_thread__utils.h b/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_thread__utils.h
index 46479566..41b0c3ae 100644
--- a/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_thread__utils.h
+++ b/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_thread__utils.h
@@ -1,4 +1,4 @@
---- third_party/perfetto/include/perfetto/base/thread_utils.h.orig	2020-11-13 06:42:20 UTC
+--- third_party/perfetto/include/perfetto/base/thread_utils.h.orig	2021-03-13 00:03:38 UTC
 +++ third_party/perfetto/include/perfetto/base/thread_utils.h
 @@ -35,6 +35,9 @@
  #else
diff --git a/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_time.h b/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_time.h
index 190e955e..bf0d8a61 100644
--- a/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_time.h
+++ b/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_time.h
@@ -1,6 +1,6 @@
---- third_party/perfetto/include/perfetto/base/time.h.orig	2020-11-13 06:42:20 UTC
+--- third_party/perfetto/include/perfetto/base/time.h.orig	2021-03-13 00:03:38 UTC
 +++ third_party/perfetto/include/perfetto/base/time.h
-@@ -141,6 +141,9 @@ inline TimeNanos GetTimeInternalNs(clockid_t clk_id) {
+@@ -142,6 +142,9 @@ inline TimeNanos GetTimeInternalNs(clockid_t clk_id) {
  // Return ns from boot. Conversely to GetWallTimeNs, this clock counts also time
  // during suspend (when supported).
  inline TimeNanos GetBootTimeNs() {
@@ -10,7 +10,7 @@
    // Determine if CLOCK_BOOTTIME is available on the first call.
    static const clockid_t kBootTimeClockSource = [] {
      struct timespec ts = {};
-@@ -148,6 +151,7 @@ inline TimeNanos GetBootTimeNs() {
+@@ -149,6 +152,7 @@ inline TimeNanos GetBootTimeNs() {
      return res == 0 ? CLOCK_BOOTTIME : kWallTimeClockSource;
    }();
    return GetTimeInternalNs(kBootTimeClockSource);
diff --git a/www/chromium/files/patch-third__party_perfetto_include_perfetto_ext_base_event__fd.h b/www/chromium/files/patch-third__party_perfetto_include_perfetto_ext_base_event__fd.h
deleted file mode 100644
index cd4dace0..00000000
--- a/www/chromium/files/patch-third__party_perfetto_include_perfetto_ext_base_event__fd.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- third_party/perfetto/include/perfetto/ext/base/event_fd.h.orig	2020-11-13 06:42:20 UTC
-+++ third_party/perfetto/include/perfetto/ext/base/event_fd.h
-@@ -20,8 +20,8 @@
- #include "perfetto/base/build_config.h"
- #include "perfetto/ext/base/scoped_file.h"
- 
--#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \
--    PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
-+#if !PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD) && (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \
-+    PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID))
- #define PERFETTO_USE_EVENTFD() 1
- #else
- #define PERFETTO_USE_EVENTFD() 0
diff --git a/www/chromium/files/patch-third__party_perfetto_include_perfetto_ext_base_thread__utils.h b/www/chromium/files/patch-third__party_perfetto_include_perfetto_ext_base_thread__utils.h
index 79fd7d02..44e71d92 100644
--- a/www/chromium/files/patch-third__party_perfetto_include_perfetto_ext_base_thread__utils.h
+++ b/www/chromium/files/patch-third__party_perfetto_include_perfetto_ext_base_thread__utils.h
@@ -1,6 +1,26 @@
---- third_party/perfetto/include/perfetto/ext/base/thread_utils.h.orig	2020-11-13 06:42:20 UTC
+--- third_party/perfetto/include/perfetto/ext/base/thread_utils.h.orig	2021-03-13 00:03:38 UTC
 +++ third_party/perfetto/include/perfetto/ext/base/thread_utils.h
-@@ -47,6 +47,9 @@ inline bool MaybeSetThreadName(const std::string& name
+@@ -23,7 +23,8 @@
+ 
+ #if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) ||   \
+     PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) || \
+-    PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE)
++    PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE) ||   \
++    PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD)
+ #include <pthread.h>
+ #include <string.h>
+ #include <algorithm>
+@@ -37,7 +38,8 @@ namespace base {
+ 
+ #if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) ||   \
+     PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) || \
+-    PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE)
++    PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE) ||   \
++    PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD)
+ // Sets the "comm" of the calling thread to the first 15 chars of the given
+ // string.
+ inline bool MaybeSetThreadName(const std::string& name) {
+@@ -47,6 +49,9 @@ inline bool MaybeSetThreadName(const std::string& name
  
  #if PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE)
    return pthread_setname_np(buf) == 0;
diff --git a/www/chromium/files/patch-third__party_perfetto_src_base_ctrl__c__handler.cc b/www/chromium/files/patch-third__party_perfetto_src_base_ctrl__c__handler.cc
new file mode 100644
index 00000000..6c3bd925
--- /dev/null
+++ b/www/chromium/files/patch-third__party_perfetto_src_base_ctrl__c__handler.cc
@@ -0,0 +1,12 @@
+--- third_party/perfetto/src/base/ctrl_c_handler.cc.orig	2021-03-15 13:19:30 UTC
++++ third_party/perfetto/src/base/ctrl_c_handler.cc
+@@ -51,7 +51,8 @@ void InstallCtrCHandler(CtrlCHandlerFunction handler) 
+   ::SetConsoleCtrlHandler(trampoline, true);
+ #elif PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \
+     PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) || \
+-    PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE)
++    PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE)   || \
++    PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD)
+   // Setup signal handler.
+   struct sigaction sa {};
+ 
diff --git a/www/chromium/files/patch-third__party_perfetto_src_base_file__utils.cc b/www/chromium/files/patch-third__party_perfetto_src_base_file__utils.cc
new file mode 100644
index 00000000..8afac6bf
--- /dev/null
+++ b/www/chromium/files/patch-third__party_perfetto_src_base_file__utils.cc
@@ -0,0 +1,14 @@
+--- third_party/perfetto/src/base/file_utils.cc.orig	2021-03-15 13:20:04 UTC
++++ third_party/perfetto/src/base/file_utils.cc
+@@ -148,8 +148,9 @@ ssize_t WriteAllHandle(PlatformHandle h, const void* b
+ 
+ bool FlushFile(int fd) {
+   PERFETTO_DCHECK(fd != 0);
+-#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \
+-    PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
++#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) ||   \
++    PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) || \
++    PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD)
+   return !PERFETTO_EINTR(fdatasync(fd));
+ #elif PERFETTO_BUILDFLAG(PERFETTO_OS_WIN)
+   return !PERFETTO_EINTR(_commit(fd));
diff --git a/www/chromium/files/patch-third__party_perfetto_src_base_subprocess.cc b/www/chromium/files/patch-third__party_perfetto_src_base_subprocess.cc
deleted file mode 100644
index c751e7f2..00000000
--- a/www/chromium/files/patch-third__party_perfetto_src_base_subprocess.cc
+++ /dev/null
@@ -1,24 +0,0 @@
---- third_party/perfetto/src/base/subprocess.cc.orig	2020-11-13 06:42:20 UTC
-+++ third_party/perfetto/src/base/subprocess.cc
-@@ -35,8 +35,8 @@
- #include "perfetto/base/time.h"
- #include "perfetto/ext/base/utils.h"
- 
--#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \
--    PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
-+#if !PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD) && (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \
-+    PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID))
- #include <sys/prctl.h>
- #endif
- 
-@@ -60,8 +60,8 @@ struct ChildProcessArgs {
- // Don't add any dynamic allocation in this function. This will be invoked
- // under a fork(), potentially in a state where the allocator lock is held.
- void __attribute__((noreturn)) ChildProcess(ChildProcessArgs* args) {
--#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \
--    PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
-+#if !PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD) && (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \
-+    PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID))
-   // In no case we want a child process to outlive its parent process. This is
-   // relevant for tests, so that a test failure/crash doesn't leave child
-   // processes around that get reparented to init.
diff --git a/www/chromium/files/patch-third__party_perfetto_src_base_subprocess__posix.cc b/www/chromium/files/patch-third__party_perfetto_src_base_subprocess__posix.cc
new file mode 100644
index 00000000..c5901bc0
--- /dev/null
+++ b/www/chromium/files/patch-third__party_perfetto_src_base_subprocess__posix.cc
@@ -0,0 +1,37 @@
+--- third_party/perfetto/src/base/subprocess_posix.cc.orig	2021-03-15 13:21:33 UTC
++++ third_party/perfetto/src/base/subprocess_posix.cc
+@@ -20,7 +20,8 @@
+ 
+ #if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) ||   \
+     PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) || \
+-    PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE)
++    PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE) ||   \
++    PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD)
+ 
+ #include <fcntl.h>
+ #include <poll.h>
+@@ -38,6 +39,8 @@
+ #if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \
+     PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
+ #include <sys/prctl.h>
++#elif PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD)
++#include <sys/procctl.h>
+ #endif
+ 
+ #include "perfetto/base/logging.h"
+@@ -70,6 +73,9 @@ void __attribute__((noreturn)) ChildProcess(ChildProce
+   // relevant for tests, so that a test failure/crash doesn't leave child
+   // processes around that get reparented to init.
+   prctl(PR_SET_PDEATHSIG, SIGKILL);
++#elif PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD)
++  int procctl_value = SIGKILL;
++  procctl(P_PID, 0, PROC_PDEATHSIG_CTL, &procctl_value);
+ #endif
+ 
+   auto die = [args](const char* err) __attribute__((noreturn)) {
+@@ -431,4 +437,4 @@ void Subprocess::KillAndWaitForTermination(int sig_num
+ }  // namespace base
+ }  // namespace perfetto
+ 
+-#endif  // PERFETTO_OS_LINUX || PERFETTO_OS_ANDROID || PERFETTO_OS_APPLE
++#endif  // PERFETTO_OS_LINUX || PERFETTO_OS_ANDROID || PERFETTO_OS_APPLE || PERFETTO_OS_FREEBSD
diff --git a/www/chromium/files/patch-third__party_perfetto_src_base_thread__task__runner.cc b/www/chromium/files/patch-third__party_perfetto_src_base_thread__task__runner.cc
deleted file mode 100644
index 3a0c3be4..00000000
--- a/www/chromium/files/patch-third__party_perfetto_src_base_thread__task__runner.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- third_party/perfetto/src/base/thread_task_runner.cc.orig	2020-11-13 06:42:20 UTC
-+++ third_party/perfetto/src/base/thread_task_runner.cc
-@@ -28,7 +28,7 @@
- #include "perfetto/ext/base/thread_utils.h"
- #include "perfetto/ext/base/unix_task_runner.h"
- 
--#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \
-+#if (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) && !PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD)) || \
-     PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
- #include <sys/prctl.h>
- #endif
diff --git a/www/chromium/files/patch-third__party_perfetto_src_base_unix__socket.cc b/www/chromium/files/patch-third__party_perfetto_src_base_unix__socket.cc
index cf875e53..c0f98c48 100644
--- a/www/chromium/files/patch-third__party_perfetto_src_base_unix__socket.cc
+++ b/www/chromium/files/patch-third__party_perfetto_src_base_unix__socket.cc
@@ -1,20 +1,21 @@
---- third_party/perfetto/src/base/unix_socket.cc.orig	2021-01-18 21:31:50 UTC
+--- third_party/perfetto/src/base/unix_socket.cc.orig	2021-03-13 00:03:38 UTC
 +++ third_party/perfetto/src/base/unix_socket.cc
-@@ -38,7 +38,7 @@
- #include "perfetto/ext/base/string_utils.h"
- #include "perfetto/ext/base/utils.h"
+@@ -41,7 +41,7 @@
+ #include <unistd.h>
+ #endif
  
 -#if PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE)
 +#if PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE) || PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD)
  #include <sys/ucred.h>
  #endif
  
-@@ -630,7 +630,7 @@ void UnixSocket::ReadPeerCredentials() {
-   if (sock_raw_.family() != SockFamily::kUnix)
-     return;
- 
--#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \
-+#if (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) && !PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD)) || \
-     PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
-   struct ucred user_cred;
+@@ -758,7 +758,8 @@ void UnixSocket::ReadPeerCredentialsPosix() {
+   PERFETTO_CHECK(res == 0);
+   peer_uid_ = user_cred.uid;
+   peer_pid_ = user_cred.pid;
+-#elif PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE)
++#elif PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE) || \
++      PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD)
+   struct xucred user_cred;
    socklen_t len = sizeof(user_cred);
+   int res = getsockopt(sock_raw_.fd(), 0, LOCAL_PEERCRED, &user_cred, &len);
diff --git a/www/chromium/files/patch-third__party_perfetto_src_base_utils.cc b/www/chromium/files/patch-third__party_perfetto_src_base_utils.cc
new file mode 100644
index 00000000..9f5c46e7
--- /dev/null
+++ b/www/chromium/files/patch-third__party_perfetto_src_base_utils.cc
@@ -0,0 +1,34 @@
+--- third_party/perfetto/src/base/utils.cc.orig	2021-03-15 13:16:17 UTC
++++ third_party/perfetto/src/base/utils.cc
+@@ -21,7 +21,8 @@
+ 
+ #if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) ||   \
+     PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) || \
+-    PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE)
++    PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE) ||   \
++    PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD)
+ #include <unistd.h>  // For getpagesize() and geteuid().
+ #endif
+ 
+@@ -67,8 +68,9 @@ void MaybeReleaseAllocatorMemToOS() {
+ 
+ uint32_t GetSysPageSize() {
+   ignore_result(kPageSize);  // Just to keep the amalgamated build happy.
+-#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \
+-    PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
++#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) ||   \
++    PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) || \
++    PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD)
+   static std::atomic<uint32_t> page_size{0};
+   // This function might be called in hot paths. Avoid calling getpagesize() all
+   // the times, in many implementations getpagesize() calls sysconf() which is
+@@ -89,7 +91,8 @@ uint32_t GetSysPageSize() {
+ uid_t GetCurrentUserId() {
+ #if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) ||   \
+     PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) || \
+-    PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE)
++    PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE) ||   \
++    PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD)
+   return geteuid();
+ #else
+   // TODO(primiano): On Windows we could hash the current user SID and derive a
diff --git a/www/chromium/files/patch-third__party_perfetto_src_base_watchdog__posix.cc b/www/chromium/files/patch-third__party_perfetto_src_base_watchdog__posix.cc
new file mode 100644
index 00000000..3eee4447
--- /dev/null
+++ b/www/chromium/files/patch-third__party_perfetto_src_base_watchdog__posix.cc
@@ -0,0 +1,14 @@
+--- third_party/perfetto/src/base/watchdog_posix.cc.orig	2021-03-15 13:20:48 UTC
++++ third_party/perfetto/src/base/watchdog_posix.cc
+@@ -114,8 +114,9 @@ void Watchdog::Start() {
+   } else {
+     PERFETTO_DCHECK(!enabled_);
+ 
+-#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \
+-    PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
++#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) ||   \
++    PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) || \
++    PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD)
+     // Kick the thread to start running but only on Android or Linux.
+     enabled_ = true;
+     thread_ = std::thread(&Watchdog::ThreadMain, this);
diff --git a/www/chromium/files/patch-third__party_perfetto_src_trace__processor_read__trace.cc b/www/chromium/files/patch-third__party_perfetto_src_trace__processor_read__trace.cc
new file mode 100644
index 00000000..07c91bd5
--- /dev/null
+++ b/www/chromium/files/patch-third__party_perfetto_src_trace__processor_read__trace.cc
@@ -0,0 +1,12 @@
+--- third_party/perfetto/src/trace_processor/read_trace.cc.orig	2021-03-15 13:13:26 UTC
++++ third_party/perfetto/src/trace_processor/read_trace.cc
+@@ -33,7 +33,8 @@
+ #include "protos/perfetto/trace/trace_packet.pbzero.h"
+ 
+ #if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \
+-    PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE)
++    PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE) || \
++    PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD)
+ #define PERFETTO_HAS_AIO_H() 1
+ #else
+ #define PERFETTO_HAS_AIO_H() 0
diff --git a/www/chromium/files/patch-third__party_perfetto_src_trace__processor_trace__processor__shell.cc b/www/chromium/files/patch-third__party_perfetto_src_trace__processor_trace__processor__shell.cc
new file mode 100644
index 00000000..24a87af1
--- /dev/null
+++ b/www/chromium/files/patch-third__party_perfetto_src_trace__processor_trace__processor__shell.cc
@@ -0,0 +1,22 @@
+--- third_party/perfetto/src/trace_processor/trace_processor_shell.cc.orig	2021-03-15 13:14:04 UTC
++++ third_party/perfetto/src/trace_processor/trace_processor_shell.cc
+@@ -55,7 +55,8 @@
+ 
+ #if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) ||   \
+     PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) || \
+-    PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE)
++    PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE) ||   \
++    PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD)
+ #define PERFETTO_HAS_SIGNAL_H() 1
+ #else
+ #define PERFETTO_HAS_SIGNAL_H() 0
+@@ -103,7 +104,8 @@ std::string GetConfigPath() {
+   const char* homedir = getenv("HOME");
+ #if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) ||   \
+     PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) || \
+-    PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE)
++    PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE) ||   \
++    PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD)
+   if (homedir == nullptr)
+     homedir = getpwuid(getuid())->pw_dir;
+ #elif PERFETTO_BUILDFLAG(PERFETTO_OS_WIN)
diff --git a/www/chromium/files/patch-third__party_perfetto_src_traced_service_service.cc b/www/chromium/files/patch-third__party_perfetto_src_traced_service_service.cc
new file mode 100644
index 00000000..04fc5916
--- /dev/null
+++ b/www/chromium/files/patch-third__party_perfetto_src_traced_service_service.cc
@@ -0,0 +1,12 @@
+--- third_party/perfetto/src/traced/service/service.cc.orig	2021-03-15 13:08:22 UTC
++++ third_party/perfetto/src/traced/service/service.cc
+@@ -28,7 +28,8 @@
+ #include "src/traced/service/builtin_producer.h"
+ 
+ #if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \
+-    PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
++    PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) || \
++    PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD)
+ #define PERFETTO_SET_SOCKET_PERMISSIONS
+ #include <fcntl.h>
+ #include <grp.h>
diff --git a/www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc b/www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc
index e2271f7f..5eadee2b 100644
--- a/www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc
+++ b/www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc
@@ -1,6 +1,16 @@
---- third_party/perfetto/src/tracing/core/tracing_service_impl.cc.orig	2021-01-18 21:31:50 UTC
+--- third_party/perfetto/src/tracing/core/tracing_service_impl.cc.orig	2021-03-13 00:03:39 UTC
 +++ third_party/perfetto/src/tracing/core/tracing_service_impl.cc
-@@ -2564,8 +2564,9 @@ bool TracingServiceImpl::SnapshotClocks(
+@@ -38,7 +38,8 @@
+ 
+ #if PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) || \
+     PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) ||   \
+-    PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE)
++    PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE) ||   \
++    PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD)
+ #define PERFETTO_HAS_CHMOD
+ #include <sys/stat.h>
+ #endif
+@@ -2659,8 +2660,9 @@ bool TracingServiceImpl::SnapshotClocks(
  
    TracingSession::ClockSnapshotData new_snapshot_data;
  
diff --git a/www/chromium/files/patch-third__party_perfetto_src_tracing_ipc_default__socket.cc b/www/chromium/files/patch-third__party_perfetto_src_tracing_ipc_default__socket.cc
new file mode 100644
index 00000000..86c5fc29
--- /dev/null
+++ b/www/chromium/files/patch-third__party_perfetto_src_tracing_ipc_default__socket.cc
@@ -0,0 +1,12 @@
+--- third_party/perfetto/src/tracing/ipc/default_socket.cc.orig	2021-03-15 13:10:10 UTC
++++ third_party/perfetto/src/tracing/ipc/default_socket.cc
+@@ -35,7 +35,8 @@ const char* kRunPerfettoBaseDir = "/run/perfetto/";
+ bool UseRunPerfettoBaseDir() {
+ #if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) ||   \
+     PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) || \
+-    PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE)
++    PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE) ||   \
++    PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD)
+   // Note that the trailing / in |kRunPerfettoBaseDir| ensures we are checking
+   // against a directory, not a file.
+   int res = PERFETTO_EINTR(access(kRunPerfettoBaseDir, X_OK));
diff --git a/www/chromium/files/patch-third__party_perfetto_src_tracing_ipc_memfd.cc b/www/chromium/files/patch-third__party_perfetto_src_tracing_ipc_memfd.cc
new file mode 100644
index 00000000..3700163c
--- /dev/null
+++ b/www/chromium/files/patch-third__party_perfetto_src_tracing_ipc_memfd.cc
@@ -0,0 +1,16 @@
+--- third_party/perfetto/src/tracing/ipc/memfd.cc.orig	2021-03-15 13:10:47 UTC
++++ third_party/perfetto/src/tracing/ipc/memfd.cc
+@@ -18,9 +18,10 @@
+ 
+ #include <errno.h>
+ 
+-#define PERFETTO_MEMFD_ENABLED()             \
+-  PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) || \
+-      PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX)
++#define PERFETTO_MEMFD_ENABLED()               \
++  PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) ||   \
++      PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \
++      PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD)
+ 
+ #if PERFETTO_MEMFD_ENABLED()
+ 
diff --git a/www/chromium/files/patch-third__party_perfetto_src_tracing_ipc_posix__shared__memory.cc b/www/chromium/files/patch-third__party_perfetto_src_tracing_ipc_posix__shared__memory.cc
new file mode 100644
index 00000000..824ed4cc
--- /dev/null
+++ b/www/chromium/files/patch-third__party_perfetto_src_tracing_ipc_posix__shared__memory.cc
@@ -0,0 +1,18 @@
+--- third_party/perfetto/src/tracing/ipc/posix_shared_memory.cc.orig	2021-03-15 13:11:13 UTC
++++ third_party/perfetto/src/tracing/ipc/posix_shared_memory.cc
+@@ -18,7 +18,8 @@
+ 
+ #if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) ||   \
+     PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) || \
+-    PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE)
++    PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE) ||   \
++    PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD)
+ 
+ #include <fcntl.h>
+ #include <stdint.h>
+@@ -132,4 +133,4 @@ std::unique_ptr<SharedMemory> PosixSharedMemory::Facto
+ 
+ }  // namespace perfetto
+ 
+-#endif  // OS_LINUX || OS_ANDROID || OS_APPLE
++#endif  // OS_LINUX || OS_ANDROID || OS_APPLE || OS_FREEBSD
diff --git a/www/chromium/files/patch-third__party_perfetto_src_tracing_ipc_posix__shared__memory.h b/www/chromium/files/patch-third__party_perfetto_src_tracing_ipc_posix__shared__memory.h
new file mode 100644
index 00000000..d9329d0e
--- /dev/null
+++ b/www/chromium/files/patch-third__party_perfetto_src_tracing_ipc_posix__shared__memory.h
@@ -0,0 +1,19 @@
+--- third_party/perfetto/src/tracing/ipc/posix_shared_memory.h.orig	2021-03-15 13:11:37 UTC
++++ third_party/perfetto/src/tracing/ipc/posix_shared_memory.h
+@@ -21,7 +21,8 @@
+ 
+ #if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) ||   \
+     PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) || \
+-    PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE)
++    PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE) ||   \
++    PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD)
+ 
+ #include <stddef.h>
+ 
+@@ -76,5 +77,5 @@ class PosixSharedMemory : public SharedMemory {
+ 
+ }  // namespace perfetto
+ 
+-#endif  // OS_LINUX || OS_ANDROID || OS_APPLE
++#endif  // OS_LINUX || OS_ANDROID || OS_APPLE || OS_FREEBSD
+ #endif  // SRC_TRACING_IPC_POSIX_SHARED_MEMORY_H_
diff --git a/www/chromium/files/patch-third__party_perfetto_src_tracing_platform__posix.cc b/www/chromium/files/patch-third__party_perfetto_src_tracing_platform__posix.cc
new file mode 100644
index 00000000..8e81af08
--- /dev/null
+++ b/www/chromium/files/patch-third__party_perfetto_src_tracing_platform__posix.cc
@@ -0,0 +1,28 @@
+--- third_party/perfetto/src/tracing/platform_posix.cc.orig	2021-03-15 13:12:05 UTC
++++ third_party/perfetto/src/tracing/platform_posix.cc
+@@ -18,7 +18,8 @@
+ 
+ #if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) ||   \
+     PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) || \
+-    PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE)
++    PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE) ||   \
++    PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD)
+ 
+ #include "perfetto/ext/base/file_utils.h"
+ #include "perfetto/ext/base/thread_task_runner.h"
+@@ -82,7 +83,8 @@ std::string PlatformPosix::GetCurrentProcessName() {
+   std::string cmdline;
+   base::ReadFile("/proc/self/cmdline", &cmdline);
+   return cmdline.substr(0, cmdline.find('\0'));
+-#elif PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE)
++#elif PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE) || \
++      PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD)
+   return std::string(getprogname());
+ #else
+   return "unknown_producer";
+@@ -98,4 +100,4 @@ Platform* Platform::GetDefaultPlatform() {
+ }
+ 
+ }  // namespace perfetto
+-#endif  // OS_LINUX || OS_ANDROID || OS_APPLE
++#endif  // OS_LINUX || OS_ANDROID || OS_APPLE || OS_FREEBSD
diff --git a/www/chromium/files/patch-third__party_perfetto_tools_busy__threads_busy__threads.cc b/www/chromium/files/patch-third__party_perfetto_tools_busy__threads_busy__threads.cc
new file mode 100644
index 00000000..c00fad1e
--- /dev/null
+++ b/www/chromium/files/patch-third__party_perfetto_tools_busy__threads_busy__threads.cc
@@ -0,0 +1,12 @@
+--- third_party/perfetto/tools/busy_threads/busy_threads.cc.orig	2021-03-15 13:04:18 UTC
++++ third_party/perfetto/tools/busy_threads/busy_threads.cc
+@@ -29,7 +29,8 @@
+ #define PERFETTO_HAVE_PTHREADS                \
+   (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) ||   \
+    PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) || \
+-   PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE))
++   PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE) ||   \
++   PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD))
+ 
+ #if PERFETTO_HAVE_PTHREADS
+ #include <pthread.h>
diff --git a/www/chromium/files/patch-third__party_protobuf_src_google_protobuf_stubs_platform__macros.h b/www/chromium/files/patch-third__party_protobuf_src_google_protobuf_stubs_platform__macros.h
index f22a0b0c..317721ce 100644
--- a/www/chromium/files/patch-third__party_protobuf_src_google_protobuf_stubs_platform__macros.h
+++ b/www/chromium/files/patch-third__party_protobuf_src_google_protobuf_stubs_platform__macros.h
@@ -1,4 +1,4 @@
---- third_party/protobuf/src/google/protobuf/stubs/platform_macros.h.orig	2020-11-13 06:37:04 UTC
+--- third_party/protobuf/src/google/protobuf/stubs/platform_macros.h.orig	2021-03-12 23:57:46 UTC
 +++ third_party/protobuf/src/google/protobuf/stubs/platform_macros.h
 @@ -118,7 +118,7 @@ GOOGLE_PROTOBUF_PLATFORM_ERROR
  
diff --git a/www/chromium/files/patch-third__party_skia_src_core_SkCpu.cpp b/www/chromium/files/patch-third__party_skia_src_core_SkCpu.cpp
index f9a6d32e..5c78ce9f 100644
--- a/www/chromium/files/patch-third__party_skia_src_core_SkCpu.cpp
+++ b/www/chromium/files/patch-third__party_skia_src_core_SkCpu.cpp
@@ -1,6 +1,6 @@
---- third_party/skia/src/core/SkCpu.cpp.orig	2020-11-13 06:42:23 UTC
+--- third_party/skia/src/core/SkCpu.cpp.orig	2021-03-13 00:03:40 UTC
 +++ third_party/skia/src/core/SkCpu.cpp
-@@ -72,6 +72,23 @@
+@@ -73,6 +73,23 @@
          return features;
      }
  
diff --git a/www/chromium/files/patch-third__party_skia_src_gpu_GrAutoLocaleSetter.h b/www/chromium/files/patch-third__party_skia_src_gpu_GrAutoLocaleSetter.h
index bdbf2482..f95b1e79 100644
--- a/www/chromium/files/patch-third__party_skia_src_gpu_GrAutoLocaleSetter.h
+++ b/www/chromium/files/patch-third__party_skia_src_gpu_GrAutoLocaleSetter.h
@@ -1,4 +1,4 @@
---- third_party/skia/src/gpu/GrAutoLocaleSetter.h.orig	2020-11-13 06:42:23 UTC
+--- third_party/skia/src/gpu/GrAutoLocaleSetter.h.orig	2021-03-13 00:03:40 UTC
 +++ third_party/skia/src/gpu/GrAutoLocaleSetter.h
 @@ -27,7 +27,7 @@
  #define HAVE_XLOCALE 0
diff --git a/www/chromium/files/patch-third__party_skia_src_images_SkJpegEncoder.cpp b/www/chromium/files/patch-third__party_skia_src_images_SkJpegEncoder.cpp
index e57788bc..9275a041 100644
--- a/www/chromium/files/patch-third__party_skia_src_images_SkJpegEncoder.cpp
+++ b/www/chromium/files/patch-third__party_skia_src_images_SkJpegEncoder.cpp
@@ -1,4 +1,4 @@
---- third_party/skia/src/images/SkJpegEncoder.cpp.orig	2020-11-13 06:42:23 UTC
+--- third_party/skia/src/images/SkJpegEncoder.cpp.orig	2021-03-13 00:03:40 UTC
 +++ third_party/skia/src/images/SkJpegEncoder.cpp
 @@ -76,9 +76,14 @@ bool SkJpegEncoderMgr::setParams(const SkImageInfo& sr
          return (transform_scanline_proc) nullptr;
diff --git a/www/chromium/files/patch-third__party_skia_src_ports_SkOSFile__stdio.cpp b/www/chromium/files/patch-third__party_skia_src_ports_SkOSFile__stdio.cpp
index 3e616184..78343502 100644
--- a/www/chromium/files/patch-third__party_skia_src_ports_SkOSFile__stdio.cpp
+++ b/www/chromium/files/patch-third__party_skia_src_ports_SkOSFile__stdio.cpp
@@ -1,4 +1,4 @@
---- third_party/skia/src/ports/SkOSFile_stdio.cpp.orig	2020-11-13 06:42:23 UTC
+--- third_party/skia/src/ports/SkOSFile_stdio.cpp.orig	2021-03-13 00:03:40 UTC
 +++ third_party/skia/src/ports/SkOSFile_stdio.cpp
 @@ -132,7 +132,7 @@ void sk_fflush(FILE* f) {
  
diff --git a/www/chromium/files/patch-third__party_skia_src_sksl_SkSLString.h b/www/chromium/files/patch-third__party_skia_src_sksl_SkSLString.h
index 7f0a27e7..4a200f68 100644
--- a/www/chromium/files/patch-third__party_skia_src_sksl_SkSLString.h
+++ b/www/chromium/files/patch-third__party_skia_src_sksl_SkSLString.h
@@ -1,4 +1,4 @@
---- third_party/skia/src/sksl/SkSLString.h.orig	2021-01-18 21:31:52 UTC
+--- third_party/skia/src/sksl/SkSLString.h.orig	2021-03-13 00:03:41 UTC
 +++ third_party/skia/src/sksl/SkSLString.h
 @@ -17,6 +17,8 @@
  #include "include/core/SkString.h"
diff --git a/www/chromium/files/patch-third__party_sqlite_BUILD.gn b/www/chromium/files/patch-third__party_sqlite_BUILD.gn
index ceae677e..c7db4149 100644
--- a/www/chromium/files/patch-third__party_sqlite_BUILD.gn
+++ b/www/chromium/files/patch-third__party_sqlite_BUILD.gn
@@ -1,4 +1,4 @@
---- third_party/sqlite/BUILD.gn.orig	2020-11-13 06:37:04 UTC
+--- third_party/sqlite/BUILD.gn.orig	2021-03-12 23:57:46 UTC
 +++ third_party/sqlite/BUILD.gn
 @@ -138,7 +138,7 @@ config("sqlite_warnings") {
        ]
diff --git a/www/chromium/files/patch-third__party_swiftshader_BUILD.gn b/www/chromium/files/patch-third__party_swiftshader_BUILD.gn
index 38a46ff2..058dff35 100644
--- a/www/chromium/files/patch-third__party_swiftshader_BUILD.gn
+++ b/www/chromium/files/patch-third__party_swiftshader_BUILD.gn
@@ -1,6 +1,6 @@
---- third_party/swiftshader/BUILD.gn.orig	2020-11-13 06:42:23 UTC
+--- third_party/swiftshader/BUILD.gn.orig	2021-03-13 00:03:40 UTC
 +++ third_party/swiftshader/BUILD.gn
-@@ -138,9 +138,11 @@ config("swiftshader_config") {
+@@ -139,9 +139,11 @@ config("swiftshader_config") {
        ldflags = [ "-Wl,--gc-sections" ]
  
        if (current_cpu == "mipsel") {
@@ -15,7 +15,7 @@
          if (mips_arch_variant == "r1") {
            ldflags += [
              "-mips32",
-@@ -152,11 +154,8 @@ config("swiftshader_config") {
+@@ -153,11 +155,8 @@ config("swiftshader_config") {
          }
        } else if (current_cpu == "mips64el") {
          ldflags += [
diff --git a/www/chromium/files/patch-third__party_swiftshader_include_vulkan_vulkan.hpp b/www/chromium/files/patch-third__party_swiftshader_include_vulkan_vulkan.hpp
index 7e807fa1..b5ca2191 100644
--- a/www/chromium/files/patch-third__party_swiftshader_include_vulkan_vulkan.hpp
+++ b/www/chromium/files/patch-third__party_swiftshader_include_vulkan_vulkan.hpp
@@ -1,4 +1,4 @@
---- third_party/swiftshader/include/vulkan/vulkan.hpp.orig	2021-01-19 12:49:47 UTC
+--- third_party/swiftshader/include/vulkan/vulkan.hpp.orig	2021-03-13 00:03:40 UTC
 +++ third_party/swiftshader/include/vulkan/vulkan.hpp
 @@ -67,7 +67,7 @@
  #endif
diff --git a/www/chromium/files/patch-third__party_swiftshader_src_Common_Configurator.cpp b/www/chromium/files/patch-third__party_swiftshader_src_Common_Configurator.cpp
index 78f7ace6..c9eb5291 100644
--- a/www/chromium/files/patch-third__party_swiftshader_src_Common_Configurator.cpp
+++ b/www/chromium/files/patch-third__party_swiftshader_src_Common_Configurator.cpp
@@ -1,4 +1,4 @@
---- third_party/swiftshader/src/Common/Configurator.cpp.orig	2020-11-13 06:42:23 UTC
+--- third_party/swiftshader/src/Common/Configurator.cpp.orig	2021-03-13 00:03:40 UTC
 +++ third_party/swiftshader/src/Common/Configurator.cpp
 @@ -42,6 +42,9 @@ namespace sw
  
diff --git a/www/chromium/files/patch-third__party_swiftshader_src_Common_MutexLock.hpp b/www/chromium/files/patch-third__party_swiftshader_src_Common_MutexLock.hpp
index 770d64bb..554138b5 100644
--- a/www/chromium/files/patch-third__party_swiftshader_src_Common_MutexLock.hpp
+++ b/www/chromium/files/patch-third__party_swiftshader_src_Common_MutexLock.hpp
@@ -1,4 +1,4 @@
---- third_party/swiftshader/src/Common/MutexLock.hpp.orig	2020-11-13 06:42:23 UTC
+--- third_party/swiftshader/src/Common/MutexLock.hpp.orig	2021-03-13 00:03:40 UTC
 +++ third_party/swiftshader/src/Common/MutexLock.hpp
 @@ -17,7 +17,7 @@
  
diff --git a/www/chromium/files/patch-third__party_swiftshader_src_Common_SharedLibrary.hpp b/www/chromium/files/patch-third__party_swiftshader_src_Common_SharedLibrary.hpp
index 544604e6..f7b1dc21 100644
--- a/www/chromium/files/patch-third__party_swiftshader_src_Common_SharedLibrary.hpp
+++ b/www/chromium/files/patch-third__party_swiftshader_src_Common_SharedLibrary.hpp
@@ -1,4 +1,4 @@
---- third_party/swiftshader/src/Common/SharedLibrary.hpp.orig	2020-11-13 06:42:23 UTC
+--- third_party/swiftshader/src/Common/SharedLibrary.hpp.orig	2021-03-13 00:03:40 UTC
 +++ third_party/swiftshader/src/Common/SharedLibrary.hpp
 @@ -97,7 +97,7 @@ void *loadLibrary(const std::string &libraryDirectory,
  
diff --git a/www/chromium/files/patch-third__party_swiftshader_src_Main_SwiftConfig.cpp b/www/chromium/files/patch-third__party_swiftshader_src_Main_SwiftConfig.cpp
index d34425f5..864bca31 100644
--- a/www/chromium/files/patch-third__party_swiftshader_src_Main_SwiftConfig.cpp
+++ b/www/chromium/files/patch-third__party_swiftshader_src_Main_SwiftConfig.cpp
@@ -1,4 +1,4 @@
---- third_party/swiftshader/src/Main/SwiftConfig.cpp.orig	2020-11-13 06:42:23 UTC
+--- third_party/swiftshader/src/Main/SwiftConfig.cpp.orig	2021-03-13 00:03:40 UTC
 +++ third_party/swiftshader/src/Main/SwiftConfig.cpp
 @@ -764,7 +764,11 @@ namespace sw
  		struct stat status;
diff --git a/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Display.cpp b/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Display.cpp
index 58ded7c0..6e96ead0 100644
--- a/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Display.cpp
+++ b/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Display.cpp
@@ -1,4 +1,4 @@
---- third_party/swiftshader/src/OpenGL/libEGL/Display.cpp.orig	2021-01-18 21:31:51 UTC
+--- third_party/swiftshader/src/OpenGL/libEGL/Display.cpp.orig	2021-03-13 00:03:40 UTC
 +++ third_party/swiftshader/src/OpenGL/libEGL/Display.cpp
 @@ -684,7 +684,7 @@ bool Display::isValidWindow(EGLNativeWindowType window
  			return status != 0;
diff --git a/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Surface.cpp b/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Surface.cpp
index 6d7c01d3..dcd45ecf 100644
--- a/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Surface.cpp
+++ b/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Surface.cpp
@@ -1,4 +1,4 @@
---- third_party/swiftshader/src/OpenGL/libEGL/Surface.cpp.orig	2021-01-18 21:31:51 UTC
+--- third_party/swiftshader/src/OpenGL/libEGL/Surface.cpp.orig	2021-03-13 00:03:40 UTC
 +++ third_party/swiftshader/src/OpenGL/libEGL/Surface.cpp
 @@ -357,7 +357,7 @@ bool WindowSurface::checkForResize()
  
diff --git a/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_libEGL.cpp b/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_libEGL.cpp
index 3024a028..7f8d2948 100644
--- a/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_libEGL.cpp
+++ b/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_libEGL.cpp
@@ -1,4 +1,4 @@
---- third_party/swiftshader/src/OpenGL/libEGL/libEGL.cpp.orig	2020-11-13 06:42:23 UTC
+--- third_party/swiftshader/src/OpenGL/libEGL/libEGL.cpp.orig	2021-03-13 00:03:40 UTC
 +++ third_party/swiftshader/src/OpenGL/libEGL/libEGL.cpp
 @@ -153,7 +153,7 @@ EGLDisplay EGLAPIENTRY GetDisplay(EGLNativeDisplayType
  		// FIXME: Check if display_id is the default display
diff --git a/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_libEGL.hpp b/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_libEGL.hpp
index a448b57b..2438c9f4 100644
--- a/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_libEGL.hpp
+++ b/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_libEGL.hpp
@@ -1,4 +1,4 @@
---- third_party/swiftshader/src/OpenGL/libEGL/libEGL.hpp.orig	2020-11-13 06:42:23 UTC
+--- third_party/swiftshader/src/OpenGL/libEGL/libEGL.hpp.orig	2021-03-13 00:03:40 UTC
 +++ third_party/swiftshader/src/OpenGL/libEGL/libEGL.hpp
 @@ -100,7 +100,7 @@ class LibEGL (private)
  				#endif
diff --git a/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libGLES__CM_libGLES__CM.hpp b/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libGLES__CM_libGLES__CM.hpp
index 9c0b1ad7..7e6c4167 100644
--- a/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libGLES__CM_libGLES__CM.hpp
+++ b/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libGLES__CM_libGLES__CM.hpp
@@ -1,4 +1,4 @@
---- third_party/swiftshader/src/OpenGL/libGLES_CM/libGLES_CM.hpp.orig	2020-11-13 06:42:23 UTC
+--- third_party/swiftshader/src/OpenGL/libGLES_CM/libGLES_CM.hpp.orig	2021-03-13 00:03:40 UTC
 +++ third_party/swiftshader/src/OpenGL/libGLES_CM/libGLES_CM.hpp
 @@ -261,7 +261,7 @@ class LibGLES_CM (private)
  				#endif
diff --git a/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libGLESv2_libGLESv2.hpp b/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libGLESv2_libGLESv2.hpp
index 3eeb606c..7a056a75 100644
--- a/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libGLESv2_libGLESv2.hpp
+++ b/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libGLESv2_libGLESv2.hpp
@@ -1,4 +1,4 @@
---- third_party/swiftshader/src/OpenGL/libGLESv2/libGLESv2.hpp.orig	2020-11-13 06:42:23 UTC
+--- third_party/swiftshader/src/OpenGL/libGLESv2/libGLESv2.hpp.orig	2021-03-13 00:03:40 UTC
 +++ third_party/swiftshader/src/OpenGL/libGLESv2/libGLESv2.hpp
 @@ -286,7 +286,7 @@ class LibGLESv2 (private)
  				#endif
diff --git a/www/chromium/files/patch-third__party_swiftshader_src_Reactor_Debug.cpp b/www/chromium/files/patch-third__party_swiftshader_src_Reactor_Debug.cpp
index f4f97ce4..979f6ea2 100644
--- a/www/chromium/files/patch-third__party_swiftshader_src_Reactor_Debug.cpp
+++ b/www/chromium/files/patch-third__party_swiftshader_src_Reactor_Debug.cpp
@@ -1,4 +1,4 @@
---- third_party/swiftshader/src/Reactor/Debug.cpp.orig	2020-11-13 06:42:23 UTC
+--- third_party/swiftshader/src/Reactor/Debug.cpp.orig	2021-03-13 00:03:40 UTC
 +++ third_party/swiftshader/src/Reactor/Debug.cpp
 @@ -23,16 +23,20 @@
  #	include <android/log.h>
diff --git a/www/chromium/files/patch-third__party_swiftshader_src_System_Debug.cpp b/www/chromium/files/patch-third__party_swiftshader_src_System_Debug.cpp
index 6dcdc957..44d55430 100644
--- a/www/chromium/files/patch-third__party_swiftshader_src_System_Debug.cpp
+++ b/www/chromium/files/patch-third__party_swiftshader_src_System_Debug.cpp
@@ -1,4 +1,4 @@
---- third_party/swiftshader/src/System/Debug.cpp.orig	2020-11-13 06:42:23 UTC
+--- third_party/swiftshader/src/System/Debug.cpp.orig	2021-03-13 00:03:41 UTC
 +++ third_party/swiftshader/src/System/Debug.cpp
 @@ -18,16 +18,20 @@
  #	include <android/log.h>
diff --git a/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-10.0_configs_linux_include_llvm_Config_config.h b/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-10.0_configs_linux_include_llvm_Config_config.h
index 7caee2df..6ae84f51 100644
--- a/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-10.0_configs_linux_include_llvm_Config_config.h
+++ b/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-10.0_configs_linux_include_llvm_Config_config.h
@@ -1,4 +1,4 @@
---- third_party/swiftshader/third_party/llvm-10.0/configs/linux/include/llvm/Config/config.h.orig	2020-11-13 06:42:25 UTC
+--- third_party/swiftshader/third_party/llvm-10.0/configs/linux/include/llvm/Config/config.h.orig	2021-03-13 00:03:43 UTC
 +++ third_party/swiftshader/third_party/llvm-10.0/configs/linux/include/llvm/Config/config.h
 @@ -9,17 +9,21 @@
  
diff --git a/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-subzero_build_Linux_include_llvm_Config_config.h b/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-subzero_build_Linux_include_llvm_Config_config.h
index dad47204..c5ce2315 100644
--- a/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-subzero_build_Linux_include_llvm_Config_config.h
+++ b/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-subzero_build_Linux_include_llvm_Config_config.h
@@ -1,4 +1,4 @@
---- third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h.orig	2020-11-13 06:42:27 UTC
+--- third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h.orig	2021-03-13 00:03:44 UTC
 +++ third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h
 @@ -121,7 +121,7 @@
  #define HAVE_LINK_H 1
diff --git a/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-subzero_lib_Support_Unix_Process.inc b/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-subzero_lib_Support_Unix_Process.inc
index 3c3aa933..1bc6580f 100644
--- a/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-subzero_lib_Support_Unix_Process.inc
+++ b/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-subzero_lib_Support_Unix_Process.inc
@@ -1,4 +1,4 @@
---- third_party/swiftshader/third_party/llvm-subzero/lib/Support/Unix/Process.inc.orig	2020-11-13 06:42:27 UTC
+--- third_party/swiftshader/third_party/llvm-subzero/lib/Support/Unix/Process.inc.orig	2021-03-13 00:03:44 UTC
 +++ third_party/swiftshader/third_party/llvm-subzero/lib/Support/Unix/Process.inc
 @@ -35,7 +35,7 @@
  // DragonFlyBSD, OpenBSD, and Bitrig have deprecated <malloc.h> for
diff --git a/www/chromium/files/patch-third__party_vulkan-deps_glslang_src_BUILD.gn b/www/chromium/files/patch-third__party_vulkan-deps_glslang_src_BUILD.gn
new file mode 100644
index 00000000..836a0437
--- /dev/null
+++ b/www/chromium/files/patch-third__party_vulkan-deps_glslang_src_BUILD.gn
@@ -0,0 +1,15 @@
+--- third_party/vulkan-deps/glslang/src/BUILD.gn.orig	2021-03-17 10:13:21 UTC
++++ third_party/vulkan-deps/glslang/src/BUILD.gn
+@@ -239,6 +239,12 @@ template("glslang_sources_common") {
+         "-Wno-unused-variable",
+       ]
+     }
++    if (is_bsd) {
++      cflags -= [
++        "-Wno-suggest-destructor-override",
++        "-Wno-suggest-override",
++      ]
++    }
+     if (is_win && !is_clang) {
+       cflags = [
+         "/wd4018",  # signed/unsigned mismatch
diff --git a/www/chromium/files/patch-third__party_angle_third__party_vulkan-loader_src_loader_loader.c b/www/chromium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_loader.c
similarity index 69%
rename from www/chromium/files/patch-third__party_angle_third__party_vulkan-loader_src_loader_loader.c
rename to www/chromium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_loader.c
index 55210585..5cc3b264 100644
--- a/www/chromium/files/patch-third__party_angle_third__party_vulkan-loader_src_loader_loader.c
+++ b/www/chromium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_loader.c
@@ -1,5 +1,5 @@
---- third_party/angle/third_party/vulkan-loader/src/loader/loader.c.orig	2021-01-18 21:31:55 UTC
-+++ third_party/angle/third_party/vulkan-loader/src/loader/loader.c
+--- third_party/vulkan-deps/vulkan-loader/src/loader/loader.c.orig	2021-03-13 00:03:46 UTC
++++ third_party/vulkan-deps/vulkan-loader/src/loader/loader.c
 @@ -253,7 +253,7 @@ void *loader_device_heap_realloc(const struct loader_d
  }
  
diff --git a/www/chromium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_vk__loader__platform.h b/www/chromium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_vk__loader__platform.h
new file mode 100644
index 00000000..289d9d61
--- /dev/null
+++ b/www/chromium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_vk__loader__platform.h
@@ -0,0 +1,42 @@
+--- third_party/vulkan-deps/vulkan-loader/src/loader/vk_loader_platform.h.orig	2021-03-13 00:03:46 UTC
++++ third_party/vulkan-deps/vulkan-loader/src/loader/vk_loader_platform.h
+@@ -35,7 +35,7 @@
+ #include "vulkan/vk_platform.h"
+ #include "vulkan/vk_sdk_platform.h"
+ 
+-#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__)
++#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__FreeBSD__)
+ /* Linux-specific common code: */
+ 
+ // Headers:
+@@ -52,6 +52,12 @@
+ #include <stdlib.h>
+ #include <libgen.h>
+ 
++#if defined(__FreeBSD__)
++#include <sys/types.h>
++#include <sys/user.h>
++#include <libutil.h>
++#endif
++
+ // VK Library Filenames, Paths, etc.:
+ #define PATH_SEPARATOR ':'
+ #define DIRECTORY_SYMBOL '/'
+@@ -120,6 +126,17 @@ static inline char *loader_platform_executable_path(ch
+     int ret = proc_pidpath(pid, buffer, size);
+     if (ret <= 0) return NULL;
+     buffer[ret] = '\0';
++    return buffer;
++}
++#elif defined(__FreeBSD__)
++static inline char *loader_platform_executable_path(char *buffer, size_t size) {
++    pid_t pid = getpid();
++    struct kinfo_proc *p = kinfo_getproc(pid);
++    if (p == NULL) return NULL;
++    size_t len = strnlen(p->ki_comm, size - 1);
++    memcpy(buffer, p->ki_comm, len);
++    buffer[len] = '\0';
++    free(p);
+     return buffer;
+ }
+ #elif defined(__Fuchsia__)
diff --git a/www/chromium/files/patch-third__party_angle_third__party_vulkan-validation-layers_src_layers_vk__loader__platform.h b/www/chromium/files/patch-third__party_vulkan-deps_vulkan-validation-layers_src_layers_vk__loader__platform.h
similarity index 53%
rename from www/chromium/files/patch-third__party_angle_third__party_vulkan-validation-layers_src_layers_vk__loader__platform.h
rename to www/chromium/files/patch-third__party_vulkan-deps_vulkan-validation-layers_src_layers_vk__loader__platform.h
index 745b91cb..0ae38201 100644
--- a/www/chromium/files/patch-third__party_angle_third__party_vulkan-validation-layers_src_layers_vk__loader__platform.h
+++ b/www/chromium/files/patch-third__party_vulkan-deps_vulkan-validation-layers_src_layers_vk__loader__platform.h
@@ -1,5 +1,5 @@
---- third_party/angle/third_party/vulkan-validation-layers/src/layers/vk_loader_platform.h.orig	2020-11-13 06:42:27 UTC
-+++ third_party/angle/third_party/vulkan-validation-layers/src/layers/vk_loader_platform.h
+--- third_party/vulkan-deps/vulkan-validation-layers/src/layers/vk_loader_platform.h.orig	2021-03-13 00:03:46 UTC
++++ third_party/vulkan-deps/vulkan-validation-layers/src/layers/vk_loader_platform.h
 @@ -33,7 +33,7 @@
  #undef NOMINMAX
  #include "vulkan/vk_sdk_platform.h"
diff --git a/www/chromium/files/patch-third__party_webrtc_BUILD.gn b/www/chromium/files/patch-third__party_webrtc_BUILD.gn
index 3b7bacc1..7fa68a65 100644
--- a/www/chromium/files/patch-third__party_webrtc_BUILD.gn
+++ b/www/chromium/files/patch-third__party_webrtc_BUILD.gn
@@ -1,6 +1,6 @@
---- third_party/webrtc/BUILD.gn.orig	2020-11-13 06:42:24 UTC
+--- third_party/webrtc/BUILD.gn.orig	2021-03-13 00:03:42 UTC
 +++ third_party/webrtc/BUILD.gn
-@@ -176,6 +176,9 @@ config("common_inherited_config") {
+@@ -179,6 +179,9 @@ config("common_inherited_config") {
    if (is_linux || is_chromeos) {
      defines += [ "WEBRTC_LINUX" ]
    }
diff --git a/www/chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn b/www/chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn
index 1c331b28..cebd9223 100644
--- a/www/chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn
+++ b/www/chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn
@@ -1,4 +1,4 @@
---- third_party/webrtc/modules/audio_device/BUILD.gn.orig	2020-11-13 06:42:25 UTC
+--- third_party/webrtc/modules/audio_device/BUILD.gn.orig	2021-03-13 00:03:43 UTC
 +++ third_party/webrtc/modules/audio_device/BUILD.gn
 @@ -263,7 +263,7 @@ rtc_library("audio_device_impl") {
      if (rtc_use_dummy_audio_file_devices) {
diff --git a/www/chromium/files/patch-third__party_webrtc_modules_rtp__rtcp_source_forward__error__correction.cc b/www/chromium/files/patch-third__party_webrtc_modules_rtp__rtcp_source_forward__error__correction.cc
index 10fdf22c..e52606d2 100644
--- a/www/chromium/files/patch-third__party_webrtc_modules_rtp__rtcp_source_forward__error__correction.cc
+++ b/www/chromium/files/patch-third__party_webrtc_modules_rtp__rtcp_source_forward__error__correction.cc
@@ -1,4 +1,4 @@
---- third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc.orig	2020-11-13 06:42:25 UTC
+--- third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc.orig	2021-03-13 00:03:43 UTC
 +++ third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc
 @@ -13,6 +13,7 @@
  #include <string.h>
diff --git a/www/chromium/files/patch-third__party_webrtc_rtc__base_byte__order.h b/www/chromium/files/patch-third__party_webrtc_rtc__base_byte__order.h
index 7c5d9d53..4282e90b 100644
--- a/www/chromium/files/patch-third__party_webrtc_rtc__base_byte__order.h
+++ b/www/chromium/files/patch-third__party_webrtc_rtc__base_byte__order.h
@@ -1,4 +1,4 @@
---- third_party/webrtc/rtc_base/byte_order.h.orig	2020-11-13 06:42:25 UTC
+--- third_party/webrtc/rtc_base/byte_order.h.orig	2021-03-13 00:03:44 UTC
 +++ third_party/webrtc/rtc_base/byte_order.h
 @@ -89,7 +89,7 @@
  #endif  // defined(WEBRTC_ARCH_LITTLE_ENDIAN)
diff --git a/www/chromium/files/patch-third__party_webrtc_rtc__base_ifaddrs__converter.h b/www/chromium/files/patch-third__party_webrtc_rtc__base_ifaddrs__converter.h
index d0ce5ef4..2a848cac 100644
--- a/www/chromium/files/patch-third__party_webrtc_rtc__base_ifaddrs__converter.h
+++ b/www/chromium/files/patch-third__party_webrtc_rtc__base_ifaddrs__converter.h
@@ -1,4 +1,4 @@
---- third_party/webrtc/rtc_base/ifaddrs_converter.h.orig	2020-11-13 06:42:25 UTC
+--- third_party/webrtc/rtc_base/ifaddrs_converter.h.orig	2021-03-13 00:03:44 UTC
 +++ third_party/webrtc/rtc_base/ifaddrs_converter.h
 @@ -14,6 +14,8 @@
  #if defined(WEBRTC_ANDROID)
diff --git a/www/chromium/files/patch-third__party_webrtc_rtc__base_ip__address.cc b/www/chromium/files/patch-third__party_webrtc_rtc__base_ip__address.cc
index 98e93400..66841182 100644
--- a/www/chromium/files/patch-third__party_webrtc_rtc__base_ip__address.cc
+++ b/www/chromium/files/patch-third__party_webrtc_rtc__base_ip__address.cc
@@ -1,4 +1,4 @@
---- third_party/webrtc/rtc_base/ip_address.cc.orig	2020-11-13 06:42:25 UTC
+--- third_party/webrtc/rtc_base/ip_address.cc.orig	2021-03-13 00:03:44 UTC
 +++ third_party/webrtc/rtc_base/ip_address.cc
 @@ -11,6 +11,9 @@
  #if defined(WEBRTC_POSIX)
diff --git a/www/chromium/files/patch-third__party_webrtc_rtc__base_ip__address.h b/www/chromium/files/patch-third__party_webrtc_rtc__base_ip__address.h
index c8d3d2bd..b40d54fd 100644
--- a/www/chromium/files/patch-third__party_webrtc_rtc__base_ip__address.h
+++ b/www/chromium/files/patch-third__party_webrtc_rtc__base_ip__address.h
@@ -1,4 +1,4 @@
---- third_party/webrtc/rtc_base/ip_address.h.orig	2020-11-13 06:42:25 UTC
+--- third_party/webrtc/rtc_base/ip_address.h.orig	2021-03-13 00:03:44 UTC
 +++ third_party/webrtc/rtc_base/ip_address.h
 @@ -17,6 +17,10 @@
  #include <netinet/in.h>
diff --git a/www/chromium/files/patch-third__party_webrtc_rtc__base_network.cc b/www/chromium/files/patch-third__party_webrtc_rtc__base_network.cc
index 75e6aa22..1fe722c3 100644
--- a/www/chromium/files/patch-third__party_webrtc_rtc__base_network.cc
+++ b/www/chromium/files/patch-third__party_webrtc_rtc__base_network.cc
@@ -1,4 +1,4 @@
---- third_party/webrtc/rtc_base/network.cc.orig	2020-11-13 06:42:25 UTC
+--- third_party/webrtc/rtc_base/network.cc.orig	2021-03-13 00:03:44 UTC
 +++ third_party/webrtc/rtc_base/network.cc
 @@ -244,7 +244,12 @@ AdapterType GetAdapterTypeFromName(const char* network
    }
diff --git a/www/chromium/files/patch-third__party_webrtc_rtc__base_network.h b/www/chromium/files/patch-third__party_webrtc_rtc__base_network.h
index dab74a13..2aaa816f 100644
--- a/www/chromium/files/patch-third__party_webrtc_rtc__base_network.h
+++ b/www/chromium/files/patch-third__party_webrtc_rtc__base_network.h
@@ -1,4 +1,4 @@
---- third_party/webrtc/rtc_base/network.h.orig	2020-11-13 06:42:25 UTC
+--- third_party/webrtc/rtc_base/network.h.orig	2021-03-13 00:03:44 UTC
 +++ third_party/webrtc/rtc_base/network.h
 @@ -29,6 +29,10 @@
  #include "rtc_base/third_party/sigslot/sigslot.h"
diff --git a/www/chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc b/www/chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc
index b763da8f..b829e368 100644
--- a/www/chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc
+++ b/www/chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc
@@ -1,4 +1,4 @@
---- third_party/webrtc/rtc_base/physical_socket_server.cc.orig	2020-11-13 06:42:25 UTC
+--- third_party/webrtc/rtc_base/physical_socket_server.cc.orig	2021-03-13 00:03:44 UTC
 +++ third_party/webrtc/rtc_base/physical_socket_server.cc
 @@ -50,7 +50,7 @@
  #include "rtc_base/null_socket_server.h"
@@ -36,7 +36,7 @@
      value = (value) ? IP_PMTUDISC_DO : IP_PMTUDISC_DONT;
  #endif
    } else if (opt == OPT_DSCP) {
-@@ -564,7 +564,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s
+@@ -571,7 +571,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s
        *slevel = IPPROTO_IP;
        *sopt = IP_DONTFRAGMENT;
        break;
diff --git a/www/chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.h b/www/chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.h
index 69e1eac5..f94ca255 100644
--- a/www/chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.h
+++ b/www/chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.h
@@ -1,4 +1,4 @@
---- third_party/webrtc/rtc_base/physical_socket_server.h.orig	2020-11-13 06:42:25 UTC
+--- third_party/webrtc/rtc_base/physical_socket_server.h.orig	2021-03-13 00:03:44 UTC
 +++ third_party/webrtc/rtc_base/physical_socket_server.h
 @@ -11,7 +11,7 @@
  #ifndef RTC_BASE_PHYSICAL_SOCKET_SERVER_H_
diff --git a/www/chromium/files/patch-third__party_webrtc_rtc__base_platform__thread__types.cc b/www/chromium/files/patch-third__party_webrtc_rtc__base_platform__thread__types.cc
index cefc8573..6656b26f 100644
--- a/www/chromium/files/patch-third__party_webrtc_rtc__base_platform__thread__types.cc
+++ b/www/chromium/files/patch-third__party_webrtc_rtc__base_platform__thread__types.cc
@@ -1,4 +1,4 @@
---- third_party/webrtc/rtc_base/platform_thread_types.cc.orig	2020-11-13 06:42:25 UTC
+--- third_party/webrtc/rtc_base/platform_thread_types.cc.orig	2021-03-13 00:03:44 UTC
 +++ third_party/webrtc/rtc_base/platform_thread_types.cc
 @@ -11,7 +11,11 @@
  #include "rtc_base/platform_thread_types.h"
diff --git a/www/chromium/files/patch-third__party_webrtc_rtc__base_third__party_sigslot_sigslot.h b/www/chromium/files/patch-third__party_webrtc_rtc__base_third__party_sigslot_sigslot.h
index 58076dd3..f8258770 100644
--- a/www/chromium/files/patch-third__party_webrtc_rtc__base_third__party_sigslot_sigslot.h
+++ b/www/chromium/files/patch-third__party_webrtc_rtc__base_third__party_sigslot_sigslot.h
@@ -1,4 +1,4 @@
---- third_party/webrtc/rtc_base/third_party/sigslot/sigslot.h.orig	2020-11-13 06:42:25 UTC
+--- third_party/webrtc/rtc_base/third_party/sigslot/sigslot.h.orig	2021-03-13 00:03:44 UTC
 +++ third_party/webrtc/rtc_base/third_party/sigslot/sigslot.h
 @@ -178,6 +178,8 @@ class multi_threaded_local {
  #endif  // _SIGSLOT_HAS_WIN32_THREADS
diff --git a/www/chromium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn b/www/chromium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn
index 65ab977b..322d8c0a 100644
--- a/www/chromium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn
+++ b/www/chromium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn
@@ -1,4 +1,4 @@
---- third_party/webrtc/system_wrappers/BUILD.gn.orig	2021-01-18 21:31:54 UTC
+--- third_party/webrtc/system_wrappers/BUILD.gn.orig	2021-03-13 00:03:44 UTC
 +++ third_party/webrtc/system_wrappers/BUILD.gn
 @@ -61,8 +61,6 @@ rtc_library("system_wrappers") {
      if (!build_with_chromium) {
diff --git a/www/chromium/files/patch-third__party_zlib_BUILD.gn b/www/chromium/files/patch-third__party_zlib_BUILD.gn
deleted file mode 100644
index dc9c65ad..00000000
--- a/www/chromium/files/patch-third__party_zlib_BUILD.gn
+++ /dev/null
@@ -1,11 +0,0 @@
---- third_party/zlib/BUILD.gn.orig	2020-11-09 14:36:38 UTC
-+++ third_party/zlib/BUILD.gn
-@@ -88,6 +88,8 @@ if (use_arm_neon_optimizations) {
-       defines = [ "CRC32_ARMV8_CRC32" ]
-       if (is_android) {
-         defines += [ "ARMV8_OS_ANDROID" ]
-+      } else if (is_bsd) {
-+        defines += [ "ARMV8_OS_FREEBSD" ]
-       } else if (is_linux || is_chromeos) {
-         defines += [ "ARMV8_OS_LINUX" ]
-       } else if (is_mac) {
diff --git a/www/chromium/files/patch-third__party_zlib_cpu__features.c b/www/chromium/files/patch-third__party_zlib_cpu__features.c
index ee58bb2c..f03a36aa 100644
--- a/www/chromium/files/patch-third__party_zlib_cpu__features.c
+++ b/www/chromium/files/patch-third__party_zlib_cpu__features.c
@@ -1,6 +1,5 @@
---- third_party/zlib/cpu_features.c.orig	2020-07-07 21:58:18 UTC
+--- third_party/zlib/cpu_features.c.orig	2021-03-12 23:57:47 UTC
 +++ third_party/zlib/cpu_features.c
-
 @@ -31,11 +31,20 @@ int ZLIB_INTERNAL x86_cpu_enable_simd = 0;
  
  #ifndef CPU_NO_SIMD
diff --git a/www/chromium/files/patch-tools_gn_build_gen.py b/www/chromium/files/patch-tools_gn_build_gen.py
index ba5d2971..e35e568b 100644
--- a/www/chromium/files/patch-tools_gn_build_gen.py
+++ b/www/chromium/files/patch-tools_gn_build_gen.py
@@ -1,4 +1,4 @@
---- tools/gn/build/gen.py.orig	2020-11-13 06:49:31 UTC
+--- tools/gn/build/gen.py.orig	2021-03-13 00:10:18 UTC
 +++ tools/gn/build/gen.py
 @@ -90,6 +90,9 @@ class Platform(object):
    def is_solaris(self):
diff --git a/www/chromium/files/patch-tools_gn_src_base_files_file__posix.cc b/www/chromium/files/patch-tools_gn_src_base_files_file__posix.cc
index 392b067f..634dc1b8 100644
--- a/www/chromium/files/patch-tools_gn_src_base_files_file__posix.cc
+++ b/www/chromium/files/patch-tools_gn_src_base_files_file__posix.cc
@@ -1,4 +1,4 @@
---- tools/gn/src/base/files/file_posix.cc.orig	2020-11-13 06:49:31 UTC
+--- tools/gn/src/base/files/file_posix.cc.orig	2021-03-13 00:10:18 UTC
 +++ tools/gn/src/base/files/file_posix.cc
 @@ -372,7 +372,7 @@ void File::DoInitialize(const FilePath& path, uint32_t
  bool File::Flush() {
diff --git a/www/chromium/files/patch-tools_gn_src_base_files_scoped__file.cc b/www/chromium/files/patch-tools_gn_src_base_files_scoped__file.cc
new file mode 100644
index 00000000..2be768b0
--- /dev/null
+++ b/www/chromium/files/patch-tools_gn_src_base_files_scoped__file.cc
@@ -0,0 +1,11 @@
+--- tools/gn/src/base/files/scoped_file.cc.orig	2021-03-13 00:10:18 UTC
++++ tools/gn/src/base/files/scoped_file.cc
+@@ -30,7 +30,7 @@ void ScopedFDCloseTraits::Free(int fd) {
+   // a single open directory would bypass the entire security model.
+   int ret = IGNORE_EINTR(close(fd));
+ 
+-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_FUCHSIA) || \
++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_FUCHSIA) || defined(OS_BSD) || \
+     defined(OS_ANDROID) || defined(OS_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
diff --git a/www/chromium/files/patch-tools_gn_src_gn_exec__process.cc b/www/chromium/files/patch-tools_gn_src_gn_exec__process.cc
index 92debe67..c96c2560 100644
--- a/www/chromium/files/patch-tools_gn_src_gn_exec__process.cc
+++ b/www/chromium/files/patch-tools_gn_src_gn_exec__process.cc
@@ -1,4 +1,4 @@
---- tools/gn/src/gn/exec_process.cc.orig	2020-11-13 06:49:31 UTC
+--- tools/gn/src/gn/exec_process.cc.orig	2021-03-13 00:10:18 UTC
 +++ tools/gn/src/gn/exec_process.cc
 @@ -30,6 +30,10 @@
  #include "base/posix/file_descriptor_shuffle.h"
diff --git a/www/chromium/files/patch-tools_gn_src_gn_function__write__file__unittest.cc b/www/chromium/files/patch-tools_gn_src_gn_function__write__file__unittest.cc
index 25bd1699..d025cd56 100644
--- a/www/chromium/files/patch-tools_gn_src_gn_function__write__file__unittest.cc
+++ b/www/chromium/files/patch-tools_gn_src_gn_function__write__file__unittest.cc
@@ -1,4 +1,4 @@
---- tools/gn/src/gn/function_write_file_unittest.cc.orig	2020-11-16 14:57:45 UTC
+--- tools/gn/src/gn/function_write_file_unittest.cc.orig	2021-03-13 00:10:18 UTC
 +++ tools/gn/src/gn/function_write_file_unittest.cc
 @@ -13,7 +13,7 @@
  #include "gn/test_with_scope.h"
diff --git a/www/chromium/files/patch-tools_gn_src_gn_version.h b/www/chromium/files/patch-tools_gn_src_gn_version.h
index 5a234a33..1fec9e80 100644
--- a/www/chromium/files/patch-tools_gn_src_gn_version.h
+++ b/www/chromium/files/patch-tools_gn_src_gn_version.h
@@ -1,4 +1,4 @@
---- tools/gn/src/gn/version.h.orig	2020-11-25 19:13:52 UTC
+--- tools/gn/src/gn/version.h.orig	2021-03-13 00:10:18 UTC
 +++ tools/gn/src/gn/version.h
 @@ -15,9 +15,9 @@ class Version {
  
diff --git a/www/chromium/files/patch-tools_gn_src_util_sys__info.cc b/www/chromium/files/patch-tools_gn_src_util_sys__info.cc
index 40d0a428..da288d6e 100644
--- a/www/chromium/files/patch-tools_gn_src_util_sys__info.cc
+++ b/www/chromium/files/patch-tools_gn_src_util_sys__info.cc
@@ -1,11 +1,11 @@
---- tools/gn/src/util/sys_info.cc.orig	2020-11-13 06:49:31 UTC
+--- tools/gn/src/util/sys_info.cc.orig	2021-03-13 00:10:18 UTC
 +++ tools/gn/src/util/sys_info.cc
-@@ -33,6 +33,8 @@ std::string OperatingSystemArchitecture() {
+@@ -34,6 +34,8 @@ std::string OperatingSystemArchitecture() {
      arch = "x86_64";
    } else if (arch == "amd64") {
      arch = "x86_64";
 +  } else if (arch == "arm64") {
 +    arch = "aarch64";
-   } else if (std::string(info.sysname) == "AIX") {
+   } else if (os == "AIX" || os == "OS400") {
      arch = "ppc64";
    }
diff --git a/www/chromium/files/patch-tools_json__schema__compiler_feature__compiler.py b/www/chromium/files/patch-tools_json__schema__compiler_feature__compiler.py
index 8aeae1aa..28969ac8 100644
--- a/www/chromium/files/patch-tools_json__schema__compiler_feature__compiler.py
+++ b/www/chromium/files/patch-tools_json__schema__compiler_feature__compiler.py
@@ -1,6 +1,6 @@
---- tools/json_schema_compiler/feature_compiler.py.orig	2020-11-13 06:37:04 UTC
+--- tools/json_schema_compiler/feature_compiler.py.orig	2021-03-12 23:57:47 UTC
 +++ tools/json_schema_compiler/feature_compiler.py
-@@ -243,6 +243,7 @@ FEATURE_GRAMMAR = ({
+@@ -252,6 +252,7 @@ FEATURE_GRAMMAR = ({
                  'chromeos': 'Feature::CHROMEOS_PLATFORM',
                  'lacros': 'Feature::LACROS_PLATFORM',
                  'linux': 'Feature::LINUX_PLATFORM',
diff --git a/www/chromium/files/patch-tools_json__schema__compiler_model.py b/www/chromium/files/patch-tools_json__schema__compiler_model.py
index e70fc957..ef7aa327 100644
--- a/www/chromium/files/patch-tools_json__schema__compiler_model.py
+++ b/www/chromium/files/patch-tools_json__schema__compiler_model.py
@@ -1,6 +1,6 @@
---- tools/json_schema_compiler/model.py.orig	2021-01-18 21:29:47 UTC
+--- tools/json_schema_compiler/model.py.orig	2021-03-12 23:57:47 UTC
 +++ tools/json_schema_compiler/model.py
-@@ -735,7 +735,7 @@ class Platforms(object):
+@@ -859,7 +859,7 @@ class Platforms(object):
    CHROMEOS = _PlatformInfo("chromeos")
    CHROMEOS_TOUCH = _PlatformInfo("chromeos_touch")
    LACROS = _PlatformInfo("lacros")
diff --git a/www/chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn b/www/chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn
index a1248eb9..f91b3154 100644
--- a/www/chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn
+++ b/www/chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn
@@ -1,6 +1,6 @@
---- tools/perf/chrome_telemetry_build/BUILD.gn.orig	2020-11-13 06:37:04 UTC
+--- tools/perf/chrome_telemetry_build/BUILD.gn.orig	2021-03-12 23:57:47 UTC
 +++ tools/perf/chrome_telemetry_build/BUILD.gn
-@@ -43,7 +43,7 @@ group("telemetry_chrome_test") {
+@@ -44,7 +44,7 @@ group("telemetry_chrome_test") {
      data_deps += [ "//chrome:reorder_imports" ]
    }
  
diff --git a/www/chromium/files/patch-tools_variations_fieldtrial__to__struct.py b/www/chromium/files/patch-tools_variations_fieldtrial__to__struct.py
index 674b330a..57606363 100644
--- a/www/chromium/files/patch-tools_variations_fieldtrial__to__struct.py
+++ b/www/chromium/files/patch-tools_variations_fieldtrial__to__struct.py
@@ -1,9 +1,9 @@
---- tools/variations/fieldtrial_to_struct.py.orig	2020-11-13 06:37:05 UTC
+--- tools/variations/fieldtrial_to_struct.py.orig	2021-03-12 23:57:47 UTC
 +++ tools/variations/fieldtrial_to_struct.py
-@@ -35,6 +35,7 @@ _platforms = [
-     'android_weblayer',
+@@ -36,6 +36,7 @@ _platforms = [
      'android_webview',
      'chromeos',
+     'chromeos_lacros',
 +    'freebsd',
      'fuchsia',
      'ios',
diff --git a/www/chromium/files/patch-ui_aura_test_aura__test__helper.cc b/www/chromium/files/patch-ui_aura_test_aura__test__helper.cc
index e85bd282..f98302b2 100644
--- a/www/chromium/files/patch-ui_aura_test_aura__test__helper.cc
+++ b/www/chromium/files/patch-ui_aura_test_aura__test__helper.cc
@@ -1,6 +1,6 @@
---- ui/aura/test/aura_test_helper.cc.orig	2021-01-18 21:29:48 UTC
+--- ui/aura/test/aura_test_helper.cc.orig	2021-03-12 23:57:48 UTC
 +++ ui/aura/test/aura_test_helper.cc
-@@ -29,7 +29,7 @@
+@@ -30,7 +30,7 @@
  #include "ui/wm/core/default_activation_client.h"
  #include "ui/wm/core/default_screen_position_client.h"
  
@@ -9,7 +9,7 @@
  #include "ui/platform_window/common/platform_window_defaults.h"  // nogncheck
  #endif
  
-@@ -63,7 +63,7 @@ AuraTestHelper::AuraTestHelper(ui::ContextFactory* con
+@@ -64,7 +64,7 @@ AuraTestHelper::AuraTestHelper(ui::ContextFactory* con
    DCHECK(!g_instance);
    g_instance = this;
  
diff --git a/www/chromium/files/patch-ui_aura_test_ui__controls__ozone.cc b/www/chromium/files/patch-ui_aura_test_ui__controls__ozone.cc
index a72018bd..dcd18b48 100644
--- a/www/chromium/files/patch-ui_aura_test_ui__controls__ozone.cc
+++ b/www/chromium/files/patch-ui_aura_test_ui__controls__ozone.cc
@@ -1,6 +1,6 @@
---- ui/aura/test/ui_controls_ozone.cc.orig	2020-11-16 14:58:19 UTC
+--- ui/aura/test/ui_controls_ozone.cc.orig	2021-03-12 23:57:48 UTC
 +++ ui/aura/test/ui_controls_ozone.cc
-@@ -348,7 +348,7 @@ bool UIControlsOzone::ScreenDIPToHostPixels(gfx::Point
+@@ -349,7 +349,7 @@ bool UIControlsOzone::ScreenDIPToHostPixels(gfx::Point
  // To avoid multiple definitions when use_x11 && use_ozone is true, disable this
  // factory method for OS_LINUX as Linux has a factory method that decides what
  // UIControls to use based on IsUsingOzonePlatform feature flag.
diff --git a/www/chromium/files/patch-ui_base_clipboard_clipboard__constants.cc b/www/chromium/files/patch-ui_base_clipboard_clipboard__constants.cc
index 67732307..83bde851 100644
--- a/www/chromium/files/patch-ui_base_clipboard_clipboard__constants.cc
+++ b/www/chromium/files/patch-ui_base_clipboard_clipboard__constants.cc
@@ -1,4 +1,4 @@
---- ui/base/clipboard/clipboard_constants.cc.orig	2020-11-16 14:58:44 UTC
+--- ui/base/clipboard/clipboard_constants.cc.orig	2021-03-12 23:57:48 UTC
 +++ ui/base/clipboard/clipboard_constants.cc
 @@ -16,11 +16,11 @@ const char kMimeTypeSvg[] = "image/svg+xml";
  const char kMimeTypeRTF[] = "text/rtf";
diff --git a/www/chromium/files/patch-ui_base_clipboard_clipboard__constants.h b/www/chromium/files/patch-ui_base_clipboard_clipboard__constants.h
index 870b4c7a..9da097ca 100644
--- a/www/chromium/files/patch-ui_base_clipboard_clipboard__constants.h
+++ b/www/chromium/files/patch-ui_base_clipboard_clipboard__constants.h
@@ -1,4 +1,4 @@
---- ui/base/clipboard/clipboard_constants.h.orig	2020-11-16 14:59:02 UTC
+--- ui/base/clipboard/clipboard_constants.h.orig	2021-03-12 23:57:48 UTC
 +++ ui/base/clipboard/clipboard_constants.h
 @@ -37,14 +37,14 @@ COMPONENT_EXPORT(UI_BASE_CLIPBOARD_TYPES) extern const
  COMPONENT_EXPORT(UI_BASE_CLIPBOARD_TYPES) extern const char kMimeTypePNG[];
diff --git a/www/chromium/files/patch-ui_base_clipboard_clipboard__ozone.cc b/www/chromium/files/patch-ui_base_clipboard_clipboard__ozone.cc
index 0c7d671f..a8e0ee0b 100644
--- a/www/chromium/files/patch-ui_base_clipboard_clipboard__ozone.cc
+++ b/www/chromium/files/patch-ui_base_clipboard_clipboard__ozone.cc
@@ -1,11 +1,11 @@
---- ui/base/clipboard/clipboard_ozone.cc.orig	2020-11-16 14:59:53 UTC
+--- ui/base/clipboard/clipboard_ozone.cc.orig	2021-03-12 23:57:48 UTC
 +++ ui/base/clipboard/clipboard_ozone.cc
-@@ -308,7 +308,7 @@ class ClipboardOzone::AsyncClipboardOzone {
- };
- 
- // Uses the factory in the clipboard_linux otherwise.
--#if defined(OS_CHROMEOS) || !defined(OS_LINUX)
-+#if defined(OS_CHROMEOS) || (!defined(OS_LINUX) && !defined(OS_BSD))
+@@ -305,7 +305,7 @@ class ClipboardOzone::AsyncClipboardOzone {
+ // of lacros-chrome is complete.
+ // 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))
  // Clipboard factory method.
  Clipboard* Clipboard::Create() {
  // linux-chromeos uses non-backed clipboard by default, but supports ozone x11
diff --git a/www/chromium/files/patch-ui_base_data__transfer__policy_data__transfer__endpoint.h b/www/chromium/files/patch-ui_base_data__transfer__policy_data__transfer__endpoint.h
deleted file mode 100644
index 967905ed..00000000
--- a/www/chromium/files/patch-ui_base_data__transfer__policy_data__transfer__endpoint.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- ui/base/data_transfer_policy/data_transfer_endpoint.h.orig	2021-01-19 11:52:05 UTC
-+++ ui/base/data_transfer_policy/data_transfer_endpoint.h
-@@ -17,9 +17,9 @@ namespace ui {
- enum class EndpointType {
-   kDefault = 0,  // This type shouldn't be used if any of the following types is
-                  // a better match.
--#if defined(OS_CHROMEOS) || (OS_LINUX) || (OS_FUCHSIA)
-+#if defined(OS_CHROMEOS) || (OS_LINUX) || (OS_FUCHSIA) || defined(OS_BSD)
-   kGuestOs = 1,  // Guest OS: PluginVM, Crostini.
--#endif           // defined(OS_CHROMEOS) || (OS_LINUX) || (OS_FUCHSIA)
-+#endif           // defined(OS_CHROMEOS) || (OS_LINUX) || (OS_FUCHSIA) || defined(OS_BSD)
- #if defined(OS_CHROMEOS)
-   kArc = 2,               // ARC.
- #endif                    // defined(OS_CHROMEOS)
diff --git a/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider.h b/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider.h
index 7098ceb0..41edff25 100644
--- a/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider.h
+++ b/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider.h
@@ -1,4 +1,4 @@
---- ui/base/dragdrop/os_exchange_data_provider.h.orig	2021-01-19 11:53:11 UTC
+--- ui/base/dragdrop/os_exchange_data_provider.h.orig	2021-03-12 23:57:48 UTC
 +++ ui/base/dragdrop/os_exchange_data_provider.h
 @@ -73,7 +73,7 @@ class COMPONENT_EXPORT(UI_BASE_DATA_EXCHANGE) OSExchan
    virtual bool HasFile() const = 0;
diff --git a/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__factory.cc b/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__factory.cc
index 421630c0..98527dfb 100644
--- a/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__factory.cc
+++ b/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__factory.cc
@@ -1,4 +1,4 @@
---- ui/base/dragdrop/os_exchange_data_provider_factory.cc.orig	2020-11-13 06:37:05 UTC
+--- ui/base/dragdrop/os_exchange_data_provider_factory.cc.orig	2021-03-12 23:57:48 UTC
 +++ ui/base/dragdrop/os_exchange_data_provider_factory.cc
 @@ -7,7 +7,7 @@
  #include "base/notreached.h"
diff --git a/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__non__backed.cc b/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__non__backed.cc
index dff0cf71..74ef325f 100644
--- a/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__non__backed.cc
+++ b/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__non__backed.cc
@@ -1,6 +1,6 @@
---- ui/base/dragdrop/os_exchange_data_provider_non_backed.cc.orig	2021-01-19 11:52:33 UTC
+--- ui/base/dragdrop/os_exchange_data_provider_non_backed.cc.orig	2021-03-12 23:57:48 UTC
 +++ ui/base/dragdrop/os_exchange_data_provider_non_backed.cc
-@@ -93,14 +93,14 @@ void OSExchangeDataProviderNonBacked::SetPickledData(
+@@ -100,14 +100,14 @@ void OSExchangeDataProviderNonBacked::SetPickledData(
  }
  
  bool OSExchangeDataProviderNonBacked::GetString(base::string16* data) const {
@@ -17,7 +17,7 @@
  
    if ((formats_ & OSExchangeData::STRING) == 0)
      return false;
-@@ -177,7 +177,7 @@ bool OSExchangeDataProviderNonBacked::HasCustomFormat(
+@@ -184,7 +184,7 @@ bool OSExchangeDataProviderNonBacked::HasCustomFormat(
    return base::Contains(pickle_data_, format);
  }
  
diff --git a/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__non__backed.h b/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__non__backed.h
index cbf4e873..698ea477 100644
--- a/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__non__backed.h
+++ b/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__non__backed.h
@@ -1,6 +1,6 @@
---- ui/base/dragdrop/os_exchange_data_provider_non_backed.h.orig	2021-01-19 11:52:55 UTC
+--- ui/base/dragdrop/os_exchange_data_provider_non_backed.h.orig	2021-03-12 23:57:48 UTC
 +++ ui/base/dragdrop/os_exchange_data_provider_non_backed.h
-@@ -60,7 +60,7 @@ class COMPONENT_EXPORT(UI_BASE) OSExchangeDataProvider
+@@ -61,7 +61,7 @@ class COMPONENT_EXPORT(UI_BASE) OSExchangeDataProvider
    bool HasURL(FilenameToURLPolicy policy) const override;
    bool HasFile() const override;
    bool HasCustomFormat(const ClipboardFormatType& format) const override;
diff --git a/www/chromium/files/patch-ui_base_ime_init_input__method__initializer.cc b/www/chromium/files/patch-ui_base_ime_init_input__method__initializer.cc
index 4c6a5108..6544ddec 100644
--- a/www/chromium/files/patch-ui_base_ime_init_input__method__initializer.cc
+++ b/www/chromium/files/patch-ui_base_ime_init_input__method__initializer.cc
@@ -1,38 +1,38 @@
---- ui/base/ime/init/input_method_initializer.cc.orig	2020-11-13 06:37:05 UTC
+--- ui/base/ime/init/input_method_initializer.cc.orig	2021-03-12 23:57:48 UTC
 +++ ui/base/ime/init/input_method_initializer.cc
-@@ -10,7 +10,7 @@
+@@ -11,7 +11,7 @@
  
- #if defined(OS_CHROMEOS)
+ #if BUILDFLAG(IS_CHROMEOS_ASH)
  #include "ui/base/ime/chromeos/ime_bridge.h"
--#elif defined(USE_AURA) && defined(OS_LINUX)
-+#elif defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_BSD))
+-#elif defined(USE_AURA) && (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
++#elif defined(USE_AURA) && (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD))
  #include "base/check.h"
  #include "ui/base/ime/linux/fake_input_method_context_factory.h"
  #elif defined(OS_WIN)
-@@ -20,7 +20,7 @@
+@@ -21,7 +21,7 @@
  
  namespace {
  
--#if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX)
-+#if !defined(OS_CHROMEOS) && defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_BSD))
+-#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))
  const ui::LinuxInputMethodContextFactory*
      g_linux_input_method_context_factory_for_testing;
  #endif
-@@ -48,7 +48,7 @@ void ShutdownInputMethod() {
+@@ -49,7 +49,7 @@ void ShutdownInputMethod() {
  void InitializeInputMethodForTesting() {
- #if defined(OS_CHROMEOS)
+ #if BUILDFLAG(IS_CHROMEOS_ASH)
    IMEBridge::Initialize();
--#elif defined(USE_AURA) && defined(OS_LINUX)
-+#elif defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_BSD))
+-#elif defined(USE_AURA) && (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
++#elif defined(USE_AURA) && (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD))
    if (!g_linux_input_method_context_factory_for_testing)
      g_linux_input_method_context_factory_for_testing =
          new FakeInputMethodContextFactory();
-@@ -67,7 +67,7 @@ void InitializeInputMethodForTesting() {
+@@ -68,7 +68,7 @@ void InitializeInputMethodForTesting() {
  void ShutdownInputMethodForTesting() {
- #if defined(OS_CHROMEOS)
+ #if BUILDFLAG(IS_CHROMEOS_ASH)
    IMEBridge::Shutdown();
--#elif defined(USE_AURA) && defined(OS_LINUX)
-+#elif defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_BSD))
+-#elif defined(USE_AURA) && (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
++#elif defined(USE_AURA) && (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD))
    const LinuxInputMethodContextFactory* factory =
        LinuxInputMethodContextFactory::instance();
    CHECK(!factory || factory == g_linux_input_method_context_factory_for_testing)
diff --git a/www/chromium/files/patch-ui_base_resource_resource__bundle.cc b/www/chromium/files/patch-ui_base_resource_resource__bundle.cc
index d02a959a..dd6c47b3 100644
--- a/www/chromium/files/patch-ui_base_resource_resource__bundle.cc
+++ b/www/chromium/files/patch-ui_base_resource_resource__bundle.cc
@@ -1,6 +1,6 @@
---- ui/base/resource/resource_bundle.cc.orig	2021-01-18 21:29:48 UTC
+--- ui/base/resource/resource_bundle.cc.orig	2021-03-12 23:57:48 UTC
 +++ ui/base/resource/resource_bundle.cc
-@@ -851,7 +851,7 @@ void ResourceBundle::ReloadFonts() {
+@@ -821,7 +821,7 @@ void ResourceBundle::ReloadFonts() {
  }
  
  ScaleFactor ResourceBundle::GetMaxScaleFactor() const {
@@ -9,7 +9,7 @@
    return max_scale_factor_;
  #else
    return GetSupportedScaleFactors().back();
-@@ -904,7 +904,7 @@ void ResourceBundle::InitSharedInstance(Delegate* dele
+@@ -874,7 +874,7 @@ void ResourceBundle::InitSharedInstance(Delegate* dele
    // On platforms other than iOS, 100P is always a supported scale factor.
    // For Windows we have a separate case in this function.
    supported_scale_factors.push_back(SCALE_FACTOR_100P);
diff --git a/www/chromium/files/patch-ui_base_resource_resource__bundle__freebsd.cc b/www/chromium/files/patch-ui_base_resource_resource__bundle__freebsd.cc
index e84aac94..01bf3316 100644
--- a/www/chromium/files/patch-ui_base_resource_resource__bundle__freebsd.cc
+++ b/www/chromium/files/patch-ui_base_resource_resource__bundle__freebsd.cc
@@ -1,4 +1,4 @@
---- ui/base/resource/resource_bundle_freebsd.cc.orig	2020-11-16 10:08:53 UTC
+--- ui/base/resource/resource_bundle_freebsd.cc.orig	2021-03-15 11:01:24 UTC
 +++ ui/base/resource/resource_bundle_freebsd.cc
 @@ -0,0 +1,21 @@
 +// Copyright 2017 The Chromium Authors. All rights reserved.
diff --git a/www/chromium/files/patch-ui_base_test_skia__gold__pixel__diff.cc b/www/chromium/files/patch-ui_base_test_skia__gold__pixel__diff.cc
index 120b31e9..faeb7e6b 100644
--- a/www/chromium/files/patch-ui_base_test_skia__gold__pixel__diff.cc
+++ b/www/chromium/files/patch-ui_base_test_skia__gold__pixel__diff.cc
@@ -1,11 +1,11 @@
---- ui/base/test/skia_gold_pixel_diff.cc.orig	2021-01-18 21:29:48 UTC
+--- ui/base/test/skia_gold_pixel_diff.cc.orig	2021-03-12 23:57:48 UTC
 +++ ui/base/test/skia_gold_pixel_diff.cc
-@@ -165,7 +165,7 @@ std::string SkiaGoldPixelDiff::GetPlatform() {
-   return "windows";
- #elif defined(OS_APPLE)
+@@ -168,7 +168,7 @@ std::string SkiaGoldPixelDiff::GetPlatform() {
    return "macOS";
--#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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)
    return "linux";
  #endif
  }
diff --git a/www/chromium/files/patch-ui_base_ui__base__features.cc b/www/chromium/files/patch-ui_base_ui__base__features.cc
index 56e29936..aba7495b 100644
--- a/www/chromium/files/patch-ui_base_ui__base__features.cc
+++ b/www/chromium/files/patch-ui_base_ui__base__features.cc
@@ -1,15 +1,15 @@
---- ui/base/ui_base_features.cc.orig	2021-01-18 21:29:48 UTC
+--- ui/base/ui_base_features.cc.orig	2021-03-12 23:57:48 UTC
 +++ ui/base/ui_base_features.cc
-@@ -109,7 +109,7 @@ const base::Feature kCompositorThreadedScrollbarScroll
- const base::Feature kExperimentalFlingAnimation {
+@@ -115,7 +115,7 @@ const base::Feature kExperimentalFlingAnimation {
    "ExperimentalFlingAnimation",
- #if defined(OS_WIN) || \
--    (defined(OS_LINUX) && !defined(OS_CHROMEOS) && !BUILDFLAG(IS_LACROS))
-+    (defined(OS_LINUX) && !defined(OS_CHROMEOS) && !BUILDFLAG(IS_LACROS)) || defined(OS_BSD)
+ // 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_ASH) && \
++#if defined(OS_WIN) || defined(OS_BSD) || (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_ASH) && \
+                         !BUILDFLAG(IS_CHROMEOS_LACROS))
        base::FEATURE_ENABLED_BY_DEFAULT
  #else
-       base::FEATURE_DISABLED_BY_DEFAULT
-@@ -141,7 +141,7 @@ const base::Feature kPrecisionTouchpadLogging{
+@@ -148,7 +148,7 @@ const base::Feature kPrecisionTouchpadLogging{
      "PrecisionTouchpadLogging", base::FEATURE_DISABLED_BY_DEFAULT};
  #endif  // defined(OS_WIN)
  
@@ -18,7 +18,7 @@
      defined(OS_CHROMEOS)
  // Enables stylus appearing as touch when in contact with digitizer.
  const base::Feature kDirectManipulationStylus = {
-@@ -152,7 +152,7 @@ const base::Feature kDirectManipulationStylus = {
+@@ -159,7 +159,7 @@ const base::Feature kDirectManipulationStylus = {
      base::FEATURE_DISABLED_BY_DEFAULT
  #endif
  };
@@ -27,7 +27,16 @@
          // defined(OS_CHROMEOS)
  
  // Enables forced colors mode for web content.
-@@ -198,7 +198,7 @@ bool IsCSSColorSchemeUARenderingEnabled() {
+@@ -193,7 +193,7 @@ bool IsEyeDropperEnabled() {
+ // crbug.com/1086530 for the Desktop launch bug.
+ const base::Feature kCSSColorSchemeUARendering = {
+     "CSSColorSchemeUARendering",
+-#if defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_LINUX) || \
++#if defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) || \
+     defined(OS_APPLE)
+                                             base::FEATURE_ENABLED_BY_DEFAULT
+ #else
+@@ -212,7 +212,7 @@ bool IsCSSColorSchemeUARenderingEnabled() {
  // crbug.com/1012106 for the Windows launch bug, and crbug.com/1012108 for the
  // Mac launch bug.
  const base::Feature kFormControlsRefresh = {"FormControlsRefresh",
diff --git a/www/chromium/files/patch-ui_base_ui__base__features.h b/www/chromium/files/patch-ui_base_ui__base__features.h
index 3a96ac62..1708dbde 100644
--- a/www/chromium/files/patch-ui_base_ui__base__features.h
+++ b/www/chromium/files/patch-ui_base_ui__base__features.h
@@ -1,6 +1,6 @@
---- ui/base/ui_base_features.h.orig	2021-01-18 21:29:48 UTC
+--- ui/base/ui_base_features.h.orig	2021-03-12 23:57:48 UTC
 +++ ui/base/ui_base_features.h
-@@ -62,11 +62,11 @@ COMPONENT_EXPORT(UI_BASE_FEATURES) extern const base::
+@@ -63,11 +63,11 @@ COMPONENT_EXPORT(UI_BASE_FEATURES) extern const base::
  COMPONENT_EXPORT(UI_BASE_FEATURES) bool IsUsingWMPointerForTouch();
  #endif  // defined(OS_WIN)
  
diff --git a/www/chromium/files/patch-ui_base_webui_web__ui__util.cc b/www/chromium/files/patch-ui_base_webui_web__ui__util.cc
index 9a4f3d2d..26bbeb74 100644
--- a/www/chromium/files/patch-ui_base_webui_web__ui__util.cc
+++ b/www/chromium/files/patch-ui_base_webui_web__ui__util.cc
@@ -1,11 +1,11 @@
---- ui/base/webui/web_ui_util.cc.orig	2021-01-18 21:29:48 UTC
+--- ui/base/webui/web_ui_util.cc.orig	2021-03-12 23:57:48 UTC
 +++ ui/base/webui/web_ui_util.cc
-@@ -221,7 +221,7 @@ void AppendWebUiCssTextDefaults(std::string* html) {
- std::string GetFontFamily() {
-   std::string font_family = l10n_util::GetStringUTF8(IDS_WEB_FONT_FAMILY);
+@@ -224,7 +224,7 @@ std::string GetFontFamily() {
  
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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)
    std::string font_name = ui::ResourceBundle::GetSharedInstance()
                                .GetFont(ui::ResourceBundle::BaseFont)
                                .GetFontName();
diff --git a/www/chromium/files/patch-ui_base_x_x11__shm__image__pool.cc b/www/chromium/files/patch-ui_base_x_x11__shm__image__pool.cc
index ea581383..8537b375 100644
--- a/www/chromium/files/patch-ui_base_x_x11__shm__image__pool.cc
+++ b/www/chromium/files/patch-ui_base_x_x11__shm__image__pool.cc
@@ -1,4 +1,4 @@
---- ui/base/x/x11_shm_image_pool.cc.orig	2020-11-13 06:37:05 UTC
+--- ui/base/x/x11_shm_image_pool.cc.orig	2021-03-12 23:57:48 UTC
 +++ ui/base/x/x11_shm_image_pool.cc
 @@ -16,6 +16,7 @@
  #include "base/environment.h"
@@ -7,8 +7,8 @@
 +#include "base/system/sys_info.h"
  #include "base/threading/thread_task_runner_handle.h"
  #include "build/build_config.h"
- #include "net/base/url_util.h"
-@@ -45,10 +46,14 @@ constexpr float kShmResizeShrinkThreshold =
+ #include "build/chromeos_buildflags.h"
+@@ -46,10 +47,14 @@ constexpr float kShmResizeShrinkThreshold =
      1.0f / (kShmResizeThreshold * kShmResizeThreshold);
  
  std::size_t MaxShmSegmentSizeImpl() {
diff --git a/www/chromium/files/patch-ui_compositor_compositor.cc b/www/chromium/files/patch-ui_compositor_compositor.cc
index 9b393d78..9d5b758e 100644
--- a/www/chromium/files/patch-ui_compositor_compositor.cc
+++ b/www/chromium/files/patch-ui_compositor_compositor.cc
@@ -1,11 +1,11 @@
---- ui/compositor/compositor.cc.orig	2021-01-18 21:29:48 UTC
+--- ui/compositor/compositor.cc.orig	2021-03-12 23:57:48 UTC
 +++ ui/compositor/compositor.cc
-@@ -732,7 +732,7 @@ void Compositor::CancelThroughtputTracker(TrackerId tr
-   throughput_tracker_map_.erase(tracker_id);
- }
+@@ -750,7 +750,7 @@ void Compositor::CancelThroughtputTracker(TrackerId tr
  
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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)
  void Compositor::OnCompleteSwapWithNewSize(const gfx::Size& size) {
    for (auto& observer : observer_list_)
      observer.OnCompositingCompleteSwapWithNewSize(this, size);
diff --git a/www/chromium/files/patch-ui_compositor_compositor.h b/www/chromium/files/patch-ui_compositor_compositor.h
index f6d8f5dd..880e568e 100644
--- a/www/chromium/files/patch-ui_compositor_compositor.h
+++ b/www/chromium/files/patch-ui_compositor_compositor.h
@@ -1,11 +1,11 @@
---- ui/compositor/compositor.h.orig	2020-11-13 06:37:05 UTC
+--- ui/compositor/compositor.h.orig	2021-03-12 23:57:48 UTC
 +++ ui/compositor/compositor.h
-@@ -366,7 +366,7 @@ class COMPOSITOR_EXPORT Compositor : public cc::LayerT
-   void StopThroughtputTracker(TrackerId tracker_id) override;
-   void CancelThroughtputTracker(TrackerId tracker_id) override;
+@@ -370,7 +370,7 @@ class COMPOSITOR_EXPORT Compositor : public cc::LayerT
  
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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)
    void OnCompleteSwapWithNewSize(const gfx::Size& size);
  #endif
  
diff --git a/www/chromium/files/patch-ui_compositor_compositor__observer.h b/www/chromium/files/patch-ui_compositor_compositor__observer.h
index 7df38637..01955597 100644
--- a/www/chromium/files/patch-ui_compositor_compositor__observer.h
+++ b/www/chromium/files/patch-ui_compositor_compositor__observer.h
@@ -1,11 +1,11 @@
---- ui/compositor/compositor_observer.h.orig	2021-01-18 21:29:48 UTC
+--- ui/compositor/compositor_observer.h.orig	2021-03-12 23:57:48 UTC
 +++ ui/compositor/compositor_observer.h
-@@ -43,11 +43,11 @@ class COMPOSITOR_EXPORT CompositorObserver {
-   // Called when a child of the compositor is resizing.
-   virtual void OnCompositingChildResizing(Compositor* compositor) {}
+@@ -46,11 +46,11 @@ class COMPOSITOR_EXPORT CompositorObserver {
  
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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)
    // Called when a swap with new size is completed.
    virtual void OnCompositingCompleteSwapWithNewSize(ui::Compositor* compositor,
                                                      const gfx::Size& size) {}
diff --git a/www/chromium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc b/www/chromium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc
index 492057ba..0cb55f7b 100644
--- a/www/chromium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc
+++ b/www/chromium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc
@@ -1,6 +1,6 @@
---- ui/events/devices/x11/device_data_manager_x11.cc.orig	2021-01-18 21:29:48 UTC
+--- ui/events/devices/x11/device_data_manager_x11.cc.orig	2021-03-12 23:57:48 UTC
 +++ ui/events/devices/x11/device_data_manager_x11.cc
-@@ -840,6 +840,9 @@ void DeviceDataManagerX11::SetDisabledKeyboardAllowedK
+@@ -841,6 +841,9 @@ void DeviceDataManagerX11::SetDisabledKeyboardAllowedK
  }
  
  void DeviceDataManagerX11::DisableDevice(x11::Input::DeviceId deviceid) {
@@ -10,7 +10,7 @@
    blocked_devices_.set(static_cast<uint32_t>(deviceid), true);
    // TODO(rsadam@): Support blocking touchscreen devices.
    std::vector<InputDevice> keyboards = GetKeyboardDevices();
-@@ -849,6 +852,7 @@ void DeviceDataManagerX11::DisableDevice(x11::Input::D
+@@ -850,6 +853,7 @@ void DeviceDataManagerX11::DisableDevice(x11::Input::D
      keyboards.erase(it);
      DeviceDataManager::OnKeyboardDevicesUpdated(keyboards);
    }
diff --git a/www/chromium/files/patch-ui_events_event.cc b/www/chromium/files/patch-ui_events_event.cc
index 3407212e..b93f1007 100644
--- a/www/chromium/files/patch-ui_events_event.cc
+++ b/www/chromium/files/patch-ui_events_event.cc
@@ -1,6 +1,6 @@
---- ui/events/event.cc.orig	2020-11-16 15:03:40 UTC
+--- ui/events/event.cc.orig	2021-03-12 23:57:48 UTC
 +++ ui/events/event.cc
-@@ -469,7 +469,7 @@ std::string LocatedEvent::ToString() const {
+@@ -451,7 +451,7 @@ std::string LocatedEvent::ToString() const {
  MouseEvent::MouseEvent(const PlatformEvent& native_event)
      : LocatedEvent(native_event),
        changed_button_flags_(GetChangedMouseButtonFlagsFromNative(native_event)),
diff --git a/www/chromium/files/patch-ui_events_event__switches.cc b/www/chromium/files/patch-ui_events_event__switches.cc
index 4e3c41a3..f04ab403 100644
--- a/www/chromium/files/patch-ui_events_event__switches.cc
+++ b/www/chromium/files/patch-ui_events_event__switches.cc
@@ -1,4 +1,4 @@
---- ui/events/event_switches.cc.orig	2020-11-13 06:37:05 UTC
+--- ui/events/event_switches.cc.orig	2021-03-12 23:57:48 UTC
 +++ ui/events/event_switches.cc
 @@ -14,7 +14,7 @@ namespace switches {
  const char kCompensateForUnstablePinchZoom[] =
diff --git a/www/chromium/files/patch-ui_events_event__switches.h b/www/chromium/files/patch-ui_events_event__switches.h
index 0c7395ff..6abe6e1d 100644
--- a/www/chromium/files/patch-ui_events_event__switches.h
+++ b/www/chromium/files/patch-ui_events_event__switches.h
@@ -1,4 +1,4 @@
---- ui/events/event_switches.h.orig	2020-11-13 06:37:05 UTC
+--- ui/events/event_switches.h.orig	2021-03-12 23:57:48 UTC
 +++ ui/events/event_switches.h
 @@ -13,7 +13,7 @@ namespace switches {
  
diff --git a/www/chromium/files/patch-ui_events_keycodes_dom_keycode__converter.cc b/www/chromium/files/patch-ui_events_keycodes_dom_keycode__converter.cc
index f4ecb14b..11a5278a 100644
--- a/www/chromium/files/patch-ui_events_keycodes_dom_keycode__converter.cc
+++ b/www/chromium/files/patch-ui_events_keycodes_dom_keycode__converter.cc
@@ -1,4 +1,4 @@
---- ui/events/keycodes/dom/keycode_converter.cc.orig	2021-01-18 21:29:48 UTC
+--- ui/events/keycodes/dom/keycode_converter.cc.orig	2021-03-12 23:57:48 UTC
 +++ ui/events/keycodes/dom/keycode_converter.cc
 @@ -24,7 +24,7 @@ namespace {
  #if defined(OS_WIN)
diff --git a/www/chromium/files/patch-ui_events_ozone_keyboard__hook__ozone.cc b/www/chromium/files/patch-ui_events_ozone_keyboard__hook__ozone.cc
index 234080e7..ba2b42a2 100644
--- a/www/chromium/files/patch-ui_events_ozone_keyboard__hook__ozone.cc
+++ b/www/chromium/files/patch-ui_events_ozone_keyboard__hook__ozone.cc
@@ -1,4 +1,4 @@
---- ui/events/ozone/keyboard_hook_ozone.cc.orig	2020-11-16 15:03:56 UTC
+--- ui/events/ozone/keyboard_hook_ozone.cc.orig	2021-03-12 23:57:48 UTC
 +++ ui/events/ozone/keyboard_hook_ozone.cc
 @@ -29,7 +29,7 @@ bool KeyboardHookOzone::RegisterHook() {
    return true;
diff --git a/www/chromium/files/patch-ui_gfx_BUILD.gn b/www/chromium/files/patch-ui_gfx_BUILD.gn
index 622b171d..32ac99c1 100644
--- a/www/chromium/files/patch-ui_gfx_BUILD.gn
+++ b/www/chromium/files/patch-ui_gfx_BUILD.gn
@@ -1,6 +1,6 @@
---- ui/gfx/BUILD.gn.orig	2021-01-18 21:29:48 UTC
+--- ui/gfx/BUILD.gn.orig	2021-03-12 23:57:48 UTC
 +++ ui/gfx/BUILD.gn
-@@ -580,7 +580,7 @@ source_set("memory_buffer_sources") {
+@@ -590,7 +590,7 @@ source_set("memory_buffer_sources") {
      deps += [ "//build/config/linux/libdrm" ]
    }
  
diff --git a/www/chromium/files/patch-ui_gfx_canvas__skia.cc b/www/chromium/files/patch-ui_gfx_canvas__skia.cc
index 5dfabd90..90d81e36 100644
--- a/www/chromium/files/patch-ui_gfx_canvas__skia.cc
+++ b/www/chromium/files/patch-ui_gfx_canvas__skia.cc
@@ -1,6 +1,6 @@
---- ui/gfx/canvas_skia.cc.orig	2020-11-13 06:37:06 UTC
+--- ui/gfx/canvas_skia.cc.orig	2021-03-12 23:57:48 UTC
 +++ ui/gfx/canvas_skia.cc
-@@ -206,7 +206,7 @@ void Canvas::DrawStringRectWithFlags(const base::strin
+@@ -209,7 +209,7 @@ void Canvas::DrawStringRectWithFlags(const base::strin
      Range range = StripAcceleratorChars(flags, &adjusted_text);
      bool elide_text = ((flags & NO_ELLIPSIS) == 0);
  
diff --git a/www/chromium/files/patch-ui_gfx_codec_jpeg__codec.cc b/www/chromium/files/patch-ui_gfx_codec_jpeg__codec.cc
index 803d7a90..1a52a8b4 100644
--- a/www/chromium/files/patch-ui_gfx_codec_jpeg__codec.cc
+++ b/www/chromium/files/patch-ui_gfx_codec_jpeg__codec.cc
@@ -1,4 +1,4 @@
---- ui/gfx/codec/jpeg_codec.cc.orig	2020-11-13 06:37:06 UTC
+--- ui/gfx/codec/jpeg_codec.cc.orig	2021-03-12 23:57:48 UTC
 +++ ui/gfx/codec/jpeg_codec.cc
 @@ -208,6 +208,7 @@ bool JPEGCodec::Decode(const unsigned char* input, siz
      case JCS_GRAYSCALE:
diff --git a/www/chromium/files/patch-ui_gfx_font__fallback__linux.cc b/www/chromium/files/patch-ui_gfx_font__fallback__linux.cc
index d618b26e..9e110611 100644
--- a/www/chromium/files/patch-ui_gfx_font__fallback__linux.cc
+++ b/www/chromium/files/patch-ui_gfx_font__fallback__linux.cc
@@ -1,4 +1,4 @@
---- ui/gfx/font_fallback_linux.cc.orig	2020-11-13 06:37:06 UTC
+--- ui/gfx/font_fallback_linux.cc.orig	2021-03-12 23:57:48 UTC
 +++ ui/gfx/font_fallback_linux.cc
 @@ -24,6 +24,10 @@
  #include "ui/gfx/linux/fontconfig_util.h"
diff --git a/www/chromium/files/patch-ui_gfx_font__list.cc b/www/chromium/files/patch-ui_gfx_font__list.cc
index 64348418..d27e5c27 100644
--- a/www/chromium/files/patch-ui_gfx_font__list.cc
+++ b/www/chromium/files/patch-ui_gfx_font__list.cc
@@ -1,4 +1,4 @@
---- ui/gfx/font_list.cc.orig	2020-11-13 06:37:06 UTC
+--- ui/gfx/font_list.cc.orig	2021-03-12 23:57:48 UTC
 +++ ui/gfx/font_list.cc
 @@ -24,7 +24,7 @@ base::LazyInstance<scoped_refptr<gfx::FontListImpl>>::
  bool g_default_impl_initialized = false;
diff --git a/www/chromium/files/patch-ui_gfx_font__names__testing.cc b/www/chromium/files/patch-ui_gfx_font__names__testing.cc
index c639ea9a..77e9d12a 100644
--- a/www/chromium/files/patch-ui_gfx_font__names__testing.cc
+++ b/www/chromium/files/patch-ui_gfx_font__names__testing.cc
@@ -1,4 +1,4 @@
---- ui/gfx/font_names_testing.cc.orig	2020-11-13 06:37:06 UTC
+--- ui/gfx/font_names_testing.cc.orig	2021-03-12 23:57:48 UTC
 +++ ui/gfx/font_names_testing.cc
 @@ -22,7 +22,7 @@ Note that we have to support the full range from Jelly
  dessert.
diff --git a/www/chromium/files/patch-ui_gfx_font__render__params.h b/www/chromium/files/patch-ui_gfx_font__render__params.h
index 53b5921b..856da0e9 100644
--- a/www/chromium/files/patch-ui_gfx_font__render__params.h
+++ b/www/chromium/files/patch-ui_gfx_font__render__params.h
@@ -1,4 +1,4 @@
---- ui/gfx/font_render_params.h.orig	2021-01-18 21:29:48 UTC
+--- ui/gfx/font_render_params.h.orig	2021-03-12 23:57:48 UTC
 +++ ui/gfx/font_render_params.h
 @@ -109,7 +109,7 @@ GFX_EXPORT FontRenderParams GetFontRenderParams(
      const FontRenderParamsQuery& query,
diff --git a/www/chromium/files/patch-ui_gfx_font__util.cc b/www/chromium/files/patch-ui_gfx_font__util.cc
index d22174b2..1b0853b8 100644
--- a/www/chromium/files/patch-ui_gfx_font__util.cc
+++ b/www/chromium/files/patch-ui_gfx_font__util.cc
@@ -1,4 +1,4 @@
---- ui/gfx/font_util.cc.orig	2020-11-13 06:37:06 UTC
+--- ui/gfx/font_util.cc.orig	2021-03-12 23:57:48 UTC
 +++ ui/gfx/font_util.cc
 @@ -6,7 +6,7 @@
  
diff --git a/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.cc b/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.cc
index 9d01aa71..c9e4b102 100644
--- a/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.cc
+++ b/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.cc
@@ -1,4 +1,4 @@
---- ui/gfx/gpu_memory_buffer.cc.orig	2021-01-18 21:29:48 UTC
+--- ui/gfx/gpu_memory_buffer.cc.orig	2021-03-12 23:57:48 UTC
 +++ ui/gfx/gpu_memory_buffer.cc
 @@ -34,7 +34,7 @@ GpuMemoryBufferHandle GpuMemoryBufferHandle::Clone() c
    handle.region = region.Duplicate();
diff --git a/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.h b/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.h
index 0c2c2eac..0b4ab808 100644
--- a/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.h
+++ b/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.h
@@ -1,15 +1,15 @@
---- ui/gfx/gpu_memory_buffer.h.orig	2021-01-18 21:29:48 UTC
+--- ui/gfx/gpu_memory_buffer.h.orig	2021-03-12 23:57:48 UTC
 +++ ui/gfx/gpu_memory_buffer.h
-@@ -15,7 +15,7 @@
- #include "ui/gfx/geometry/rect.h"
+@@ -16,7 +16,7 @@
  #include "ui/gfx/gfx_export.h"
+ #include "ui/gfx/hdr_metadata.h"
  
 -#if defined(USE_OZONE) || defined(OS_LINUX) || defined(OS_CHROMEOS)
 +#if defined(USE_OZONE) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
  #include "ui/gfx/native_pixmap_handle.h"
  #elif defined(OS_MAC)
  #include "ui/gfx/mac/io_surface.h"
-@@ -69,7 +69,7 @@ struct GFX_EXPORT GpuMemoryBufferHandle {
+@@ -70,7 +70,7 @@ struct GFX_EXPORT GpuMemoryBufferHandle {
    base::UnsafeSharedMemoryRegion region;
    uint32_t offset = 0;
    int32_t stride = 0;
@@ -17,4 +17,4 @@
 +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_FUCHSIA) || defined(OS_BSD)
    NativePixmapHandle native_pixmap_handle;
  #elif defined(OS_MAC)
-   gfx::ScopedIOSurface io_surface;
+   ScopedIOSurface io_surface;
diff --git a/www/chromium/files/patch-ui_gfx_ipc_gfx__param__traits__macros.h b/www/chromium/files/patch-ui_gfx_ipc_gfx__param__traits__macros.h
index e6a5849c..d1d61c28 100644
--- a/www/chromium/files/patch-ui_gfx_ipc_gfx__param__traits__macros.h
+++ b/www/chromium/files/patch-ui_gfx_ipc_gfx__param__traits__macros.h
@@ -1,4 +1,4 @@
---- ui/gfx/ipc/gfx_param_traits_macros.h.orig	2021-01-18 21:29:48 UTC
+--- ui/gfx/ipc/gfx_param_traits_macros.h.orig	2021-03-12 23:57:48 UTC
 +++ ui/gfx/ipc/gfx_param_traits_macros.h
 @@ -18,7 +18,7 @@
  #include "ui/gfx/selection_bound.h"
diff --git a/www/chromium/files/patch-ui_gfx_linux_client__native__pixmap__dmabuf.cc b/www/chromium/files/patch-ui_gfx_linux_client__native__pixmap__dmabuf.cc
index 0599e914..b9971492 100644
--- a/www/chromium/files/patch-ui_gfx_linux_client__native__pixmap__dmabuf.cc
+++ b/www/chromium/files/patch-ui_gfx_linux_client__native__pixmap__dmabuf.cc
@@ -1,4 +1,4 @@
---- ui/gfx/linux/client_native_pixmap_dmabuf.cc.orig	2020-11-13 06:37:06 UTC
+--- ui/gfx/linux/client_native_pixmap_dmabuf.cc.orig	2021-03-12 23:57:48 UTC
 +++ ui/gfx/linux/client_native_pixmap_dmabuf.cc
 @@ -5,7 +5,9 @@
  #include "ui/gfx/linux/client_native_pixmap_dmabuf.h"
@@ -10,7 +10,7 @@
  #include <stddef.h>
  #include <sys/ioctl.h>
  #include <sys/mman.h>
-@@ -27,11 +29,7 @@
+@@ -28,11 +30,7 @@
  #include "ui/gfx/buffer_format_util.h"
  #include "ui/gfx/switches.h"
  
diff --git a/www/chromium/files/patch-ui_gfx_mojom_buffer__types__mojom__traits.cc b/www/chromium/files/patch-ui_gfx_mojom_buffer__types__mojom__traits.cc
index 813b759c..8a1ccf1b 100644
--- a/www/chromium/files/patch-ui_gfx_mojom_buffer__types__mojom__traits.cc
+++ b/www/chromium/files/patch-ui_gfx_mojom_buffer__types__mojom__traits.cc
@@ -1,4 +1,4 @@
---- ui/gfx/mojom/buffer_types_mojom_traits.cc.orig	2021-01-18 21:29:48 UTC
+--- ui/gfx/mojom/buffer_types_mojom_traits.cc.orig	2021-03-12 23:57:48 UTC
 +++ ui/gfx/mojom/buffer_types_mojom_traits.cc
 @@ -33,7 +33,7 @@ gfx::mojom::GpuMemoryBufferPlatformHandlePtr StructTra
        return gfx::mojom::GpuMemoryBufferPlatformHandle::NewSharedMemoryHandle(
diff --git a/www/chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.cc b/www/chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.cc
index e836fc73..1bee7c45 100644
--- a/www/chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.cc
+++ b/www/chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.cc
@@ -1,4 +1,4 @@
---- ui/gfx/mojom/native_handle_types_mojom_traits.cc.orig	2020-11-13 06:37:06 UTC
+--- ui/gfx/mojom/native_handle_types_mojom_traits.cc.orig	2021-03-12 23:57:48 UTC
 +++ ui/gfx/mojom/native_handle_types_mojom_traits.cc
 @@ -8,15 +8,15 @@
  
diff --git a/www/chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.h b/www/chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.h
index 53f92778..4ff5863e 100644
--- a/www/chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.h
+++ b/www/chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.h
@@ -1,4 +1,4 @@
---- ui/gfx/mojom/native_handle_types_mojom_traits.h.orig	2020-11-13 06:37:06 UTC
+--- ui/gfx/mojom/native_handle_types_mojom_traits.h.orig	2021-03-12 23:57:48 UTC
 +++ ui/gfx/mojom/native_handle_types_mojom_traits.h
 @@ -14,13 +14,13 @@
  #include "mojo/public/cpp/system/platform_handle.h"
diff --git a/www/chromium/files/patch-ui_gfx_native__pixmap__handle.cc b/www/chromium/files/patch-ui_gfx_native__pixmap__handle.cc
index a53271d2..b559fa74 100644
--- a/www/chromium/files/patch-ui_gfx_native__pixmap__handle.cc
+++ b/www/chromium/files/patch-ui_gfx_native__pixmap__handle.cc
@@ -1,4 +1,4 @@
---- ui/gfx/native_pixmap_handle.cc.orig	2020-11-13 06:37:06 UTC
+--- ui/gfx/native_pixmap_handle.cc.orig	2021-03-12 23:57:48 UTC
 +++ ui/gfx/native_pixmap_handle.cc
 @@ -9,11 +9,15 @@
  #include "base/logging.h"
diff --git a/www/chromium/files/patch-ui_gfx_native__pixmap__handle.h b/www/chromium/files/patch-ui_gfx_native__pixmap__handle.h
index ccdaf57e..8886abec 100644
--- a/www/chromium/files/patch-ui_gfx_native__pixmap__handle.h
+++ b/www/chromium/files/patch-ui_gfx_native__pixmap__handle.h
@@ -1,4 +1,4 @@
---- ui/gfx/native_pixmap_handle.h.orig	2020-11-13 06:37:06 UTC
+--- ui/gfx/native_pixmap_handle.h.orig	2021-03-12 23:57:48 UTC
 +++ ui/gfx/native_pixmap_handle.h
 @@ -15,7 +15,7 @@
  #include "build/build_config.h"
diff --git a/www/chromium/files/patch-ui_gfx_native__widget__types.h b/www/chromium/files/patch-ui_gfx_native__widget__types.h
index 3db00354..821d58cc 100644
--- a/www/chromium/files/patch-ui_gfx_native__widget__types.h
+++ b/www/chromium/files/patch-ui_gfx_native__widget__types.h
@@ -1,20 +1,20 @@
---- ui/gfx/native_widget_types.h.orig	2020-11-13 06:37:06 UTC
+--- ui/gfx/native_widget_types.h.orig	2021-03-12 23:57:48 UTC
 +++ ui/gfx/native_widget_types.h
-@@ -103,7 +103,7 @@ class ViewAndroid;
- #endif
- class SkBitmap;
+@@ -106,7 +106,7 @@ class SkBitmap;
  
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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)
  extern "C" {
  struct _AtkObject;
  typedef struct _AtkObject AtkObject;
-@@ -204,7 +204,7 @@ typedef id NativeViewAccessible;
- #elif defined(OS_MAC)
- typedef NSFont* NativeFont;
+@@ -209,7 +209,7 @@ typedef NSFont* NativeFont;
  typedef id NativeViewAccessible;
--#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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)
  // Linux doesn't have a native font type.
  typedef AtkObject* NativeViewAccessible;
  #else
diff --git a/www/chromium/files/patch-ui_gfx_render__text.cc b/www/chromium/files/patch-ui_gfx_render__text.cc
index 7d072e40..b9a144fb 100644
--- a/www/chromium/files/patch-ui_gfx_render__text.cc
+++ b/www/chromium/files/patch-ui_gfx_render__text.cc
@@ -1,6 +1,6 @@
---- ui/gfx/render_text.cc.orig	2020-11-13 06:37:06 UTC
+--- ui/gfx/render_text.cc.orig	2021-03-12 23:57:48 UTC
 +++ ui/gfx/render_text.cc
-@@ -1191,32 +1191,33 @@ void RenderText::SetDisplayOffset(int horizontal_offse
+@@ -1193,32 +1193,33 @@ void RenderText::SetDisplayOffset(int horizontal_offse
    const int extra_content = GetContentWidth() - display_rect_.width();
    const int cursor_width = cursor_enabled_ ? 1 : 0;
  
diff --git a/www/chromium/files/patch-ui_gl_BUILD.gn b/www/chromium/files/patch-ui_gl_BUILD.gn
index caf52530..d4097b52 100644
--- a/www/chromium/files/patch-ui_gl_BUILD.gn
+++ b/www/chromium/files/patch-ui_gl_BUILD.gn
@@ -1,6 +1,6 @@
---- ui/gl/BUILD.gn.orig	2021-01-18 21:29:48 UTC
+--- ui/gl/BUILD.gn.orig	2021-03-12 23:57:48 UTC
 +++ ui/gl/BUILD.gn
-@@ -221,7 +221,7 @@ component("gl") {
+@@ -223,7 +223,7 @@ component("gl") {
        ]
      }
  
diff --git a/www/chromium/files/patch-ui_gl_generate__bindings.py b/www/chromium/files/patch-ui_gl_generate__bindings.py
index 442d7426..7a9d6aae 100644
--- a/www/chromium/files/patch-ui_gl_generate__bindings.py
+++ b/www/chromium/files/patch-ui_gl_generate__bindings.py
@@ -1,4 +1,4 @@
---- ui/gl/generate_bindings.py.orig	2021-01-18 21:29:48 UTC
+--- ui/gl/generate_bindings.py.orig	2021-03-12 23:57:48 UTC
 +++ ui/gl/generate_bindings.py
 @@ -2840,6 +2840,9 @@ GLX_FUNCTIONS = [
    'arguments':
diff --git a/www/chromium/files/patch-ui_gl_gl__bindings__api__autogen__glx.h b/www/chromium/files/patch-ui_gl_gl__bindings__api__autogen__glx.h
index f4663309..1f4cc24f 100644
--- a/www/chromium/files/patch-ui_gl_gl__bindings__api__autogen__glx.h
+++ b/www/chromium/files/patch-ui_gl_gl__bindings__api__autogen__glx.h
@@ -1,4 +1,4 @@
---- ui/gl/gl_bindings_api_autogen_glx.h.orig	2020-11-13 06:37:06 UTC
+--- ui/gl/gl_bindings_api_autogen_glx.h.orig	2021-03-12 23:57:48 UTC
 +++ ui/gl/gl_bindings_api_autogen_glx.h
 @@ -88,6 +88,7 @@ bool glXGetMscRateOMLFn(Display* dpy,
                          GLXDrawable drawable,
diff --git a/www/chromium/files/patch-ui_gl_gl__bindings__autogen__glx.cc b/www/chromium/files/patch-ui_gl_gl__bindings__autogen__glx.cc
index fb6515b2..2aca940d 100644
--- a/www/chromium/files/patch-ui_gl_gl__bindings__autogen__glx.cc
+++ b/www/chromium/files/patch-ui_gl_gl__bindings__autogen__glx.cc
@@ -1,4 +1,4 @@
---- ui/gl/gl_bindings_autogen_glx.cc.orig	2020-11-13 06:37:06 UTC
+--- ui/gl/gl_bindings_autogen_glx.cc.orig	2021-03-12 23:57:48 UTC
 +++ ui/gl/gl_bindings_autogen_glx.cc
 @@ -115,6 +115,8 @@ void DriverGLX::InitializeExtensionBindings() {
  
diff --git a/www/chromium/files/patch-ui_gl_gl__bindings__autogen__glx.h b/www/chromium/files/patch-ui_gl_gl__bindings__autogen__glx.h
index 74e201f5..d6c735bf 100644
--- a/www/chromium/files/patch-ui_gl_gl__bindings__autogen__glx.h
+++ b/www/chromium/files/patch-ui_gl_gl__bindings__autogen__glx.h
@@ -1,4 +1,4 @@
---- ui/gl/gl_bindings_autogen_glx.h.orig	2020-11-13 06:37:06 UTC
+--- ui/gl/gl_bindings_autogen_glx.h.orig	2021-03-12 23:57:48 UTC
 +++ ui/gl/gl_bindings_autogen_glx.h
 @@ -104,6 +104,8 @@ typedef bool(GL_BINDING_CALL* glXGetMscRateOMLProc)(Di
                                                      GLXDrawable drawable,
diff --git a/www/chromium/files/patch-ui_gl_gl__features.cc b/www/chromium/files/patch-ui_gl_gl__features.cc
index 33c34828..7d6ef3e5 100644
--- a/www/chromium/files/patch-ui_gl_gl__features.cc
+++ b/www/chromium/files/patch-ui_gl_gl__features.cc
@@ -1,11 +1,13 @@
---- ui/gl/gl_features.cc.orig	2020-11-16 15:04:56 UTC
+--- ui/gl/gl_features.cc.orig	2021-03-12 23:57:48 UTC
 +++ ui/gl/gl_features.cc
-@@ -14,7 +14,7 @@ namespace features {
+@@ -23,8 +23,8 @@ const base::Feature kGpuVsync{"GpuVsync", base::FEATUR
+ // Launched on Windows, still experimental on other platforms.
  const base::Feature kDefaultPassthroughCommandDecoder{
    "DefaultPassthroughCommandDecoder",
- #if defined(OS_WIN) || \
--    (defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(CHROMECAST_BUILD))
-+    (defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(CHROMECAST_BUILD)) || defined(OS_BSD)
+-#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)) && \
+      !defined(CHROMECAST_BUILD))
        base::FEATURE_ENABLED_BY_DEFAULT
  #else
-       base::FEATURE_DISABLED_BY_DEFAULT
diff --git a/www/chromium/files/patch-ui_gl_gl__fence.cc b/www/chromium/files/patch-ui_gl_gl__fence.cc
index 6af87c32..010df9b4 100644
--- a/www/chromium/files/patch-ui_gl_gl__fence.cc
+++ b/www/chromium/files/patch-ui_gl_gl__fence.cc
@@ -1,4 +1,4 @@
---- ui/gl/gl_fence.cc.orig	2020-11-13 06:37:06 UTC
+--- ui/gl/gl_fence.cc.orig	2021-03-12 23:57:48 UTC
 +++ ui/gl/gl_fence.cc
 @@ -18,7 +18,7 @@
  #include "ui/gl/gl_fence_apple.h"
diff --git a/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.cc b/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.cc
index c8b7505e..3f2908c5 100644
--- a/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.cc
+++ b/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.cc
@@ -1,4 +1,4 @@
---- ui/gl/sync_control_vsync_provider.cc.orig	2020-11-13 06:37:06 UTC
+--- ui/gl/sync_control_vsync_provider.cc.orig	2021-03-12 23:57:48 UTC
 +++ ui/gl/sync_control_vsync_provider.cc
 @@ -11,7 +11,7 @@
  #include "base/trace_event/trace_event.h"
diff --git a/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.h b/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.h
index 87d79bd8..fedf2657 100644
--- a/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.h
+++ b/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.h
@@ -1,4 +1,4 @@
---- ui/gl/sync_control_vsync_provider.h.orig	2020-11-13 06:37:06 UTC
+--- ui/gl/sync_control_vsync_provider.h.orig	2021-03-12 23:57:48 UTC
 +++ ui/gl/sync_control_vsync_provider.h
 @@ -26,11 +26,11 @@ class SyncControlVSyncProvider : public gfx::VSyncProv
    bool SupportGetVSyncParametersIfAvailable() const override;
diff --git a/www/chromium/files/patch-ui_gtk_printing_print__dialog__gtk.cc b/www/chromium/files/patch-ui_gtk_printing_print__dialog__gtk.cc
index 3d31d6cb..8e404bc8 100644
--- a/www/chromium/files/patch-ui_gtk_printing_print__dialog__gtk.cc
+++ b/www/chromium/files/patch-ui_gtk_printing_print__dialog__gtk.cc
@@ -1,4 +1,4 @@
---- ui/gtk/printing/print_dialog_gtk.cc.orig	2020-11-13 06:37:06 UTC
+--- ui/gtk/printing/print_dialog_gtk.cc.orig	2021-03-12 23:57:48 UTC
 +++ ui/gtk/printing/print_dialog_gtk.cc
 @@ -388,7 +388,7 @@ void PrintDialogGtk::ShowDialog(
    // Since we only generate PDF, only show printers that support PDF.
diff --git a/www/chromium/files/patch-ui_message__center_views_message__popup__view.cc b/www/chromium/files/patch-ui_message__center_views_message__popup__view.cc
index b9850f7e..4f8f4009 100644
--- a/www/chromium/files/patch-ui_message__center_views_message__popup__view.cc
+++ b/www/chromium/files/patch-ui_message__center_views_message__popup__view.cc
@@ -1,11 +1,11 @@
---- ui/message_center/views/message_popup_view.cc.orig	2020-11-13 06:37:06 UTC
+--- ui/message_center/views/message_popup_view.cc.orig	2021-03-12 23:57:48 UTC
 +++ ui/message_center/views/message_popup_view.cc
-@@ -110,7 +110,7 @@ void MessagePopupView::AutoCollapse() {
- void MessagePopupView::Show() {
-   views::Widget::InitParams params(views::Widget::InitParams::TYPE_POPUP);
+@@ -114,7 +114,7 @@ void MessagePopupView::Show() {
    params.z_order = ui::ZOrderLevel::kFloatingWindow;
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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)
    // Make the widget explicitly activatable as TYPE_POPUP is not activatable by
    // default but we need focus for the inline reply textarea.
    params.activatable = views::Widget::InitParams::ACTIVATABLE_YES;
diff --git a/www/chromium/files/patch-ui_native__theme_native__theme.h b/www/chromium/files/patch-ui_native__theme_native__theme.h
index d3e7aae4..062c00df 100644
--- a/www/chromium/files/patch-ui_native__theme_native__theme.h
+++ b/www/chromium/files/patch-ui_native__theme_native__theme.h
@@ -1,11 +1,11 @@
---- ui/native_theme/native_theme.h.orig	2020-11-13 06:37:06 UTC
+--- ui/native_theme/native_theme.h.orig	2021-03-12 23:57:48 UTC
 +++ ui/native_theme/native_theme.h
-@@ -51,7 +51,7 @@ class NATIVE_THEME_EXPORT NativeTheme {
-   // The part to be painted / sized.
-   enum Part {
+@@ -54,7 +54,7 @@ class NATIVE_THEME_EXPORT NativeTheme {
      kCheckbox,
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+ // 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)
      kFrameTopArea,
  #endif
      kInnerSpinButton,
diff --git a/www/chromium/files/patch-ui_native__theme_native__theme__base.cc b/www/chromium/files/patch-ui_native__theme_native__theme__base.cc
index f2db72ed..6c6ca446 100644
--- a/www/chromium/files/patch-ui_native__theme_native__theme__base.cc
+++ b/www/chromium/files/patch-ui_native__theme_native__theme__base.cc
@@ -1,11 +1,11 @@
---- ui/native_theme/native_theme_base.cc.orig	2020-11-13 06:37:06 UTC
+--- ui/native_theme/native_theme_base.cc.orig	2021-03-12 23:57:48 UTC
 +++ ui/native_theme/native_theme_base.cc
-@@ -255,7 +255,7 @@ void NativeThemeBase::Paint(cc::PaintCanvas* canvas,
-     case kCheckbox:
-       PaintCheckbox(canvas, state, rect, extra.button, color_scheme);
+@@ -258,7 +258,7 @@ void NativeThemeBase::Paint(cc::PaintCanvas* canvas,
        break;
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+ // 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)
      case kFrameTopArea:
        PaintFrameTopArea(canvas, state, rect, extra.frame_top_area,
                          color_scheme);
diff --git a/www/chromium/files/patch-ui_platform__window_platform__window__init__properties.h b/www/chromium/files/patch-ui_platform__window_platform__window__init__properties.h
index af6fc25c..6df46efd 100644
--- a/www/chromium/files/patch-ui_platform__window_platform__window__init__properties.h
+++ b/www/chromium/files/patch-ui_platform__window_platform__window__init__properties.h
@@ -1,4 +1,4 @@
---- ui/platform_window/platform_window_init_properties.h.orig	2021-01-18 21:29:48 UTC
+--- ui/platform_window/platform_window_init_properties.h.orig	2021-03-12 23:57:48 UTC
 +++ ui/platform_window/platform_window_init_properties.h
 @@ -41,7 +41,7 @@ enum class PlatformWindowOpacity {
  
diff --git a/www/chromium/files/patch-ui_strings_app__locale__settings.grd b/www/chromium/files/patch-ui_strings_app__locale__settings.grd
index c7a618ec..b99a54e2 100644
--- a/www/chromium/files/patch-ui_strings_app__locale__settings.grd
+++ b/www/chromium/files/patch-ui_strings_app__locale__settings.grd
@@ -1,11 +1,11 @@
---- ui/strings/app_locale_settings.grd.orig	2020-11-13 06:37:06 UTC
+--- ui/strings/app_locale_settings.grd.orig	2021-03-12 23:57:48 UTC
 +++ ui/strings/app_locale_settings.grd
 @@ -217,7 +217,7 @@
            75%
          </message>
        </if>
--      <if expr="(is_linux or is_android or is_bsd) and not chromeos">
-+      <if expr="is_posix and not chromeos">
+-      <if expr="(is_linux or is_android or is_bsd) and not (chromeos or lacros)">
++      <if expr="(is_posix or is_android or is_bsd) and not (chromeos or lacros)">
          <!-- The font used in Web UI (e.g. History). Note that these are only
               backups. We try to use the system font if possible. -->
          <message name="IDS_WEB_FONT_FAMILY" use_name_for_id="true">
diff --git a/www/chromium/files/patch-ui_views_controls_label.cc b/www/chromium/files/patch-ui_views_controls_label.cc
index 4089af1b..d16e6594 100644
--- a/www/chromium/files/patch-ui_views_controls_label.cc
+++ b/www/chromium/files/patch-ui_views_controls_label.cc
@@ -1,20 +1,20 @@
---- ui/views/controls/label.cc.orig	2021-01-18 21:29:49 UTC
+--- ui/views/controls/label.cc.orig	2021-03-12 23:57:48 UTC
 +++ ui/views/controls/label.cc
-@@ -773,7 +773,7 @@ bool Label::OnMousePressed(const ui::MouseEvent& event
-     GetFocusManager()->SetFocusedView(this);
-   }
+@@ -806,7 +806,7 @@ bool Label::OnMousePressed(const ui::MouseEvent& event
  
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+ // 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 (event.IsOnlyMiddleMouseButton() && GetFocusManager() && !had_focus)
      GetFocusManager()->SetFocusedView(this);
  #endif
-@@ -960,7 +960,7 @@ bool Label::PasteSelectionClipboard() {
- }
- 
+@@ -995,7 +995,7 @@ bool Label::PasteSelectionClipboard() {
  void Label::UpdateSelectionClipboard() {
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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 (!GetObscured()) {
      ui::ScopedClipboardWriter(ui::ClipboardBuffer::kSelection)
          .WriteText(GetSelectedText());
diff --git a/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc b/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc
index aad44bd5..e21a6d47 100644
--- a/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc
+++ b/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc
@@ -1,15 +1,15 @@
---- ui/views/controls/textfield/textfield.cc.orig	2021-01-18 21:29:49 UTC
+--- ui/views/controls/textfield/textfield.cc.orig	2021-03-12 23:57:48 UTC
 +++ ui/views/controls/textfield/textfield.cc
-@@ -68,7 +68,7 @@
- #include "base/win/win_util.h"
- #endif
+@@ -71,7 +71,7 @@
  
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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)
  #include "ui/base/ime/linux/text_edit_command_auralinux.h"
  #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h"
  #endif
-@@ -195,14 +195,14 @@ ui::TextEditCommand GetCommandForKeyEvent(const ui::Ke
+@@ -239,14 +239,14 @@ ui::TextEditCommand GetCommandForKeyEvent(const ui::Ke
  #endif
          return ui::TextEditCommand::DELETE_BACKWARD;
        }
@@ -26,7 +26,7 @@
        // Only erase by line break on Linux and ChromeOS.
        if (shift && control)
          return ui::TextEditCommand::DELETE_TO_END_OF_LINE;
-@@ -270,7 +270,7 @@ bool IsControlKeyModifier(int flags) {
+@@ -320,7 +320,7 @@ bool IsControlKeyModifier(int flags) {
  // Control-modified key combination, but we cannot extend it to other platforms
  // as Control has different meanings and behaviors.
  // https://crrev.com/2580483002/#msg46
@@ -35,39 +35,39 @@
    return flags & ui::EF_CONTROL_DOWN;
  #else
    return false;
-@@ -765,7 +765,7 @@ bool Textfield::OnMousePressed(const ui::MouseEvent& e
- #endif
-   }
+@@ -818,7 +818,7 @@ bool Textfield::OnMousePressed(const ui::MouseEvent& e
  
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+ // 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 (!handled && !had_focus && event.IsOnlyMiddleMouseButton())
      RequestFocusWithPointer(ui::EventPointerType::kMouse);
  #endif
-@@ -812,7 +812,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event
-   if (!textfield)
-     return handled;
+@@ -867,7 +867,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event
  
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+ // 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)
    ui::TextEditKeyBindingsDelegateAuraLinux* delegate =
        ui::GetTextEditKeyBindingsDelegate();
    std::vector<ui::TextEditCommandAuraLinux> commands;
-@@ -966,7 +966,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo
- }
- 
+@@ -1023,7 +1023,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo
  bool Textfield::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) {
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+ // 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)
    // Skip any accelerator handling that conflicts with custom keybindings.
    ui::TextEditKeyBindingsDelegateAuraLinux* delegate =
        ui::GetTextEditKeyBindingsDelegate();
-@@ -2256,7 +2256,7 @@ bool Textfield::PasteSelectionClipboard() {
- }
- 
+@@ -2343,7 +2343,7 @@ bool Textfield::PasteSelectionClipboard() {
  void Textfield::UpdateSelectionClipboard() {
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+ // 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 (text_input_type_ != ui::TEXT_INPUT_TYPE_PASSWORD) {
      ui::ScopedClipboardWriter(ui::ClipboardBuffer::kSelection)
          .WriteText(GetSelectedText());
diff --git a/www/chromium/files/patch-ui_views_corewm_tooltip__aura.cc b/www/chromium/files/patch-ui_views_corewm_tooltip__aura.cc
index 4eae8ee7..73b891c5 100644
--- a/www/chromium/files/patch-ui_views_corewm_tooltip__aura.cc
+++ b/www/chromium/files/patch-ui_views_corewm_tooltip__aura.cc
@@ -1,11 +1,11 @@
---- ui/views/corewm/tooltip_aura.cc.orig	2020-11-13 06:37:06 UTC
+--- ui/views/corewm/tooltip_aura.cc.orig	2021-03-12 23:57:48 UTC
 +++ ui/views/corewm/tooltip_aura.cc
-@@ -46,7 +46,7 @@ constexpr int kVerticalPaddingBottom = 5;
- 
- // TODO(varkha): Update if native widget can be transparent on Linux.
+@@ -49,7 +49,7 @@ constexpr int kVerticalPaddingBottom = 5;
  bool CanUseTranslucentTooltipWidget() {
--#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_WIN)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_WIN) || defined(OS_BSD)
+ // 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)) || defined(OS_WIN)
++#if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_WIN) || defined(OS_BSD)
    return false;
  #else
    return true;
diff --git a/www/chromium/files/patch-ui_views_examples_widget__example.cc b/www/chromium/files/patch-ui_views_examples_widget__example.cc
index 32badab3..952c5d1e 100644
--- a/www/chromium/files/patch-ui_views_examples_widget__example.cc
+++ b/www/chromium/files/patch-ui_views_examples_widget__example.cc
@@ -1,4 +1,4 @@
---- ui/views/examples/widget_example.cc.orig	2021-01-18 21:29:49 UTC
+--- ui/views/examples/widget_example.cc.orig	2021-03-12 23:57:48 UTC
 +++ ui/views/examples/widget_example.cc
 @@ -50,7 +50,7 @@ void WidgetExample::CreateExampleView(View* container)
    modal_button->SetCallback(
diff --git a/www/chromium/files/patch-ui_views_focus_focus__manager.cc b/www/chromium/files/patch-ui_views_focus_focus__manager.cc
index 38b7984f..9792a1dd 100644
--- a/www/chromium/files/patch-ui_views_focus_focus__manager.cc
+++ b/www/chromium/files/patch-ui_views_focus_focus__manager.cc
@@ -1,20 +1,20 @@
---- ui/views/focus/focus_manager.cc.orig	2021-01-18 21:29:49 UTC
+--- ui/views/focus/focus_manager.cc.orig	2021-03-12 23:57:48 UTC
 +++ ui/views/focus/focus_manager.cc
-@@ -621,7 +621,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi
-   if (!focus_manager->IsAcceleratorRegistered(accelerator))
-     return false;
+@@ -624,7 +624,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi
  
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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)
    // Processing an accelerator can delete things. Because we
    // need these objects afterwards on Linux, save widget_ as weak pointer and
    // save the close_on_deactivate property value of widget_delegate in a
-@@ -636,7 +636,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi
-   const bool accelerator_processed =
-       focus_manager->ProcessAccelerator(accelerator);
+@@ -641,7 +641,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi
  
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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)
    // Need to manually close the bubble widget on Linux. On Linux when the
    // bubble is shown, the main widget remains active. Because of that when
    // focus is set to the main widget to process accelerator, the main widget
diff --git a/www/chromium/files/patch-ui_views_selection__controller.cc b/www/chromium/files/patch-ui_views_selection__controller.cc
index 091a9cd6..cdd50f32 100644
--- a/www/chromium/files/patch-ui_views_selection__controller.cc
+++ b/www/chromium/files/patch-ui_views_selection__controller.cc
@@ -1,11 +1,11 @@
---- ui/views/selection_controller.cc.orig	2020-11-13 06:37:06 UTC
+--- ui/views/selection_controller.cc.orig	2021-03-12 23:57:48 UTC
 +++ ui/views/selection_controller.cc
-@@ -23,7 +23,7 @@ SelectionController::SelectionController(SelectionCont
-       delegate_(delegate),
-       handles_selection_clipboard_(false) {
+@@ -26,7 +26,7 @@ SelectionController::SelectionController(SelectionCont
  // On Linux, update the selection clipboard on a text selection.
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+ // 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)
    set_handles_selection_clipboard(true);
  #endif
  
diff --git a/www/chromium/files/patch-ui_views_style_platform__style.cc b/www/chromium/files/patch-ui_views_style_platform__style.cc
index fd8e9911..0bab5cb2 100644
--- a/www/chromium/files/patch-ui_views_style_platform__style.cc
+++ b/www/chromium/files/patch-ui_views_style_platform__style.cc
@@ -1,15 +1,15 @@
---- ui/views/style/platform_style.cc.orig	2021-01-18 21:29:49 UTC
+--- ui/views/style/platform_style.cc.orig	2021-03-12 23:57:48 UTC
 +++ ui/views/style/platform_style.cc
-@@ -54,7 +54,7 @@ const bool PlatformStyle::kInactiveWidgetControlsAppea
- // Linux clips bubble windows that extend outside their parent window
- // bounds.
+@@ -58,7 +58,7 @@ const View::FocusBehavior PlatformStyle::kDefaultFocus
  const bool PlatformStyle::kAdjustBubbleIfOffscreen =
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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)
      false;
  #else
      true;
-@@ -89,7 +89,7 @@ View::FocusBehavior PlatformStyle::DefaultFocusBehavio
+@@ -88,7 +88,7 @@ gfx::Range PlatformStyle::RangeToDeleteBackwards(const
  #endif  // OS_APPLE
  
  #if !BUILDFLAG(ENABLE_DESKTOP_AURA) || \
diff --git a/www/chromium/files/patch-ui_views_views__delegate.cc b/www/chromium/files/patch-ui_views_views__delegate.cc
index 7ea678b0..6b944281 100644
--- a/www/chromium/files/patch-ui_views_views__delegate.cc
+++ b/www/chromium/files/patch-ui_views_views__delegate.cc
@@ -1,11 +1,11 @@
---- ui/views/views_delegate.cc.orig	2020-11-13 06:37:06 UTC
+--- ui/views/views_delegate.cc.orig	2021-03-12 23:57:48 UTC
 +++ ui/views/views_delegate.cc
-@@ -86,7 +86,7 @@ bool ViewsDelegate::IsWindowInMetro(gfx::NativeWindow 
+@@ -90,7 +90,7 @@ bool ViewsDelegate::IsWindowInMetro(gfx::NativeWindow 
    return false;
  }
  #elif BUILDFLAG(ENABLE_DESKTOP_AURA) && \
--  (defined(OS_LINUX) || defined(OS_CHROMEOS))
-+  (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD))
+-    (defined(OS_LINUX) || defined(OS_CHROMEOS))
++    (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD))
  gfx::ImageSkia* ViewsDelegate::GetDefaultWindowIcon() const {
    return nullptr;
  }
diff --git a/www/chromium/files/patch-ui_views_views__delegate.h b/www/chromium/files/patch-ui_views_views__delegate.h
index 9a1aebe4..da8e763e 100644
--- a/www/chromium/files/patch-ui_views_views__delegate.h
+++ b/www/chromium/files/patch-ui_views_views__delegate.h
@@ -1,11 +1,11 @@
---- ui/views/views_delegate.h.orig	2020-11-13 06:37:06 UTC
+--- ui/views/views_delegate.h.orig	2021-03-12 23:57:48 UTC
 +++ ui/views/views_delegate.h
-@@ -134,7 +134,7 @@ class VIEWS_EXPORT ViewsDelegate {
+@@ -138,7 +138,7 @@ class VIEWS_EXPORT ViewsDelegate {
    // environment.
    virtual bool IsWindowInMetro(gfx::NativeWindow window) const;
  #elif BUILDFLAG(ENABLE_DESKTOP_AURA) && \
--  (defined(OS_LINUX) || defined(OS_CHROMEOS))
-+  (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD))
+-    (defined(OS_LINUX) || defined(OS_CHROMEOS))
++    (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD))
    virtual gfx::ImageSkia* GetDefaultWindowIcon() const;
  #endif
  
diff --git a/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__screen__ozone.cc b/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__screen__ozone.cc
index e01c9e73..f9835852 100644
--- a/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__screen__ozone.cc
+++ b/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__screen__ozone.cc
@@ -1,4 +1,4 @@
---- ui/views/widget/desktop_aura/desktop_screen_ozone.cc.orig	2020-11-16 15:06:43 UTC
+--- ui/views/widget/desktop_aura/desktop_screen_ozone.cc.orig	2021-03-12 23:57:48 UTC
 +++ ui/views/widget/desktop_aura/desktop_screen_ozone.cc
 @@ -26,7 +26,7 @@ gfx::NativeWindow DesktopScreenOzone::GetNativeWindowF
  // To avoid multiple definitions when use_x11 && use_ozone is true, disable this
diff --git a/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc b/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc
index d42787a5..9471972d 100644
--- a/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc
+++ b/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc
@@ -1,6 +1,6 @@
---- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig	2020-11-13 06:37:06 UTC
+--- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig	2021-03-12 23:57:48 UTC
 +++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc
-@@ -791,7 +791,7 @@ void DesktopWindowTreeHostPlatform::AddAdditionalInitP
+@@ -818,7 +818,7 @@ void DesktopWindowTreeHostPlatform::AddAdditionalInitP
  // DesktopWindowTreeHost:
  
  // Linux subclasses this host and adds some Linux specific bits.
diff --git a/www/chromium/files/patch-ui_views_widget_native__widget__aura.cc b/www/chromium/files/patch-ui_views_widget_native__widget__aura.cc
index 3b5da6f0..e5805929 100644
--- a/www/chromium/files/patch-ui_views_widget_native__widget__aura.cc
+++ b/www/chromium/files/patch-ui_views_widget_native__widget__aura.cc
@@ -1,6 +1,6 @@
---- ui/views/widget/native_widget_aura.cc.orig	2021-01-18 21:29:49 UTC
+--- ui/views/widget/native_widget_aura.cc.orig	2021-03-12 23:57:48 UTC
 +++ ui/views/widget/native_widget_aura.cc
-@@ -65,7 +65,7 @@
+@@ -68,7 +68,7 @@
  #endif
  
  #if BUILDFLAG(ENABLE_DESKTOP_AURA) && \
@@ -9,7 +9,7 @@
  #include "ui/views/linux_ui/linux_ui.h"
  #include "ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h"
  #endif
-@@ -1090,7 +1090,7 @@ void NativeWidgetAura::SetInitialFocus(ui::WindowShowS
+@@ -1121,7 +1121,7 @@ void NativeWidgetAura::SetInitialFocus(ui::WindowShowS
  
  namespace {
  #if BUILDFLAG(ENABLE_DESKTOP_AURA) && \
@@ -18,7 +18,7 @@
  void CloseWindow(aura::Window* window) {
    if (window) {
      Widget* widget = Widget::GetWidgetForNativeView(window);
-@@ -1121,14 +1121,14 @@ void Widget::CloseAllSecondaryWidgets() {
+@@ -1152,14 +1152,14 @@ void Widget::CloseAllSecondaryWidgets() {
  #endif
  
  #if BUILDFLAG(ENABLE_DESKTOP_AURA) && \
diff --git a/www/chromium/files/patch-ui_views_window_custom__frame__view.cc b/www/chromium/files/patch-ui_views_window_custom__frame__view.cc
index 1ca243e8..904b36b5 100644
--- a/www/chromium/files/patch-ui_views_window_custom__frame__view.cc
+++ b/www/chromium/files/patch-ui_views_window_custom__frame__view.cc
@@ -1,11 +1,11 @@
---- ui/views/window/custom_frame_view.cc.orig	2021-01-18 21:29:49 UTC
+--- ui/views/window/custom_frame_view.cc.orig	2021-03-12 23:57:48 UTC
 +++ ui/views/window/custom_frame_view.cc
-@@ -257,7 +257,7 @@ int CustomFrameView::NonClientTopBorderHeight() const 
- int CustomFrameView::CaptionButtonY() const {
-   // Maximized buttons start at window top so that even if their images aren't
+@@ -259,7 +259,7 @@ int CustomFrameView::CaptionButtonY() const {
    // drawn flush with the screen edge, they still obey Fitts' Law.
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)
+ // 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)
    return FrameBorderThickness();
  #else
    return frame_->IsMaximized() ? FrameBorderThickness() : kFrameShadowThickness;
diff --git a/www/chromium/files/patch-ui_views_window_dialog__delegate.cc b/www/chromium/files/patch-ui_views_window_dialog__delegate.cc
index ef6a81e8..4b69d60e 100644
--- a/www/chromium/files/patch-ui_views_window_dialog__delegate.cc
+++ b/www/chromium/files/patch-ui_views_window_dialog__delegate.cc
@@ -1,6 +1,6 @@
---- ui/views/window/dialog_delegate.cc.orig	2020-11-13 06:37:06 UTC
+--- ui/views/window/dialog_delegate.cc.orig	2021-03-12 23:57:48 UTC
 +++ ui/views/window/dialog_delegate.cc
-@@ -71,7 +71,7 @@ Widget* DialogDelegate::CreateDialogWidget(
+@@ -72,7 +72,7 @@ Widget* DialogDelegate::CreateDialogWidget(
  
  // static
  bool DialogDelegate::CanSupportCustomFrame(gfx::NativeView parent) {
diff --git a/www/chromium/files/patch-ui_views_window_frame__background.cc b/www/chromium/files/patch-ui_views_window_frame__background.cc
index 8818c97c..d2a13b85 100644
--- a/www/chromium/files/patch-ui_views_window_frame__background.cc
+++ b/www/chromium/files/patch-ui_views_window_frame__background.cc
@@ -1,4 +1,4 @@
---- ui/views/window/frame_background.cc.orig	2020-11-13 06:37:06 UTC
+--- ui/views/window/frame_background.cc.orig	2021-03-12 23:57:48 UTC
 +++ ui/views/window/frame_background.cc
 @@ -99,7 +99,7 @@ void FrameBackground::PaintMaximized(gfx::Canvas* canv
                                       const View* view) const {
diff --git a/www/chromium/files/patch-ui_webui_resources_js_cr.js b/www/chromium/files/patch-ui_webui_resources_js_cr.js
index 319111e9..db06cd9a 100644
--- a/www/chromium/files/patch-ui_webui_resources_js_cr.js
+++ b/www/chromium/files/patch-ui_webui_resources_js_cr.js
@@ -1,4 +1,4 @@
---- ui/webui/resources/js/cr.js.orig	2021-01-18 21:29:49 UTC
+--- ui/webui/resources/js/cr.js.orig	2021-03-12 23:57:48 UTC
 +++ ui/webui/resources/js/cr.js
 @@ -450,6 +450,11 @@ var cr = cr || function(global) {
      get isMac() {
diff --git a/www/chromium/files/patch-v8_BUILD.gn b/www/chromium/files/patch-v8_BUILD.gn
index 91e9002d..602c8b86 100644
--- a/www/chromium/files/patch-v8_BUILD.gn
+++ b/www/chromium/files/patch-v8_BUILD.gn
@@ -1,6 +1,6 @@
---- v8/BUILD.gn.orig	2021-01-18 21:31:57 UTC
+--- v8/BUILD.gn.orig	2021-03-13 00:03:47 UTC
 +++ v8/BUILD.gn
-@@ -4157,9 +4157,15 @@ v8_component("v8_libbase") {
+@@ -4209,9 +4209,15 @@ v8_component("v8_libbase") {
      }
    }
  
@@ -17,7 +17,7 @@
        "src/base/platform/platform-linux.cc",
      ]
  
-@@ -4575,6 +4581,7 @@ if (current_toolchain == v8_generator_toolchain) {
+@@ -4667,6 +4673,7 @@ if (current_toolchain == v8_generator_toolchain) {
        "src/interpreter/bytecodes.cc",
        "src/interpreter/bytecodes.h",
      ]
diff --git a/www/chromium/files/patch-v8_include_v8config.h b/www/chromium/files/patch-v8_include_v8config.h
index 0364af55..8b14c056 100644
--- a/www/chromium/files/patch-v8_include_v8config.h
+++ b/www/chromium/files/patch-v8_include_v8config.h
@@ -1,8 +1,8 @@
---- v8/include/v8config.h.orig	2020-11-13 06:42:28 UTC
+--- v8/include/v8config.h.orig	2021-03-13 00:03:47 UTC
 +++ v8/include/v8config.h
-@@ -276,7 +276,18 @@
- # define V8_HAS_ATTRIBUTE_WARN_UNUSED_RESULT \
-     (__has_attribute(warn_unused_result))
+@@ -285,7 +285,18 @@
+ 
+ # define V8_HAS_CPP_ATTRIBUTE_NODISCARD (V8_HAS_CPP_ATTRIBUTE(nodiscard))
  
 +// Work around Clang bug present in 9.0.1, at least.
 +//
diff --git a/www/chromium/files/patch-v8_src_api_api.cc b/www/chromium/files/patch-v8_src_api_api.cc
index a7fa74ed..5e495633 100644
--- a/www/chromium/files/patch-v8_src_api_api.cc
+++ b/www/chromium/files/patch-v8_src_api_api.cc
@@ -1,6 +1,6 @@
---- v8/src/api/api.cc.orig	2021-01-18 21:31:57 UTC
+--- v8/src/api/api.cc.orig	2021-03-13 00:03:47 UTC
 +++ v8/src/api/api.cc
-@@ -5775,7 +5775,7 @@ bool v8::V8::Initialize(const int build_config) {
+@@ -5894,7 +5894,7 @@ bool v8::V8::Initialize(const int build_config) {
    return true;
  }
  
diff --git a/www/chromium/files/patch-v8_src_base_cpu.cc b/www/chromium/files/patch-v8_src_base_cpu.cc
index c78e6e53..2939b9e7 100644
--- a/www/chromium/files/patch-v8_src_base_cpu.cc
+++ b/www/chromium/files/patch-v8_src_base_cpu.cc
@@ -1,6 +1,6 @@
---- v8/src/base/cpu.cc.orig	2020-11-13 06:42:28 UTC
+--- v8/src/base/cpu.cc.orig	2021-03-13 00:03:47 UTC
 +++ v8/src/base/cpu.cc
-@@ -534,6 +534,7 @@ CPU::CPU()
+@@ -545,6 +545,7 @@ CPU::CPU()
  
  #if V8_OS_LINUX
  
@@ -8,7 +8,7 @@
    CPUInfo cpu_info;
  
    // Extract implementor from the "CPU implementer" field.
-@@ -567,6 +568,7 @@ CPU::CPU()
+@@ -578,6 +579,7 @@ CPU::CPU()
      }
      delete[] part;
    }
diff --git a/www/chromium/files/patch-v8_src_base_platform_platform-freebsd.cc b/www/chromium/files/patch-v8_src_base_platform_platform-freebsd.cc
index 55430651..228b3be9 100644
--- a/www/chromium/files/patch-v8_src_base_platform_platform-freebsd.cc
+++ b/www/chromium/files/patch-v8_src_base_platform_platform-freebsd.cc
@@ -1,4 +1,4 @@
---- v8/src/base/platform/platform-freebsd.cc.orig	2020-11-13 06:42:28 UTC
+--- v8/src/base/platform/platform-freebsd.cc.orig	2021-03-13 00:03:47 UTC
 +++ v8/src/base/platform/platform-freebsd.cc
 @@ -82,8 +82,8 @@ std::vector<OS::SharedLibraryAddress> OS::GetSharedLib
              lib_name = std::string(path);
diff --git a/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc b/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc
index 76c63894..b977573e 100644
--- a/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc
+++ b/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc
@@ -1,4 +1,4 @@
---- v8/src/base/platform/platform-posix.cc.orig	2021-01-18 21:31:57 UTC
+--- v8/src/base/platform/platform-posix.cc.orig	2021-03-13 00:03:47 UTC
 +++ v8/src/base/platform/platform-posix.cc
 @@ -464,7 +464,7 @@ bool OS::DiscardSystemPages(void* address, size_t size
  
diff --git a/www/chromium/files/patch-v8_src_d8_d8.cc b/www/chromium/files/patch-v8_src_d8_d8.cc
index 161e17c7..a10c6ff1 100644
--- a/www/chromium/files/patch-v8_src_d8_d8.cc
+++ b/www/chromium/files/patch-v8_src_d8_d8.cc
@@ -1,6 +1,6 @@
---- v8/src/d8/d8.cc.orig	2021-01-19 11:56:19 UTC
+--- v8/src/d8/d8.cc.orig	2021-03-13 00:03:47 UTC
 +++ v8/src/d8/d8.cc
-@@ -71,7 +71,7 @@
+@@ -73,7 +73,7 @@
  #include "unicode/locid.h"
  #endif  // V8_INTL_SUPPORT
  
@@ -9,7 +9,7 @@
  #include <sys/mman.h>  // For MultiMappedAllocator.
  #endif
  
-@@ -233,7 +233,7 @@ class MockArrayBufferAllocatiorWithLimit : public Mock
+@@ -235,7 +235,7 @@ class MockArrayBufferAllocatiorWithLimit : public Mock
    std::atomic<size_t> space_left_;
  };
  
@@ -18,7 +18,7 @@
  
  // This is a mock allocator variant that provides a huge virtual allocation
  // backed by a small real allocation that is repeatedly mapped. If you create an
-@@ -326,7 +326,7 @@ class MultiMappedAllocator : public ArrayBufferAllocat
+@@ -328,7 +328,7 @@ class MultiMappedAllocator : public ArrayBufferAllocat
    base::Mutex regions_mutex_;
  };
  
@@ -27,7 +27,7 @@
  
  v8::Platform* g_default_platform;
  std::unique_ptr<v8::Platform> g_platform;
-@@ -3532,7 +3532,7 @@ bool Shell::SetOptions(int argc, char* argv[]) {
+@@ -3689,7 +3689,7 @@ bool Shell::SetOptions(int argc, char* argv[]) {
    options.mock_arraybuffer_allocator = i::FLAG_mock_arraybuffer_allocator;
    options.mock_arraybuffer_allocator_limit =
        i::FLAG_mock_arraybuffer_allocator_limit;
@@ -36,7 +36,7 @@
    options.multi_mapped_mock_allocator = i::FLAG_multi_mapped_mock_allocator;
  #endif
  
-@@ -4147,19 +4147,19 @@ int Shell::Main(int argc, char* argv[]) {
+@@ -4321,19 +4321,19 @@ int Shell::Main(int argc, char* argv[]) {
        memory_limit >= options.mock_arraybuffer_allocator_limit
            ? memory_limit
            : std::numeric_limits<size_t>::max());
diff --git a/www/chromium/files/patch-weblayer_BUILD.gn b/www/chromium/files/patch-weblayer_BUILD.gn
index 628cbe0a..0cc17331 100644
--- a/www/chromium/files/patch-weblayer_BUILD.gn
+++ b/www/chromium/files/patch-weblayer_BUILD.gn
@@ -1,6 +1,6 @@
---- weblayer/BUILD.gn.orig	2021-01-18 21:29:49 UTC
+--- weblayer/BUILD.gn.orig	2021-03-12 23:57:49 UTC
 +++ weblayer/BUILD.gn
-@@ -677,6 +677,14 @@ source_set("weblayer_lib_base") {
+@@ -706,6 +706,14 @@ source_set("weblayer_lib_base") {
      ]
    }
  
diff --git a/www/chromium/files/patch-weblayer_app_content__main__delegate__impl.cc b/www/chromium/files/patch-weblayer_app_content__main__delegate__impl.cc
index a686f93d..9f5518b6 100644
--- a/www/chromium/files/patch-weblayer_app_content__main__delegate__impl.cc
+++ b/www/chromium/files/patch-weblayer_app_content__main__delegate__impl.cc
@@ -1,11 +1,11 @@
---- weblayer/app/content_main_delegate_impl.cc.orig	2021-01-18 21:29:49 UTC
+--- weblayer/app/content_main_delegate_impl.cc.orig	2021-03-12 23:57:49 UTC
 +++ weblayer/app/content_main_delegate_impl.cc
-@@ -221,7 +221,7 @@ bool ContentMainDelegateImpl::ShouldCreateFeatureList(
+@@ -218,7 +218,7 @@ bool ContentMainDelegateImpl::ShouldCreateFeatureList(
+ }
  
  void ContentMainDelegateImpl::PreSandboxStartup() {
- #if defined(ARCH_CPU_ARM_FAMILY) && \
--    (defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS))
-+    (defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD))
+-#if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || defined(OS_LINUX))
++#if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD))
    // Create an instance of the CPU class to parse /proc/cpuinfo and cache
    // cpu_brand info.
    base::CPU cpu_info;
diff --git a/www/chromium/files/patch-weblayer_browser_browser__main__parts__impl.cc b/www/chromium/files/patch-weblayer_browser_browser__main__parts__impl.cc
index 5851976f..9d1db677 100644
--- a/www/chromium/files/patch-weblayer_browser_browser__main__parts__impl.cc
+++ b/www/chromium/files/patch-weblayer_browser_browser__main__parts__impl.cc
@@ -1,20 +1,20 @@
---- weblayer/browser/browser_main_parts_impl.cc.orig	2021-01-18 21:29:49 UTC
+--- weblayer/browser/browser_main_parts_impl.cc.orig	2021-03-12 23:57:49 UTC
 +++ weblayer/browser/browser_main_parts_impl.cc
-@@ -68,7 +68,7 @@
+@@ -69,7 +69,7 @@
  #include "ui/base/ui_base_features.h"
  #include "ui/events/devices/x11/touch_factory_x11.h"  // nogncheck
  #endif
--#if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX)
-+#if !defined(OS_CHROMEOS) && defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_BSD))
+-#if defined(USE_AURA) && defined(OS_LINUX)
++#if defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_BSD))
  #include "ui/base/ime/init/input_method_initializer.h"
  #endif
  
-@@ -191,7 +191,7 @@ void BrowserMainPartsImpl::PreMainMessageLoopStart() {
+@@ -184,7 +184,7 @@ void BrowserMainPartsImpl::PreMainMessageLoopStart() {
  int BrowserMainPartsImpl::PreEarlyInitialization() {
    browser_process_ = std::make_unique<BrowserProcess>(std::move(local_state_));
  
--#if defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_CHROMEOS))
-+#if defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD))
+-#if defined(USE_AURA) && defined(OS_LINUX)
++#if defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_BSD))
    ui::InitializeInputMethodForTesting();
  #endif
  #if defined(OS_ANDROID)
diff --git a/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.cc b/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.cc
index ec15b39b..e26f3744 100644
--- a/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.cc
+++ b/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.cc
@@ -1,20 +1,20 @@
---- weblayer/browser/content_browser_client_impl.cc.orig	2020-11-13 06:37:06 UTC
+--- weblayer/browser/content_browser_client_impl.cc.orig	2021-03-12 23:57:49 UTC
 +++ weblayer/browser/content_browser_client_impl.cc
 @@ -135,7 +135,7 @@
  #include "weblayer/browser/weblayer_factory_impl_android.h"
  #endif
  
--#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD)
+-#if defined(OS_LINUX) || defined(OS_ANDROID)
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
  #include "content/public/common/content_descriptors.h"
  #endif
  
-@@ -382,7 +382,7 @@ void ContentBrowserClientImpl::ConfigureNetworkContext
+@@ -387,7 +387,7 @@ void ContentBrowserClientImpl::ConfigureNetworkContext
  
  void ContentBrowserClientImpl::OnNetworkServiceCreated(
      network::mojom::NetworkService* network_service) {
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
    network::mojom::CryptConfigPtr config = network::mojom::CryptConfig::New();
    content::GetNetworkService()->SetCryptConfig(std::move(config));
  #endif
diff --git a/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.h b/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.h
deleted file mode 100644
index 93c03f42..00000000
--- a/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.h
+++ /dev/null
@@ -1,17 +0,0 @@
---- weblayer/browser/content_browser_client_impl.h.orig	2020-11-13 06:37:06 UTC
-+++ weblayer/browser/content_browser_client_impl.h
-@@ -116,12 +116,12 @@ class ContentBrowserClientImpl : public content::Conte
-   void RenderProcessWillLaunch(content::RenderProcessHost* host) override;
-   scoped_refptr<content::QuotaPermissionContext> CreateQuotaPermissionContext()
-       override;
--#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD)
-   void GetAdditionalMappedFilesForChildProcess(
-       const base::CommandLine& command_line,
-       int child_process_id,
-       content::PosixFileDescriptorInfo* mappings) override;
--#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
-+#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD)
-   void AppendExtraCommandLineSwitches(base::CommandLine* command_line,
-                                       int child_process_id) override;
- #if defined(OS_ANDROID)
diff --git a/www/chromium/files/patch-weblayer_browser_system__network__context__manager.cc b/www/chromium/files/patch-weblayer_browser_system__network__context__manager.cc
index 1c120aa2..7f4c1366 100644
--- a/www/chromium/files/patch-weblayer_browser_system__network__context__manager.cc
+++ b/www/chromium/files/patch-weblayer_browser_system__network__context__manager.cc
@@ -1,15 +1,15 @@
---- weblayer/browser/system_network_context_manager.cc.orig	2020-11-13 06:37:06 UTC
+--- weblayer/browser/system_network_context_manager.cc.orig	2021-03-12 23:57:49 UTC
 +++ weblayer/browser/system_network_context_manager.cc
 @@ -64,10 +64,10 @@ void SystemNetworkContextManager::ConfigureDefaultNetw
      network::mojom::NetworkContextParams* network_context_params,
      const std::string& user_agent) {
    network_context_params->user_agent = user_agent;
--#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_BSD)
+-#if defined(OS_LINUX) || defined(OS_WIN)
++#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
    // We're not configuring the cookie encryption on these platforms yet.
    network_context_params->enable_encrypted_cookies = false;
--#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN)
-+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_BSD)
+-#endif  // defined(OS_LINUX) || defined(OS_WIN)
++#endif  // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
  }
  
  SystemNetworkContextManager::SystemNetworkContextManager(
diff --git a/www/chromium/files/patch-weblayer_common_weblayer__paths.cc b/www/chromium/files/patch-weblayer_common_weblayer__paths.cc
index e8a034b8..3771b1ee 100644
--- a/www/chromium/files/patch-weblayer_common_weblayer__paths.cc
+++ b/www/chromium/files/patch-weblayer_common_weblayer__paths.cc
@@ -1,11 +1,11 @@
---- weblayer/common/weblayer_paths.cc.orig	2020-11-13 06:37:06 UTC
+--- weblayer/common/weblayer_paths.cc.orig	2021-03-12 23:57:49 UTC
 +++ weblayer/common/weblayer_paths.cc
 @@ -17,7 +17,7 @@
  
  #if defined(OS_WIN)
  #include "base/base_paths_win.h"
--#elif defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#elif defined(OS_LINUX)
++#elif defined(OS_LINUX) || defined(OS_BSD)
  #include "base/nix/xdg_util.h"
  #endif
  
@@ -13,8 +13,8 @@
      return false;
    *result = result->AppendASCII("weblayer");
    return true;
--#elif defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#elif defined(OS_LINUX)
++#elif defined(OS_LINUX) || defined(OS_BSD)
    std::unique_ptr<base::Environment> env(base::Environment::Create());
    base::FilePath config_dir(base::nix::GetXDGDirectory(
        env.get(), base::nix::kXdgConfigHomeEnvVar, base::nix::kDotConfigDir));
diff --git a/www/chromium/files/sndio_input.cc b/www/chromium/files/sndio_input.cc
index 5aed9a03..e607418d 100644
--- a/www/chromium/files/sndio_input.cc
+++ b/www/chromium/files/sndio_input.cc
@@ -191,7 +191,7 @@ void SndioAudioInputStream::ThreadLoop(void) {
       params.sample_rate());
 
     // push into bus
-    audio_bus->FromInterleaved(buffer, nframes, SampleFormatToBytesPerChannel(kSampleFormat));
+    audio_bus->FromInterleaved<SignedInt16SampleTypeTraits>(reinterpret_cast<int16_t*>(buffer), nframes);
 
     // invoke callback
     callback->OnData(audio_bus.get(), base::TimeTicks::Now() - delay, 1.);
diff --git a/www/chromium/files/sndio_output.cc b/www/chromium/files/sndio_output.cc
index a6719f9a..c42d6bdc 100644
--- a/www/chromium/files/sndio_output.cc
+++ b/www/chromium/files/sndio_output.cc
@@ -159,7 +159,7 @@ void SndioAudioOutputStream::ThreadLoop(void) {
     const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay,
 	params.sample_rate());
     count = source->OnMoreData(delay, base::TimeTicks::Now(), 0, audio_bus.get());
-    audio_bus->ToInterleaved(count, SampleFormatToBytesPerChannel(kSampleFormat), buffer);
+    audio_bus->ToInterleaved<SignedInt16SampleTypeTraits>(count, reinterpret_cast<int16_t*>(buffer));
     if (count == 0) {
       // We have to submit something to the device
       count = audio_bus->frames();
diff --git a/www/chromium/pkg-plist b/www/chromium/pkg-plist
index 86019960..9c92cd75 100644
--- a/www/chromium/pkg-plist
+++ b/www/chromium/pkg-plist
@@ -129,16 +129,17 @@ bin/chrome
 %%DATADIR%%/resources/inspector/Images/chevrons.svg
 %%DATADIR%%/resources/inspector/Images/chromeDisabledSelect.png
 %%DATADIR%%/resources/inspector/Images/chromeDisabledSelect_2x.png
-%%DATADIR%%/resources/inspector/Images/chromeLeft.png
-%%DATADIR%%/resources/inspector/Images/chromeMiddle.png
-%%DATADIR%%/resources/inspector/Images/chromeRight.png
-%%DATADIR%%/resources/inspector/Images/chromeSelect.png
-%%DATADIR%%/resources/inspector/Images/chromeSelect_2x.png
-%%DATADIR%%/resources/inspector/Images/cssoverview_icons_2x.png
+%%DATADIR%%/resources/inspector/Images/chromeLeft.avif
+%%DATADIR%%/resources/inspector/Images/chromeMiddle.avif
+%%DATADIR%%/resources/inspector/Images/chromeRight.avif
+%%DATADIR%%/resources/inspector/Images/chromeSelect.svg
+%%DATADIR%%/resources/inspector/Images/chromeSelectDark.svg
+%%DATADIR%%/resources/inspector/Images/cssoverview_icons_2x.avif
 %%DATADIR%%/resources/inspector/Images/dropdown_7x6_icon.svg
 %%DATADIR%%/resources/inspector/Images/elements_panel_icon.svg
 %%DATADIR%%/resources/inspector/Images/baseline-icon.svg
 %%DATADIR%%/resources/inspector/Images/breaking_change_icon.svg
+%%DATADIR%%/resources/inspector/Images/error_icon.svg
 %%DATADIR%%/resources/inspector/Images/errorWave.svg
 %%DATADIR%%/resources/inspector/Images/feedback_thin_16x16_icon.svg
 %%DATADIR%%/resources/inspector/Images/flex-align-content-center-icon.svg
@@ -163,6 +164,9 @@ bin/chrome
 %%DATADIR%%/resources/inspector/Images/flex-justify-content-space-around-icon.svg
 %%DATADIR%%/resources/inspector/Images/flex-justify-content-space-between-icon.svg
 %%DATADIR%%/resources/inspector/Images/flex-justify-content-space-evenly-icon.svg
+%%DATADIR%%/resources/inspector/Images/ic_checkmark_16x16.svg
+%%DATADIR%%/resources/inspector/Images/ic_delete_filter.svg
+%%DATADIR%%/resources/inspector/Images/ic_delete_list.svg
 %%DATADIR%%/resources/inspector/Images/ic_info_black_18dp.svg
 %%DATADIR%%/resources/inspector/Images/ic_page_next_16x16_icon.svg
 %%DATADIR%%/resources/inspector/Images/ic_page_prev_16x16_icon.svg
@@ -179,7 +183,7 @@ bin/chrome
 %%DATADIR%%/resources/inspector/Images/navigationControls_2x.png
 %%DATADIR%%/resources/inspector/Images/network_panel_icon.svg
 %%DATADIR%%/resources/inspector/Images/node_search_icon.svg
-%%DATADIR%%/resources/inspector/Images/nodeIcon.png
+%%DATADIR%%/resources/inspector/Images/nodeIcon.avif
 %%DATADIR%%/resources/inspector/Images/popoverArrows.png
 %%DATADIR%%/resources/inspector/Images/profileGroupIcon.png
 %%DATADIR%%/resources/inspector/Images/profileIcon.png
@@ -196,7 +200,7 @@ bin/chrome
 %%DATADIR%%/resources/inspector/Images/resourceJSIcon.png
 %%DATADIR%%/resources/inspector/Images/resourcePlainIcon.png
 %%DATADIR%%/resources/inspector/Images/resourcePlainIconSmall.png
-%%DATADIR%%/resources/inspector/Images/resourcesTimeGraphIcon.png
+%%DATADIR%%/resources/inspector/Images/resourcesTimeGraphIcon.avif
 %%DATADIR%%/resources/inspector/Images/searchNext.png
 %%DATADIR%%/resources/inspector/Images/searchPrev.png
 %%DATADIR%%/resources/inspector/Images/securityIcons.svg
@@ -207,13 +211,13 @@ bin/chrome
 %%DATADIR%%/resources/inspector/Images/touchCursor.png
 %%DATADIR%%/resources/inspector/Images/touchCursor_2x.png
 %%DATADIR%%/resources/inspector/Images/treeoutlineTriangles.svg
-%%DATADIR%%/resources/inspector/Images/whatsnew.png
+%%DATADIR%%/resources/inspector/Images/warning_icon.svg
+%%DATADIR%%/resources/inspector/Images/whatsnew.avif
 %%DATADIR%%/resources/inspector/Tests.js
 %%DATADIR%%/resources/inspector/accessibility/accessibility_module.js
 %%DATADIR%%/resources/inspector/accessibility/accessibility-legacy.js
+%%DATADIR%%/resources/inspector/accessibility/accessibility-meta.js
 %%DATADIR%%/resources/inspector/accessibility/accessibility.js
-%%DEBUG%%%%DATADIR%%/resources/inspector/accessibility/AccessibilityModel.js
-%%DEBUG%%%%DATADIR%%/resources/inspector/accessibility/AccessibilityModel.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/accessibility/AccessibilityNodeView.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/accessibility/AccessibilityNodeView.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/accessibility/AccessibilitySidebarView.js
@@ -234,6 +238,7 @@ bin/chrome
 %%DATADIR%%/resources/inspector/accessibility_test_runner/accessibility_test_runner.js
 %%DATADIR%%/resources/inspector/animation/animation_module.js
 %%DATADIR%%/resources/inspector/animation/animation-legacy.js
+%%DATADIR%%/resources/inspector/animation/animation-meta.js
 %%DATADIR%%/resources/inspector/animation/animation.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/animation/AnimationGroupPreviewUI.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/animation/AnimationGroupPreviewUI.js.map
@@ -245,6 +250,8 @@ bin/chrome
 %%DEBUG%%%%DATADIR%%/resources/inspector/animation/AnimationTimeline.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/animation/AnimationUI.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/animation/AnimationUI.js.map
+%%DEBUG%%%%DATADIR%%/resources/inspector/animation/ModuleUIStrings.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/animation/ModuleUIStrings.js.map
 %%DATADIR%%/resources/inspector/application_test_runner/application_test_runner_module.js
 %%DATADIR%%/resources/inspector/application_test_runner/application_test_runner.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/application_test_runner/AppcacheTestRunner.js
@@ -264,8 +271,6 @@ bin/chrome
 %%DEBUG%%%%DATADIR%%/resources/inspector/bindings_test_runner/PersistenceTestRunner.js
 %%DATADIR%%/resources/inspector/bindings/bindings.js
 %%DATADIR%%/resources/inspector/bindings/bindings-legacy.js
-%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/BlackboxManager.js
-%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/BlackboxManager.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/bindings/BreakpointManager.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/bindings/BreakpointManager.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/bindings/CompilerScriptMapping.js
@@ -282,6 +287,8 @@ bin/chrome
 %%DEBUG%%%%DATADIR%%/resources/inspector/bindings/DefaultScriptMapping.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/bindings/FileUtils.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/bindings/FileUtils.js.map
+%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/IgnoreListManager.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/IgnoreListManager.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/bindings/LiveLocation.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/bindings/LiveLocation.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/bindings/NetworkProject.js
@@ -302,7 +309,12 @@ bin/chrome
 %%DEBUG%%%%DATADIR%%/resources/inspector/bindings/TempFile.js.map
 %%DATADIR%%/resources/inspector/browser_debugger/browser_debugger_module.js
 %%DATADIR%%/resources/inspector/browser_debugger/browser_debugger-legacy.js
+%%DATADIR%%/resources/inspector/browser_debugger/browser_debugger-meta.js
 %%DATADIR%%/resources/inspector/browser_debugger/browser_debugger.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/browser_debugger/CategorizedBreakpointsSidebarPane.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/browser_debugger/CategorizedBreakpointsSidebarPane.js.map
+%%DEBUG%%%%DATADIR%%/resources/inspector/browser_debugger/CSPViolationBreakpointsSidebarPane.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/browser_debugger/CSPViolationBreakpointsSidebarPane.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/browser_debugger/DOMBreakpointsSidebarPane.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/browser_debugger/DOMBreakpointsSidebarPane.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/browser_debugger/EventListenerBreakpointsSidebarPane.js
@@ -316,10 +328,15 @@ bin/chrome
 %%DEBUG%%%%DATADIR%%/resources/inspector/browser_sdk/IssuesManager.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/browser_sdk/LogManager.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/browser_sdk/LogManager.js.map
+%%DEBUG%%%%DATADIR%%/resources/inspector/browser_sdk/MarkdownHelpers.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/browser_sdk/MarkdownHelpers.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/browser_sdk/RelatedIssue.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/browser_sdk/RelatedIssue.js.map
+%%DEBUG%%%%DATADIR%%/resources/inspector/browser_sdk/SourceFrameIssuesManager.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/browser_sdk/SourceFrameIssuesManager.js.map
 %%DATADIR%%/resources/inspector/changes/changes_module.js
 %%DATADIR%%/resources/inspector/changes/changes-legacy.js
+%%DATADIR%%/resources/inspector/changes/changes-meta.js
 %%DATADIR%%/resources/inspector/changes/changes.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/changes/ChangesHighlighter.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/changes/ChangesHighlighter.js.map
@@ -329,15 +346,13 @@ bin/chrome
 %%DEBUG%%%%DATADIR%%/resources/inspector/changes/ChangesTextEditor.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/changes/ChangesView.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/changes/ChangesView.js.map
+%%DEBUG%%%%DATADIR%%/resources/inspector/changes/ModuleUIStrings.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/changes/ModuleUIStrings.js.map
 %%DATADIR%%/resources/inspector/client_variations/client_variations_module.js
 %%DATADIR%%/resources/inspector/client_variations/client_variations.js
 %%DATADIR%%/resources/inspector/cm_headless/cm_headless.js
 %%DATADIR%%/resources/inspector/cm/cm_module.js
 %%DATADIR%%/resources/inspector/cm/cm.js
-%%DATADIR%%/resources/inspector/cm_modes/cm_modes_module.js
-%%DATADIR%%/resources/inspector/cm_modes/cm_modes.js
-%%DEBUG%%%%DATADIR%%/resources/inspector/cm_modes/DefaultCodeMirrorMimeMode.js
-%%DEBUG%%%%DATADIR%%/resources/inspector/cm_modes/DefaultCodeMirrorMimeMode.js.map
 %%DATADIR%%/resources/inspector/color_picker/color_picker_module.js
 %%DATADIR%%/resources/inspector/color_picker/color_picker-legacy.js
 %%DATADIR%%/resources/inspector/color_picker/color_picker.js
@@ -391,6 +406,8 @@ bin/chrome
 %%DEBUG%%%%DATADIR%%/resources/inspector/common/Runnable.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/common/SegmentedRange.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/common/SegmentedRange.js.map
+%%DEBUG%%%%DATADIR%%/resources/inspector/common/SettingRegistration.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/common/SettingRegistration.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/common/Settings.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/common/Settings.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/common/SimpleHistoryManager.js
@@ -412,6 +429,8 @@ bin/chrome
 %%DEBUG%%%%DATADIR%%/resources/inspector/component_helpers/component-server-setup.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/component_helpers/get-stylesheet.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/component_helpers/get-stylesheet.js.map
+%%DEBUG%%%%DATADIR%%/resources/inspector/component_helpers/set-css-property.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/component_helpers/set-css-property.js.map
 %%DATADIR%%/resources/inspector/components/components.js
 %%DATADIR%%/resources/inspector/components/components-legacy.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/components/ImagePreview.js
@@ -430,6 +449,7 @@ bin/chrome
 %%DEBUG%%%%DATADIR%%/resources/inspector/console_counters/WarningErrorCounter.js.map
 %%DATADIR%%/resources/inspector/console/console_module.js
 %%DATADIR%%/resources/inspector/console/console-legacy.js
+%%DATADIR%%/resources/inspector/console/console-meta.js
 %%DATADIR%%/resources/inspector/console/console.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/console/ConsoleContextSelector.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/console/ConsoleContextSelector.js.map
@@ -458,6 +478,7 @@ bin/chrome
 %%DEBUG%%%%DATADIR%%/resources/inspector/cookie_table/CookiesTable.js.map
 %%DATADIR%%/resources/inspector/coverage/coverage_module.js
 %%DATADIR%%/resources/inspector/coverage/coverage-legacy.js
+%%DATADIR%%/resources/inspector/coverage/coverage-meta.js
 %%DATADIR%%/resources/inspector/coverage/coverage.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/coverage/CoverageDecorationManager.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/coverage/CoverageDecorationManager.js.map
@@ -474,7 +495,7 @@ bin/chrome
 %%DATADIR%%/resources/inspector/cpu_profiler_test_runner/cpu_profiler_test_runner_module.js
 %%DATADIR%%/resources/inspector/cpu_profiler_test_runner/cpu_profiler_test_runner.js
 %%DATADIR%%/resources/inspector/css_overview/css_overview_module.js
-%%DATADIR%%/resources/inspector/css_overview/css_overview-legacy.js
+%%DATADIR%%/resources/inspector/css_overview/css_overview-meta.js
 %%DATADIR%%/resources/inspector/css_overview/css_overview.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/css_overview/CSSOverviewCompletedView.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/css_overview/CSSOverviewCompletedView.js.map
@@ -507,11 +528,14 @@ bin/chrome
 %%DATADIR%%/resources/inspector/data_grid_test_runner/data_grid_test_runner.js
 %%DATADIR%%/resources/inspector/developer_resources/developer_resources_module.js
 %%DATADIR%%/resources/inspector/developer_resources/developer_resources-legacy.js
+%%DATADIR%%/resources/inspector/developer_resources/developer_resources-meta.js
 %%DATADIR%%/resources/inspector/developer_resources/developer_resources.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/developer_resources/DeveloperResourcesListView.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/developer_resources/DeveloperResourcesListView.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/developer_resources/DeveloperResourcesView.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/developer_resources/DeveloperResourcesView.js.map
+%%DEBUG%%%%DATADIR%%/resources/inspector/developer_resources/ModuleUIStrings.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/developer_resources/ModuleUIStrings.js.map
 %%DATADIR%%/resources/inspector/device_mode_test_runner/device_mode_test_runner_module.js
 %%DATADIR%%/resources/inspector/device_mode_test_runner/device_mode_test_runner.js
 %%DATADIR%%/resources/inspector/devices/devices_module.js
@@ -523,7 +547,6 @@ bin/chrome
 %%DATADIR%%/resources/inspector/devtools_app.html
 %%DATADIR%%/resources/inspector/devtools_app.js
 %%DATADIR%%/resources/inspector/devtools_compatibility.js
-%%DATADIR%%/resources/inspector/devtools_extension_api.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/diff/diff_match_patch.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/diff/diff_match_patch.js.map
 %%DATADIR%%/resources/inspector/diff/diff_module.js
@@ -536,7 +559,14 @@ bin/chrome
 %%DEBUG%%%%DATADIR%%/resources/inspector/dom_extension/DOMExtension.js.map
 %%DATADIR%%/resources/inspector/elements/elements_module.js
 %%DATADIR%%/resources/inspector/elements/elements-legacy.js
+%%DATADIR%%/resources/inspector/elements/elements-meta.js
 %%DATADIR%%/resources/inspector/elements/elements.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/elements/AccessibilityNode.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/elements/AccessibilityNode.js.map
+%%DEBUG%%%%DATADIR%%/resources/inspector/elements/AccessibilityTree.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/elements/AccessibilityTree.js.map
+%%DEBUG%%%%DATADIR%%/resources/inspector/elements/AccessibilityTreeView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/elements/AccessibilityTreeView.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/elements/Adorner.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/elements/Adorner.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/elements/ClassesPaneWidget.js
@@ -545,12 +575,8 @@ bin/chrome
 %%DEBUG%%%%DATADIR%%/resources/inspector/elements/ColorSwatchPopoverIcon.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/elements/ComputedStyleModel.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/elements/ComputedStyleModel.js.map
-%%DEBUG%%%%DATADIR%%/resources/inspector/elements/ComputedStyleProperty_bridge.js
-%%DEBUG%%%%DATADIR%%/resources/inspector/elements/ComputedStyleProperty_bridge.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/elements/ComputedStyleProperty.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/elements/ComputedStyleProperty.js.map
-%%DEBUG%%%%DATADIR%%/resources/inspector/elements/ComputedStyleTrace_bridge.js
-%%DEBUG%%%%DATADIR%%/resources/inspector/elements/ComputedStyleTrace_bridge.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/elements/ComputedStyleTrace.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/elements/ComputedStyleTrace.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/elements/ComputedStyleWidget.js
@@ -561,16 +587,12 @@ bin/chrome
 %%DEBUG%%%%DATADIR%%/resources/inspector/elements/DOMLinkifier.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/elements/DOMPath.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/elements/DOMPath.js.map
-%%DEBUG%%%%DATADIR%%/resources/inspector/elements/ElementsBreadcrumbs_bridge.js
-%%DEBUG%%%%DATADIR%%/resources/inspector/elements/ElementsBreadcrumbs_bridge.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/elements/ElementsBreadcrumbs.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/elements/ElementsBreadcrumbs.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/elements/ElementsBreadcrumbsUtils.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/elements/ElementsBreadcrumbsUtils.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/elements/ElementsPanel.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/elements/ElementsPanel.js.map
-%%DEBUG%%%%DATADIR%%/resources/inspector/elements/ElementsPanelLink_bridge.js
-%%DEBUG%%%%DATADIR%%/resources/inspector/elements/ElementsPanelLink_bridge.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/elements/ElementsPanelLink.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/elements/ElementsPanelLink.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/elements/ElementsSidebarPane.js
@@ -585,16 +607,10 @@ bin/chrome
 %%DEBUG%%%%DATADIR%%/resources/inspector/elements/ElementsTreeOutline.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/elements/EventListenersWidget.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/elements/EventListenersWidget.js.map
-%%DEBUG%%%%DATADIR%%/resources/inspector/elements/Icon_bridge.js
-%%DEBUG%%%%DATADIR%%/resources/inspector/elements/Icon_bridge.js.map
-%%DEBUG%%%%DATADIR%%/resources/inspector/elements/Icon.js
-%%DEBUG%%%%DATADIR%%/resources/inspector/elements/Icon.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/elements/ImagePreviewPopover.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/elements/ImagePreviewPopover.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/elements/InspectElementModeController.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/elements/InspectElementModeController.js.map
-%%DEBUG%%%%DATADIR%%/resources/inspector/elements/LayoutPane_bridge.js
-%%DEBUG%%%%DATADIR%%/resources/inspector/elements/LayoutPane_bridge.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/elements/LayoutPane.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/elements/LayoutPane.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/elements/LayoutPaneUtils.js
@@ -682,6 +698,7 @@ bin/chrome
 %%DEBUG%%%%DATADIR%%/resources/inspector/emulation/EmulatedDevices.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/emulation/EmulatedDevices.js.map
 %%DATADIR%%/resources/inspector/emulation/emulation-legacy.js
+%%DATADIR%%/resources/inspector/emulation/emulation-meta.js
 %%DATADIR%%/resources/inspector/emulation/emulation.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/emulation/InspectedPagePlaceholder.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/emulation/InspectedPagePlaceholder.js.map
@@ -691,6 +708,10 @@ bin/chrome
 %%DEBUG%%%%DATADIR%%/resources/inspector/emulation/MediaQueryInspector.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/emulation/SensorsView.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/emulation/SensorsView.js.map
+%%DEBUG%%%%DATADIR%%/resources/inspector/emulation/StructuredHeaders.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/emulation/StructuredHeaders.js.map
+%%DEBUG%%%%DATADIR%%/resources/inspector/emulation/UserAgentMetadata.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/emulation/UserAgentMetadata.js.map
 %%DATADIR%%/resources/inspector/event_listeners/event_listeners_module.js
 %%DATADIR%%/resources/inspector/event_listeners/event_listeners-legacy.js
 %%DATADIR%%/resources/inspector/event_listeners/event_listeners.js
@@ -716,7 +737,8 @@ bin/chrome
 %%DEBUG%%%%DATADIR%%/resources/inspector/extensions/ExtensionView.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/extensions/LanguageExtensionEndpoint.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/extensions/LanguageExtensionEndpoint.js.map
-%%DATADIR%%/resources/inspector/formatter_worker_entrypoint.js
+%%DATADIR%%/resources/inspector/formatter_worker/formatter_worker.js
+%%DATADIR%%/resources/inspector/formatter_worker/formatter_worker-entrypoint.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/formatter_worker/AcornTokenizer.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/formatter_worker/AcornTokenizer.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/formatter_worker/CSSFormatter.js
@@ -727,7 +749,7 @@ bin/chrome
 %%DEBUG%%%%DATADIR%%/resources/inspector/formatter_worker/ESTreeWalker.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/formatter_worker/FormattedContentBuilder.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/formatter_worker/FormattedContentBuilder.js.map
-%%DATADIR%%/resources/inspector/formatter_worker/formatter_worker.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/formatter_worker/FormatterActions.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/formatter_worker/FormatterWorker.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/formatter_worker/FormatterWorker.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/formatter_worker/HTMLFormatter.js
@@ -767,18 +789,16 @@ bin/chrome
 %%DATADIR%%/resources/inspector/heap_snapshot_model/heap_snapshot_model.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/heap_snapshot_model/HeapSnapshotModel.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/heap_snapshot_model/HeapSnapshotModel.js.map
-%%DATADIR%%/resources/inspector/heap_snapshot_worker_entrypoint.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/heap_snapshot_worker/AllocationProfile.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/heap_snapshot_worker/AllocationProfile.js.map
 %%DATADIR%%/resources/inspector/heap_snapshot_worker/heap_snapshot_worker_module.js
+%%DATADIR%%/resources/inspector/heap_snapshot_worker/heap_snapshot_worker-entrypoint.js
 %%DATADIR%%/resources/inspector/heap_snapshot_worker/heap_snapshot_worker-legacy.js
 %%DATADIR%%/resources/inspector/heap_snapshot_worker/heap_snapshot_worker.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/heap_snapshot_worker/HeapSnapshot.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/heap_snapshot_worker/HeapSnapshot.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/heap_snapshot_worker/HeapSnapshotLoader.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/heap_snapshot_worker/HeapSnapshotLoader.js.map
-%%DEBUG%%%%DATADIR%%/resources/inspector/heap_snapshot_worker/HeapSnapshotWorker.js
-%%DEBUG%%%%DATADIR%%/resources/inspector/heap_snapshot_worker/HeapSnapshotWorker.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/heap_snapshot_worker/HeapSnapshotWorkerDispatcher.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/heap_snapshot_worker/HeapSnapshotWorkerDispatcher.js.map
 %%DATADIR%%/resources/inspector/help/help_module.js
@@ -786,6 +806,8 @@ bin/chrome
 %%DATADIR%%/resources/inspector/help/help.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/help/HelpImpl.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/help/HelpImpl.js.map
+%%DEBUG%%%%DATADIR%%/resources/inspector/help/ModuleUIStrings.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/help/ModuleUIStrings.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/help/ReleaseNoteText.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/help/ReleaseNoteText.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/help/ReleaseNoteView.js
@@ -813,16 +835,10 @@ bin/chrome
 %%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/BezierUI.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/ColorSwatch.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/ColorSwatch.js.map
-%%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/ColorSwatch_bridge.js
-%%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/ColorSwatch_bridge.js.map
-%%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/CSSAngle_bridge.js
-%%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/CSSAngle_bridge.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/CSSAngle.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/CSSAngle.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/CSSAngleEditor.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/CSSAngleEditor.js.map
-%%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/CSSAngleRegex.js
-%%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/CSSAngleRegex.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/CSSAngleSwatch.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/CSSAngleSwatch.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/CSSAngleUtils.js
@@ -831,10 +847,14 @@ bin/chrome
 %%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/CSSShadowEditor.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/CSSShadowModel.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/CSSShadowModel.js.map
-%%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/CSSVarSwatch_bridge.js
-%%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/CSSVarSwatch_bridge.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/CSSVarSwatch.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/CSSVarSwatch.js.map
+%%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/FontEditor.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/FontEditor.js.map
+%%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/FontEditorUnitConverter.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/FontEditorUnitConverter.js.map
+%%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/FontEditorUtils.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/FontEditorUtils.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/Swatches.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/Swatches.js.map
 %%DATADIR%%/resources/inspector/inline_editor/inline_editor_module.js
@@ -849,6 +869,8 @@ bin/chrome
 %%DEBUG%%%%DATADIR%%/resources/inspector/input/InputModel.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/input/InputTimeline.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/input/InputTimeline.js.map
+%%DEBUG%%%%DATADIR%%/resources/inspector/input/ModuleUIStrings.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/input/ModuleUIStrings.js.map
 %%DATADIR%%/resources/inspector/inspector_main/inspector_main.js
 %%DATADIR%%/resources/inspector/inspector_main/inspector_main-legacy.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/inspector_main/InspectorMain.js
@@ -862,6 +884,16 @@ bin/chrome
 %%DATADIR%%/resources/inspector/issues/issues_module.js
 %%DATADIR%%/resources/inspector/issues/issues-legacy.js
 %%DATADIR%%/resources/inspector/issues/issues.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/issues/AffectedResourcesView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/issues/AffectedResourcesView.js.map
+%%DEBUG%%%%DATADIR%%/resources/inspector/issues/AffectedSharedArrayBufferTransferDetailsView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/issues/AffectedSharedArrayBufferTransferDetailsView.js.map
+%%DEBUG%%%%DATADIR%%/resources/inspector/issues/ComboBoxOfCheckBoxes.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/issues/ComboBoxOfCheckBoxes.js.map
+%%DEBUG%%%%DATADIR%%/resources/inspector/issues/CSPViolationsListView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/issues/CSPViolationsListView.js.map
+%%DEBUG%%%%DATADIR%%/resources/inspector/issues/CSPViolationsView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/issues/CSPViolationsView.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/issues/IssueAggregator.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/issues/IssueAggregator.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/issues/IssueRevealer.js
@@ -870,8 +902,16 @@ bin/chrome
 %%DEBUG%%%%DATADIR%%/resources/inspector/issues/IssuesPane.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/issues/IssueSurveyLink.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/issues/IssueSurveyLink.js.map
+%%DEBUG%%%%DATADIR%%/resources/inspector/issues/MarkdownImage.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/issues/MarkdownImage.js.map
+%%DEBUG%%%%DATADIR%%/resources/inspector/issues/MarkdownImagesMap.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/issues/MarkdownImagesMap.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/issues/MarkdownIssueDescription.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/issues/MarkdownIssueDescription.js.map
+%%DEBUG%%%%DATADIR%%/resources/inspector/issues/MarkdownLink.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/issues/MarkdownLink.js.map
+%%DEBUG%%%%DATADIR%%/resources/inspector/issues/MarkdownLinksMap.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/issues/MarkdownLinksMap.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/issues/MarkdownView.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/issues/MarkdownView.js.map
 %%DATADIR%%/resources/inspector/javascript_metadata/javascript_metadata_module.js
@@ -889,6 +929,8 @@ bin/chrome
 %%DEBUG%%%%DATADIR%%/resources/inspector/js_main/JsMain.js.map
 %%DATADIR%%/resources/inspector/js_profiler/js_profiler_module.js
 %%DATADIR%%/resources/inspector/js_profiler/js_profiler.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/js_profiler/ModuleUIStrings.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/js_profiler/ModuleUIStrings.js.map
 %%DATADIR%%/resources/inspector/layer_viewer/layer_viewer_module.js
 %%DATADIR%%/resources/inspector/layer_viewer/layer_viewer-legacy.js
 %%DATADIR%%/resources/inspector/layer_viewer/layer_viewer.js
@@ -900,6 +942,8 @@ bin/chrome
 %%DEBUG%%%%DATADIR%%/resources/inspector/layer_viewer/LayerTreeOutline.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/layer_viewer/LayerViewHost.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/layer_viewer/LayerViewHost.js.map
+%%DEBUG%%%%DATADIR%%/resources/inspector/layer_viewer/ModuleUIStrings.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/layer_viewer/ModuleUIStrings.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/layer_viewer/PaintProfilerView.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/layer_viewer/PaintProfilerView.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/layer_viewer/TransformController.js
@@ -913,6 +957,8 @@ bin/chrome
 %%DEBUG%%%%DATADIR%%/resources/inspector/layers/LayersPanel.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/layers/LayerTreeModel.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/layers/LayerTreeModel.js.map
+%%DEBUG%%%%DATADIR%%/resources/inspector/layers/ModuleUIStrings.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/layers/ModuleUIStrings.js.map
 %%DATADIR%%/resources/inspector/layers_test_runner/layers_test_runner_module.js
 %%DATADIR%%/resources/inspector/layers_test_runner/layers_test_runner.js
 %%DATADIR%%/resources/inspector/lighthouse_test_runner/lighthouse_test_runner_module.js
@@ -939,14 +985,19 @@ bin/chrome
 %%DEBUG%%%%DATADIR%%/resources/inspector/lighthouse/LighthouseStartView.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/lighthouse/LighthouseStatusView.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/lighthouse/LighthouseStatusView.js.map
+%%DEBUG%%%%DATADIR%%/resources/inspector/lighthouse/ModuleUIStrings.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/lighthouse/ModuleUIStrings.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/lighthouse/RadioSetting.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/lighthouse/RadioSetting.js.map
 %%DATADIR%%/resources/inspector/linear_memory_inspector/linear_memory_inspector_module.js
+%%DATADIR%%/resources/inspector/linear_memory_inspector/linear_memory_inspector-legacy.js
 %%DATADIR%%/resources/inspector/linear_memory_inspector/linear_memory_inspector.js
-%%DEBUG%%%%DATADIR%%/resources/inspector/linear_memory_inspector/LinearMemoryInspector_bridge.js
-%%DEBUG%%%%DATADIR%%/resources/inspector/linear_memory_inspector/LinearMemoryInspector_bridge.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/linear_memory_inspector/LinearMemoryInspector.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/linear_memory_inspector/LinearMemoryInspector.js.map
+%%DEBUG%%%%DATADIR%%/resources/inspector/linear_memory_inspector/LinearMemoryInspectorController.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/linear_memory_inspector/LinearMemoryInspectorController.js.map
+%%DEBUG%%%%DATADIR%%/resources/inspector/linear_memory_inspector/LinearMemoryInspectorPane.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/linear_memory_inspector/LinearMemoryInspectorPane.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/linear_memory_inspector/LinearMemoryInspectorUtils.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/linear_memory_inspector/LinearMemoryInspectorUtils.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/linear_memory_inspector/LinearMemoryNavigator.js
@@ -959,6 +1010,8 @@ bin/chrome
 %%DEBUG%%%%DATADIR%%/resources/inspector/linear_memory_inspector/ValueInterpreterDisplay.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/linear_memory_inspector/ValueInterpreterDisplayUtils.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/linear_memory_inspector/ValueInterpreterDisplayUtils.js.map
+%%DEBUG%%%%DATADIR%%/resources/inspector/linear_memory_inspector/ValueInterpreterSettings.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/linear_memory_inspector/ValueInterpreterSettings.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/main/ExecutionContextSelector.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/main/ExecutionContextSelector.js.map
 %%DATADIR%%/resources/inspector/main/main-legacy.js
@@ -978,6 +1031,8 @@ bin/chrome
 %%DEBUG%%%%DATADIR%%/resources/inspector/media/MainView.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/media/MediaModel.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/media/MediaModel.js.map
+%%DEBUG%%%%DATADIR%%/resources/inspector/media/ModuleUIStrings.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/media/ModuleUIStrings.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/media/PlayerDetailView.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/media/PlayerDetailView.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/media/PlayerListView.js
@@ -994,6 +1049,8 @@ bin/chrome
 %%DATADIR%%/resources/inspector/mobile_throttling/mobile_throttling-legacy.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/mobile_throttling/MobileThrottlingSelector.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/mobile_throttling/MobileThrottlingSelector.js.map
+%%DEBUG%%%%DATADIR%%/resources/inspector/mobile_throttling/ModuleUIStrings.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/mobile_throttling/ModuleUIStrings.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/mobile_throttling/NetworkPanelIndicator.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/mobile_throttling/NetworkPanelIndicator.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/mobile_throttling/NetworkThrottlingSelector.js
@@ -1008,6 +1065,7 @@ bin/chrome
 %%DATADIR%%/resources/inspector/ndb_app.js
 %%DATADIR%%/resources/inspector/network/network_module.js
 %%DATADIR%%/resources/inspector/network/network-legacy.js
+%%DATADIR%%/resources/inspector/network/network-meta.js
 %%DATADIR%%/resources/inspector/network/network.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/network/BinaryResourceView.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/network/BinaryResourceView.js.map
@@ -1055,6 +1113,8 @@ bin/chrome
 %%DEBUG%%%%DATADIR%%/resources/inspector/network/RequestResponseView.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/network/RequestTimingView.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/network/RequestTimingView.js.map
+%%DEBUG%%%%DATADIR%%/resources/inspector/network/RequestTrustTokensView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/network/RequestTrustTokensView.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/network/ResourceWebSocketFrameView.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/network/ResourceWebSocketFrameView.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/network/SignedExchangeInfoView.js
@@ -1065,8 +1125,12 @@ bin/chrome
 %%DATADIR%%/resources/inspector/node_app.js
 %%DATADIR%%/resources/inspector/node_debugger/node_debugger_module.js
 %%DATADIR%%/resources/inspector/node_debugger/node_debugger.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/node_debugger/ModuleUIStrings.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/node_debugger/ModuleUIStrings.js.map
 %%DATADIR%%/resources/inspector/node_main/node_main-legacy.js
 %%DATADIR%%/resources/inspector/node_main/node_main.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/node_main/ModuleUIStrings.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/node_main/ModuleUIStrings.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/node_main/NodeConnectionsPanel.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/node_main/NodeConnectionsPanel.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/node_main/NodeMain.js
@@ -1105,8 +1169,6 @@ bin/chrome
 %%DEBUG%%%%DATADIR%%/resources/inspector/perf_ui/NetworkPriorities.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/perf_ui/OverviewGrid.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/perf_ui/OverviewGrid.js.map
-%%DEBUG%%%%DATADIR%%/resources/inspector/perf_ui/PieChart_bridge.js
-%%DEBUG%%%%DATADIR%%/resources/inspector/perf_ui/PieChart_bridge.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/perf_ui/PieChart.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/perf_ui/PieChart.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/perf_ui/TimelineGrid.js
@@ -1116,12 +1178,16 @@ bin/chrome
 %%DATADIR%%/resources/inspector/performance_monitor/performance_monitor_module.js
 %%DATADIR%%/resources/inspector/performance_monitor/performance_monitor-legacy.js
 %%DATADIR%%/resources/inspector/performance_monitor/performance_monitor.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/performance_monitor/ModuleUIStrings.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/performance_monitor/ModuleUIStrings.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/performance_monitor/PerformanceMonitor.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/performance_monitor/PerformanceMonitor.js.map
 %%DATADIR%%/resources/inspector/performance_test_runner/performance_test_runner_module.js
 %%DATADIR%%/resources/inspector/performance_test_runner/performance_test_runner.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/performance_test_runner/TimelineDataTestRunner.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/performance_test_runner/TimelineTestRunner.js
+%%DATADIR%%/resources/inspector/persistence/persistence.js
+%%DATADIR%%/resources/inspector/persistence/persistence-legacy.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/persistence/Automapping.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/persistence/Automapping.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/persistence/EditFileSystemView.js
@@ -1132,10 +1198,10 @@ bin/chrome
 %%DEBUG%%%%DATADIR%%/resources/inspector/persistence/IsolatedFileSystem.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/persistence/IsolatedFileSystemManager.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/persistence/IsolatedFileSystemManager.js.map
+%%DEBUG%%%%DATADIR%%/resources/inspector/persistence/ModuleUIStrings.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/persistence/ModuleUIStrings.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/persistence/NetworkPersistenceManager.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/persistence/NetworkPersistenceManager.js.map
-%%DATADIR%%/resources/inspector/persistence/persistence.js
-%%DATADIR%%/resources/inspector/persistence/persistence-legacy.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/persistence/PersistenceActions.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/persistence/PersistenceActions.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/persistence/PersistenceImpl.js
@@ -1161,10 +1227,13 @@ bin/chrome
 %%DEBUG%%%%DATADIR%%/resources/inspector/platform/set-utilities.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/platform/string-utilities.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/platform/string-utilities.js.map
+%%DEBUG%%%%DATADIR%%/resources/inspector/platform/typescript-utilities.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/platform/typescript-utilities.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/platform/UIString.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/platform/UIString.js.map
 %%DATADIR%%/resources/inspector/profiler/profiler_module.js
 %%DATADIR%%/resources/inspector/profiler/profiler-legacy.js
+%%DATADIR%%/resources/inspector/profiler/profiler-meta.js
 %%DATADIR%%/resources/inspector/profiler/profiler.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/profiler/BottomUpProfileDataGrid.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/profiler/BottomUpProfileDataGrid.js.map
@@ -1211,6 +1280,8 @@ bin/chrome
 %%DATADIR%%/resources/inspector/protocol_monitor/protocol_monitor_module.js
 %%DATADIR%%/resources/inspector/protocol_monitor/protocol_monitor-legacy.js
 %%DATADIR%%/resources/inspector/protocol_monitor/protocol_monitor.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/protocol_monitor/ModuleUIStrings.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/protocol_monitor/ModuleUIStrings.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/protocol_monitor/ProtocolMonitor.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/protocol_monitor/ProtocolMonitor.js.map
 %%DATADIR%%/resources/inspector/protocol_client/protocol_client-legacy.js
@@ -1234,6 +1305,15 @@ bin/chrome
 %%DEBUG%%%%DATADIR%%/resources/inspector/quick_open/QuickOpen.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/quick_open/QuickPick.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/quick_open/QuickPick.js.map
+%%DATADIR%%/resources/inspector/recorder/recorder.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/recorder/RecorderModel.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/recorder/RecorderModel.js.map
+%%DEBUG%%%%DATADIR%%/resources/inspector/recorder/RecordingEventHandler.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/recorder/RecordingEventHandler.js.map
+%%DEBUG%%%%DATADIR%%/resources/inspector/recorder/RecordingFileSystem.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/recorder/RecordingFileSystem.js.map
+%%DEBUG%%%%DATADIR%%/resources/inspector/recorder/RecordingSession.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/recorder/RecordingSession.js.map
 %%DATADIR%%/resources/inspector/resources/resources_module.js
 %%DATADIR%%/resources/inspector/resources/resources-legacy.js
 %%DATADIR%%/resources/inspector/resources/resources.js
@@ -1241,8 +1321,12 @@ bin/chrome
 %%DEBUG%%%%DATADIR%%/resources/inspector/resources/ApplicationCacheItemsView.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/resources/ApplicationCacheModel.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/resources/ApplicationCacheModel.js.map
+%%DEBUG%%%%DATADIR%%/resources/inspector/resources/ApplicationPanelCacheSection.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/resources/ApplicationPanelCacheSection.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/resources/ApplicationPanelSidebar.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/resources/ApplicationPanelSidebar.js.map
+%%DEBUG%%%%DATADIR%%/resources/inspector/resources/ApplicationPanelTreeElement.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/resources/ApplicationPanelTreeElement.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/resources/AppManifestView.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/resources/AppManifestView.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/resources/BackgroundServiceModel.js
@@ -1291,6 +1375,10 @@ bin/chrome
 %%DEBUG%%%%DATADIR%%/resources/inspector/screencast/ScreencastView.js.map
 %%DATADIR%%/resources/inspector/sdk_test_runner/sdk_test_runner_module.js
 %%DATADIR%%/resources/inspector/sdk_test_runner/sdk_test_runner.js
+%%DATADIR%%/resources/inspector/sdk/sdk.js
+%%DATADIR%%/resources/inspector/sdk/sdk-legacy.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/AccessibilityModel.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/AccessibilityModel.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/ChildTargetManager.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/ChildTargetManager.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CompilerSourceMappingContentProvider.js
@@ -1299,6 +1387,8 @@ bin/chrome
 %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/Connections.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/ConsoleModel.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/ConsoleModel.js.map
+%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/ConsoleModelTypes.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/ConsoleModelTypes.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/ContentSecurityPolicyIssue.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/ContentSecurityPolicyIssue.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/Cookie.js
@@ -1373,8 +1463,12 @@ bin/chrome
 %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/NetworkManager.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/NetworkRequest.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/NetworkRequest.js.map
+%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/OverlayColorGenerator.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/OverlayColorGenerator.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/OverlayModel.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/OverlayModel.js.map
+%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/OverlayPersistentHighlighter.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/OverlayPersistentHighlighter.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/PageResourceLoader.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/PageResourceLoader.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/PaintProfiler.js
@@ -1397,8 +1491,6 @@ bin/chrome
 %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/ScreenCaptureModel.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/Script.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/Script.js.map
-%%DATADIR%%/resources/inspector/sdk/sdk.js
-%%DATADIR%%/resources/inspector/sdk/sdk-legacy.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/SDKModel.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/SDKModel.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/SecurityOriginManager.js
@@ -1409,6 +1501,8 @@ bin/chrome
 %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/ServiceWorkerCacheModel.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/ServiceWorkerManager.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/ServiceWorkerManager.js.map
+%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/SharedArrayBufferTransferIssue.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/SharedArrayBufferTransferIssue.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/SourceMap.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/SourceMap.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/SourceMapManager.js
@@ -1419,10 +1513,6 @@ bin/chrome
 %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/TracingModel.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/WebAuthnModel.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/WebAuthnModel.js.map
-%%DATADIR%%/resources/inspector/sdk/wasm_source_map/pkg/wasm_source_map_bg.wasm
-%%DATADIR%%/resources/inspector/sdk/wasm_source_map/pkg/wasm_source_map.d.ts
-%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/wasm_source_map/pkg/wasm_source_map.js
-%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/wasm_source_map/wasm_source_map-tsconfig.json
 %%DATADIR%%/resources/inspector/search/search_module.js
 %%DATADIR%%/resources/inspector/search/search-legacy.js
 %%DATADIR%%/resources/inspector/search/search.js
@@ -1434,7 +1524,10 @@ bin/chrome
 %%DEBUG%%%%DATADIR%%/resources/inspector/search/SearchView.js.map
 %%DATADIR%%/resources/inspector/security/security_module.js
 %%DATADIR%%/resources/inspector/security/security-legacy.js
+%%DATADIR%%/resources/inspector/security/security-meta.js
 %%DATADIR%%/resources/inspector/security/security.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/security/ModuleUIStrings.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/security/ModuleUIStrings.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/security/SecurityModel.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/security/SecurityModel.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/security/SecurityPanel.js
@@ -1448,8 +1541,8 @@ bin/chrome
 %%DATADIR%%/resources/inspector/settings/settings_module.js
 %%DATADIR%%/resources/inspector/settings/settings-legacy.js
 %%DATADIR%%/resources/inspector/settings/settings.js
-%%DEBUG%%%%DATADIR%%/resources/inspector/settings/FrameworkBlackboxSettingsTab.js
-%%DEBUG%%%%DATADIR%%/resources/inspector/settings/FrameworkBlackboxSettingsTab.js.map
+%%DEBUG%%%%DATADIR%%/resources/inspector/settings/FrameworkIgnoreListSettingsTab.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/settings/FrameworkIgnoreListSettingsTab.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/settings/KeybindsSettingsTab.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/settings/KeybindsSettingsTab.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/settings/ModuleUIStrings.js
@@ -1460,6 +1553,8 @@ bin/chrome
 %%DATADIR%%/resources/inspector/snippets/snippets_module.js
 %%DATADIR%%/resources/inspector/snippets/snippets-legacy.js
 %%DATADIR%%/resources/inspector/snippets/snippets.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/snippets/ModuleUIStrings.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/snippets/ModuleUIStrings.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/snippets/ScriptSnippetFileSystem.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/snippets/ScriptSnippetFileSystem.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/snippets/SnippetsQuickOpen.js
@@ -1489,6 +1584,7 @@ bin/chrome
 %%DEBUG%%%%DATADIR%%/resources/inspector/source_frame/XMLView.js.map
 %%DATADIR%%/resources/inspector/sources/sources_module.js
 %%DATADIR%%/resources/inspector/sources/sources-legacy.js
+%%DATADIR%%/resources/inspector/sources/sources-meta.js
 %%DATADIR%%/resources/inspector/sources/sources.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/sources/AddSourceMapURLDialog.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/sources/AddSourceMapURLDialog.js.map
@@ -1528,6 +1624,8 @@ bin/chrome
 %%DEBUG%%%%DATADIR%%/resources/inspector/sources/OutlineQuickOpen.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/sources/Plugin.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/sources/Plugin.js.map
+%%DEBUG%%%%DATADIR%%/resources/inspector/sources/RecorderPlugin.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sources/RecorderPlugin.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/sources/ScopeChainSidebarPane.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/sources/ScopeChainSidebarPane.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/sources/ScriptFormatterEditorAction.js
@@ -1571,12 +1669,14 @@ bin/chrome
 %%DEBUG%%%%DATADIR%%/resources/inspector/test_runner/TestRunner.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/test_runner/TestRunner.js.map
 %%DATADIR%%/resources/inspector/text_editor/text_editor_module.js
+%%DATADIR%%/resources/inspector/text_editor/text_editor.js
+%%DATADIR%%/resources/inspector/text_editor/text_editor-legacy.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/text_editor/cm_modes.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/text_editor/cm_modes.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/text_editor/CodeMirrorTextEditor.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/text_editor/CodeMirrorTextEditor.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/text_editor/CodeMirrorUtils.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/text_editor/CodeMirrorUtils.js.map
-%%DATADIR%%/resources/inspector/text_editor/text_editor.js
-%%DATADIR%%/resources/inspector/text_editor/text_editor-legacy.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/text_editor/TextEditorAutocompleteController.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/text_editor/TextEditorAutocompleteController.js.map
 %%DATADIR%%/resources/inspector/text_utils/text_utils.js
@@ -1596,17 +1696,9 @@ bin/chrome
 %%DATADIR%%/resources/inspector/theme_support/theme_support.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/theme_support/theme_support_impl.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/theme_support/theme_support_impl.js.map
-%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/acorn-logical-assignment/acorn-logical-assignment-tsconfig.json
-%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/acorn-logical-assignment/package/dist/acorn-logical-assignment.mjs
-%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/acorn-logical-assignment/package/dist/acorn-logical-assignment.mjs.d.ts
-%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/acorn-logical-assignment/package/dist/acorn-logical-assignment.mjs.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/third_party/acorn-loose/acorn-loose-tsconfig.json
 %%DEBUG%%%%DATADIR%%/resources/inspector/third_party/acorn-loose/package/dist/acorn-loose.d.ts
 %%DEBUG%%%%DATADIR%%/resources/inspector/third_party/acorn-loose/package/dist/acorn-loose.mjs
-%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/acorn-numeric-separator/acorn-numeric-separator-tsconfig.json
-%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/acorn-numeric-separator/package/dist/acorn-numeric-separator.mjs
-%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/acorn-numeric-separator/package/dist/acorn-numeric-separator.mjs.d.ts
-%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/acorn-numeric-separator/package/dist/acorn-numeric-separator.mjs.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/third_party/acorn/acorn-tsconfig.json
 %%DEBUG%%%%DATADIR%%/resources/inspector/third_party/acorn/acorn.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/third_party/acorn/package/dist/acorn.d.ts
@@ -2031,8 +2123,6 @@ bin/chrome
 %%DEBUG%%%%DATADIR%%/resources/inspector/timeline/UIDevtoolsUtils.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/timeline/WebVitalsLane.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/timeline/WebVitalsLane.js.map
-%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/WebVitalsTimeline_bridge.js
-%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/WebVitalsTimeline_bridge.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/timeline/WebVitalsTimeline.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/timeline/WebVitalsTimeline.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/timeline/WebVitalsTimelineUtils.js
@@ -2040,10 +2130,10 @@ bin/chrome
 %%DATADIR%%/resources/inspector/toolbox_bootstrap/toolbox_bootstrap.js
 %%DATADIR%%/resources/inspector/toolbox.html
 %%DATADIR%%/resources/inspector/toolbox.js
-%%DEBUG%%%%DATADIR%%/resources/inspector/ui/Action.js
-%%DEBUG%%%%DATADIR%%/resources/inspector/ui/Action.js.map
-%%DEBUG%%%%DATADIR%%/resources/inspector/ui/ActionDelegate.js
-%%DEBUG%%%%DATADIR%%/resources/inspector/ui/ActionDelegate.js.map
+%%DATADIR%%/resources/inspector/ui/ui.js
+%%DATADIR%%/resources/inspector/ui/ui-legacy.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/ActionRegistration.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/ActionRegistration.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/ui/ActionRegistry.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/ui/ActionRegistry.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/ui/ARIAUtils.js
@@ -2051,12 +2141,22 @@ bin/chrome
 %%DEBUG%%%%DATADIR%%/resources/inspector/ui/components/components.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/ui/components/DataGrid.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/ui/components/DataGrid.js.map
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/components/DataGridContextMenuUtils.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/components/DataGridContextMenuUtils.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/ui/components/DataGridController.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/ui/components/DataGridController.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/ui/components/DataGridRenderers.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/ui/components/DataGridRenderers.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/ui/components/DataGridUtils.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/ui/components/DataGridUtils.js.map
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/components/Icon.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/components/Icon.js.map
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/components/Linkifier.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/components/Linkifier.js.map
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/components/LinkifierUtils.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/components/LinkifierUtils.js.map
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/components/ReportView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/components/ReportView.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/ui/Context.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/ui/Context.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/ui/ContextFlavorListener.js
@@ -2149,14 +2249,14 @@ bin/chrome
 %%DEBUG%%%%DATADIR%%/resources/inspector/ui/Tooltip.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/ui/Treeoutline.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/ui/Treeoutline.js.map
-%%DATADIR%%/resources/inspector/ui/ui.js
-%%DATADIR%%/resources/inspector/ui/ui-legacy.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/ui/UIUtils.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/ui/UIUtils.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/ui/View.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/ui/View.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/ui/ViewManager.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/ui/ViewManager.js.map
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/ViewRegistration.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/ViewRegistration.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/ui/Widget.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/ui/Widget.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/ui/XElement.js
@@ -2180,8 +2280,8 @@ bin/chrome
 %%DEBUG%%%%DATADIR%%/resources/inspector/ui/utils/register-custom-element.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/ui/utils/register-custom-element.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/ui/utils/utils.js
-%%DATADIR%%/resources/inspector/wasmparser_worker_entrypoint.js
 %%DATADIR%%/resources/inspector/wasmparser_worker/wasmparser_worker.js
+%%DATADIR%%/resources/inspector/wasmparser_worker/wasmparser_worker-entrypoint.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/wasmparser_worker/WasmParserWorker.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/wasmparser_worker/WasmParserWorker.js.map
 %%DATADIR%%/resources/inspector/web_audio/web_audio_module.js
@@ -2190,6 +2290,8 @@ bin/chrome
 %%DATADIR%%/resources/inspector/webauthn/webauthn-legacy.js
 %%DATADIR%%/resources/inspector/webauthn/webauthn.js
 %%DATADIR%%/resources/inspector/webauthn/webauthn_module.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/webauthn/ModuleUIStrings.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/webauthn/ModuleUIStrings.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/webauthn/WebauthnPane.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/webauthn/WebauthnPane.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/web_audio/AudioContextContentBuilder.js
@@ -2209,6 +2311,8 @@ bin/chrome
 %%DEBUG%%%%DATADIR%%/resources/inspector/web_audio/graph_visualizer/NodeRendererUtility.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/web_audio/graph_visualizer/NodeView.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/web_audio/graph_visualizer/NodeView.js.map
+%%DEBUG%%%%DATADIR%%/resources/inspector/web_audio/ModuleUIStrings.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/web_audio/ModuleUIStrings.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/web_audio/WebAudioModel.js
 %%DEBUG%%%%DATADIR%%/resources/inspector/web_audio/WebAudioModel.js.map
 %%DEBUG%%%%DATADIR%%/resources/inspector/web_audio/WebAudioView.js
@@ -2247,7 +2351,7 @@ bin/chrome
 %%DEBUG%%%%DATADIR%%/libimmediate_crash_test_helper.so
 %%DEBUG%%%%DATADIR%%/libmalloc_wrapper.so
 %%DEBUG%%%%DATADIR%%/libtest_shared_library.so
-%%DEBUG%%%%DATADIR%%/libvulkan.so
+%%DEBUG%%%%DATADIR%%/libvulkan.so.1
 %%DRIVER%%bin/chromedriver
 man/man1/chrome.1.gz
 share/applications/chromium-browser.desktop

From 6f952f03b0b2eb2e685f72232ba7bab62673119f Mon Sep 17 00:00:00 2001
From: Matthias Wolf <matthias@rheinwolf.de>
Date: Wed, 31 Mar 2021 17:22:01 +0200
Subject: [PATCH 2/6] Upgrade to v89.0.4389.114, based the check for LTO on
 COMPILER_VERSION instead of OSVERSION

---
 www/chromium/Makefile | 11 ++++++-----
 www/chromium/distinfo | 10 +++++-----
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/www/chromium/Makefile b/www/chromium/Makefile
index 8e63c5db..2dd36519 100644
--- a/www/chromium/Makefile
+++ b/www/chromium/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD: head/www/chromium/Makefile 563913 2021-02-03 19:46:35Z sunpoet $
 
 PORTNAME=	chromium
-PORTVERSION=	89.0.4389.90
+PORTVERSION=	89.0.4389.114
 CATEGORIES=	www java
 MASTER_SITES=	https://commondatastorage.googleapis.com/chromium-browser-official/ \
 		LOCAL/rene/chromium/:fonts
@@ -65,7 +65,7 @@ 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 cpe desktop-file-utils dos2unix gl gnome jpeg localbase:ldflags \
+USES=		bison compiler:c++17-lang cpe desktop-file-utils dos2unix gl gnome jpeg localbase:ldflags \
 		ninja perl5 pkgconfig python:2.7,build shebangfix tar:xz xorg
 
 MAKE_ARGS=	-C out/${BUILDTYPE}
@@ -198,16 +198,17 @@ TEST_DISTFILES=		${PORTNAME}-${DISTVERSION}-testdata${EXTRACT_SUFX} \
 			test_fonts-85${EXTRACT_SUFX}:fonts
 
 .include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MHEIMDAL_BASE} && !exists(/usr/lib/libkrb5.so)
 IGNORE=		you have selected HEIMDAL_BASE but do not have Heimdal installed in base
 .endif
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1300000
+.if ${COMPILER_VERSION} < 120
 EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-build_config_compiler_pgo_pgo.gni
 
 .if ${PORT_OPTIONS:MLTO}
-BROKEN+=	does not build with LTO on FreeBSD < 13, needs LLVM 11+
+BROKEN+=	does not build with LTO needs LLVM 12+
 .endif
 .endif
 
@@ -352,4 +353,4 @@ post-install-DRIVER-on:
 	${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chromedriver \
 		${STAGEDIR}${PREFIX}/bin
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/chromium/distinfo b/www/chromium/distinfo
index 853ae86b..8323d953 100644
--- a/www/chromium/distinfo
+++ b/www/chromium/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1615805841
-SHA256 (chromium-89.0.4389.90.tar.xz) = 11c6089c5fdd921216aa4eb34b52818a9b091cad655a24aed0982d29e65b279a
-SIZE (chromium-89.0.4389.90.tar.xz) = 890844888
-SHA256 (chromium-89.0.4389.90-testdata.tar.xz) = d5c2ac5a11f23ae8d28925dce5875baf370feed30319fab0875f65c80be10d2d
-SIZE (chromium-89.0.4389.90-testdata.tar.xz) = 257730924
+TIMESTAMP = 1617179966
+SHA256 (chromium-89.0.4389.114.tar.xz) = f2f0abe9697a220a8545df74d832c6c8d85a4fb11845e7e398752d746e72ed00
+SIZE (chromium-89.0.4389.114.tar.xz) = 890898912
+SHA256 (chromium-89.0.4389.114-testdata.tar.xz) = 42d108ab42c81ce42973ec9ccac951237d29089c850738eeeea770ced3293bc6
+SIZE (chromium-89.0.4389.114-testdata.tar.xz) = 257717396
 SHA256 (test_fonts-85.tar.xz) = f22b61b3639acb147c98ec2e2305d8b96f0b55c8c74c40e2ea696402fae8cef9
 SIZE (test_fonts-85.tar.xz) = 9511984

From b2de306cefa02ddff4e0f2addb98ee6261c09232 Mon Sep 17 00:00:00 2001
From: Matthias Wolf <matthias@rheinwolf.de>
Date: Thu, 1 Apr 2021 17:52:59 +0200
Subject: [PATCH 3/6] Hopefully fixed issue w/ libva-2.11

---
 ...rotected__content_va__protected__content.h | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 www/chromium/files/patch-third__party_libva__protected__content_va__protected__content.h

diff --git a/www/chromium/files/patch-third__party_libva__protected__content_va__protected__content.h b/www/chromium/files/patch-third__party_libva__protected__content_va__protected__content.h
new file mode 100644
index 00000000..f3299359
--- /dev/null
+++ b/www/chromium/files/patch-third__party_libva__protected__content_va__protected__content.h
@@ -0,0 +1,34 @@
+--- third_party/libva_protected_content/va_protected_content.h.orig	2021-04-01 15:39:21 UTC
++++ third_party/libva_protected_content/va_protected_content.h
+@@ -133,6 +133,7 @@ extern "C" {
+ #define VA_PC_SAMPLE_TYPE_SUBSAMPLE 0x00000002
+ 
+ /** \brief TeeExec Function Codes. */
++#if 0
+ typedef enum _VA_TEE_EXEC_FUNCTION_ID {
+   VA_TEE_EXEC_TEE_FUNCID_PASS_THROUGH_NONE = 0x0,
+ 
+@@ -144,6 +145,7 @@ typedef enum _VA_TEE_EXEC_FUNCTION_ID {
+   VA_TEE_EXEC_TEE_FUNCID_PASS_THROUGH = 0x40001000,
+ 
+ } VA_TEE_EXEC_FUNCTION_ID;
++#endif
+ 
+ /** \brief values for the encryption return status. */
+ typedef enum {
+@@ -160,6 +162,7 @@ typedef enum {
+ } VAEncryptionStatus;
+ 
+ /** \brief structure for encrypted segment info. */
++#if 0
+ typedef struct _VAEncryptionSegmentInfo {
+   /** \brief  The offset relative to the start of the bitstream input in
+    *  bytes of the start of the segment*/
+@@ -215,6 +218,7 @@ typedef struct _VAEncryptionParameters {
+   /** \brief Reserved bytes for future use, must be zero */
+   uint32_t va_reserved[VA_PADDING_MEDIUM];
+ } VAEncryptionParameters;
++#endif
+ 
+ /** \brief structure for VA_TEE_EXEC_GPU_FUNCID_ENCRYPTION_BLT */
+ typedef struct _VA_PROTECTED_BLT_PARAMS {

From 1abe2862e708a3cf37831f2f3fbfa50c2490a692 Mon Sep 17 00:00:00 2001
From: Rene Ladan <rene0@freedom.nl>
Date: Sat, 3 Apr 2021 11:30:55 +0200
Subject: [PATCH 4/6] Fix a stage-qa warning.

---
 www/chromium/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/www/chromium/Makefile b/www/chromium/Makefile
index 2dd36519..9f713534 100644
--- a/www/chromium/Makefile
+++ b/www/chromium/Makefile
@@ -60,7 +60,8 @@ LIB_DEPENDS=	libatk-bridge-2.0.so:accessibility/at-spi2-atk \
 		libnss3.so:security/nss \
 		libexpat.so:textproc/expat2 \
 		libfontconfig.so:x11-fonts/fontconfig \
-		libxkbcommon.so:x11/libxkbcommon
+		libxkbcommon.so:x11/libxkbcommon \
+		libxshmfence.so:x11/libxshmfence
 
 RUN_DEPENDS=	xdg-open:devel/xdg-utils \
 		noto-basic>0:x11-fonts/noto-basic

From 190f5409257486fdd64d2f7936e3e194bc815665 Mon Sep 17 00:00:00 2001
From: Matthias Wolf <matthias@rheinwolf.de>
Date: Wed, 14 Apr 2021 10:29:09 +0200
Subject: [PATCH 5/6] Update to 89.0.4389.128

---
 www/chromium/Makefile |  3 +--
 www/chromium/distinfo | 10 +++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/www/chromium/Makefile b/www/chromium/Makefile
index 9f713534..253955fd 100644
--- a/www/chromium/Makefile
+++ b/www/chromium/Makefile
@@ -1,8 +1,7 @@
 # Created by: Florent Thoumie <flz@FreeBSD.org>
-# $FreeBSD: head/www/chromium/Makefile 563913 2021-02-03 19:46:35Z sunpoet $
 
 PORTNAME=	chromium
-PORTVERSION=	89.0.4389.114
+PORTVERSION=	89.0.4389.128
 CATEGORIES=	www java
 MASTER_SITES=	https://commondatastorage.googleapis.com/chromium-browser-official/ \
 		LOCAL/rene/chromium/:fonts
diff --git a/www/chromium/distinfo b/www/chromium/distinfo
index 8323d953..7ff96a7b 100644
--- a/www/chromium/distinfo
+++ b/www/chromium/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1617179966
-SHA256 (chromium-89.0.4389.114.tar.xz) = f2f0abe9697a220a8545df74d832c6c8d85a4fb11845e7e398752d746e72ed00
-SIZE (chromium-89.0.4389.114.tar.xz) = 890898912
-SHA256 (chromium-89.0.4389.114-testdata.tar.xz) = 42d108ab42c81ce42973ec9ccac951237d29089c850738eeeea770ced3293bc6
-SIZE (chromium-89.0.4389.114-testdata.tar.xz) = 257717396
+TIMESTAMP = 1618388739
+SHA256 (chromium-89.0.4389.128.tar.xz) = 1a75ea6aeb98f2d3b6feae1fbf5692679e93d5b7631bc7c762dd873499deda5b
+SIZE (chromium-89.0.4389.128.tar.xz) = 890850492
+SHA256 (chromium-89.0.4389.128-testdata.tar.xz) = 03f16939f3fc8182a0f306abf1e6c801e2e6fd11533d18787c05c852cbec46bd
+SIZE (chromium-89.0.4389.128-testdata.tar.xz) = 257707276
 SHA256 (test_fonts-85.tar.xz) = f22b61b3639acb147c98ec2e2305d8b96f0b55c8c74c40e2ea696402fae8cef9
 SIZE (test_fonts-85.tar.xz) = 9511984

From 9055e96714b91f08fdf6cb68b0fc6741ee92f3ee Mon Sep 17 00:00:00 2001
From: Rene Ladan <rene0@freedom.nl>
Date: Wed, 14 Apr 2021 19:53:38 +0200
Subject: [PATCH 6/6] Sync with ports.

---
 www/chromium/Makefile | 42 ++++++++++++++++++++----------------------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/www/chromium/Makefile b/www/chromium/Makefile
index 253955fd..ab5a34ab 100644
--- a/www/chromium/Makefile
+++ b/www/chromium/Makefile
@@ -68,22 +68,22 @@ RUN_DEPENDS=	xdg-open:devel/xdg-utils \
 USES=		bison compiler:c++17-lang cpe desktop-file-utils dos2unix gl gnome jpeg localbase:ldflags \
 		ninja perl5 pkgconfig python:2.7,build shebangfix tar:xz xorg
 
-MAKE_ARGS=	-C out/${BUILDTYPE}
-BINARY_ALIAS=	python=${PYTHON_CMD}
-DOS2UNIX_FILES=	third_party/skia/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h
-
 CPE_VENDOR=	google
 CPE_PRODUCT=	chrome
+DOS2UNIX_FILES=	third_party/skia/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h
 USE_GL=		gbm gl
+USE_GNOME=	atk dconf glib20 gtk30 libxml2 libxslt
+INSTALLS_ICONS=	yes
 USE_LDCONFIG=	${DATADIR}
 USE_PERL5=	build
 USE_XORG=	x11 xcb xcomposite xcursor xext xdamage xfixes xi \
 		xorgproto xrandr xrender xscrnsaver xtst
-USE_GNOME=	atk dconf glib20 gtk30 libxml2 libxslt
 SHEBANG_FILES=	chrome/tools/build/linux/chrome-wrapper buildtools/linux64/clang-format
+
+MAKE_ARGS=	-C out/${BUILDTYPE}
 ALL_TARGET=	chrome
-INSTALLS_ICONS=	yes
 
+BINARY_ALIAS=	python=${PYTHON_CMD}
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-clang
 
 # TODO bz@ : install libwidevinecdm.so (see third_party/widevine/cdm/BUILD.gn)
@@ -127,21 +127,17 @@ SUB_FILES=	chromium-browser.desktop chrome
 SUB_LIST+=	COMMENT="${COMMENT}"
 
 OPTIONS_DEFINE=	CODECS CUPS DEBUG DRIVER KERBEROS LTO TEST
-CODECS_DESC=	Compile and enable patented codecs like H.264
-DRIVER_DESC=	Install chromedriver
+OPTIONS_DEFAULT=	CODECS CUPS DRIVER KERBEROS SNDIO
 OPTIONS_GROUP=		AUDIO
 OPTIONS_GROUP_AUDIO=	ALSA PULSEAUDIO SNDIO
-
 OPTIONS_RADIO=		KERBEROS
 OPTIONS_RADIO_KERBEROS=	HEIMDAL HEIMDAL_BASE MIT
-HEIMDAL_DESC=		Heimdal Kerberos (security/heimdal)
+OPTIONS_SUB=		yes
+CODECS_DESC=		Compile and enable patented codecs like H.264
+DRIVER_DESC=		Install chromedriver
 HEIMDAL_BASE_DESC=	Heimdal Kerberos (base)
+HEIMDAL_DESC=		Heimdal Kerberos (security/heimdal)
 MIT_DESC=		MIT Kerberos (security/krb5)
-HEIMDAL_LIB_DEPENDS=	libkrb.so.26:security/heimdal
-MIT_LIB_DEPENDS=	libkrb.so.3:security/krb5
-
-OPTIONS_DEFAULT=	CODECS CUPS DRIVER KERBEROS SNDIO
-OPTIONS_SUB=		yes
 
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins \
@@ -173,6 +169,7 @@ DEBUG_VARS_OFF=		BUILDTYPE=Release \
 
 DRIVER_MAKE_ARGS=	chromedriver
 
+HEIMDAL_LIB_DEPENDS=	libkrb.so.26:security/heimdal
 KERBEROS_VARS=		GN_ARGS+=use_kerberos=true
 KERBEROS_VARS_OFF=	GN_ARGS+=use_kerberos=false
 
@@ -180,6 +177,7 @@ LTO_VARS=		GN_ARGS+=use_thin_lto=true \
 			GN_ARGS+=thin_lto_enable_optimizations=true \
 			WANTSPACE="14 GB"
 
+MIT_LIB_DEPENDS=	libkrb.so.3:security/krb5
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_VARS=	GN_ARGS+=use_pulseaudio=true
 PULSEAUDIO_VARS_OFF=	GN_ARGS+=use_pulseaudio=false
@@ -193,9 +191,9 @@ SNDIO_VARS=		GN_ARGS+=use_sndio=true
 SNDIO_VARS_OFF=		GN_ARGS+=use_sndio=false
 
 .include "Makefile.tests"
-TEST_ALL_TARGET=	${TEST_TARGETS}
 TEST_DISTFILES=		${PORTNAME}-${DISTVERSION}-testdata${EXTRACT_SUFX} \
 			test_fonts-85${EXTRACT_SUFX}:fonts
+TEST_ALL_TARGET=	${TEST_TARGETS}
 
 .include <bsd.port.options.mk>
 .include <bsd.port.pre.mk>
@@ -288,12 +286,6 @@ do-configure:
 	${LN} -sf ${WRKSRC}/buildtools/linux64/clang-format ${WRKSRC}/buildtools/freebsd
 	${LN} -sf ${WRKSRC}/out/${BUILDTYPE}/gn ${WRKSRC}/buildtools/freebsd
 
-do-test-TEST-on:
-.for t in ${TEST_TARGETS}
-	cd ${WRKSRC}/out/${BUILDTYPE} && ${SETENV} LC_ALL=en_US.UTF-8 \
-		./${t} --gtest_filter=-${EXCLUDE_${t}:ts:} || ${TRUE}
-.endfor
-
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_MAN} ${WRKSRC}/chrome/app/resources/manpage.1.in \
@@ -353,4 +345,10 @@ post-install-DRIVER-on:
 	${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chromedriver \
 		${STAGEDIR}${PREFIX}/bin
 
+do-test-TEST-on:
+.for t in ${TEST_TARGETS}
+	cd ${WRKSRC}/out/${BUILDTYPE} && ${SETENV} LC_ALL=en_US.UTF-8 \
+		./${t} --gtest_filter=-${EXCLUDE_${t}:ts:} || ${TRUE}
+.endfor
+
 .include <bsd.port.post.mk>