From owner-svn-ports-all@freebsd.org  Thu Jan 16 21:03:45 2020
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9C6091F5FF7;
 Thu, 16 Jan 2020 21:03:45 +0000 (UTC)
 (envelope-from rene@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 47zGrd47vPz4bX5;
 Thu, 16 Jan 2020 21:03:45 +0000 (UTC)
 (envelope-from rene@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 88D4825AB7;
 Thu, 16 Jan 2020 21:03:45 +0000 (UTC)
 (envelope-from rene@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 00GL3jdQ032701;
 Thu, 16 Jan 2020 21:03:45 GMT (envelope-from rene@FreeBSD.org)
Received: (from rene@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00GL3dCB032669;
 Thu, 16 Jan 2020 21:03:39 GMT (envelope-from rene@FreeBSD.org)
Message-Id: <202001162103.00GL3dCB032669@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: rene set sender to
 rene@FreeBSD.org using -f
From: Rene Ladan <rene@FreeBSD.org>
Date: Thu, 16 Jan 2020 21:03:39 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r523260 - in branches/2020Q1/www/chromium: . files
X-SVN-Group: ports-branches
X-SVN-Commit-Author: rene
X-SVN-Commit-Paths: in branches/2020Q1/www/chromium: . files
X-SVN-Commit-Revision: 523260
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 16 Jan 2020 21:03:45 -0000

Author: rene
Date: Thu Jan 16 21:03:39 2020
New Revision: 523260
URL: https://svnweb.freebsd.org/changeset/ports/523260

Log:
  MFH: r523259
  
  www/chromium: update to 79.0.3945.117
  
  Submitted by:	Matthias Wolf via GitHub
  Pull requests:	169, 170
  
  Approved by:	ports-secteam (implicit, browser)

Added:
  branches/2020Q1/www/chromium/files/patch-3p-pdfium_3p_base_allocator_partition__allocator_page__allocator__internals__posix.h
     - copied unchanged from r523259, head/www/chromium/files/patch-3p-pdfium_3p_base_allocator_partition__allocator_page__allocator__internals__posix.h
  branches/2020Q1/www/chromium/files/patch-chrome_browser_crash__upload__list_crash__upload__list.cc
     - copied unchanged from r523259, head/www/chromium/files/patch-chrome_browser_crash__upload__list_crash__upload__list.cc
  branches/2020Q1/www/chromium/files/patch-chrome_browser_crash__upload__list_crash__upload__list__crashpad.cc
     - copied unchanged from r523259, head/www/chromium/files/patch-chrome_browser_crash__upload__list_crash__upload__list__crashpad.cc
  branches/2020Q1/www/chromium/files/patch-chrome_common_channel__info.h
     - copied unchanged from r523259, head/www/chromium/files/patch-chrome_common_channel__info.h
  branches/2020Q1/www/chromium/files/patch-chrome_common_channel__info__posix.cc
     - copied unchanged from r523259, head/www/chromium/files/patch-chrome_common_channel__info__posix.cc
  branches/2020Q1/www/chromium/files/patch-chromecast_external__mojo_public_cpp_external__mojo__broker.cc
     - copied unchanged from r523259, head/www/chromium/files/patch-chromecast_external__mojo_public_cpp_external__mojo__broker.cc
  branches/2020Q1/www/chromium/files/patch-components_crash_content_app_crashpad.h
     - copied unchanged from r523259, head/www/chromium/files/patch-components_crash_content_app_crashpad.h
  branches/2020Q1/www/chromium/files/patch-components_crash_content_app_crashpad__linux.cc
     - copied unchanged from r523259, head/www/chromium/files/patch-components_crash_content_app_crashpad__linux.cc
  branches/2020Q1/www/chromium/files/patch-components_sync__device__info_device__info__sync__bridge.cc
     - copied unchanged from r523259, head/www/chromium/files/patch-components_sync__device__info_device__info__sync__bridge.cc
  branches/2020Q1/www/chromium/files/patch-components_sync__device__info_local__device__info__util.cc
     - copied unchanged from r523259, head/www/chromium/files/patch-components_sync__device__info_local__device__info__util.cc
  branches/2020Q1/www/chromium/files/patch-components_viz_host_host__display__client.cc
     - copied unchanged from r523259, head/www/chromium/files/patch-components_viz_host_host__display__client.cc
  branches/2020Q1/www/chromium/files/patch-components_viz_host_host__display__client.h
     - copied unchanged from r523259, head/www/chromium/files/patch-components_viz_host_host__display__client.h
  branches/2020Q1/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.cc
     - copied unchanged from r523259, head/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.cc
  branches/2020Q1/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.h
     - copied unchanged from r523259, head/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.h
  branches/2020Q1/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc
     - copied unchanged from r523259, head/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc
  branches/2020Q1/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h
     - copied unchanged from r523259, head/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h
  branches/2020Q1/www/chromium/files/patch-content_browser_compositor_gpu__process__transport__factory.cc
     - copied unchanged from r523259, head/www/chromium/files/patch-content_browser_compositor_gpu__process__transport__factory.cc
  branches/2020Q1/www/chromium/files/patch-content_browser_compositor_software__browser__compositor__output__surface.cc
     - copied unchanged from r523259, head/www/chromium/files/patch-content_browser_compositor_software__browser__compositor__output__surface.cc
  branches/2020Q1/www/chromium/files/patch-content_browser_compositor_software__browser__compositor__output__surface.h
     - copied unchanged from r523259, head/www/chromium/files/patch-content_browser_compositor_software__browser__compositor__output__surface.h
  branches/2020Q1/www/chromium/files/patch-content_browser_ppapi__plugin__process__host__receiver__bindings.cc
     - copied unchanged from r523259, head/www/chromium/files/patch-content_browser_ppapi__plugin__process__host__receiver__bindings.cc
  branches/2020Q1/www/chromium/files/patch-media_gpu_buffer__validation.cc
     - copied unchanged from r523259, head/www/chromium/files/patch-media_gpu_buffer__validation.cc
  branches/2020Q1/www/chromium/files/patch-media_video_fake__gpu__memory__buffer.cc
     - copied unchanged from r523259, head/www/chromium/files/patch-media_video_fake__gpu__memory__buffer.cc
  branches/2020Q1/www/chromium/files/patch-media_webrtc_webrtc__switches.cc
     - copied unchanged from r523259, head/www/chromium/files/patch-media_webrtc_webrtc__switches.cc
  branches/2020Q1/www/chromium/files/patch-services_tracing_public_cpp_perfetto_trace__event__data__source.cc
     - copied unchanged from r523259, head/www/chromium/files/patch-services_tracing_public_cpp_perfetto_trace__event__data__source.cc
  branches/2020Q1/www/chromium/files/patch-third__party_swiftshader_third__party_marl_src_memory.cpp
     - copied unchanged from r523259, head/www/chromium/files/patch-third__party_swiftshader_third__party_marl_src_memory.cpp
  branches/2020Q1/www/chromium/files/patch-third__party_swiftshader_third__party_marl_src_thread.cpp
     - copied unchanged from r523259, head/www/chromium/files/patch-third__party_swiftshader_third__party_marl_src_thread.cpp
  branches/2020Q1/www/chromium/files/patch-ui_base_x_x11__shm__image__pool__base.cc
     - copied unchanged from r523259, head/www/chromium/files/patch-ui_base_x_x11__shm__image__pool__base.cc
  branches/2020Q1/www/chromium/files/patch-ui_compositor_compositor.cc
     - copied unchanged from r523259, head/www/chromium/files/patch-ui_compositor_compositor.cc
  branches/2020Q1/www/chromium/files/patch-ui_compositor_compositor.h
     - copied unchanged from r523259, head/www/chromium/files/patch-ui_compositor_compositor.h
  branches/2020Q1/www/chromium/files/patch-ui_compositor_compositor__observer.h
     - copied unchanged from r523259, head/www/chromium/files/patch-ui_compositor_compositor__observer.h
  branches/2020Q1/www/chromium/files/patch-ui_compositor_host_host__context__factory__private.cc
     - copied unchanged from r523259, head/www/chromium/files/patch-ui_compositor_host_host__context__factory__private.cc
  branches/2020Q1/www/chromium/files/patch-ui_gfx_font__util.cc
     - copied unchanged from r523259, head/www/chromium/files/patch-ui_gfx_font__util.cc
  branches/2020Q1/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.cc
     - copied unchanged from r523259, head/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.cc
  branches/2020Q1/www/chromium/files/patch-ui_views_widget_native__widget__aura.cc
     - copied unchanged from r523259, head/www/chromium/files/patch-ui_views_widget_native__widget__aura.cc
  branches/2020Q1/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.cc
     - copied unchanged from r523259, head/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.cc
  branches/2020Q1/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.h
     - copied unchanged from r523259, head/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.h
  branches/2020Q1/www/chromium/files/patch-weblayer_common_weblayer__paths.cc
     - copied unchanged from r523259, head/www/chromium/files/patch-weblayer_common_weblayer__paths.cc
Deleted:
  branches/2020Q1/www/chromium/files/patch-chrome_browser_download_download__status__updater.cc
  branches/2020Q1/www/chromium/files/patch-chrome_browser_sharing_click__to__call_feature.cc
  branches/2020Q1/www/chromium/files/patch-chrome_browser_sharing_click__to__call_feature.h
  branches/2020Q1/www/chromium/files/patch-chrome_browser_ui_ui__features.cc
  branches/2020Q1/www/chromium/files/patch-chrome_browser_ui_ui__features.h
  branches/2020Q1/www/chromium/files/patch-media_audio_pulse_pulse.sigs
  branches/2020Q1/www/chromium/files/patch-media_capture_video_mock__gpu__memory__buffer__manager.cc
  branches/2020Q1/www/chromium/files/patch-services_service__manager_sandbox_sandbox__type.cc
  branches/2020Q1/www/chromium/files/patch-third__party_pdfium_third__party_base_allocator_partition__allocator_page__allocator__internals__posix.h
  branches/2020Q1/www/chromium/files/patch-third__party_swiftshader_src_Yarn_Thread.cpp
  branches/2020Q1/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.h
  branches/2020Q1/www/chromium/files/patch-weblayer_shell_app_shell__main.cc
Modified:
  branches/2020Q1/www/chromium/Makefile
  branches/2020Q1/www/chromium/distinfo
  branches/2020Q1/www/chromium/files/patch-BUILD.gn
  branches/2020Q1/www/chromium/files/patch-base_BUILD.gn
  branches/2020Q1/www/chromium/files/patch-base_files_file__util.h
  branches/2020Q1/www/chromium/files/patch-base_files_file__util__posix.cc
  branches/2020Q1/www/chromium/files/patch-base_i18n_icu__util.cc
  branches/2020Q1/www/chromium/files/patch-base_linux__util.cc
  branches/2020Q1/www/chromium/files/patch-base_logging__unittest.cc
  branches/2020Q1/www/chromium/files/patch-base_process_kill.h
  branches/2020Q1/www/chromium/files/patch-base_system_sys__info.h
  branches/2020Q1/www/chromium/files/patch-base_system_sys__info__freebsd.cc
  branches/2020Q1/www/chromium/files/patch-base_test_generate__fontconfig__caches.cc
  branches/2020Q1/www/chromium/files/patch-base_threading_thread__task__runner__handle.cc
  branches/2020Q1/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc
  branches/2020Q1/www/chromium/files/patch-build_config_compiler_BUILD.gn
  branches/2020Q1/www/chromium/files/patch-build_config_compiler_compiler.gni
  branches/2020Q1/www/chromium/files/patch-cc_BUILD.gn
  branches/2020Q1/www/chromium/files/patch-cc_layers_scrollbar__layer__impl__base.cc
  branches/2020Q1/www/chromium/files/patch-cc_trees_property__tree.cc
  branches/2020Q1/www/chromium/files/patch-chrome_app_chrome__content__browser__overlay__manifest.cc
  branches/2020Q1/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc
  branches/2020Q1/www/chromium/files/patch-chrome_app_chromium__strings.grd
  branches/2020Q1/www/chromium/files/patch-chrome_app_generated__resources.grd
  branches/2020Q1/www/chromium/files/patch-chrome_app_google__chrome__strings.grd
  branches/2020Q1/www/chromium/files/patch-chrome_app_settings__strings.grdp
  branches/2020Q1/www/chromium/files/patch-chrome_browser_about__flags.cc
  branches/2020Q1/www/chromium/files/patch-chrome_browser_after__startup__task__utils.cc
  branches/2020Q1/www/chromium/files/patch-chrome_browser_background_background__mode__manager.cc
  branches/2020Q1/www/chromium/files/patch-chrome_browser_browser__resources.grd
  branches/2020Q1/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc
  branches/2020Q1/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc
  branches/2020Q1/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc
  branches/2020Q1/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h
  branches/2020Q1/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc
  branches/2020Q1/www/chromium/files/patch-chrome_browser_download_download__commands.cc
  branches/2020Q1/www/chromium/files/patch-chrome_browser_download_download__item__model.cc
  branches/2020Q1/www/chromium/files/patch-chrome_browser_download_download__prefs.cc
  branches/2020Q1/www/chromium/files/patch-chrome_browser_download_download__shelf__context__menu.cc
  branches/2020Q1/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn
  branches/2020Q1/www/chromium/files/patch-chrome_browser_extensions_activity__log_activity__log.cc
  branches/2020Q1/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc
  branches/2020Q1/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc
  branches/2020Q1/www/chromium/files/patch-chrome_browser_flag__descriptions.cc
  branches/2020Q1/www/chromium/files/patch-chrome_browser_flag__descriptions.h
  branches/2020Q1/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__event__log__uploader.cc
  branches/2020Q1/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc
  branches/2020Q1/www/chromium/files/patch-chrome_browser_metrics_process__memory__metrics__emitter.cc
  branches/2020Q1/www/chromium/files/patch-chrome_browser_native__file__system_chrome__native__file__system__permission__context.cc
  branches/2020Q1/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc
  branches/2020Q1/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc
  branches/2020Q1/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc
  branches/2020Q1/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc
  branches/2020Q1/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__whitelist.cc
  branches/2020Q1/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc
  branches/2020Q1/www/chromium/files/patch-chrome_browser_profiles_profile__attributes__entry.cc
  branches/2020Q1/www/chromium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.cc
  branches/2020Q1/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc
  branches/2020Q1/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc
  branches/2020Q1/www/chromium/files/patch-chrome_browser_search_search__suggest_search__suggest__service.cc
  branches/2020Q1/www/chromium/files/patch-chrome_browser_signin_signin__util.cc
  branches/2020Q1/www/chromium/files/patch-chrome_browser_themes_theme__service__factory.cc
  branches/2020Q1/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc
  branches/2020Q1/www/chromium/files/patch-chrome_browser_ui_sad__tab.cc
  branches/2020Q1/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc
  branches/2020Q1/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc
  branches/2020Q1/www/chromium/files/patch-chrome_browser_ui_views_first__run__dialog.cc
  branches/2020Q1/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc
  branches/2020Q1/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc
  branches/2020Q1/www/chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc
  branches/2020Q1/www/chromium/files/patch-chrome_browser_ui_views_tabs_new__tab__button.cc
  branches/2020Q1/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc
  branches/2020Q1/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc
  branches/2020Q1/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc
  branches/2020Q1/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc
  branches/2020Q1/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc
  branches/2020Q1/www/chromium/files/patch-chrome_browser_web__applications_extensions_web__app__extension__shortcut.cc
  branches/2020Q1/www/chromium/files/patch-chrome_common_BUILD.gn
  branches/2020Q1/www/chromium/files/patch-chrome_common_chrome__features.cc
  branches/2020Q1/www/chromium/files/patch-chrome_common_chrome__features.h
  branches/2020Q1/www/chromium/files/patch-chrome_common_chrome__paths.cc
  branches/2020Q1/www/chromium/files/patch-chrome_common_chrome__paths.h
  branches/2020Q1/www/chromium/files/patch-chrome_common_chrome__switches.cc
  branches/2020Q1/www/chromium/files/patch-chrome_common_chrome__switches.h
  branches/2020Q1/www/chromium/files/patch-chrome_common_extensions_api_api__sources.gni
  branches/2020Q1/www/chromium/files/patch-chrome_common_features.gni
  branches/2020Q1/www/chromium/files/patch-chrome_common_pref__names.cc
  branches/2020Q1/www/chromium/files/patch-chrome_common_pref__names.h
  branches/2020Q1/www/chromium/files/patch-chrome_common_webui__url__constants.cc
  branches/2020Q1/www/chromium/files/patch-chrome_common_webui__url__constants.h
  branches/2020Q1/www/chromium/files/patch-chrome_renderer_chrome__content__renderer__client.cc
  branches/2020Q1/www/chromium/files/patch-chrome_test_BUILD.gn
  branches/2020Q1/www/chromium/files/patch-chrome_test_base_in__process__browser__test.cc
  branches/2020Q1/www/chromium/files/patch-chrome_test_chromedriver_chrome__launcher.cc
  branches/2020Q1/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc
  branches/2020Q1/www/chromium/files/patch-components_autofill_content_renderer_password__form__conversion__utils.cc
  branches/2020Q1/www/chromium/files/patch-components_autofill_core_browser_autofill__experiments.cc
  branches/2020Q1/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc
  branches/2020Q1/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc
  branches/2020Q1/www/chromium/files/patch-components_crash_content_app_BUILD.gn
  branches/2020Q1/www/chromium/files/patch-components_crash_core_common_BUILD.gn
  branches/2020Q1/www/chromium/files/patch-components_discardable__memory_service_discardable__shared__memory__manager.cc
  branches/2020Q1/www/chromium/files/patch-components_download_internal_common_base__file.cc
  branches/2020Q1/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc
  branches/2020Q1/www/chromium/files/patch-components_feature__engagement_public_feature__list.h
  branches/2020Q1/www/chromium/files/patch-components_metrics_BUILD.gn
  branches/2020Q1/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc
  branches/2020Q1/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc
  branches/2020Q1/www/chromium/files/patch-components_policy_resources_policy__templates.json
  branches/2020Q1/www/chromium/files/patch-components_policy_tools_generate__policy__source.py
  branches/2020Q1/www/chromium/files/patch-components_sync__device__info_local__device__info__util__linux.cc
  branches/2020Q1/www/chromium/files/patch-content_app_content__main__runner__impl.cc
  branches/2020Q1/www/chromium/files/patch-content_browser_browser__main__loop.cc
  branches/2020Q1/www/chromium/files/patch-content_browser_devtools_protocol_system__info__handler.cc
  branches/2020Q1/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc
  branches/2020Q1/www/chromium/files/patch-content_browser_media_media__internals.cc
  branches/2020Q1/www/chromium/files/patch-content_browser_ppapi__plugin__process__host.cc
  branches/2020Q1/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.cc
  branches/2020Q1/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.h
  branches/2020Q1/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc
  branches/2020Q1/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h
  branches/2020Q1/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc
  branches/2020Q1/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc
  branches/2020Q1/www/chromium/files/patch-content_browser_utility__process__host.cc
  branches/2020Q1/www/chromium/files/patch-content_browser_webui_shared__resources__data__source.cc
  branches/2020Q1/www/chromium/files/patch-content_common_BUILD.gn
  branches/2020Q1/www/chromium/files/patch-content_common_user__agent.cc
  branches/2020Q1/www/chromium/files/patch-content_gpu_BUILD.gn
  branches/2020Q1/www/chromium/files/patch-content_gpu_gpu__main.cc
  branches/2020Q1/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc
  branches/2020Q1/www/chromium/files/patch-content_public_common_common__param__traits__macros.h
  branches/2020Q1/www/chromium/files/patch-content_public_common_content__features.cc
  branches/2020Q1/www/chromium/files/patch-content_public_common_content__switches.cc
  branches/2020Q1/www/chromium/files/patch-content_public_common_content__switches.h
  branches/2020Q1/www/chromium/files/patch-content_public_test_browser__test__base.cc
  branches/2020Q1/www/chromium/files/patch-content_public_test_mock__render__thread.cc
  branches/2020Q1/www/chromium/files/patch-content_renderer_render__thread__impl.cc
  branches/2020Q1/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc
  branches/2020Q1/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h
  branches/2020Q1/www/chromium/files/patch-content_shell_BUILD.gn
  branches/2020Q1/www/chromium/files/patch-content_shell_app_shell__main__delegate.cc
  branches/2020Q1/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc
  branches/2020Q1/www/chromium/files/patch-content_shell_test__runner_test__runner.cc
  branches/2020Q1/www/chromium/files/patch-content_test_content__test__suite.cc
  branches/2020Q1/www/chromium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.cc
  branches/2020Q1/www/chromium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.h
  branches/2020Q1/www/chromium/files/patch-extensions_common_image__util.cc
  branches/2020Q1/www/chromium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc
  branches/2020Q1/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc
  branches/2020Q1/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.h
  branches/2020Q1/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__gl__representation.cc
  branches/2020Q1/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.cc
  branches/2020Q1/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.h
  branches/2020Q1/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc
  branches/2020Q1/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.cc
  branches/2020Q1/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.h
  branches/2020Q1/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc
  branches/2020Q1/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h
  branches/2020Q1/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc
  branches/2020Q1/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.h
  branches/2020Q1/www/chromium/files/patch-headless_lib_browser_headless__request__context__manager.cc
  branches/2020Q1/www/chromium/files/patch-ipc_ipc__channel.h
  branches/2020Q1/www/chromium/files/patch-ipc_ipc__channel__mojo.cc
  branches/2020Q1/www/chromium/files/patch-media_audio_BUILD.gn
  branches/2020Q1/www/chromium/files/patch-media_base_video__frame.cc
  branches/2020Q1/www/chromium/files/patch-media_base_video__frame.h
  branches/2020Q1/www/chromium/files/patch-media_capture_video_fake__video__capture__device__factory.cc
  branches/2020Q1/www/chromium/files/patch-media_capture_video_video__capture__buffer__pool__impl.cc
  branches/2020Q1/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc
  branches/2020Q1/www/chromium/files/patch-media_gpu_libyuv__image__processor.cc
  branches/2020Q1/www/chromium/files/patch-media_gpu_linux_platform__video__frame__utils.cc
  branches/2020Q1/www/chromium/files/patch-media_media__options.gni
  branches/2020Q1/www/chromium/files/patch-media_mojo_clients_mojo__video__encode__accelerator.cc
  branches/2020Q1/www/chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc
  branches/2020Q1/www/chromium/files/patch-media_mojo_services_gpu__mojo__media__client.cc
  branches/2020Q1/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc
  branches/2020Q1/www/chromium/files/patch-net_BUILD.gn
  branches/2020Q1/www/chromium/files/patch-net_base_address__tracker__linux.cc
  branches/2020Q1/www/chromium/files/patch-net_base_network__change__notifier.cc
  branches/2020Q1/www/chromium/files/patch-net_socket_socket__posix.cc
  branches/2020Q1/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc
  branches/2020Q1/www/chromium/files/patch-net_url__request_url__request__context__builder.cc
  branches/2020Q1/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc
  branches/2020Q1/www/chromium/files/patch-printing_cups__config__helper.py
  branches/2020Q1/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc
  branches/2020Q1/www/chromium/files/patch-remoting_resources_remoting__strings.grd
  branches/2020Q1/www/chromium/files/patch-services_device_geolocation_location__arbitrator.cc
  branches/2020Q1/www/chromium/files/patch-services_device_hid_hid__service__freebsd.cc
  branches/2020Q1/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor.cc
  branches/2020Q1/www/chromium/files/patch-services_network_BUILD.gn
  branches/2020Q1/www/chromium/files/patch-services_network_network__context.cc
  branches/2020Q1/www/chromium/files/patch-services_network_network__service.cc
  branches/2020Q1/www/chromium/files/patch-services_network_network__service.h
  branches/2020Q1/www/chromium/files/patch-services_video__capture_broadcasting__receiver.cc
  branches/2020Q1/www/chromium/files/patch-third__party_angle_BUILD.gn
  branches/2020Q1/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp
  branches/2020Q1/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.h
  branches/2020Q1/www/chromium/files/patch-third__party_angle_third__party_vulkan-loader_src_loader_loader.c
  branches/2020Q1/www/chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc
  branches/2020Q1/www/chromium/files/patch-third__party_blink_renderer_modules_mediastream_processed__local__audio__source.cc
  branches/2020Q1/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn
  branches/2020Q1/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h
  branches/2020Q1/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc
  branches/2020Q1/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_threading__pthreads.cc
  branches/2020Q1/www/chromium/files/patch-third__party_boringssl_BUILD.gn
  branches/2020Q1/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_signals.cc
  branches/2020Q1/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_build__config.h
  branches/2020Q1/www/chromium/files/patch-third__party_skia_src_sksl_SkSLString.h
  branches/2020Q1/www/chromium/files/patch-third__party_swiftshader_BUILD.gn
  branches/2020Q1/www/chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn
  branches/2020Q1/www/chromium/files/patch-third__party_webrtc_rtc__base_network.cc
  branches/2020Q1/www/chromium/files/patch-third__party_webrtc_rtc__base_network.h
  branches/2020Q1/www/chromium/files/patch-third__party_webrtc_rtc__base_platform__thread__types.cc
  branches/2020Q1/www/chromium/files/patch-tools_gn_base_files_file__posix.cc
  branches/2020Q1/www/chromium/files/patch-tools_gn_base_files_file__util.h
  branches/2020Q1/www/chromium/files/patch-tools_gn_base_files_file__util__posix.cc
  branches/2020Q1/www/chromium/files/patch-tools_gn_build_gen.py
  branches/2020Q1/www/chromium/files/patch-tools_gn_tools_gn_exec__process.cc
  branches/2020Q1/www/chromium/files/patch-tools_json__schema__compiler_feature__compiler.py
  branches/2020Q1/www/chromium/files/patch-tools_json__schema__compiler_model.py
  branches/2020Q1/www/chromium/files/patch-ui_base_resource_resource__bundle.cc
  branches/2020Q1/www/chromium/files/patch-ui_base_ui__base__features.cc
  branches/2020Q1/www/chromium/files/patch-ui_base_ui__base__features.h
  branches/2020Q1/www/chromium/files/patch-ui_base_webui_web__ui__util.cc
  branches/2020Q1/www/chromium/files/patch-ui_gfx_font__fallback__linux.cc
  branches/2020Q1/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.h
  branches/2020Q1/www/chromium/files/patch-ui_gfx_linux_client__native__pixmap__dmabuf.cc
  branches/2020Q1/www/chromium/files/patch-ui_gfx_mojom_buffer__types__mojom__traits.h
  branches/2020Q1/www/chromium/files/patch-ui_gl_BUILD.gn
  branches/2020Q1/www/chromium/files/patch-ui_gl_generate__bindings.py
  branches/2020Q1/www/chromium/files/patch-ui_gl_gl__surface__glx.cc
  branches/2020Q1/www/chromium/files/patch-ui_message__center_views_message__popup__view.cc
  branches/2020Q1/www/chromium/files/patch-ui_native__theme_native__theme__base.cc
  branches/2020Q1/www/chromium/files/patch-ui_views_controls_label.cc
  branches/2020Q1/www/chromium/files/patch-ui_views_corewm_tooltip__aura.cc
  branches/2020Q1/www/chromium/files/patch-ui_views_selection__controller.cc
  branches/2020Q1/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc
  branches/2020Q1/www/chromium/files/patch-ui_views_window_dialog__delegate.cc
  branches/2020Q1/www/chromium/files/patch-ui_webui_resources_js_cr.js
  branches/2020Q1/www/chromium/files/patch-v8_BUILD.gn
  branches/2020Q1/www/chromium/files/patch-v8_src_api_api.cc
  branches/2020Q1/www/chromium/files/patch-v8_src_base_cpu.cc
  branches/2020Q1/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc
  branches/2020Q1/www/chromium/files/patch-weblayer_browser_browser__main__parts__impl.cc
  branches/2020Q1/www/chromium/pkg-plist
Directory Properties:
  branches/2020Q1/   (props changed)

Modified: branches/2020Q1/www/chromium/Makefile
==============================================================================
--- branches/2020Q1/www/chromium/Makefile	Thu Jan 16 20:59:10 2020	(r523259)
+++ branches/2020Q1/www/chromium/Makefile	Thu Jan 16 21:03:39 2020	(r523260)
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	chromium
-PORTVERSION=	78.0.3904.108
-CATEGORIES?=	www
+PORTVERSION=	79.0.3945.117
+CATEGORIES?=	www java
 MASTER_SITES=	https://commondatastorage.googleapis.com/chromium-browser-official/ \
 		LOCAL/cpm/chromium/:fonts
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
@@ -320,15 +320,13 @@ do-install:
 	${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR}
 .endfor
 .if ${BUILDTYPE} == Debug
-.for f in libVkLayer_core_validation.so libVkLayer_object_lifetimes.so libVkLayer_stateless_validation.so \
-	libVkLayer_thread_safety.so libVkLayer_unique_objects.so
-	${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR}
-.endfor
+	${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/libVkLayer_khronos_validation.so ${STAGEDIR}${DATADIR}
 .endif
 
 	# SwiftShader
 .if ${ARCH} != aarch64
 	@${MKDIR} ${STAGEDIR}${DATADIR}/swiftshader
+	${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/libvk_swiftshader.so ${STAGEDIR}${DATADIR}
 .for g in libEGL.so libGLESv2.so
 	${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/swiftshader/${g} \
 		${STAGEDIR}${DATADIR}/swiftshader

Modified: branches/2020Q1/www/chromium/distinfo
==============================================================================
--- branches/2020Q1/www/chromium/distinfo	Thu Jan 16 20:59:10 2020	(r523259)
+++ branches/2020Q1/www/chromium/distinfo	Thu Jan 16 21:03:39 2020	(r523260)
@@ -1,7 +1,7 @@
-TIMESTAMP = 1574329181
-SHA256 (chromium-78.0.3904.108.tar.xz) = f9c53839f306d2973de27723360024f7904101d426b9e7e9cdb56e8bcc775b0e
-SIZE (chromium-78.0.3904.108.tar.xz) = 742906260
-SHA256 (chromium-78.0.3904.108-testdata.tar.xz) = a46480e2a3b3a1b22e1234e5247d41c69c27e3d498ad9a330abefd6d0066351e
-SIZE (chromium-78.0.3904.108-testdata.tar.xz) = 252295600
+TIMESTAMP = 1578472567
+SHA256 (chromium-79.0.3945.117.tar.xz) = 4d960e8bd790cc1c8e7f0632790424957c4996a8a91b9d899eb572acec854ef1
+SIZE (chromium-79.0.3945.117.tar.xz) = 778215364
+SHA256 (chromium-79.0.3945.117-testdata.tar.xz) = f53530e59bfd76bf46e123eb281699e340281990a0e10405d48c2e6cefb7d84e
+SIZE (chromium-79.0.3945.117-testdata.tar.xz) = 252398316
 SHA256 (test_fonts.tar.xz) = cf9cbe3b7f1c4c42d426bddc65ec178d333ad7e205a36fe0a606a3c0c545ece1
 SIZE (test_fonts.tar.xz) = 200040

Copied: branches/2020Q1/www/chromium/files/patch-3p-pdfium_3p_base_allocator_partition__allocator_page__allocator__internals__posix.h (from r523259, head/www/chromium/files/patch-3p-pdfium_3p_base_allocator_partition__allocator_page__allocator__internals__posix.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2020Q1/www/chromium/files/patch-3p-pdfium_3p_base_allocator_partition__allocator_page__allocator__internals__posix.h	Thu Jan 16 21:03:39 2020	(r523260, copy of r523259, head/www/chromium/files/patch-3p-pdfium_3p_base_allocator_partition__allocator_page__allocator__internals__posix.h)
@@ -0,0 +1,38 @@
+--- third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator_internals_posix.h.orig	2020-01-07 21:54:50 UTC
++++ third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator_internals_posix.h
+@@ -13,7 +13,7 @@
+ #if defined(OS_MACOSX)
+ #include <mach/mach.h>
+ #endif
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ #include <sys/resource.h>
+ 
+ #include <algorithm>
+@@ -48,7 +48,7 @@ int GetAccessFlags(PageAccessibilityConfiguration acce
+   }
+ }
+ 
+-#if defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)
++#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(ARCH_CPU_64_BITS)
+ 
+ // Multiple guarded memory regions may exceed the process address space limit.
+ // This function will raise or lower the limit by |amount|.
+@@ -68,7 +68,7 @@ bool AdjustAddressSpaceLimit(int64_t amount) {
+ // schemes that reduce that to 4 GiB.
+ constexpr size_t kMinimumGuardedMemorySize = 1ULL << 32;  // 4 GiB
+ 
+-#endif  // defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)
++#endif  // (defined(OS_LINUX) || defined(OS_BSD)) && defined(ARCH_CPU_64_BITS)
+ 
+ void* SystemAllocPagesInternal(void* hint,
+                                size_t length,
+@@ -134,7 +134,7 @@ void SetSystemPagesAccessInternal(
+ void FreePagesInternal(void* address, size_t length) {
+   CHECK(!munmap(address, length));
+ 
+-#if defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)
++#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(ARCH_CPU_64_BITS)
+   // Restore the address space limit.
+   if (length >= kMinimumGuardedMemorySize) {
+     CHECK(AdjustAddressSpaceLimit(-base::checked_cast<int64_t>(length)));

Modified: branches/2020Q1/www/chromium/files/patch-BUILD.gn
==============================================================================
--- branches/2020Q1/www/chromium/files/patch-BUILD.gn	Thu Jan 16 20:59:10 2020	(r523259)
+++ branches/2020Q1/www/chromium/files/patch-BUILD.gn	Thu Jan 16 21:03:39 2020	(r523260)
@@ -1,6 +1,6 @@
---- BUILD.gn.orig	2019-10-21 19:06:17 UTC
+--- BUILD.gn.orig	2019-12-16 21:51:21 UTC
 +++ BUILD.gn
-@@ -404,7 +404,7 @@ group("gn_all") {
+@@ -411,7 +411,7 @@ group("gn_all") {
      ]
    }
  
@@ -9,7 +9,7 @@
      deps += [
        "//third_party/breakpad:breakpad_unittests",
        "//third_party/breakpad:core-2-minidump",
-@@ -445,8 +445,6 @@ group("gn_all") {
+@@ -452,8 +452,6 @@ group("gn_all") {
        "//net:disk_cache_memory_test",
        "//net:quic_client",
        "//net:quic_server",
@@ -18,7 +18,7 @@
        "//testing:empty_main",
      ]
  
-@@ -501,10 +499,6 @@ group("gn_all") {
+@@ -508,10 +506,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",
-@@ -560,10 +554,6 @@ group("gn_all") {
+@@ -567,10 +561,6 @@ group("gn_all") {
        "//mojo:mojo_perftests",
        "//services/service_manager/public/cpp",
        "//testing/gmock:gmock_main",
@@ -40,7 +40,7 @@
      ]
  
      if (!is_android) {
-@@ -637,7 +627,7 @@ group("gn_all") {
+@@ -644,7 +634,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)" ]
    }
  
-@@ -776,7 +766,6 @@ group("gn_all") {
+@@ -782,7 +772,6 @@ group("gn_all") {
        "//chrome/browser/vr:vr_common_perftests",
        "//chrome/browser/vr:vr_common_unittests",
        "//chrome/browser/vr:vr_pixeltests",
@@ -57,7 +57,7 @@
      ]
      if (is_desktop_linux && use_ozone) {
        deps += [ "//chrome/browser/vr/testapp:vr_testapp" ]
-@@ -896,7 +885,6 @@ if (is_chromeos) {
+@@ -905,7 +894,6 @@ if (is_chromeos) {
        "//ppapi/examples/video_decode",
        "//sandbox/linux:chrome_sandbox",
        "//sandbox/linux:sandbox_linux_unittests",
@@ -65,7 +65,7 @@
  
        # Blocked on https://github.com/catapult-project/catapult/issues/2297
        #"//third_party/catapult/telemetry:bitmaptools",
-@@ -1065,7 +1053,7 @@ if (!is_ios) {
+@@ -1076,7 +1064,7 @@ if (!is_ios) {
        ]
      }
  
@@ -74,7 +74,7 @@
        data_deps +=
            [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ]
      }
-@@ -1074,7 +1062,7 @@ if (!is_ios) {
+@@ -1085,7 +1073,7 @@ if (!is_ios) {
        data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
      }
  
@@ -83,7 +83,7 @@
        data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
      }
  
-@@ -1216,9 +1204,6 @@ group("chromium_builder_perf") {
+@@ -1227,9 +1215,6 @@ group("chromium_builder_perf") {
  
      if (is_win) {
        data_deps += [ "//chrome/installer/mini_installer:mini_installer" ]

Modified: branches/2020Q1/www/chromium/files/patch-base_BUILD.gn
==============================================================================
--- branches/2020Q1/www/chromium/files/patch-base_BUILD.gn	Thu Jan 16 20:59:10 2020	(r523259)
+++ branches/2020Q1/www/chromium/files/patch-base_BUILD.gn	Thu Jan 16 21:03:39 2020	(r523260)
@@ -1,6 +1,6 @@
---- base/BUILD.gn.orig	2019-10-21 19:06:18 UTC
+--- base/BUILD.gn.orig	2019-12-16 21:51:21 UTC
 +++ base/BUILD.gn
-@@ -1266,7 +1266,7 @@ jumbo_component("base") {
+@@ -1274,7 +1274,7 @@ jumbo_component("base") {
    # Needed for <atomic> if using newer C++ library than sysroot, except if
    # building inside the cros_sdk environment - use host_toolchain as a
    # more robust check for this.
@@ -9,7 +9,7 @@
        host_toolchain != "//build/toolchain/cros:host") {
      libs += [ "atomic" ]
    }
-@@ -1292,7 +1292,7 @@ jumbo_component("base") {
+@@ -1300,7 +1300,7 @@ jumbo_component("base") {
          "allocator/allocator_shim_override_glibc_weak_symbols.h",
        ]
        deps += [ "//base/allocator:tcmalloc" ]
@@ -18,7 +18,7 @@
        sources += [ "allocator/allocator_shim_default_dispatch_to_glibc.cc" ]
      } else if (is_android && use_allocator == "none") {
        sources += [
-@@ -1893,6 +1893,33 @@ jumbo_component("base") {
+@@ -1903,6 +1903,33 @@ jumbo_component("base") {
      }
    }
  
@@ -52,7 +52,7 @@
    # iOS
    if (is_ios) {
      set_sources_assignment_filter([])
-@@ -3041,6 +3068,12 @@ test("base_unittests") {
+@@ -3071,6 +3098,12 @@ test("base_unittests") {
      ]
      set_sources_assignment_filter(sources_assignment_filter)
    }

Modified: branches/2020Q1/www/chromium/files/patch-base_files_file__util.h
==============================================================================
--- branches/2020Q1/www/chromium/files/patch-base_files_file__util.h	Thu Jan 16 20:59:10 2020	(r523259)
+++ branches/2020Q1/www/chromium/files/patch-base_files_file__util.h	Thu Jan 16 21:03:39 2020	(r523260)
@@ -1,6 +1,6 @@
---- base/files/file_util.h.orig	2019-10-21 19:06:18 UTC
+--- base/files/file_util.h.orig	2019-12-16 21:51:21 UTC
 +++ base/files/file_util.h
-@@ -497,7 +497,7 @@ BASE_EXPORT bool VerifyPathControlledByAdmin(const bas
+@@ -512,7 +512,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);
  

Modified: branches/2020Q1/www/chromium/files/patch-base_files_file__util__posix.cc
==============================================================================
--- branches/2020Q1/www/chromium/files/patch-base_files_file__util__posix.cc	Thu Jan 16 20:59:10 2020	(r523259)
+++ branches/2020Q1/www/chromium/files/patch-base_files_file__util__posix.cc	Thu Jan 16 21:03:39 2020	(r523260)
@@ -1,6 +1,6 @@
---- base/files/file_util_posix.cc.orig	2019-10-21 19:06:18 UTC
+--- base/files/file_util_posix.cc.orig	2019-12-16 21:51:21 UTC
 +++ base/files/file_util_posix.cc
-@@ -426,7 +426,7 @@ bool CreatePipe(ScopedFD* read_fd, ScopedFD* write_fd,
+@@ -435,7 +435,7 @@ bool CreatePipe(ScopedFD* read_fd, ScopedFD* write_fd,
  }
  
  bool CreateLocalNonBlockingPipe(int fds[2]) {

Modified: branches/2020Q1/www/chromium/files/patch-base_i18n_icu__util.cc
==============================================================================
--- branches/2020Q1/www/chromium/files/patch-base_i18n_icu__util.cc	Thu Jan 16 20:59:10 2020	(r523259)
+++ branches/2020Q1/www/chromium/files/patch-base_i18n_icu__util.cc	Thu Jan 16 21:03:39 2020	(r523260)
@@ -1,4 +1,4 @@
---- base/i18n/icu_util.cc.orig	2019-07-24 18:58:02 UTC
+--- base/i18n/icu_util.cc.orig	2019-12-16 21:51:21 UTC
 +++ base/i18n/icu_util.cc
 @@ -20,7 +20,7 @@
  #include "build/build_config.h"
@@ -9,7 +9,7 @@
  #include "third_party/icu/source/i18n/unicode/timezone.h"
  #endif
  
-@@ -285,7 +285,7 @@ bool InitializeICU() {
+@@ -365,7 +365,7 @@ bool InitializeICU() {
  // TODO(jungshik): Some callers do not care about tz at all. If necessary,
  // add a boolean argument to this function to init'd the default tz only
  // when requested.

Modified: branches/2020Q1/www/chromium/files/patch-base_linux__util.cc
==============================================================================
--- branches/2020Q1/www/chromium/files/patch-base_linux__util.cc	Thu Jan 16 20:59:10 2020	(r523259)
+++ branches/2020Q1/www/chromium/files/patch-base_linux__util.cc	Thu Jan 16 21:03:39 2020	(r523260)
@@ -1,6 +1,6 @@
---- base/linux_util.cc.orig	2019-03-11 22:00:51 UTC
+--- base/linux_util.cc.orig	2019-12-16 21:50:40 UTC
 +++ base/linux_util.cc
-@@ -90,12 +90,14 @@ char g_linux_distro[kDistroSize] =
+@@ -144,6 +144,8 @@ char g_linux_distro[kDistroSize] =
      "CrOS";
  #elif defined(OS_ANDROID)
      "Android";
@@ -9,6 +9,8 @@
  #else  // if defined(OS_LINUX)
      "Unknown";
  #endif
+@@ -164,7 +166,7 @@ BASE_EXPORT std::string GetKeyValueFromOSReleaseFileFo
+ }
  
  std::string GetLinuxDistro() {
 -#if defined(OS_CHROMEOS) || defined(OS_ANDROID)

Modified: branches/2020Q1/www/chromium/files/patch-base_logging__unittest.cc
==============================================================================
--- branches/2020Q1/www/chromium/files/patch-base_logging__unittest.cc	Thu Jan 16 20:59:10 2020	(r523259)
+++ branches/2020Q1/www/chromium/files/patch-base_logging__unittest.cc	Thu Jan 16 21:03:39 2020	(r523260)
@@ -1,6 +1,6 @@
---- base/logging_unittest.cc.orig	2019-10-21 19:06:18 UTC
+--- base/logging_unittest.cc.orig	2019-12-16 21:51:21 UTC
 +++ base/logging_unittest.cc
-@@ -590,7 +590,7 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo
+@@ -591,7 +591,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;

Modified: branches/2020Q1/www/chromium/files/patch-base_process_kill.h
==============================================================================
--- branches/2020Q1/www/chromium/files/patch-base_process_kill.h	Thu Jan 16 20:59:10 2020	(r523259)
+++ branches/2020Q1/www/chromium/files/patch-base_process_kill.h	Thu Jan 16 21:03:39 2020	(r523260)
@@ -1,6 +1,6 @@
---- base/process/kill.h.orig	2019-06-04 18:55:15 UTC
+--- base/process/kill.h.orig	2019-12-16 21:50:40 UTC
 +++ base/process/kill.h
-@@ -111,11 +111,11 @@ BASE_EXPORT TerminationStatus GetTerminationStatus(Pro
+@@ -118,11 +118,11 @@ BASE_EXPORT TerminationStatus GetTerminationStatus(Pro
  BASE_EXPORT TerminationStatus GetKnownDeadTerminationStatus(
      ProcessHandle handle, int* exit_code);
  

Modified: branches/2020Q1/www/chromium/files/patch-base_system_sys__info.h
==============================================================================
--- branches/2020Q1/www/chromium/files/patch-base_system_sys__info.h	Thu Jan 16 20:59:10 2020	(r523259)
+++ branches/2020Q1/www/chromium/files/patch-base_system_sys__info.h	Thu Jan 16 21:03:39 2020	(r523260)
@@ -1,6 +1,15 @@
---- base/system/sys_info.h.orig	2019-06-04 18:55:15 UTC
+--- base/system/sys_info.h.orig	2019-12-16 21:50:40 UTC
 +++ base/system/sys_info.h
-@@ -192,7 +192,7 @@ class BASE_EXPORT SysInfo {
+@@ -188,6 +188,8 @@ class BASE_EXPORT SysInfo {
+   // See also SysUtils.java, method isLowEndDevice.
+   static bool IsLowEndDevice();
+ 
++  static uint64_t MaxSharedMemorySize();
++
+  private:
+   FRIEND_TEST_ALL_PREFIXES(SysInfoTest, AmountOfAvailablePhysicalMemory);
+   FRIEND_TEST_ALL_PREFIXES(debug::SystemMetricsTest, ParseMeminfo);
+@@ -197,7 +199,7 @@ class BASE_EXPORT SysInfo {
    static bool IsLowEndDeviceImpl();
    static HardwareInfo GetHardwareInfoSync();
  

Modified: branches/2020Q1/www/chromium/files/patch-base_system_sys__info__freebsd.cc
==============================================================================
--- branches/2020Q1/www/chromium/files/patch-base_system_sys__info__freebsd.cc	Thu Jan 16 20:59:10 2020	(r523259)
+++ branches/2020Q1/www/chromium/files/patch-base_system_sys__info__freebsd.cc	Thu Jan 16 21:03:39 2020	(r523260)
@@ -1,6 +1,6 @@
---- base/system/sys_info_freebsd.cc.orig	2019-09-09 21:55:05 UTC
+--- base/system/sys_info_freebsd.cc.orig	2019-12-16 21:50:40 UTC
 +++ base/system/sys_info_freebsd.cc
-@@ -13,26 +13,46 @@
+@@ -13,26 +13,59 @@
  namespace base {
  
  int64_t SysInfo::AmountOfPhysicalMemoryImpl() {
@@ -21,11 +21,6 @@
    return static_cast<int64_t>(pages) * page_size;
  }
  
--// static
--uint64_t SysInfo::MaxSharedMemorySize() {
--  size_t limit;
--  size_t size = sizeof(limit);
--  if (sysctlbyname("kern.ipc.shmmax", &limit, &size, NULL, 0) < 0) {
 +int64_t SysInfo::AmountOfAvailablePhysicalMemoryImpl() {
 +  int page_size, r = 0;
 +  unsigned pgfree, pginact, pgcache;
@@ -40,14 +35,13 @@
 +  if(r == 0)
 +    r = sysctlbyname("vm.stats.vm.v_cache_count", &pgcache, &szpg, NULL, 0);
 +  if(r == -1) {
-     NOTREACHED();
-     return 0;
-   }
--  return static_cast<uint64_t>(limit);
++    NOTREACHED();
++    return 0;
++  }
 +  return static_cast<int64_t>((pgfree + pginact + pgcache) * page_size);
- }
- 
-+// static
++}
++
+ // static
 +std::string SysInfo::CPUModelName() {
 +  int mib[] = { CTL_HW, HW_MODEL };
 +  char name[256];
@@ -56,4 +50,18 @@
 +    return name;
 +  return std::string();
 +}
++
++// static
+ uint64_t SysInfo::MaxSharedMemorySize() {
+   size_t limit;
+   size_t size = sizeof(limit);
++
+   if (sysctlbyname("kern.ipc.shmmax", &limit, &size, NULL, 0) < 0) {
+     NOTREACHED();
+     return 0;
+   }
++
+   return static_cast<uint64_t>(limit);
+ }
+-
  }  // namespace base

Modified: branches/2020Q1/www/chromium/files/patch-base_test_generate__fontconfig__caches.cc
==============================================================================
--- branches/2020Q1/www/chromium/files/patch-base_test_generate__fontconfig__caches.cc	Thu Jan 16 20:59:10 2020	(r523259)
+++ branches/2020Q1/www/chromium/files/patch-base_test_generate__fontconfig__caches.cc	Thu Jan 16 21:03:39 2020	(r523260)
@@ -1,14 +1,6 @@
---- base/test/generate_fontconfig_caches.cc.orig	2019-04-30 22:22:28 UTC
+--- base/test/generate_fontconfig_caches.cc.orig	2019-12-16 21:51:21 UTC
 +++ base/test/generate_fontconfig_caches.cc
-@@ -52,14 +52,21 @@ int main() {
- 
-   // Delete directory before generating fontconfig caches. This will notify
-   // future fontconfig_caches changes.
--  CHECK(base::DeleteFile(fontconfig_caches, /*recursive=*/true));
- 
-+  CHECK(base::DeleteFile(fontconfig_caches, /*recursive=*/true));
-   base::SetUpFontconfig();
-   FcInit();
+@@ -59,7 +59,14 @@ int main() {
    FcFini();
  
    // Check existence of intended fontconfig cache file.

Modified: branches/2020Q1/www/chromium/files/patch-base_threading_thread__task__runner__handle.cc
==============================================================================
--- branches/2020Q1/www/chromium/files/patch-base_threading_thread__task__runner__handle.cc	Thu Jan 16 20:59:10 2020	(r523259)
+++ branches/2020Q1/www/chromium/files/patch-base_threading_thread__task__runner__handle.cc	Thu Jan 16 21:03:39 2020	(r523260)
@@ -1,4 +1,4 @@
---- base/threading/thread_task_runner_handle.cc.orig	2019-04-30 22:22:28 UTC
+--- base/threading/thread_task_runner_handle.cc.orig	2019-12-16 21:50:40 UTC
 +++ base/threading/thread_task_runner_handle.cc
 @@ -8,6 +8,7 @@
  #include <utility>
@@ -8,7 +8,7 @@
  #include "base/lazy_instance.h"
  #include "base/logging.h"
  #include "base/run_loop.h"
-@@ -37,6 +38,7 @@ bool ThreadTaskRunnerHandle::IsSet() {
+@@ -38,6 +39,7 @@ bool ThreadTaskRunnerHandle::IsSet() {
    return !!thread_task_runner_tls.Pointer()->Get();
  }
  
@@ -16,7 +16,7 @@
  // static
  ScopedClosureRunner ThreadTaskRunnerHandle::OverrideForTesting(
      scoped_refptr<SingleThreadTaskRunner> overriding_task_runner) {
-@@ -81,6 +83,7 @@ ScopedClosureRunner ThreadTaskRunnerHandle::OverrideFo
+@@ -82,6 +84,7 @@ ScopedClosureRunner ThreadTaskRunnerHandle::OverrideFo
        base::Unretained(ttrh->task_runner_.get()),
        std::move(no_running_during_override)));
  }

Modified: branches/2020Q1/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc
==============================================================================
--- branches/2020Q1/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc	Thu Jan 16 20:59:10 2020	(r523259)
+++ branches/2020Q1/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc	Thu Jan 16 21:03:39 2020	(r523260)
@@ -1,4 +1,4 @@
---- base/trace_event/malloc_dump_provider.cc.orig	2019-04-30 22:22:28 UTC
+--- base/trace_event/malloc_dump_provider.cc.orig	2019-12-16 21:50:40 UTC
 +++ base/trace_event/malloc_dump_provider.cc
 @@ -17,6 +17,8 @@
  
@@ -18,4 +18,4 @@
 +  allocated_objects_size = 0;
  #else
    struct mallinfo info = mallinfo();
-   DCHECK_GE(info.arena + info.hblkhd, info.uordblks);
+ #if !defined(ADDRESS_SANITIZER) && !defined(THREAD_SANITIZER)

Modified: branches/2020Q1/www/chromium/files/patch-build_config_compiler_BUILD.gn
==============================================================================
--- branches/2020Q1/www/chromium/files/patch-build_config_compiler_BUILD.gn	Thu Jan 16 20:59:10 2020	(r523259)
+++ branches/2020Q1/www/chromium/files/patch-build_config_compiler_BUILD.gn	Thu Jan 16 21:03:39 2020	(r523260)
@@ -1,4 +1,4 @@
---- build/config/compiler/BUILD.gn.orig	2019-10-21 19:06:18 UTC
+--- build/config/compiler/BUILD.gn.orig	2019-12-16 21:51:21 UTC
 +++ build/config/compiler/BUILD.gn
 @@ -57,7 +57,7 @@ declare_args() {
    # only two architectures that are currently checked in). Turn this off when
@@ -9,7 +9,7 @@
        (current_cpu == "x64" || current_cpu == "x86")
    binutils_path = rebase_path("//third_party/binutils/Linux_x64/Release/bin",
                                root_build_dir)
-@@ -288,7 +288,7 @@ config("compiler") {
+@@ -303,7 +303,7 @@ config("compiler") {
  
      # Linker warnings.
      if (fatal_linker_warnings && !(is_chromeos && current_cpu == "arm") &&
@@ -18,7 +18,7 @@
        # TODO(jochen): Enable this on chromeos on arm. http://crbug.com/356580
        ldflags += [ "-Wl,--fatal-warnings" ]
      }
-@@ -383,7 +383,7 @@ config("compiler") {
+@@ -398,7 +398,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",
-@@ -483,7 +483,7 @@ config("compiler") {
+@@ -498,7 +498,7 @@ config("compiler") {
      }
    }
  
@@ -36,7 +36,7 @@
      cflags += [ "-fcrash-diagnostics-dir=" +
                  rebase_path("//tools/clang/crashreports", root_build_dir) ]
  
-@@ -753,7 +753,7 @@ config("compiler_cpu_abi") {
+@@ -768,7 +768,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" ]
        }
-@@ -1104,7 +1104,7 @@ config("compiler_deterministic") {
+@@ -1119,7 +1119,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,." ]
      }
-@@ -1493,7 +1493,7 @@ config("default_warnings") {
+@@ -1508,7 +1508,7 @@ config("default_warnings") {
          cflags += [ "-Wno-nonportable-include-path" ]
        }
  
@@ -63,7 +63,7 @@
          # Flags NaCl (Clang 3.7) and Xcode 9.2 (Clang clang-900.0.39.2) do not
          # recognize.
          cflags += [
-@@ -1722,7 +1722,7 @@ config("thin_archive") {
+@@ -1738,7 +1738,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).
@@ -72,7 +72,7 @@
      arflags = [ "-T" ]
    } else if (is_win && use_lld) {
      arflags = [ "/llvmlibthin" ]
-@@ -2292,7 +2292,7 @@ config("symbols") {
+@@ -2328,7 +2328,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) {
@@ -81,7 +81,7 @@
      }
  
      if (use_debug_fission && !is_nacl && !is_android) {
-@@ -2313,7 +2313,7 @@ config("symbols") {
+@@ -2349,7 +2349,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_mac && !is_ios && !is_nacl && current_cpu != "x86" &&

Modified: branches/2020Q1/www/chromium/files/patch-build_config_compiler_compiler.gni
==============================================================================
--- branches/2020Q1/www/chromium/files/patch-build_config_compiler_compiler.gni	Thu Jan 16 20:59:10 2020	(r523259)
+++ branches/2020Q1/www/chromium/files/patch-build_config_compiler_compiler.gni	Thu Jan 16 21:03:39 2020	(r523260)
@@ -1,6 +1,6 @@
---- build/config/compiler/compiler.gni.orig	2019-10-21 19:06:18 UTC
+--- build/config/compiler/compiler.gni.orig	2019-12-16 21:51:21 UTC
 +++ build/config/compiler/compiler.gni
-@@ -188,7 +188,7 @@ declare_args() {
+@@ -192,7 +192,7 @@ declare_args() {
  declare_args() {
    # Whether to use the gold linker from binutils instead of lld or bfd.
    use_gold =

Modified: branches/2020Q1/www/chromium/files/patch-cc_BUILD.gn
==============================================================================
--- branches/2020Q1/www/chromium/files/patch-cc_BUILD.gn	Thu Jan 16 20:59:10 2020	(r523259)
+++ branches/2020Q1/www/chromium/files/patch-cc_BUILD.gn	Thu Jan 16 21:03:39 2020	(r523260)
@@ -1,6 +1,6 @@
---- cc/BUILD.gn.orig	2019-10-21 19:06:18 UTC
+--- cc/BUILD.gn.orig	2019-12-16 21:51:21 UTC
 +++ cc/BUILD.gn
-@@ -572,7 +572,7 @@ cc_test_static_library("test_support") {
+@@ -576,7 +576,7 @@ cc_test_static_library("test_support") {
    if (enable_vulkan) {
      deps += [ "//gpu/vulkan/init" ]
    }
@@ -9,7 +9,7 @@
      data_deps = [
        "//third_party/mesa_headers",
      ]
-@@ -776,9 +776,6 @@ cc_test("cc_unittests") {
+@@ -780,9 +780,6 @@ cc_test("cc_unittests") {
      "//ui/gfx/geometry",
      "//ui/gl",
      "//ui/gl:test_support",

Modified: branches/2020Q1/www/chromium/files/patch-cc_layers_scrollbar__layer__impl__base.cc
==============================================================================
--- branches/2020Q1/www/chromium/files/patch-cc_layers_scrollbar__layer__impl__base.cc	Thu Jan 16 20:59:10 2020	(r523259)
+++ branches/2020Q1/www/chromium/files/patch-cc_layers_scrollbar__layer__impl__base.cc	Thu Jan 16 21:03:39 2020	(r523260)
@@ -1,6 +1,6 @@
---- cc/layers/scrollbar_layer_impl_base.cc.orig	2019-03-11 22:00:52 UTC
+--- cc/layers/scrollbar_layer_impl_base.cc.orig	2019-12-16 21:50:40 UTC
 +++ cc/layers/scrollbar_layer_impl_base.cc
-@@ -218,8 +218,8 @@ gfx::Rect ScrollbarLayerImplBase::ComputeThumbQuadRect
+@@ -220,8 +220,8 @@ gfx::Rect ScrollbarLayerImplBase::ComputeThumbQuadRect
    int thumb_offset = TrackStart();
    if (maximum > 0) {
      float ratio = clamped_current_pos / maximum;

Modified: branches/2020Q1/www/chromium/files/patch-cc_trees_property__tree.cc
==============================================================================
--- branches/2020Q1/www/chromium/files/patch-cc_trees_property__tree.cc	Thu Jan 16 20:59:10 2020	(r523259)
+++ branches/2020Q1/www/chromium/files/patch-cc_trees_property__tree.cc	Thu Jan 16 21:03:39 2020	(r523260)
@@ -1,6 +1,6 @@
---- cc/trees/property_tree.cc.orig	2019-10-21 19:06:18 UTC
+--- cc/trees/property_tree.cc.orig	2019-12-16 21:51:22 UTC
 +++ cc/trees/property_tree.cc
-@@ -1278,13 +1278,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollOffset(int scro
+@@ -1229,13 +1229,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollOffset(int scro
  
    gfx::Size clip_layer_bounds = container_bounds(scroll_node->id);
  

Modified: branches/2020Q1/www/chromium/files/patch-chrome_app_chrome__content__browser__overlay__manifest.cc
==============================================================================
--- branches/2020Q1/www/chromium/files/patch-chrome_app_chrome__content__browser__overlay__manifest.cc	Thu Jan 16 20:59:10 2020	(r523259)
+++ branches/2020Q1/www/chromium/files/patch-chrome_app_chrome__content__browser__overlay__manifest.cc	Thu Jan 16 21:03:39 2020	(r523260)
@@ -1,20 +1,20 @@
---- chrome/app/chrome_content_browser_overlay_manifest.cc.orig	2019-10-21 19:06:19 UTC
+--- chrome/app/chrome_content_browser_overlay_manifest.cc.orig	2019-12-16 21:51:22 UTC
 +++ chrome/app/chrome_content_browser_overlay_manifest.cc
-@@ -69,7 +69,7 @@
- #include "chrome/services/app_service/public/cpp/manifest.h"
+@@ -70,7 +70,7 @@
+ #include "chrome/browser/ui/webui/app_management/app_management.mojom.h"
  #endif
  
 -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \
 +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \
      defined(OS_CHROMEOS)
- #include "chrome/browser/performance_manager/webui_graph_dump.mojom.h"  // nogncheck
  #include "chrome/browser/ui/webui/discards/discards.mojom.h"
-@@ -205,7 +205,7 @@ const service_manager::Manifest& GetChromeContentBrows
+ #endif
+@@ -189,7 +189,7 @@ const service_manager::Manifest& GetChromeContentBrows
  #else
                  app_management::mojom::PageHandlerFactory,
  #endif
 -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \
 +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \
      defined(OS_CHROMEOS)
-                 mojom::DiscardsDetailsProvider,
-                 performance_manager::mojom::WebUIGraphDump,
+                 discards::mojom::DetailsProvider, discards::mojom::GraphDump,
+ #endif

Modified: branches/2020Q1/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc
==============================================================================
--- branches/2020Q1/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc	Thu Jan 16 20:59:10 2020	(r523259)
+++ branches/2020Q1/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc	Thu Jan 16 21:03:39 2020	(r523260)
@@ -1,6 +1,6 @@
---- chrome/app/chrome_main_delegate.cc.orig	2019-10-21 19:06:19 UTC
+--- chrome/app/chrome_main_delegate.cc.orig	2019-12-16 21:51:22 UTC
 +++ chrome/app/chrome_main_delegate.cc
-@@ -99,7 +99,7 @@
+@@ -100,7 +100,7 @@
  #include "chrome/app/shutdown_signal_handlers_posix.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "components/nacl/common/nacl_paths.h"
  #include "components/nacl/zygote/nacl_fork_delegate_linux.h"
  #endif
-@@ -137,7 +137,7 @@
+@@ -139,7 +139,7 @@
  #include "v8/include/v8.h"
  #endif
  
@@ -18,7 +18,7 @@
  #include "base/environment.h"
  #endif
  
-@@ -240,7 +240,7 @@ bool UseHooks() {
+@@ -243,7 +243,7 @@ bool UseHooks() {
  
  #endif  // defined(OS_WIN)
  
@@ -27,7 +27,7 @@
  void AdjustLinuxOOMScore(const std::string& process_type) {
    // Browsers and zygotes should still be killable, but killed last.
    const int kZygoteScore = 0;
-@@ -299,13 +299,13 @@ void AdjustLinuxOOMScore(const std::string& process_ty
+@@ -302,13 +302,13 @@ void AdjustLinuxOOMScore(const std::string& process_ty
    if (score > -1)
      base::AdjustOOMScore(base::GetCurrentProcId(), score);
  }
@@ -43,7 +43,7 @@
        // The zygote process opens the resources for the renderers.
        process_type == service_manager::switches::kZygoteProcess ||
  #endif
-@@ -344,7 +344,7 @@ bool HandleVersionSwitches(const base::CommandLine& co
+@@ -347,7 +347,7 @@ bool HandleVersionSwitches(const base::CommandLine& co
    return false;
  }
  
@@ -52,7 +52,7 @@
  // Show the man page if --help or -h is on the command line.
  void HandleHelpSwitches(const base::CommandLine& command_line) {
    if (command_line.HasSwitch(switches::kHelp) ||
-@@ -354,7 +354,7 @@ void HandleHelpSwitches(const base::CommandLine& comma
+@@ -357,7 +357,7 @@ void HandleHelpSwitches(const base::CommandLine& comma
      PLOG(FATAL) << "execlp failed";
    }
  }
@@ -61,7 +61,7 @@
  
  #if !defined(OS_MACOSX) && !defined(OS_ANDROID)
  void SIGTERMProfilingShutdown(int signal) {
-@@ -408,7 +408,7 @@ void InitializeUserDataDir(base::CommandLine* command_
+@@ -411,7 +411,7 @@ void InitializeUserDataDir(base::CommandLine* command_
    std::string process_type =
        command_line->GetSwitchValueASCII(switches::kProcessType);
  
@@ -70,7 +70,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.
-@@ -420,7 +420,7 @@ void InitializeUserDataDir(base::CommandLine* command_
+@@ -423,7 +423,7 @@ void InitializeUserDataDir(base::CommandLine* command_
        user_data_dir = base::FilePath::FromUTF8Unsafe(user_data_dir_string);
      }
    }
@@ -79,7 +79,7 @@
  #if defined(OS_MACOSX)
    policy::path_parser::CheckUserDataDirPolicy(&user_data_dir);
  #endif  // OS_MAC
-@@ -477,7 +477,7 @@ void InitLogging(const std::string& process_type) {
+@@ -480,7 +480,7 @@ void InitLogging(const std::string& process_type) {
  void RecordMainStartupMetrics(base::TimeTicks exe_entry_point_ticks) {
    if (!exe_entry_point_ticks.is_null())
      startup_metric_utils::RecordExeMainEntryPointTicks(exe_entry_point_ticks);
@@ -88,7 +88,7 @@
    // Record the startup process creation time on supported platforms.
    startup_metric_utils::RecordStartupProcessCreationTime(
        base::Process::Current().CreationTime());
-@@ -654,7 +654,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
+@@ -665,7 +665,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
      *exit_code = 0;
      return true;  // Got a --version switch; exit with a success error code.
    }
@@ -97,7 +97,7 @@
    // This will directly exit if the user asked for help.
    HandleHelpSwitches(command_line);
  #endif
-@@ -678,7 +678,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
+@@ -689,7 +689,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
  #if defined(OS_CHROMEOS)
    chromeos::RegisterPathProvider();
  #endif
@@ -106,7 +106,7 @@
    nacl::RegisterPathProvider();
  #endif
  
-@@ -872,7 +872,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -883,7 +883,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
  #if defined(OS_WIN)
    child_process_logging::Init();
  #endif
@@ -115,7 +115,7 @@
    // Create an instance of the CPU class to parse /proc/cpuinfo and cache
    // cpu_brand info.
    base::CPU cpu_info;
-@@ -996,7 +996,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -1007,7 +1007,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
    InitializePDF();
  #endif
  
@@ -124,8 +124,8 @@
    // Zygote needs to call InitCrashReporter() in RunZygote().
    if (process_type != service_manager::switches::kZygoteProcess) {
  #if defined(OS_ANDROID)
-@@ -1011,7 +1011,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
-     breakpad::InitCrashReporter(process_type);
+@@ -1028,7 +1028,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+     }
  #endif  // defined(OS_ANDROID)
    }
 -#endif  // defined(OS_POSIX) && !defined(OS_MACOSX)
@@ -133,7 +133,7 @@
  
    // After all the platform Breakpads have been initialized, store the command
    // line for crash reporting.
-@@ -1021,7 +1021,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -1038,7 +1038,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.

Modified: branches/2020Q1/www/chromium/files/patch-chrome_app_chromium__strings.grd
==============================================================================
--- branches/2020Q1/www/chromium/files/patch-chrome_app_chromium__strings.grd	Thu Jan 16 20:59:10 2020	(r523259)
+++ branches/2020Q1/www/chromium/files/patch-chrome_app_chromium__strings.grd	Thu Jan 16 21:03:39 2020	(r523260)
@@ -1,6 +1,6 @@
---- chrome/app/chromium_strings.grd.orig	2019-10-21 19:06:20 UTC
+--- chrome/app/chromium_strings.grd.orig	2019-12-16 21:51:22 UTC
 +++ chrome/app/chromium_strings.grd
-@@ -694,7 +694,7 @@ Signing in anyway will merge Chromium information like
+@@ -602,7 +602,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>
-@@ -825,7 +825,7 @@ Signing in anyway will merge Chromium information like
+@@ -713,7 +713,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>
-@@ -1069,7 +1069,7 @@ Signing in anyway will merge Chromium information like
+@@ -946,7 +946,7 @@ Chromium is unable to recover your settings.
        </message>
  
        <!-- Plugin Placeholders -->

Modified: branches/2020Q1/www/chromium/files/patch-chrome_app_generated__resources.grd
==============================================================================
--- branches/2020Q1/www/chromium/files/patch-chrome_app_generated__resources.grd	Thu Jan 16 20:59:10 2020	(r523259)
+++ branches/2020Q1/www/chromium/files/patch-chrome_app_generated__resources.grd	Thu Jan 16 21:03:39 2020	(r523260)
@@ -1,6 +1,6 @@
---- chrome/app/generated_resources.grd.orig	2019-10-21 19:06:20 UTC
+--- chrome/app/generated_resources.grd.orig	2019-12-16 21:51:22 UTC
 +++ chrome/app/generated_resources.grd
-@@ -4885,7 +4885,7 @@ Keep your key file in a safe place. You will need it t
+@@ -4922,7 +4922,7 @@ Keep your key file in a safe place. You will need it t
        </if>
  
        <!-- chrome://browser-switch strings -->
@@ -9,7 +9,7 @@
          <message name="IDS_ABOUT_BROWSER_SWITCH_TITLE" desc="about:browser-switch page title">
            Legacy Browser Support
          </message>
-@@ -6514,7 +6514,7 @@ the Bookmarks menu.">
+@@ -6571,7 +6571,7 @@ the Bookmarks menu.">
          Google Pay
        </message>
  
@@ -18,7 +18,7 @@
          <message name="IDS_SHOW_WINDOW_DECORATIONS" desc="The label of a radio button in the options dialog for using the system title bar and borders.">
            Use system title bar and borders
          </message>
-@@ -7395,7 +7395,7 @@ Please help our engineers fix this problem. Tell us wh
+@@ -7521,7 +7521,7 @@ Please help our engineers fix this problem. Tell us wh
          Set as default
        </message>
  

Modified: branches/2020Q1/www/chromium/files/patch-chrome_app_google__chrome__strings.grd
==============================================================================
--- branches/2020Q1/www/chromium/files/patch-chrome_app_google__chrome__strings.grd	Thu Jan 16 20:59:10 2020	(r523259)
+++ branches/2020Q1/www/chromium/files/patch-chrome_app_google__chrome__strings.grd	Thu Jan 16 21:03:39 2020	(r523260)
@@ -1,6 +1,6 @@
---- chrome/app/google_chrome_strings.grd.orig	2019-10-21 19:06:20 UTC
+--- chrome/app/google_chrome_strings.grd.orig	2019-12-16 21:51:22 UTC
 +++ chrome/app/google_chrome_strings.grd
-@@ -706,7 +706,7 @@ Signing in anyway will merge Chrome information like b
+@@ -614,7 +614,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>
-@@ -837,7 +837,7 @@ Signing in anyway will merge Chrome information like b
+@@ -725,7 +725,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>
-@@ -1088,7 +1088,7 @@ Signing in anyway will merge Chrome information like b
+@@ -965,7 +965,7 @@ Google Chrome is unable to recover your settings.
        </message>
  
        <!-- Plugin Placeholders -->

Modified: branches/2020Q1/www/chromium/files/patch-chrome_app_settings__strings.grdp
==============================================================================
--- branches/2020Q1/www/chromium/files/patch-chrome_app_settings__strings.grdp	Thu Jan 16 20:59:10 2020	(r523259)
+++ branches/2020Q1/www/chromium/files/patch-chrome_app_settings__strings.grdp	Thu Jan 16 21:03:39 2020	(r523260)
@@ -1,6 +1,6 @@
---- chrome/app/settings_strings.grdp.orig	2019-10-21 19:06:20 UTC
+--- chrome/app/settings_strings.grdp.orig	2019-12-16 21:51:23 UTC
 +++ chrome/app/settings_strings.grdp
-@@ -757,7 +757,7 @@
+@@ -760,7 +760,7 @@
        Themes
      </message>
    </if>
@@ -9,7 +9,7 @@
      <message name="IDS_SETTINGS_SYSTEM_THEME" desc="Text of the label describing the system (GTK+) browser theme on Linux">
        GTK+
      </message>
-@@ -771,7 +771,7 @@
+@@ -774,7 +774,7 @@
        Use Classic
      </message>
    </if>

Modified: branches/2020Q1/www/chromium/files/patch-chrome_browser_about__flags.cc
==============================================================================
--- branches/2020Q1/www/chromium/files/patch-chrome_browser_about__flags.cc	Thu Jan 16 20:59:10 2020	(r523259)
+++ branches/2020Q1/www/chromium/files/patch-chrome_browser_about__flags.cc	Thu Jan 16 21:03:39 2020	(r523260)
@@ -1,6 +1,6 @@
---- chrome/browser/about_flags.cc.orig	2019-10-21 19:06:20 UTC
+--- chrome/browser/about_flags.cc.orig	2019-12-16 21:51:23 UTC
 +++ chrome/browser/about_flags.cc
-@@ -162,7 +162,7 @@
+@@ -164,7 +164,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
  
-@@ -716,7 +716,7 @@ const FeatureEntry::FeatureVariation
+@@ -715,7 +715,7 @@ const FeatureEntry::FeatureVariation
           nullptr}};
  #endif  // OS_ANDROID
  
@@ -18,7 +18,7 @@
  const FeatureEntry::FeatureParam
      kAutofillSaveCreditCardUsesImprovedMessagingStoreCard[] = {
          {autofill::features::
-@@ -763,7 +763,7 @@ const FeatureEntry::FeatureVariation
+@@ -762,7 +762,7 @@ const FeatureEntry::FeatureVariation
               kAutofillSaveCreditCardUsesImprovedMessagingConfirmAndSaveCard),
           nullptr},
  };
@@ -27,7 +27,7 @@
  
  const FeatureEntry::Choice kMemlogModeChoices[] = {
      {flags_ui::kGenericExperimentChoiceDisabled, "", ""},
-@@ -816,7 +816,7 @@ const FeatureEntry::Choice kMemlogSamplingRateChoices[
+@@ -815,7 +815,7 @@ const FeatureEntry::Choice kMemlogSamplingRateChoices[
       heap_profiling::kMemlogSamplingRate5MB},
  };
  
@@ -36,16 +36,16 @@
  const FeatureEntry::FeatureParam kOmniboxDocumentProviderServerScoring[] = {
      {"DocumentUseServerScore", "true"},
      {"DocumentUseClientScore", "false"},
-@@ -854,7 +854,7 @@ const FeatureEntry::FeatureVariation kOmniboxDocumentP
+@@ -853,7 +853,7 @@ const FeatureEntry::FeatureVariation kOmniboxDocumentP
       base::size(kOmniboxDocumentProviderClientScoring), nullptr},
      {"server and client scores", kOmniboxDocumentProviderServerAndClientScoring,
       base::size(kOmniboxDocumentProviderServerAndClientScoring), nullptr}};
 -#endif  // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
 +#endif  // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
  
- const FeatureEntry::FeatureParam kOmniboxOnFocusSuggestionsParamNTPOmnibox[] = {
-     {"ZeroSuggestVariant:7:*", ZeroSuggestProvider::kRemoteNoUrlVariant}};
-@@ -932,7 +932,7 @@ const FeatureEntry::FeatureVariation kOmniboxMaxURLMat
+ #ifdef OS_ANDROID
+ const FeatureEntry::FeatureParam kOmniboxNTPZPSLocal[] = {
+@@ -967,7 +967,7 @@ const FeatureEntry::FeatureVariation kOmniboxMaxURLMat
      {"6 matches", kOmniboxMaxURLMatches6, base::size(kOmniboxMaxURLMatches6),
       nullptr}};
  
@@ -54,7 +54,7 @@
      defined(OS_CHROMEOS)
  const FeatureEntry::FeatureParam kTranslateBubbleUIButton[] = {
      {language::kTranslateUIBubbleKey, language::kTranslateUIBubbleButtonValue}};
-@@ -948,7 +948,7 @@ const FeatureEntry::FeatureVariation kTranslateBubbleU
+@@ -983,7 +983,7 @@ const FeatureEntry::FeatureVariation kTranslateBubbleU
      {"Tab", kTranslateBubbleUITab, base::size(kTranslateBubbleUITab), nullptr},
      {"Button_GM2", kTranslateBubbleUIButtonGM2,
       base::size(kTranslateBubbleUIButton), nullptr}};
@@ -63,7 +63,7 @@
  
  const FeatureEntry::FeatureParam kMarkHttpAsDangerous[] = {
      {security_state::features::kMarkHttpAsFeatureParameterName,
-@@ -1849,13 +1849,13 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -1913,13 +1913,13 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kCloudPrintXpsDescription, kOsWin,
       SINGLE_VALUE_TYPE(switches::kEnableCloudPrintXps)},
  #endif  // OS_WIN
@@ -79,7 +79,7 @@
      {"enable-webgl-draft-extensions",
       flag_descriptions::kWebglDraftExtensionsName,
       flag_descriptions::kWebglDraftExtensionsDescription, kOsAll,
-@@ -1904,14 +1904,14 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -1971,14 +1971,14 @@ const FeatureEntry kFeatureEntries[] = {
                                      "OverrideTranslateTriggerInIndia")},
  #endif  // OS_ANDROID
  
@@ -96,7 +96,7 @@
  
  #if BUILDFLAG(ENABLE_NATIVE_NOTIFICATIONS) && !defined(OS_CHROMEOS)
      {"enable-native-notifications",
-@@ -1983,7 +1983,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -2044,7 +2044,7 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kCrostiniBackupDescription, kOsCrOS,
       FEATURE_VALUE_TYPE(chromeos::features::kCrostiniBackup)},
  #endif  // OS_CHROMEOS
@@ -105,7 +105,7 @@
      {"terminal-system-app", flag_descriptions::kTerminalSystemAppName,
       flag_descriptions::kTerminalSystemAppDescription, kOsCrOS | kOsLinux,
       FEATURE_VALUE_TYPE(features::kTerminalSystemApp)},
-@@ -1992,7 +1992,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -2053,7 +2053,7 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kDynamicTcmallocDescription, kOsCrOS | kOsLinux,
       FEATURE_VALUE_TYPE(performance_manager::features::kDynamicTcmallocTuning)},
  #endif  // BUILDFLAG(USE_TCMALLOC)
@@ -114,31 +114,16 @@
  #if defined(OS_ANDROID)
      {"enable-credit-card-assist", flag_descriptions::kCreditCardAssistName,
       flag_descriptions::kCreditCardAssistDescription, kOsAndroid,
-@@ -2075,7 +2075,7 @@ const FeatureEntry kFeatureEntries[] = {
-      FEATURE_VALUE_TYPE(
-          previews::features::kHTTPSServerPreviewsUsingURLLoader)},
+@@ -2131,7 +2131,7 @@ const FeatureEntry kFeatureEntries[] = {
+      flag_descriptions::kEnableLitePageServerPreviewsDescription, kOsAndroid,
+      FEATURE_VALUE_TYPE(previews::features::kLitePageServerPreviews)},
  #endif  // OS_ANDROID
 -#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,
       SINGLE_VALUE_TYPE(
-@@ -2427,12 +2427,12 @@ const FeatureEntry kFeatureEntries[] = {
-                                     "AndroidNightMode")},
- #endif  // BUILDFLAG(ENABLE_ANDROID_NIGHT_MODE)
- #endif  // OS_ANDROID
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
-     {"enable-dbus-and-x11-status-icons",
-      flag_descriptions::kEnableDbusAndX11StatusIconsName,
-      flag_descriptions::kEnableDbusAndX11StatusIconsDescription, kOsLinux,
-      FEATURE_VALUE_TYPE(features::kEnableDbusAndX11StatusIcons)},
--#endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#endif  // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
-     {"enable-experimental-accessibility-features",
-      flag_descriptions::kExperimentalAccessibilityFeaturesName,
-      flag_descriptions::kExperimentalAccessibilityFeaturesDescription, kOsCrOS,
-@@ -2752,7 +2752,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -2810,7 +2810,7 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kOmniboxLocalEntitySuggestionsDescription, kOsDesktop,
       FEATURE_VALUE_TYPE(omnibox::kOmniboxLocalEntitySuggestions)},
  
@@ -147,16 +132,16 @@
      {"omnibox-experimental-keyword-mode",

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***