From owner-svn-ports-all@freebsd.org  Wed Jun  3 11:20:49 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 17EFF33413F;
 Wed,  3 Jun 2020 11:20:49 +0000 (UTC) (envelope-from jrm@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)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
 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 49cRKs049Wz4816;
 Wed,  3 Jun 2020 11:20:49 +0000 (UTC) (envelope-from jrm@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 F1054D217;
 Wed,  3 Jun 2020 11:20:48 +0000 (UTC) (envelope-from jrm@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 053BKmVF097995;
 Wed, 3 Jun 2020 11:20:48 GMT (envelope-from jrm@FreeBSD.org)
Received: (from jrm@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 053BKgU7097961;
 Wed, 3 Jun 2020 11:20:42 GMT (envelope-from jrm@FreeBSD.org)
Message-Id: <202006031120.053BKgU7097961@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jrm set sender to jrm@FreeBSD.org
 using -f
From: Joseph Mingrone <jrm@FreeBSD.org>
Date: Wed, 3 Jun 2020 11:20:42 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r537611 - in branches/2020Q2/www/chromium: . files
X-SVN-Group: ports-branches
X-SVN-Commit-Author: jrm
X-SVN-Commit-Paths: in branches/2020Q2/www/chromium: . files
X-SVN-Commit-Revision: 537611
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.33
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: Wed, 03 Jun 2020 11:20:49 -0000

Author: jrm
Date: Wed Jun  3 11:20:42 2020
New Revision: 537611
URL: https://svnweb.freebsd.org/changeset/ports/537611

Log:
  MFH: r537579
  
  www/chromium: Update to version 83.0.4103.61
  
  Submitted by:	Matthias Wolf <freebsd@rheinwolf.de>
  Reviewed by:	rene
  Approved by:    portmgr (blanket) chromium@ (rene)
  Obtained from:	https://github.com/gliaskos/freebsd-chromium
  Security:	https://chromereleases.googleblog.com/2020/05/stable-channel-update-for-desktop.html
  Differential Revision:	https://reviews.freebsd.org/D25102

Added:
  branches/2020Q2/www/chromium/files/patch-base_location__unittest.cc
     - copied unchanged from r537579, head/www/chromium/files/patch-base_location__unittest.cc
  branches/2020Q2/www/chromium/files/patch-base_stl__util.h
     - copied unchanged from r537579, head/www/chromium/files/patch-base_stl__util.h
  branches/2020Q2/www/chromium/files/patch-chrome_app_BUILD.gn
     - copied unchanged from r537579, head/www/chromium/files/patch-chrome_app_BUILD.gn
  branches/2020Q2/www/chromium/files/patch-chrome_browser_BUILD.gn
     - copied unchanged from r537579, head/www/chromium/files/patch-chrome_browser_BUILD.gn
  branches/2020Q2/www/chromium/files/patch-chrome_browser_device__identity_device__oauth2__token__service__factory.cc
     - copied unchanged from r537579, head/www/chromium/files/patch-chrome_browser_device__identity_device__oauth2__token__service__factory.cc
  branches/2020Q2/www/chromium/files/patch-chrome_browser_ui_BUILD.gn
     - copied unchanged from r537579, head/www/chromium/files/patch-chrome_browser_ui_BUILD.gn
  branches/2020Q2/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__file__handler__registration.h
     - copied unchanged from r537579, head/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__file__handler__registration.h
  branches/2020Q2/www/chromium/files/patch-components_BUILD.gn
     - copied unchanged from r537579, head/www/chromium/files/patch-components_BUILD.gn
  branches/2020Q2/www/chromium/files/patch-components_safe__browsing_core_resources_gen__file__type__proto.py
     - copied unchanged from r537579, head/www/chromium/files/patch-components_safe__browsing_core_resources_gen__file__type__proto.py
  branches/2020Q2/www/chromium/files/patch-components_security__interstitials_content_utils.cc
     - copied unchanged from r537579, head/www/chromium/files/patch-components_security__interstitials_content_utils.cc
  branches/2020Q2/www/chromium/files/patch-content_browser_BUILD.gn
     - copied unchanged from r537579, head/www/chromium/files/patch-content_browser_BUILD.gn
  branches/2020Q2/www/chromium/files/patch-content_browser_compositor_viz__process__transport__factory.cc
     - copied unchanged from r537579, head/www/chromium/files/patch-content_browser_compositor_viz__process__transport__factory.cc
  branches/2020Q2/www/chromium/files/patch-content_child_BUILD.gn
     - copied unchanged from r537579, head/www/chromium/files/patch-content_child_BUILD.gn
  branches/2020Q2/www/chromium/files/patch-content_public_common_BUILD.gn
     - copied unchanged from r537579, head/www/chromium/files/patch-content_public_common_BUILD.gn
  branches/2020Q2/www/chromium/files/patch-content_public_common_content__constants.cc
     - copied unchanged from r537579, head/www/chromium/files/patch-content_public_common_content__constants.cc
  branches/2020Q2/www/chromium/files/patch-content_public_common_content__constants.h
     - copied unchanged from r537579, head/www/chromium/files/patch-content_public_common_content__constants.h
  branches/2020Q2/www/chromium/files/patch-content_renderer_BUILD.gn
     - copied unchanged from r537579, head/www/chromium/files/patch-content_renderer_BUILD.gn
  branches/2020Q2/www/chromium/files/patch-content_test_BUILD.gn
     - copied unchanged from r537579, head/www/chromium/files/patch-content_test_BUILD.gn
  branches/2020Q2/www/chromium/files/patch-extensions_shell_BUILD.gn
     - copied unchanged from r537579, head/www/chromium/files/patch-extensions_shell_BUILD.gn
  branches/2020Q2/www/chromium/files/patch-headless_BUILD.gn
     - copied unchanged from r537579, head/www/chromium/files/patch-headless_BUILD.gn
  branches/2020Q2/www/chromium/files/patch-media_audio_audio__features.cc
     - copied unchanged from r537579, head/www/chromium/files/patch-media_audio_audio__features.cc
  branches/2020Q2/www/chromium/files/patch-media_base_status.cc
     - copied unchanged from r537579, head/www/chromium/files/patch-media_base_status.cc
  branches/2020Q2/www/chromium/files/patch-media_blink_webmediaplayer__impl.cc
     - copied unchanged from r537579, head/www/chromium/files/patch-media_blink_webmediaplayer__impl.cc
  branches/2020Q2/www/chromium/files/patch-net_proxy__resolution_configured__proxy__resolution__service.cc
     - copied unchanged from r537579, head/www/chromium/files/patch-net_proxy__resolution_configured__proxy__resolution__service.cc
  branches/2020Q2/www/chromium/files/patch-services_device_serial_serial__device__enumerator.cc
     - copied unchanged from r537579, head/www/chromium/files/patch-services_device_serial_serial__device__enumerator.cc
  branches/2020Q2/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.cpp
     - copied unchanged from r537579, head/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.cpp
  branches/2020Q2/www/chromium/files/patch-third__party_blink_renderer_bindings_scripts_bind__gen_style__format.py
     - copied unchanged from r537579, head/www/chromium/files/patch-third__party_blink_renderer_bindings_scripts_bind__gen_style__format.py
  branches/2020Q2/www/chromium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.cc
     - copied unchanged from r537579, head/www/chromium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.cc
  branches/2020Q2/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc
     - copied unchanged from r537579, head/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc
  branches/2020Q2/www/chromium/files/patch-third__party_perfetto_src_base_subprocess.cc
     - copied unchanged from r537579, head/www/chromium/files/patch-third__party_perfetto_src_base_subprocess.cc
  branches/2020Q2/www/chromium/files/patch-third__party_swiftshader_src_Reactor_Debug.cpp
     - copied unchanged from r537579, head/www/chromium/files/patch-third__party_swiftshader_src_Reactor_Debug.cpp
  branches/2020Q2/www/chromium/files/patch-third__party_swiftshader_src_System_Debug.cpp
     - copied unchanged from r537579, head/www/chromium/files/patch-third__party_swiftshader_src_System_Debug.cpp
  branches/2020Q2/www/chromium/files/patch-ui_base_x_x11__shm__image__pool.cc
     - copied unchanged from r537579, head/www/chromium/files/patch-ui_base_x_x11__shm__image__pool.cc
  branches/2020Q2/www/chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.cc
     - copied unchanged from r537579, head/www/chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.cc
  branches/2020Q2/www/chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.h
     - copied unchanged from r537579, head/www/chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.h
  branches/2020Q2/www/chromium/files/patch-ui_gfx_native__widget__types.h
     - copied unchanged from r537579, head/www/chromium/files/patch-ui_gfx_native__widget__types.h
  branches/2020Q2/www/chromium/files/patch-ui_gtk_print__dialog__gtk.cc
     - copied unchanged from r537579, head/www/chromium/files/patch-ui_gtk_print__dialog__gtk.cc
  branches/2020Q2/www/chromium/files/patch-weblayer_BUILD.gn
     - copied unchanged from r537579, head/www/chromium/files/patch-weblayer_BUILD.gn
Deleted:
  branches/2020Q2/www/chromium/files/patch-chrome_browser_metrics_bluetooth__available__utility.cc
  branches/2020Q2/www/chromium/files/patch-chrome_browser_resources_safe__browsing_gen__file__type__proto.py
  branches/2020Q2/www/chromium/files/patch-chrome_browser_ssl_ssl__error__controller__client.cc
  branches/2020Q2/www/chromium/files/patch-chrome_browser_ui_gtk_print__dialog__gtk.cc
  branches/2020Q2/www/chromium/files/patch-chrome_browser_ui_toolbar_app__menu__model.cc
  branches/2020Q2/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__file__handler__registration.cc
  branches/2020Q2/www/chromium/files/patch-chromecast_media_base_monotonic__clock.cc
  branches/2020Q2/www/chromium/files/patch-components_crash_content_app_BUILD.gn
  branches/2020Q2/www/chromium/files/patch-components_crash_content_app_crashpad.cc
  branches/2020Q2/www/chromium/files/patch-components_crash_content_app_crashpad.h
  branches/2020Q2/www/chromium/files/patch-components_crash_content_app_crashpad__linux.cc
  branches/2020Q2/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc
  branches/2020Q2/www/chromium/files/patch-net_proxy__resolution_proxy__resolution__service.cc
  branches/2020Q2/www/chromium/files/patch-services_service__manager_embedder_set__process__title__linux.cc
  branches/2020Q2/www/chromium/files/patch-third__party_swiftshader_src_Vulkan_VkDebug.cpp
  branches/2020Q2/www/chromium/files/patch-ui_base_x_x11__shm__image__pool__base.cc
  branches/2020Q2/www/chromium/files/patch-ui_compositor_host_host__context__factory__private.cc
  branches/2020Q2/www/chromium/files/patch-ui_gfx_mojom_buffer__types__mojom__traits.h
Modified:
  branches/2020Q2/www/chromium/Makefile
  branches/2020Q2/www/chromium/distinfo
  branches/2020Q2/www/chromium/files/patch-3p-pdfium_3p_base_allocator_partition__allocator_page__allocator__internals__posix.h
  branches/2020Q2/www/chromium/files/patch-BUILD.gn
  branches/2020Q2/www/chromium/files/patch-ash_display_mirror__window__controller.cc
  branches/2020Q2/www/chromium/files/patch-base_BUILD.gn
  branches/2020Q2/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h
  branches/2020Q2/www/chromium/files/patch-base_debug_debugger__posix.cc
  branches/2020Q2/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc
  branches/2020Q2/www/chromium/files/patch-base_i18n_icu__util.cc
  branches/2020Q2/www/chromium/files/patch-base_linux__util.cc
  branches/2020Q2/www/chromium/files/patch-base_memory_platform__shared__memory__region__posix.cc
  branches/2020Q2/www/chromium/files/patch-base_profiler_stack__copier__signal.cc
  branches/2020Q2/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc
  branches/2020Q2/www/chromium/files/patch-base_profiler_thread__delegate__posix.cc
  branches/2020Q2/www/chromium/files/patch-base_system_sys__info.h
  branches/2020Q2/www/chromium/files/patch-base_test_test__suite.cc
  branches/2020Q2/www/chromium/files/patch-build_config_BUILD.gn
  branches/2020Q2/www/chromium/files/patch-build_config_compiler_BUILD.gn
  branches/2020Q2/www/chromium/files/patch-build_config_compiler_compiler.gni
  branches/2020Q2/www/chromium/files/patch-build_config_linux_BUILD.gn
  branches/2020Q2/www/chromium/files/patch-build_config_sysroot.gni
  branches/2020Q2/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni
  branches/2020Q2/www/chromium/files/patch-cc_BUILD.gn
  branches/2020Q2/www/chromium/files/patch-cc_trees_property__tree.cc
  branches/2020Q2/www/chromium/files/patch-chrome_app_chrome__command__ids.h
  branches/2020Q2/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc
  branches/2020Q2/www/chromium/files/patch-chrome_app_chromium__strings.grd
  branches/2020Q2/www/chromium/files/patch-chrome_app_generated__resources.grd
  branches/2020Q2/www/chromium/files/patch-chrome_app_google__chrome__strings.grd
  branches/2020Q2/www/chromium/files/patch-chrome_app_settings__strings.grdp
  branches/2020Q2/www/chromium/files/patch-chrome_browser_about__flags.cc
  branches/2020Q2/www/chromium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc
  branches/2020Q2/www/chromium/files/patch-chrome_browser_browser__resources.grd
  branches/2020Q2/www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc
  branches/2020Q2/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc
  branches/2020Q2/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc
  branches/2020Q2/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc
  branches/2020Q2/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h
  branches/2020Q2/www/chromium/files/patch-chrome_browser_dev__ui__browser__resources.grd
  branches/2020Q2/www/chromium/files/patch-chrome_browser_download_download__commands.cc
  branches/2020Q2/www/chromium/files/patch-chrome_browser_download_download__item__model.cc
  branches/2020Q2/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn
  branches/2020Q2/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_device__info__fetcher__linux.cc
  branches/2020Q2/www/chromium/files/patch-chrome_browser_extensions_api_erp_chrome_desktop_report_request_helper.cc
  branches/2020Q2/www/chromium/files/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc
  branches/2020Q2/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc
  branches/2020Q2/www/chromium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc
  branches/2020Q2/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc
  branches/2020Q2/www/chromium/files/patch-chrome_browser_flag__descriptions.cc
  branches/2020Q2/www/chromium/files/patch-chrome_browser_flag__descriptions.h
  branches/2020Q2/www/chromium/files/patch-chrome_browser_memory__details.cc
  branches/2020Q2/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc
  branches/2020Q2/www/chromium/files/patch-chrome_browser_metrics_process__memory__metrics__emitter.cc
  branches/2020Q2/www/chromium/files/patch-chrome_browser_native__file__system_chrome__native__file__system__permission__context.cc
  branches/2020Q2/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc
  branches/2020Q2/www/chromium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc
  branches/2020Q2/www/chromium/files/patch-chrome_browser_password__manager_password__store__factory.cc
  branches/2020Q2/www/chromium/files/patch-chrome_browser_policy_browser__signin__policy__handler.cc
  branches/2020Q2/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc
  branches/2020Q2/www/chromium/files/patch-chrome_browser_policy_policy__prefs__browsertest.cc
  branches/2020Q2/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc
  branches/2020Q2/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__whitelist.cc
  branches/2020Q2/www/chromium/files/patch-chrome_browser_profiles_profile__attributes__entry.cc
  branches/2020Q2/www/chromium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.cc
  branches/2020Q2/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.js
  branches/2020Q2/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html
  branches/2020Q2/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.js
  branches/2020Q2/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc
  branches/2020Q2/www/chromium/files/patch-chrome_browser_search_search__suggest_search__suggest__service.cc
  branches/2020Q2/www/chromium/files/patch-chrome_browser_sharing_shared__clipboard_feature__flags.cc
  branches/2020Q2/www/chromium/files/patch-chrome_browser_sharing_shared__clipboard_feature__flags.h
  branches/2020Q2/www/chromium/files/patch-chrome_browser_sharing_sharing__device__registration.cc
  branches/2020Q2/www/chromium/files/patch-chrome_browser_sharing_sharing__service.cc
  branches/2020Q2/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc
  branches/2020Q2/www/chromium/files/patch-chrome_browser_tracing_crash__service__uploader.cc
  branches/2020Q2/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc
  branches/2020Q2/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc
  branches/2020Q2/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc
  branches/2020Q2/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc
  branches/2020Q2/www/chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc
  branches/2020Q2/www/chromium/files/patch-chrome_browser_ui_views_download_download__item__view.cc
  branches/2020Q2/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc
  branches/2020Q2/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc
  branches/2020Q2/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc
  branches/2020Q2/www/chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc
  branches/2020Q2/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc
  branches/2020Q2/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc
  branches/2020Q2/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc
  branches/2020Q2/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc
  branches/2020Q2/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc
  branches/2020Q2/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__shortcut.cc
  branches/2020Q2/www/chromium/files/patch-chrome_common_BUILD.gn
  branches/2020Q2/www/chromium/files/patch-chrome_common_channel__info.h
  branches/2020Q2/www/chromium/files/patch-chrome_common_chrome__features.cc
  branches/2020Q2/www/chromium/files/patch-chrome_common_chrome__features.h
  branches/2020Q2/www/chromium/files/patch-chrome_common_chrome__switches.cc
  branches/2020Q2/www/chromium/files/patch-chrome_common_chrome__switches.h
  branches/2020Q2/www/chromium/files/patch-chrome_common_features.gni
  branches/2020Q2/www/chromium/files/patch-chrome_common_pref__names.cc
  branches/2020Q2/www/chromium/files/patch-chrome_common_pref__names.h
  branches/2020Q2/www/chromium/files/patch-chrome_common_webui__url__constants.cc
  branches/2020Q2/www/chromium/files/patch-chrome_common_webui__url__constants.h
  branches/2020Q2/www/chromium/files/patch-chrome_renderer_chrome__content__renderer__client.cc
  branches/2020Q2/www/chromium/files/patch-chrome_test_BUILD.gn
  branches/2020Q2/www/chromium/files/patch-chrome_test_base_chrome__test__launcher.cc
  branches/2020Q2/www/chromium/files/patch-chrome_test_base_in__process__browser__test.cc
  branches/2020Q2/www/chromium/files/patch-chrome_test_base_testing__browser__process.h
  branches/2020Q2/www/chromium/files/patch-chrome_test_chromedriver_chrome__launcher.cc
  branches/2020Q2/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc
  branches/2020Q2/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc
  branches/2020Q2/www/chromium/files/patch-chromecast_renderer_cast__content__renderer__client.cc
  branches/2020Q2/www/chromium/files/patch-components_autofill_core_browser_autofill__external__delegate.cc
  branches/2020Q2/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc
  branches/2020Q2/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc
  branches/2020Q2/www/chromium/files/patch-components_discardable__memory_service_discardable__shared__memory__manager.cc
  branches/2020Q2/www/chromium/files/patch-components_download_internal_common_base__file.cc
  branches/2020Q2/www/chromium/files/patch-components_metrics_metrics__log.cc
  branches/2020Q2/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc
  branches/2020Q2/www/chromium/files/patch-components_policy_resources_policy__templates.json
  branches/2020Q2/www/chromium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.h
  branches/2020Q2/www/chromium/files/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc
  branches/2020Q2/www/chromium/files/patch-components_url__matcher_regex__set__matcher.cc
  branches/2020Q2/www/chromium/files/patch-components_viz_common_features.cc
  branches/2020Q2/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.cc
  branches/2020Q2/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.h
  branches/2020Q2/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc
  branches/2020Q2/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h
  branches/2020Q2/www/chromium/files/patch-components_viz_test_fake__output__surface.cc
  branches/2020Q2/www/chromium/files/patch-components_viz_test_fake__output__surface.h
  branches/2020Q2/www/chromium/files/patch-content_app_content__main__runner__impl.cc
  branches/2020Q2/www/chromium/files/patch-content_browser_browser__main__loop.cc
  branches/2020Q2/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc
  branches/2020Q2/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc
  branches/2020Q2/www/chromium/files/patch-content_browser_media_media__internals.cc
  branches/2020Q2/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.cc
  branches/2020Q2/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.h
  branches/2020Q2/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc
  branches/2020Q2/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h
  branches/2020Q2/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc
  branches/2020Q2/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc
  branches/2020Q2/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc
  branches/2020Q2/www/chromium/files/patch-content_browser_scheduler_responsiveness_jank__monitor.cc
  branches/2020Q2/www/chromium/files/patch-content_browser_utility__process__host.cc
  branches/2020Q2/www/chromium/files/patch-content_common_BUILD.gn
  branches/2020Q2/www/chromium/files/patch-content_common_user__agent.cc
  branches/2020Q2/www/chromium/files/patch-content_gpu_BUILD.gn
  branches/2020Q2/www/chromium/files/patch-content_gpu_gpu__main.cc
  branches/2020Q2/www/chromium/files/patch-content_public_app_content__main__delegate.cc
  branches/2020Q2/www/chromium/files/patch-content_public_app_content__main__delegate.h
  branches/2020Q2/www/chromium/files/patch-content_public_common_common__param__traits__macros.h
  branches/2020Q2/www/chromium/files/patch-content_public_common_content__features.cc
  branches/2020Q2/www/chromium/files/patch-content_public_common_content__switches.cc
  branches/2020Q2/www/chromium/files/patch-content_public_common_content__switches.h
  branches/2020Q2/www/chromium/files/patch-content_public_test_browser__test__base.cc
  branches/2020Q2/www/chromium/files/patch-content_public_test_content__browser__test.cc
  branches/2020Q2/www/chromium/files/patch-content_public_test_mock__render__thread.cc
  branches/2020Q2/www/chromium/files/patch-content_renderer_media_audio_audio__device__factory.cc
  branches/2020Q2/www/chromium/files/patch-content_renderer_render__process__impl.cc
  branches/2020Q2/www/chromium/files/patch-content_renderer_render__thread__impl.cc
  branches/2020Q2/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h
  branches/2020Q2/www/chromium/files/patch-content_shell_BUILD.gn
  branches/2020Q2/www/chromium/files/patch-content_shell_app_shell__main__delegate.cc
  branches/2020Q2/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc
  branches/2020Q2/www/chromium/files/patch-content_shell_test__runner_test__runner.cc
  branches/2020Q2/www/chromium/files/patch-content_utility_BUILD.gn
  branches/2020Q2/www/chromium/files/patch-extensions_common_api___permission__features.json
  branches/2020Q2/www/chromium/files/patch-extensions_common_feature__switch.cc
  branches/2020Q2/www/chromium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc
  branches/2020Q2/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc
  branches/2020Q2/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.h
  branches/2020Q2/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__gl__representation.cc
  branches/2020Q2/www/chromium/files/patch-gpu_config_gpu__control__list.cc
  branches/2020Q2/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc
  branches/2020Q2/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.cc
  branches/2020Q2/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.h
  branches/2020Q2/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc
  branches/2020Q2/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h
  branches/2020Q2/www/chromium/files/patch-headless_lib_browser_headless__request__context__manager.cc
  branches/2020Q2/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc
  branches/2020Q2/www/chromium/files/patch-media_BUILD.gn
  branches/2020Q2/www/chromium/files/patch-media_base_audio__latency.cc
  branches/2020Q2/www/chromium/files/patch-media_base_media__switches.cc
  branches/2020Q2/www/chromium/files/patch-media_base_video__frame.cc
  branches/2020Q2/www/chromium/files/patch-media_base_video__frame.h
  branches/2020Q2/www/chromium/files/patch-media_capture_video_video__capture__buffer__pool__impl.cc
  branches/2020Q2/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc
  branches/2020Q2/www/chromium/files/patch-media_mojo_clients_mojo__video__encode__accelerator.cc
  branches/2020Q2/www/chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc
  branches/2020Q2/www/chromium/files/patch-media_mojo_services_gpu__mojo__media__client.cc
  branches/2020Q2/www/chromium/files/patch-net_BUILD.gn
  branches/2020Q2/www/chromium/files/patch-net_base_features.cc
  branches/2020Q2/www/chromium/files/patch-net_dns_dns__config__service__posix__unittest.cc
  branches/2020Q2/www/chromium/files/patch-net_dns_dns__util.cc
  branches/2020Q2/www/chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc
  branches/2020Q2/www/chromium/files/patch-net_socket_udp__socket__posix.cc
  branches/2020Q2/www/chromium/files/patch-net_tools_quic_quic__http__proxy__backend.cc
  branches/2020Q2/www/chromium/files/patch-net_url__request_url__fetcher.h
  branches/2020Q2/www/chromium/files/patch-net_url__request_url__request__context__builder.cc
  branches/2020Q2/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc
  branches/2020Q2/www/chromium/files/patch-remoting_host_host__attributes.cc
  branches/2020Q2/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc
  branches/2020Q2/www/chromium/files/patch-remoting_resources_remoting__strings.grd
  branches/2020Q2/www/chromium/files/patch-services_device_serial_serial__io__handler__posix.cc
  branches/2020Q2/www/chromium/files/patch-services_network_BUILD.gn
  branches/2020Q2/www/chromium/files/patch-services_network_network__context.cc
  branches/2020Q2/www/chromium/files/patch-services_network_network__service.cc
  branches/2020Q2/www/chromium/files/patch-services_network_network__service.h
  branches/2020Q2/www/chromium/files/patch-services_service__manager_embedder_main.cc
  branches/2020Q2/www/chromium/files/patch-services_service__manager_zygote_host_zygote__host__impl__linux.cc
  branches/2020Q2/www/chromium/files/patch-services_service__manager_zygote_zygote__main__linux.cc
  branches/2020Q2/www/chromium/files/patch-services_tracing_public_cpp_stack__sampling_tracing__sampler__profiler.cc
  branches/2020Q2/www/chromium/files/patch-services_video__capture_broadcasting__receiver.cc
  branches/2020Q2/www/chromium/files/patch-third__party_angle_BUILD.gn
  branches/2020Q2/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp
  branches/2020Q2/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.h
  branches/2020Q2/www/chromium/files/patch-third__party_angle_third__party_vulkan-loader_src_loader_loader.c
  branches/2020Q2/www/chromium/files/patch-third__party_angle_third__party_vulkan-validation-layers_src_layers_vk__loader__platform.h
  branches/2020Q2/www/chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc
  branches/2020Q2/www/chromium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc
  branches/2020Q2/www/chromium/files/patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc
  branches/2020Q2/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc
  branches/2020Q2/www/chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc
  branches/2020Q2/www/chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc
  branches/2020Q2/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn
  branches/2020Q2/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h
  branches/2020Q2/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc
  branches/2020Q2/www/chromium/files/patch-third__party_boringssl_BUILD.gn
  branches/2020Q2/www/chromium/files/patch-third__party_crashpad_crashpad_client_BUILD.gn
  branches/2020Q2/www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_capture__context.h
  branches/2020Q2/www/chromium/files/patch-third__party_leveldatabase_env__chromium.cc
  branches/2020Q2/www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc
  branches/2020Q2/www/chromium/files/patch-third__party_sqlite_BUILD.gn
  branches/2020Q2/www/chromium/files/patch-third__party_swiftshader_BUILD.gn
  branches/2020Q2/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Display.cpp
  branches/2020Q2/www/chromium/files/patch-third__party_swiftshader_third__party_marl_src_thread.cpp
  branches/2020Q2/www/chromium/files/patch-third__party_usrsctp_BUILD.gn
  branches/2020Q2/www/chromium/files/patch-third__party_webrtc_BUILD.gn
  branches/2020Q2/www/chromium/files/patch-third__party_webrtc_rtc__base_network.cc
  branches/2020Q2/www/chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc
  branches/2020Q2/www/chromium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn
  branches/2020Q2/www/chromium/files/patch-tools_gn_build_gen.py
  branches/2020Q2/www/chromium/files/patch-tools_json__schema__compiler_feature__compiler.py
  branches/2020Q2/www/chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn
  branches/2020Q2/www/chromium/files/patch-ui_base_ime_init_input__method__initializer.cc
  branches/2020Q2/www/chromium/files/patch-ui_base_resource_resource__bundle.cc
  branches/2020Q2/www/chromium/files/patch-ui_base_ui__base__features.cc
  branches/2020Q2/www/chromium/files/patch-ui_base_ui__base__features.h
  branches/2020Q2/www/chromium/files/patch-ui_compositor_compositor.cc
  branches/2020Q2/www/chromium/files/patch-ui_compositor_compositor.h
  branches/2020Q2/www/chromium/files/patch-ui_gfx_BUILD.gn
  branches/2020Q2/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.cc
  branches/2020Q2/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.h
  branches/2020Q2/www/chromium/files/patch-ui_gfx_mojom_buffer__types__mojom__traits.cc
  branches/2020Q2/www/chromium/files/patch-ui_gfx_render__text.cc
  branches/2020Q2/www/chromium/files/patch-ui_gl_BUILD.gn
  branches/2020Q2/www/chromium/files/patch-ui_gl_generate__bindings.py
  branches/2020Q2/www/chromium/files/patch-ui_message__center_public_cpp_message__center__constants.h
  branches/2020Q2/www/chromium/files/patch-ui_native__theme_native__theme.h
  branches/2020Q2/www/chromium/files/patch-ui_native__theme_native__theme__base.cc
  branches/2020Q2/www/chromium/files/patch-ui_views_bubble_bubble__dialog__delegate__view.cc
  branches/2020Q2/www/chromium/files/patch-ui_views_controls_label.cc
  branches/2020Q2/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc
  branches/2020Q2/www/chromium/files/patch-ui_views_corewm_tooltip__aura.cc
  branches/2020Q2/www/chromium/files/patch-ui_views_examples_widget__example.cc
  branches/2020Q2/www/chromium/files/patch-ui_views_selection__controller.cc
  branches/2020Q2/www/chromium/files/patch-ui_views_views__delegate.h
  branches/2020Q2/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc
  branches/2020Q2/www/chromium/files/patch-ui_views_widget_native__widget__aura.cc
  branches/2020Q2/www/chromium/files/patch-ui_views_window_custom__frame__view.cc
  branches/2020Q2/www/chromium/files/patch-ui_views_window_dialog__delegate.cc
  branches/2020Q2/www/chromium/files/patch-ui_views_window_frame__background.cc
  branches/2020Q2/www/chromium/files/patch-ui_webui_resources_js_cr.js
  branches/2020Q2/www/chromium/files/patch-v8_BUILD.gn
  branches/2020Q2/www/chromium/files/patch-v8_src_api_api.cc
  branches/2020Q2/www/chromium/files/patch-v8_src_base_cpu.cc
  branches/2020Q2/www/chromium/files/patch-v8_src_base_platform_platform-freebsd.cc
  branches/2020Q2/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc
  branches/2020Q2/www/chromium/files/patch-weblayer_app_content__main__delegate__impl.cc
  branches/2020Q2/www/chromium/files/patch-weblayer_browser_browser__main__parts__impl.cc
  branches/2020Q2/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.cc
  branches/2020Q2/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.h
  branches/2020Q2/www/chromium/files/patch-weblayer_browser_system__network__context__manager.cc
  branches/2020Q2/www/chromium/pkg-plist
Directory Properties:
  branches/2020Q2/   (props changed)

Modified: branches/2020Q2/www/chromium/Makefile
==============================================================================
--- branches/2020Q2/www/chromium/Makefile	Wed Jun  3 11:16:45 2020	(r537610)
+++ branches/2020Q2/www/chromium/Makefile	Wed Jun  3 11:20:42 2020	(r537611)
@@ -89,7 +89,7 @@ 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
+SHEBANG_FILES=	chrome/tools/build/linux/chrome-wrapper buildtools/linux64/clang-format
 ALL_TARGET=	chrome
 INSTALLS_ICONS=	yes
 
@@ -275,6 +275,11 @@ do-configure:
 	@${MKDIR} ${WRKDIR}/bin
 	${LN} -sf ${LOCALBASE}/openjdk8/bin/java ${WRKDIR}/bin/java
 .endif
+
+	# Setup buildtools/freebsd
+	@${MKDIR} ${WRKSRC}/buildtools/freebsd
+	${LN} -sf ${WRKSRC}/buildtools/linux64/clang-format ${WRKSRC}/buildtools/freebsd
+	${LN} -sf ${WRKSRC}/out/${BUILDTYPE}/gn ${WRKSRC}/buildtools/freebsd
 .endif
 
 do-test-TEST-on:

Modified: branches/2020Q2/www/chromium/distinfo
==============================================================================
--- branches/2020Q2/www/chromium/distinfo	Wed Jun  3 11:16:45 2020	(r537610)
+++ branches/2020Q2/www/chromium/distinfo	Wed Jun  3 11:20:42 2020	(r537611)
@@ -1,7 +1,7 @@
-TIMESTAMP = 1588777393
-SHA256 (chromium-81.0.4044.138.tar.xz) = f478f28b8111cb70231df4c36e754d812ad7a94b7c844e9d0515345a71fd77a6
-SIZE (chromium-81.0.4044.138.tar.xz) = 785960928
-SHA256 (chromium-81.0.4044.138-testdata.tar.xz) = e2083a3c9ae5bd183ebaf3dc0b701c3fc6e990a6864852a2fa961e811c99ec32
-SIZE (chromium-81.0.4044.138-testdata.tar.xz) = 257018904
+TIMESTAMP = 1590142056
+SHA256 (chromium-83.0.4103.61.tar.xz) = 4961f20c4ee6a94490e823f1b1c4128147068f1ce9cfc509e81815f2101405bc
+SIZE (chromium-83.0.4103.61.tar.xz) = 802558244
+SHA256 (chromium-83.0.4103.61-testdata.tar.xz) = 06096007d6fd1a4adce3b9940a653086e380d0f2be3cf9e36d39956ba2f7363e
+SIZE (chromium-83.0.4103.61-testdata.tar.xz) = 257159920
 SHA256 (test_fonts.tar.xz) = cf9cbe3b7f1c4c42d426bddc65ec178d333ad7e205a36fe0a606a3c0c545ece1
 SIZE (test_fonts.tar.xz) = 200040

Modified: branches/2020Q2/www/chromium/files/patch-3p-pdfium_3p_base_allocator_partition__allocator_page__allocator__internals__posix.h
==============================================================================
--- branches/2020Q2/www/chromium/files/patch-3p-pdfium_3p_base_allocator_partition__allocator_page__allocator__internals__posix.h	Wed Jun  3 11:16:45 2020	(r537610)
+++ branches/2020Q2/www/chromium/files/patch-3p-pdfium_3p_base_allocator_partition__allocator_page__allocator__internals__posix.h	Wed Jun  3 11:20:42 2020	(r537611)
@@ -1,4 +1,4 @@
---- third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator_internals_posix.h.orig	2020-04-03 04:13:08 UTC
+--- third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator_internals_posix.h.orig	2020-05-18 18:42:41 UTC
 +++ third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator_internals_posix.h
 @@ -16,7 +16,7 @@
  #if defined(OS_ANDROID)

Modified: branches/2020Q2/www/chromium/files/patch-BUILD.gn
==============================================================================
--- branches/2020Q2/www/chromium/files/patch-BUILD.gn	Wed Jun  3 11:16:45 2020	(r537610)
+++ branches/2020Q2/www/chromium/files/patch-BUILD.gn	Wed Jun  3 11:20:42 2020	(r537611)
@@ -1,4 +1,4 @@
---- BUILD.gn.orig	2020-03-16 18:40:27 UTC
+--- BUILD.gn.orig	2020-05-13 18:40:15 UTC
 +++ BUILD.gn
 @@ -418,7 +418,7 @@ group("gn_all") {
      ]
@@ -29,7 +29,7 @@
          "//media/cast:generate_barcode_video",
          "//media/cast:generate_timecode_audio",
          "//net:crash_cache",
-@@ -575,10 +569,6 @@ group("gn_all") {
+@@ -579,10 +573,6 @@ group("gn_all") {
        "//mojo:mojo_perftests",
        "//services/service_manager/public/cpp",
        "//testing/gmock:gmock_main",
@@ -40,7 +40,7 @@
      ]
  
      if (!is_android) {
-@@ -652,7 +642,7 @@ group("gn_all") {
+@@ -656,7 +646,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)" ]
    }
  
-@@ -794,7 +784,6 @@ group("gn_all") {
+@@ -789,7 +779,6 @@ group("gn_all") {
        "//chrome/browser/vr:vr_common_perftests",
        "//chrome/browser/vr:vr_common_unittests",
        "//chrome/browser/vr:vr_pixeltests",
@@ -57,15 +57,7 @@
      ]
      if (is_desktop_linux && use_ozone) {
        deps += [ "//chrome/browser/vr/testapp:vr_testapp" ]
-@@ -934,7 +923,6 @@ if (is_chromeos) {
-       "//ppapi/examples/video_decode",
-       "//sandbox/linux:chrome_sandbox",
-       "//sandbox/linux:sandbox_linux_unittests",
--      "//third_party/breakpad:minidump_stackwalk($host_toolchain)",
- 
-       # Blocked on https://github.com/catapult-project/catapult/issues/2297
-       #"//third_party/catapult/telemetry:bitmaptools",
-@@ -1092,7 +1080,7 @@ if (!is_ios) {
+@@ -1071,7 +1060,7 @@ if (!is_ios) {
        ]
      }
  
@@ -74,7 +66,7 @@
        data_deps +=
            [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ]
      }
-@@ -1101,7 +1089,7 @@ if (!is_ios) {
+@@ -1080,7 +1069,7 @@ if (!is_ios) {
        data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
      }
  
@@ -83,7 +75,7 @@
        data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
      }
  
-@@ -1231,9 +1219,6 @@ group("chromium_builder_perf") {
+@@ -1273,9 +1262,6 @@ group("chromium_builder_perf") {
  
      if (is_win) {
        data_deps += [ "//chrome/installer/mini_installer:mini_installer" ]

Modified: branches/2020Q2/www/chromium/files/patch-ash_display_mirror__window__controller.cc
==============================================================================
--- branches/2020Q2/www/chromium/files/patch-ash_display_mirror__window__controller.cc	Wed Jun  3 11:16:45 2020	(r537610)
+++ branches/2020Q2/www/chromium/files/patch-ash_display_mirror__window__controller.cc	Wed Jun  3 11:20:42 2020	(r537611)
@@ -1,6 +1,6 @@
---- ash/display/mirror_window_controller.cc.orig	2020-03-16 18:40:27 UTC
+--- ash/display/mirror_window_controller.cc.orig	2020-05-13 18:39:35 UTC
 +++ ash/display/mirror_window_controller.cc
-@@ -276,7 +276,11 @@ void MirrorWindowController::UpdateWindow(
+@@ -275,7 +275,11 @@ void MirrorWindowController::UpdateWindow(
                           return info.id() == iter->first;
                         }) == display_info_list.end()) {
          CloseAndDeleteHost(iter->second, true);

Modified: branches/2020Q2/www/chromium/files/patch-base_BUILD.gn
==============================================================================
--- branches/2020Q2/www/chromium/files/patch-base_BUILD.gn	Wed Jun  3 11:16:45 2020	(r537610)
+++ branches/2020Q2/www/chromium/files/patch-base_BUILD.gn	Wed Jun  3 11:20:42 2020	(r537611)
@@ -1,6 +1,15 @@
---- base/BUILD.gn.orig	2020-03-16 18:40:27 UTC
+--- base/BUILD.gn.orig	2020-05-13 18:40:16 UTC
 +++ base/BUILD.gn
-@@ -912,7 +912,7 @@ jumbo_component("base") {
+@@ -59,7 +59,7 @@ declare_args() {
+   # replacement base::Location::Current(). On by default in non-official builds
+   # for testing purposes.
+   # TODO(https://crbug.com/974061): remove this eventually.
+-  from_here_uses_location_builtins = !is_official_build
++  from_here_uses_location_builtins = !is_official_build && !is_bsd
+ 
+   # Unsafe developer build. Has developer-friendly features that may weaken or
+   # disable security measures like sandboxing or ASLR.
+@@ -929,7 +929,7 @@ jumbo_component("base") {
        "timer/hi_res_timer_manager_posix.cc",
      ]
  
@@ -9,7 +18,7 @@
        sources += [
          "profiler/stack_copier_signal.cc",
          "profiler/stack_copier_signal.h",
-@@ -921,6 +921,12 @@ jumbo_component("base") {
+@@ -938,6 +938,12 @@ jumbo_component("base") {
          "profiler/thread_delegate_posix.h",
        ]
      }
@@ -22,7 +31,7 @@
    }
  
    if (is_win) {
-@@ -1305,7 +1311,7 @@ jumbo_component("base") {
+@@ -1321,7 +1327,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.
@@ -31,7 +40,7 @@
        host_toolchain != "//build/toolchain/cros:host") {
      libs += [ "atomic" ]
    }
-@@ -1331,7 +1337,7 @@ jumbo_component("base") {
+@@ -1347,7 +1353,7 @@ jumbo_component("base") {
          "allocator/allocator_shim_override_glibc_weak_symbols.h",
        ]
        deps += [ "//base/allocator:tcmalloc" ]
@@ -40,7 +49,7 @@
        sources += [ "allocator/allocator_shim_default_dispatch_to_glibc.cc" ]
      } else if (is_android && use_allocator == "none") {
        sources += [
-@@ -1930,6 +1936,33 @@ jumbo_component("base") {
+@@ -1942,6 +1948,33 @@ jumbo_component("base") {
      }
    }
  
@@ -74,7 +83,7 @@
    # iOS
    if (is_ios) {
      sources -= [
-@@ -2880,7 +2913,7 @@ test("base_unittests") {
+@@ -2898,7 +2931,7 @@ test("base_unittests") {
        "posix/unix_domain_socket_unittest.cc",
        "task/thread_pool/task_tracker_posix_unittest.cc",
      ]
@@ -83,7 +92,7 @@
        sources += [ "profiler/stack_copier_signal_unittest.cc" ]
      }
    }
-@@ -3068,6 +3101,12 @@ test("base_unittests") {
+@@ -3087,6 +3120,12 @@ test("base_unittests") {
  
      manifest = "//build/config/fuchsia/tests.cmx"
    }

Modified: branches/2020Q2/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h
==============================================================================
--- branches/2020Q2/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h	Wed Jun  3 11:16:45 2020	(r537610)
+++ branches/2020Q2/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h	Wed Jun  3 11:20:42 2020	(r537611)
@@ -1,6 +1,6 @@
---- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig	2019-10-21 19:06:18 UTC
+--- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig	2020-05-13 18:39:35 UTC
 +++ base/allocator/partition_allocator/page_allocator_internals_posix.h
-@@ -19,7 +19,7 @@
+@@ -22,7 +22,7 @@
  #if defined(OS_ANDROID)
  #include <sys/prctl.h>
  #endif

Modified: branches/2020Q2/www/chromium/files/patch-base_debug_debugger__posix.cc
==============================================================================
--- branches/2020Q2/www/chromium/files/patch-base_debug_debugger__posix.cc	Wed Jun  3 11:16:45 2020	(r537610)
+++ branches/2020Q2/www/chromium/files/patch-base_debug_debugger__posix.cc	Wed Jun  3 11:20:42 2020	(r537611)
@@ -1,6 +1,6 @@
---- base/debug/debugger_posix.cc.orig	2019-09-09 21:55:05 UTC
+--- base/debug/debugger_posix.cc.orig	2020-05-13 18:40:16 UTC
 +++ base/debug/debugger_posix.cc
-@@ -90,7 +90,7 @@ bool BeingDebugged() {
+@@ -95,7 +95,7 @@ bool BeingDebugged() {
      KERN_PROC,
      KERN_PROC_PID,
      getpid()
@@ -9,7 +9,7 @@
      , sizeof(struct kinfo_proc),
      0
  #endif
-@@ -98,33 +98,35 @@ bool BeingDebugged() {
+@@ -103,33 +103,35 @@ bool BeingDebugged() {
  
    // Caution: struct kinfo_proc is marked __APPLE_API_UNSTABLE.  The source and
    // binary interfaces may change.

Modified: branches/2020Q2/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc
==============================================================================
--- branches/2020Q2/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc	Wed Jun  3 11:16:45 2020	(r537610)
+++ branches/2020Q2/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc	Wed Jun  3 11:20:42 2020	(r537611)
@@ -1,6 +1,6 @@
---- base/files/file_path_watcher_unittest.cc.orig	2020-03-16 18:39:41 UTC
+--- base/files/file_path_watcher_unittest.cc.orig	2020-05-13 18:40:16 UTC
 +++ base/files/file_path_watcher_unittest.cc
-@@ -435,7 +435,7 @@ TEST_F(FilePathWatcherTest, WatchDirectory) {
+@@ -430,7 +430,7 @@ TEST_F(FilePathWatcherTest, WatchDirectory) {
    VLOG(1) << "Waiting for file1 creation";
    ASSERT_TRUE(WaitForEvents());
  
@@ -9,7 +9,7 @@
    // Mac implementation does not detect files modified in a directory.
    ASSERT_TRUE(WriteFile(file1, "content v2"));
    VLOG(1) << "Waiting for file1 modification";
-@@ -808,7 +808,7 @@ enum Permission {
+@@ -803,7 +803,7 @@ enum Permission {
    Execute
  };
  
@@ -18,7 +18,7 @@
  bool ChangeFilePermissions(const FilePath& path, Permission perm, bool allow) {
    struct stat stat_buf;
  
-@@ -837,9 +837,9 @@ bool ChangeFilePermissions(const FilePath& path, Permi
+@@ -832,9 +832,9 @@ bool ChangeFilePermissions(const FilePath& path, Permi
    }
    return chmod(path.value().c_str(), stat_buf.st_mode) == 0;
  }
@@ -30,7 +30,7 @@
  // Linux implementation of FilePathWatcher doesn't catch attribute changes.
  // http://crbug.com/78043
  // Windows implementation of FilePathWatcher catches attribute changes that
-@@ -874,7 +874,7 @@ TEST_F(FilePathWatcherTest, DirAttributesChanged) {
+@@ -869,7 +869,7 @@ TEST_F(FilePathWatcherTest, DirAttributesChanged) {
    ASSERT_TRUE(ChangeFilePermissions(test_dir1, Execute, true));
  }
  

Modified: branches/2020Q2/www/chromium/files/patch-base_i18n_icu__util.cc
==============================================================================
--- branches/2020Q2/www/chromium/files/patch-base_i18n_icu__util.cc	Wed Jun  3 11:16:45 2020	(r537610)
+++ branches/2020Q2/www/chromium/files/patch-base_i18n_icu__util.cc	Wed Jun  3 11:20:42 2020	(r537611)
@@ -1,6 +1,6 @@
---- base/i18n/icu_util.cc.orig	2020-03-16 18:40:27 UTC
+--- base/i18n/icu_util.cc.orig	2020-05-13 18:39:35 UTC
 +++ base/i18n/icu_util.cc
-@@ -46,7 +46,7 @@
+@@ -49,7 +49,7 @@
  #endif
  
  #if defined(OS_ANDROID) || defined(OS_FUCHSIA) || \
@@ -14,7 +14,7 @@
    icu::TimeZone::adoptDefault(
        icu::TimeZone::createTimeZone(icu::UnicodeString::fromUTF8(zone_id)));
 -#elif defined(OS_LINUX) && !BUILDFLAG(IS_CHROMECAST)
-+#elif (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMECAST)) || defined(OS_BSD)
-   // To respond to the timezone change properly, the default timezone
++#elif (defined(OS_LINUX) || defined(OS_BSD)) && !BUILDFLAG(IS_CHROMECAST)
+   // To respond to the time zone change properly, the default time zone
    // cache in ICU has to be populated on starting up.
    // See TimeZoneMonitorLinux::NotifyClientsFromImpl().

Modified: branches/2020Q2/www/chromium/files/patch-base_linux__util.cc
==============================================================================
--- branches/2020Q2/www/chromium/files/patch-base_linux__util.cc	Wed Jun  3 11:16:45 2020	(r537610)
+++ branches/2020Q2/www/chromium/files/patch-base_linux__util.cc	Wed Jun  3 11:20:42 2020	(r537611)
@@ -1,20 +1,12 @@
---- base/linux_util.cc.orig	2019-12-16 21:50:40 UTC
+--- base/linux_util.cc.orig	2020-05-13 18:39:35 UTC
 +++ base/linux_util.cc
-@@ -144,6 +144,8 @@ char g_linux_distro[kDistroSize] =
-     "CrOS";
- #elif defined(OS_ANDROID)
-     "Android";
-+#elif defined(OS_BSD)
-+    "BSD";
- #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)
-+#if defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD)
-   return g_linux_distro;
- #elif defined(OS_LINUX)
-   LinuxDistroHelper* distro_state_singleton = LinuxDistroHelper::GetInstance();
+@@ -78,6 +78,9 @@ class DistroNameGetter {
+  public:
+   DistroNameGetter() {
+     static const char* const kFilesToCheck[] = {"/etc/os-release",
++#if defined(OS_BSD)
++	                                        "/usr/local/etc/os-release",
++#endif
+                                                 "/usr/lib/os-release"};
+     for (const char* file : kFilesToCheck) {
+       if (ReadDistroFromOSReleaseFile(file))

Copied: branches/2020Q2/www/chromium/files/patch-base_location__unittest.cc (from r537579, head/www/chromium/files/patch-base_location__unittest.cc)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2020Q2/www/chromium/files/patch-base_location__unittest.cc	Wed Jun  3 11:20:42 2020	(r537611, copy of r537579, head/www/chromium/files/patch-base_location__unittest.cc)
@@ -0,0 +1,11 @@
+--- base/location_unittest.cc.orig	2020-05-26 09:56:30 UTC
++++ base/location_unittest.cc
+@@ -32,7 +32,7 @@ TEST(LocationTest, CurrentYieldsCorrectValue) {
+   EXPECT_EQ(here.line_number(), previous_line + 1);
+   EXPECT_STREQ("TestBody", here.function_name());
+ #endif
+-#elif defined(OFFICIAL_BUILD)
++#elif defined(OFFICIAL_BUILD) && !defined(OS_BSD)
+ #error Location builtins must be supported in official builds.
+ #elif BUILDFLAG(FROM_HERE_USES_LOCATION_BUILTINS)
+ #error FROM_HERE requires location builtins to be supported.

Modified: branches/2020Q2/www/chromium/files/patch-base_memory_platform__shared__memory__region__posix.cc
==============================================================================
--- branches/2020Q2/www/chromium/files/patch-base_memory_platform__shared__memory__region__posix.cc	Wed Jun  3 11:16:45 2020	(r537610)
+++ branches/2020Q2/www/chromium/files/patch-base_memory_platform__shared__memory__region__posix.cc	Wed Jun  3 11:20:42 2020	(r537611)
@@ -1,6 +1,6 @@
---- base/memory/platform_shared_memory_region_posix.cc.orig	2020-02-03 21:52:37 UTC
+--- base/memory/platform_shared_memory_region_posix.cc.orig	2020-05-13 18:40:16 UTC
 +++ base/memory/platform_shared_memory_region_posix.cc
-@@ -75,7 +75,7 @@ FDPair ScopedFDPair::get() const {
+@@ -69,7 +69,7 @@ FDPair ScopedFDPair::get() const {
    return {fd.get(), readonly_fd.get()};
  }
  
@@ -9,7 +9,7 @@
  // static
  ScopedFD PlatformSharedMemoryRegion::ExecutableRegion::CreateFD(size_t size) {
    PlatformSharedMemoryRegion region =
-@@ -84,7 +84,7 @@ ScopedFD PlatformSharedMemoryRegion::ExecutableRegion:
+@@ -78,7 +78,7 @@ ScopedFD PlatformSharedMemoryRegion::ExecutableRegion:
      return region.PassPlatformHandle().fd;
    return ScopedFD();
  }
@@ -18,7 +18,7 @@
  
  // static
  PlatformSharedMemoryRegion PlatformSharedMemoryRegion::Take(
-@@ -209,7 +209,7 @@ bool PlatformSharedMemoryRegion::MapAtInternal(off_t o
+@@ -203,7 +203,7 @@ bool PlatformSharedMemoryRegion::MapAtInternal(off_t o
  // static
  PlatformSharedMemoryRegion PlatformSharedMemoryRegion::Create(Mode mode,
                                                                size_t size
@@ -27,7 +27,7 @@
                                                                ,
                                                                bool executable
  #endif
-@@ -240,7 +240,7 @@ PlatformSharedMemoryRegion PlatformSharedMemoryRegion:
+@@ -232,7 +232,7 @@ PlatformSharedMemoryRegion PlatformSharedMemoryRegion:
    // flag.
    FilePath directory;
    if (!GetShmemTempDir(

Modified: branches/2020Q2/www/chromium/files/patch-base_profiler_stack__copier__signal.cc
==============================================================================
--- branches/2020Q2/www/chromium/files/patch-base_profiler_stack__copier__signal.cc	Wed Jun  3 11:16:45 2020	(r537610)
+++ branches/2020Q2/www/chromium/files/patch-base_profiler_stack__copier__signal.cc	Wed Jun  3 11:20:42 2020	(r537611)
@@ -1,4 +1,4 @@
---- base/profiler/stack_copier_signal.cc.orig	2020-04-10 00:33:01 UTC
+--- base/profiler/stack_copier_signal.cc.orig	2020-05-13 18:40:16 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>
-@@ -35,8 +42,13 @@ class AsyncSafeWaitableEvent {
+@@ -33,8 +40,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)
-@@ -46,8 +58,12 @@ class AsyncSafeWaitableEvent {
+@@ -44,8 +56,12 @@ class AsyncSafeWaitableEvent {
  
    void Signal() {
      futex_.store(1, std::memory_order_release);
@@ -42,7 +42,7 @@
    }
  
   private:
-@@ -214,11 +230,18 @@ bool StackCopierSignal::CopyStack(StackBuffer* stack_b
+@@ -215,11 +231,18 @@ bool StackCopierSignal::CopyStack(StackBuffer* stack_b
      if (!scoped_sigaction.succeeded())
        return false;
  

Modified: branches/2020Q2/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc
==============================================================================
--- branches/2020Q2/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc	Wed Jun  3 11:16:45 2020	(r537610)
+++ branches/2020Q2/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc	Wed Jun  3 11:20:42 2020	(r537611)
@@ -1,6 +1,6 @@
---- base/profiler/stack_sampling_profiler_unittest.cc.orig	2019-07-24 18:58:02 UTC
+--- base/profiler/stack_sampling_profiler_unittest.cc.orig	2020-05-13 18:40:16 UTC
 +++ base/profiler/stack_sampling_profiler_unittest.cc
-@@ -41,7 +41,7 @@
+@@ -43,7 +43,7 @@
  #include <intrin.h>
  #include <malloc.h>
  #include <windows.h>

Modified: branches/2020Q2/www/chromium/files/patch-base_profiler_thread__delegate__posix.cc
==============================================================================
--- branches/2020Q2/www/chromium/files/patch-base_profiler_thread__delegate__posix.cc	Wed Jun  3 11:16:45 2020	(r537610)
+++ branches/2020Q2/www/chromium/files/patch-base_profiler_thread__delegate__posix.cc	Wed Jun  3 11:20:42 2020	(r537611)
@@ -1,4 +1,4 @@
---- base/profiler/thread_delegate_posix.cc.orig	2020-04-03 04:10:36 UTC
+--- base/profiler/thread_delegate_posix.cc.orig	2020-05-13 18:39:35 UTC
 +++ base/profiler/thread_delegate_posix.cc
 @@ -9,6 +9,9 @@
  #include "base/stl_util.h"
@@ -10,7 +10,7 @@
  
  namespace base {
  
-@@ -17,7 +20,12 @@
+@@ -17,7 +20,12 @@ namespace {
  uintptr_t GetThreadStackBaseAddressImpl(
      SamplingProfilerThreadToken thread_token) {
    pthread_attr_t attr;
@@ -23,7 +23,7 @@
    // See crbug.com/617730 for limitations of this approach on Linux.
    void* address;
    size_t size;
-@@ -93,16 +103,33 @@
+@@ -93,16 +101,33 @@ std::vector<uintptr_t*> ThreadDelegatePosix::GetRegist
    return {
        // Return the set of callee-save registers per the i386 System V ABI
        // section 2.2.3, plus the stack pointer.
@@ -57,7 +57,7 @@
        reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_RBP]),
        reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_RBX]),
        reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_R12]),
-@@ -110,6 +137,7 @@
+@@ -110,6 +135,7 @@ std::vector<uintptr_t*> ThreadDelegatePosix::GetRegist
        reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_R14]),
        reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_R15]),
        reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_RSP]),

Copied: branches/2020Q2/www/chromium/files/patch-base_stl__util.h (from r537579, head/www/chromium/files/patch-base_stl__util.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2020Q2/www/chromium/files/patch-base_stl__util.h	Wed Jun  3 11:20:42 2020	(r537611, copy of r537579, head/www/chromium/files/patch-base_stl__util.h)
@@ -0,0 +1,47 @@
+--- base/stl_util.h.orig	2020-05-18 14:07:28 UTC
++++ base/stl_util.h
+@@ -561,14 +561,6 @@ size_t EraseIf(std::vector<T, Allocator>& container, P
+   return removed;
+ }
+ 
+-template <class T, class Allocator, class Value>
+-size_t Erase(std::forward_list<T, Allocator>& container, const Value& value) {
+-  // Unlike std::forward_list::remove, this function template accepts
+-  // heterogeneous types and does not force a conversion to the container's
+-  // value type before invoking the == operator.
+-  return EraseIf(container, [&](const T& cur) { return cur == value; });
+-}
+-
+ template <class T, class Allocator, class Predicate>
+ size_t EraseIf(std::forward_list<T, Allocator>& container, Predicate pred) {
+   // Note: std::forward_list does not have a size() API, thus we need to use the
+@@ -580,10 +572,10 @@ size_t EraseIf(std::forward_list<T, Allocator>& contai
+ }
+ 
+ template <class T, class Allocator, class Value>
+-size_t Erase(std::list<T, Allocator>& container, const Value& value) {
+-  // Unlike std::list::remove, this function template accepts heterogeneous
+-  // types and does not force a conversion to the container's value type before
+-  // invoking the == operator.
++size_t Erase(std::forward_list<T, Allocator>& container, const Value& value) {
++  // Unlike std::forward_list::remove, this function template accepts
++  // heterogeneous types and does not force a conversion to the container's
++  // value type before invoking the == operator.
+   return EraseIf(container, [&](const T& cur) { return cur == value; });
+ }
+ 
+@@ -592,6 +584,14 @@ size_t EraseIf(std::list<T, Allocator>& container, Pre
+   size_t old_size = container.size();
+   container.remove_if(pred);
+   return old_size - container.size();
++}
++
++template <class T, class Allocator, class Value>
++size_t Erase(std::list<T, Allocator>& container, const Value& value) {
++  // Unlike std::list::remove, this function template accepts heterogeneous
++  // types and does not force a conversion to the container's value type before
++  // invoking the == operator.
++  return EraseIf(container, [&](const T& cur) { return cur == value; });
+ }
+ 
+ template <class Key, class T, class Compare, class Allocator, class Predicate>

Modified: branches/2020Q2/www/chromium/files/patch-base_system_sys__info.h
==============================================================================
--- branches/2020Q2/www/chromium/files/patch-base_system_sys__info.h	Wed Jun  3 11:16:45 2020	(r537610)
+++ branches/2020Q2/www/chromium/files/patch-base_system_sys__info.h	Wed Jun  3 11:20:42 2020	(r537611)
@@ -1,6 +1,6 @@
---- base/system/sys_info.h.orig	2020-03-16 18:39:41 UTC
+--- base/system/sys_info.h.orig	2020-05-13 18:39:35 UTC
 +++ base/system/sys_info.h
-@@ -194,6 +194,8 @@ class BASE_EXPORT SysInfo {
+@@ -197,6 +197,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);
-@@ -203,7 +205,7 @@ class BASE_EXPORT SysInfo {
+@@ -206,7 +208,7 @@ class BASE_EXPORT SysInfo {
    static bool IsLowEndDeviceImpl();
    static HardwareInfo GetHardwareInfoSync();
  

Modified: branches/2020Q2/www/chromium/files/patch-base_test_test__suite.cc
==============================================================================
--- branches/2020Q2/www/chromium/files/patch-base_test_test__suite.cc	Wed Jun  3 11:16:45 2020	(r537610)
+++ branches/2020Q2/www/chromium/files/patch-base_test_test__suite.cc	Wed Jun  3 11:20:42 2020	(r537611)
@@ -1,6 +1,6 @@
---- base/test/test_suite.cc.orig	2020-03-23 15:30:45 UTC
+--- base/test/test_suite.cc.orig	2020-05-13 18:39:35 UTC
 +++ base/test/test_suite.cc
-@@ -68,7 +68,7 @@
+@@ -69,7 +69,7 @@
  #include "base/test/test_support_ios.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "base/test/fontconfig_util_linux.h"
  #endif
  
-@@ -384,14 +384,14 @@ void TestSuite::PreInitialize() {
+@@ -385,14 +385,14 @@ void TestSuite::PreInitialize() {
    testing::GTEST_FLAG(catch_exceptions) = false;
  #endif
    EnableTerminationOnHeapCorruption();
@@ -26,7 +26,7 @@
  
    // On Android, AtExitManager is created in
    // testing/android/native_test_wrapper.cc before main() is called.
-@@ -620,7 +620,7 @@ void TestSuite::Initialize() {
+@@ -623,7 +623,7 @@ void TestSuite::Initialize() {
    // TODO(jshin): Should we set the locale via an OS X locale API here?
    i18n::SetICUDefaultLocale("en_US");
  

Modified: branches/2020Q2/www/chromium/files/patch-build_config_BUILD.gn
==============================================================================
--- branches/2020Q2/www/chromium/files/patch-build_config_BUILD.gn	Wed Jun  3 11:16:45 2020	(r537610)
+++ branches/2020Q2/www/chromium/files/patch-build_config_BUILD.gn	Wed Jun  3 11:20:42 2020	(r537611)
@@ -1,4 +1,4 @@
---- build/config/BUILD.gn.orig	2020-03-16 18:40:27 UTC
+--- build/config/BUILD.gn.orig	2020-05-13 18:39:35 UTC
 +++ build/config/BUILD.gn
 @@ -133,7 +133,7 @@ config("debug") {
        # builds, and we have to tell it to turn it off.
@@ -19,7 +19,7 @@
      ]
    }
  }
-@@ -315,7 +313,7 @@ config("executable_config") {
+@@ -316,7 +314,7 @@ config("executable_config") {
        "//build/config/ios:ios_dynamic_flags",
        "//build/config/ios:ios_executable_flags",
      ]

Modified: branches/2020Q2/www/chromium/files/patch-build_config_compiler_BUILD.gn
==============================================================================
--- branches/2020Q2/www/chromium/files/patch-build_config_compiler_BUILD.gn	Wed Jun  3 11:16:45 2020	(r537610)
+++ branches/2020Q2/www/chromium/files/patch-build_config_compiler_BUILD.gn	Wed Jun  3 11:20:42 2020	(r537611)
@@ -1,24 +1,24 @@
---- build/config/compiler/BUILD.gn.orig	2020-03-16 18:40:27 UTC
+--- build/config/compiler/BUILD.gn.orig	2020-05-13 18:40:16 UTC
 +++ build/config/compiler/BUILD.gn
-@@ -137,7 +137,7 @@ declare_args() {
-   # TODO(vitalybuka):
+@@ -138,7 +138,7 @@ declare_args() {
    # 'is_android' breaks content_shell_test_apk on android-kitkat-arm-rel.
    # 'use_xcode_clang' may call old clang.
--  init_stack_vars = !is_android && !use_xcode_clang && !is_official_build
-+  init_stack_vars = !is_android && !use_xcode_clang && !is_official_build && !is_bsd
+   init_stack_vars =
+-      !is_android && !use_xcode_clang && (!is_official_build || is_linux)
++      !is_android && !use_xcode_clang && (!is_official_build || is_linux) && !is_bsd
  }
  
  declare_args() {
 @@ -298,7 +298,7 @@ config("compiler") {
+     }
  
      # Linker warnings.
-     if (fatal_linker_warnings && !(is_chromeos && current_cpu == "arm") &&
--        !is_mac && !is_ios && current_os != "aix") {
-+        !is_mac && !is_ios && current_os != "aix" && !is_bsd) {
-       # TODO(jochen): Enable this on chromeos on arm. http://crbug.com/356580
+-    if (fatal_linker_warnings && !is_mac && !is_ios && current_os != "aix") {
++    if (fatal_linker_warnings && !is_mac && !is_ios && !is_bsd && current_os != "aix") {
        ldflags += [ "-Wl,--fatal-warnings" ]
      }
-@@ -393,7 +393,7 @@ config("compiler") {
+     if (fatal_linker_warnings && (is_mac || is_ios)) {
+@@ -392,7 +392,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",
-@@ -486,7 +486,7 @@ config("compiler") {
+@@ -485,7 +485,7 @@ config("compiler") {
      }
    }
  
@@ -36,7 +36,7 @@
      cflags += [ "-fcrash-diagnostics-dir=" +
                  rebase_path("//tools/clang/crashreports", root_build_dir) ]
  
-@@ -767,7 +767,7 @@ config("compiler_cpu_abi") {
+@@ -755,7 +755,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" ]
        }
-@@ -1118,7 +1118,7 @@ config("compiler_deterministic") {
+@@ -1105,7 +1105,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,." ]
      }
-@@ -1507,7 +1507,7 @@ config("default_warnings") {
+@@ -1488,7 +1488,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 += [
-@@ -1741,7 +1741,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" ]
-@@ -2334,7 +2334,7 @@ config("symbols") {
+@@ -2262,7 +2262,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) {
@@ -80,8 +80,8 @@
 +      cflags += [ "-g0" ]
      }
  
-     if (use_debug_fission && !is_nacl && !is_android) {
-@@ -2355,7 +2355,7 @@ config("symbols") {
+     if (is_clang && !is_nacl && !use_xcode_clang) {
+@@ -2290,7 +2290,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/2020Q2/www/chromium/files/patch-build_config_compiler_compiler.gni
==============================================================================
--- branches/2020Q2/www/chromium/files/patch-build_config_compiler_compiler.gni	Wed Jun  3 11:16:45 2020	(r537610)
+++ branches/2020Q2/www/chromium/files/patch-build_config_compiler_compiler.gni	Wed Jun  3 11:20:42 2020	(r537611)
@@ -1,4 +1,4 @@
---- build/config/compiler/compiler.gni.orig	2020-03-16 18:40:27 UTC
+--- build/config/compiler/compiler.gni.orig	2020-05-13 18:40:16 UTC
 +++ build/config/compiler/compiler.gni
 @@ -47,7 +47,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)
-@@ -200,7 +200,7 @@ declare_args() {
+@@ -190,7 +190,7 @@ declare_args() {
  declare_args() {
    # Whether to use the gold linker from binutils instead of lld or bfd.
    use_gold =

Modified: branches/2020Q2/www/chromium/files/patch-build_config_linux_BUILD.gn
==============================================================================
--- branches/2020Q2/www/chromium/files/patch-build_config_linux_BUILD.gn	Wed Jun  3 11:16:45 2020	(r537610)
+++ branches/2020Q2/www/chromium/files/patch-build_config_linux_BUILD.gn	Wed Jun  3 11:20:42 2020	(r537611)
@@ -1,9 +1,9 @@
---- build/config/linux/BUILD.gn.orig	2019-03-11 22:00:52 UTC
+--- build/config/linux/BUILD.gn.orig	2020-05-13 18:39:36 UTC
 +++ build/config/linux/BUILD.gn
-@@ -28,7 +28,7 @@ config("runtime_library") {
-   }
+@@ -30,7 +30,7 @@ config("runtime_library") {
  
-   if ((!is_chromeos || default_toolchain != "//build/toolchain/cros:target") &&
+   if ((!(is_chromeos || chromeos_is_browser_only) ||
+        default_toolchain != "//build/toolchain/cros:target") &&
 -      (!use_custom_libcxx || current_cpu == "mipsel")) {
 +      (!use_custom_libcxx || current_cpu == "mipsel") && !is_bsd) {
      libs = [ "atomic" ]

Modified: branches/2020Q2/www/chromium/files/patch-build_config_sysroot.gni
==============================================================================
--- branches/2020Q2/www/chromium/files/patch-build_config_sysroot.gni	Wed Jun  3 11:16:45 2020	(r537610)
+++ branches/2020Q2/www/chromium/files/patch-build_config_sysroot.gni	Wed Jun  3 11:20:42 2020	(r537611)
@@ -1,15 +1,14 @@
---- build/config/sysroot.gni.orig	2019-03-11 22:00:52 UTC
+--- build/config/sysroot.gni.orig	2020-05-13 18:39:36 UTC
 +++ build/config/sysroot.gni
-@@ -15,9 +15,10 @@ declare_args() {
-   # The absolute path to directory containing linux sysroot images
-   target_sysroot_dir = "//build/linux"
+@@ -21,9 +21,9 @@ declare_args() {
  
+   # Controls default is_linux sysroot. If set to true, and sysroot
+   # is empty, default sysroot is calculated.
 -  use_sysroot = current_cpu == "x86" || current_cpu == "x64" ||
-+  use_sysroot = !is_bsd && (
-+                current_cpu == "x86" || current_cpu == "x64" ||
++  use_sysroot = !is_bsd && (current_cpu == "x86" || current_cpu == "x64" ||
                  current_cpu == "arm" || current_cpu == "arm64" ||
 -                current_cpu == "mipsel" || current_cpu == "mips64el"
 +                current_cpu == "mipsel" || current_cpu == "mips64el")
  }
  
- if (current_os == target_os && current_cpu == target_cpu &&
+ if (sysroot == "") {

Modified: branches/2020Q2/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni
==============================================================================
--- branches/2020Q2/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni	Wed Jun  3 11:16:45 2020	(r537610)
+++ branches/2020Q2/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni	Wed Jun  3 11:20:42 2020	(r537611)
@@ -1,4 +1,4 @@
---- build/toolchain/gcc_toolchain.gni.orig	2020-03-16 18:40:27 UTC
+--- build/toolchain/gcc_toolchain.gni.orig	2020-05-13 18:40:16 UTC
 +++ build/toolchain/gcc_toolchain.gni
 @@ -36,6 +36,11 @@ if (is_linux && target_os == "android") {
    enable_resource_whitelist_generation = false
@@ -12,7 +12,7 @@
  # This template defines a toolchain for something that works like gcc
  # (including clang).
  #
-@@ -577,13 +582,23 @@ template("clang_toolchain") {
+@@ -589,13 +594,23 @@ template("clang_toolchain") {
    }
  
    gcc_toolchain(target_name) {

Modified: branches/2020Q2/www/chromium/files/patch-cc_BUILD.gn
==============================================================================
--- branches/2020Q2/www/chromium/files/patch-cc_BUILD.gn	Wed Jun  3 11:16:45 2020	(r537610)
+++ branches/2020Q2/www/chromium/files/patch-cc_BUILD.gn	Wed Jun  3 11:20:42 2020	(r537611)
@@ -1,6 +1,6 @@
---- cc/BUILD.gn.orig	2020-03-16 18:40:27 UTC
+--- cc/BUILD.gn.orig	2020-05-13 18:40:16 UTC
 +++ cc/BUILD.gn
-@@ -582,7 +582,7 @@ cc_test_static_library("test_support") {
+@@ -589,7 +589,7 @@ cc_test_static_library("test_support") {
    if (enable_vulkan) {
      deps += [ "//gpu/vulkan/init" ]
    }
@@ -9,11 +9,11 @@
      data_deps = [ "//third_party/mesa_headers" ]
    }
  }
-@@ -788,7 +788,6 @@ cc_test("cc_unittests") {
+@@ -790,7 +790,6 @@ cc_test("cc_unittests") {
    ]
    data_deps = [
      "//testing/buildbot/filters:cc_unittests_filters",
 -    "//third_party/mesa_headers",
    ]
  
-   if (enable_vulkan) {
+   defines = []

Modified: branches/2020Q2/www/chromium/files/patch-cc_trees_property__tree.cc
==============================================================================
--- branches/2020Q2/www/chromium/files/patch-cc_trees_property__tree.cc	Wed Jun  3 11:16:45 2020	(r537610)
+++ branches/2020Q2/www/chromium/files/patch-cc_trees_property__tree.cc	Wed Jun  3 11:20:42 2020	(r537611)
@@ -1,6 +1,6 @@
---- cc/trees/property_tree.cc.orig	2020-03-16 18:40:27 UTC
+--- cc/trees/property_tree.cc.orig	2020-05-13 18:40:17 UTC
 +++ cc/trees/property_tree.cc
-@@ -1237,13 +1237,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollOffset(int scro
+@@ -1241,13 +1241,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollOffset(int scro
  
    gfx::Size clip_layer_bounds = container_bounds(scroll_node->id);
  

Copied: branches/2020Q2/www/chromium/files/patch-chrome_app_BUILD.gn (from r537579, head/www/chromium/files/patch-chrome_app_BUILD.gn)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2020Q2/www/chromium/files/patch-chrome_app_BUILD.gn	Wed Jun  3 11:20:42 2020	(r537611, copy of r537579, head/www/chromium/files/patch-chrome_app_BUILD.gn)
@@ -0,0 +1,11 @@
+--- chrome/app/BUILD.gn.orig	2020-05-18 10:34:00 UTC
++++ chrome/app/BUILD.gn
+@@ -138,7 +138,7 @@ static_library("test_support") {
+     "//v8:v8_headers",
+   ]
+ 
+-  if (!is_fuchsia) {
++  if (!is_fuchsia && !is_bsd) {
+     # TODO(crbug.com/753619): Enable crash reporting on Fuchsia.
+     deps += [
+       "//components/crash/core/app",

Modified: branches/2020Q2/www/chromium/files/patch-chrome_app_chrome__command__ids.h
==============================================================================
--- branches/2020Q2/www/chromium/files/patch-chrome_app_chrome__command__ids.h	Wed Jun  3 11:16:45 2020	(r537610)
+++ branches/2020Q2/www/chromium/files/patch-chrome_app_chrome__command__ids.h	Wed Jun  3 11:20:42 2020	(r537611)
@@ -1,8 +1,8 @@
---- chrome/app/chrome_command_ids.h.orig	2020-02-03 21:53:28 UTC
+--- chrome/app/chrome_command_ids.h.orig	2020-05-13 18:39:36 UTC
 +++ chrome/app/chrome_command_ids.h
-@@ -62,7 +62,7 @@
- #define IDC_VISIT_DESKTOP_OF_LRU_USER_2 34049
- #define IDC_VISIT_DESKTOP_OF_LRU_USER_3 34050
+@@ -60,7 +60,7 @@
+ #define IDC_MAXIMIZE_WINDOW             34047
+ #define IDC_ALL_WINDOWS_FRONT           34048
  
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)

Modified: branches/2020Q2/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc
==============================================================================
--- branches/2020Q2/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc	Wed Jun  3 11:16:45 2020	(r537610)
+++ branches/2020Q2/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc	Wed Jun  3 11:20:42 2020	(r537611)
@@ -1,6 +1,6 @@
---- chrome/app/chrome_main_delegate.cc.orig	2020-03-16 18:40:27 UTC
+--- chrome/app/chrome_main_delegate.cc.orig	2020-05-13 18:40:17 UTC
 +++ chrome/app/chrome_main_delegate.cc
-@@ -100,7 +100,7 @@
+@@ -102,7 +102,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
-@@ -142,12 +142,12 @@
+@@ -145,12 +145,12 @@
  #include "v8/include/v8.h"
  #endif
  
@@ -22,18 +22,18 @@
 -    defined(OS_LINUX)
 +    defined(OS_LINUX) || defined(OS_BSD)
  #include "chrome/browser/policy/policy_path_parser.h"
- #include "components/crash/content/app/crashpad.h"
+ #include "components/crash/core/app/crashpad.h"
  #endif
-@@ -246,7 +246,7 @@ bool UseHooks() {
+@@ -276,7 +276,7 @@ void SetUpExtendedCrashReporting(bool is_browser_proce
  
  #endif  // defined(OS_WIN)
  
 -#if defined(OS_LINUX)
 +#if defined(OS_LINUX) && !defined(OS_BSD)
  void AdjustLinuxOOMScore(const std::string& process_type) {
-   // Browsers and zygotes should still be killable, but killed last.
-   const int kZygoteScore = 0;
-@@ -305,13 +305,13 @@ void AdjustLinuxOOMScore(const std::string& process_ty
+   int score = -1;
+ 
+@@ -316,13 +316,13 @@ void AdjustLinuxOOMScore(const std::string& process_ty
    if (score > -1)
      base::AdjustOOMScore(base::GetCurrentProcId(), score);
  }
@@ -49,7 +49,7 @@
        // The zygote process opens the resources for the renderers.
        process_type == service_manager::switches::kZygoteProcess ||
  #endif
-@@ -350,7 +350,7 @@ bool HandleVersionSwitches(const base::CommandLine& co
+@@ -361,7 +361,7 @@ bool HandleVersionSwitches(const base::CommandLine& co
    return false;
  }
  
@@ -58,7 +58,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) ||
-@@ -360,7 +360,7 @@ void HandleHelpSwitches(const base::CommandLine& comma
+@@ -371,7 +371,7 @@ void HandleHelpSwitches(const base::CommandLine& comma
      PLOG(FATAL) << "execlp failed";
    }
  }
@@ -67,7 +67,7 @@
  
  #if !defined(OS_MACOSX) && !defined(OS_ANDROID)
  void SIGTERMProfilingShutdown(int signal) {
-@@ -414,7 +414,7 @@ void InitializeUserDataDir(base::CommandLine* command_
+@@ -425,7 +425,7 @@ void InitializeUserDataDir(base::CommandLine* command_
    std::string process_type =
        command_line->GetSwitchValueASCII(switches::kProcessType);
  
@@ -76,7 +76,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.
-@@ -426,7 +426,7 @@ void InitializeUserDataDir(base::CommandLine* command_
+@@ -437,7 +437,7 @@ void InitializeUserDataDir(base::CommandLine* command_
        user_data_dir = base::FilePath::FromUTF8Unsafe(user_data_dir_string);
      }
    }
@@ -85,16 +85,25 @@
  #if defined(OS_MACOSX)
    policy::path_parser::CheckUserDataDirPolicy(&user_data_dir);
  #endif  // OS_MAC
-@@ -483,7 +483,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);
+@@ -509,7 +509,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat
+   startup_metric_utils::RecordApplicationStartTime(now);
+ #endif
+ 
 -#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX)
 +#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
    // Record the startup process creation time on supported platforms.
    startup_metric_utils::RecordStartupProcessCreationTime(
        base::Process::Current().CreationTime());
-@@ -688,7 +688,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
+@@ -701,7 +701,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
+   v8_crashpad_support::SetUp();
+ #endif
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) && !defined(OS_BSD)
+   if (!crash_reporter::IsCrashpadEnabled()) {
+     breakpad::SetFirstChanceExceptionHandler(v8::TryHandleWebAssemblyTrapPosix);
+   }
+@@ -712,7 +712,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
      *exit_code = 0;
      return true;  // Got a --version switch; exit with a success error code.
    }
@@ -103,7 +112,7 @@
    // This will directly exit if the user asked for help.
    HandleHelpSwitches(command_line);
  #endif
-@@ -712,7 +712,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
+@@ -736,7 +736,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
  #if defined(OS_CHROMEOS)
    chromeos::RegisterPathProvider();
  #endif
@@ -112,7 +121,16 @@
    nacl::RegisterPathProvider();
  #endif
  
-@@ -904,7 +904,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -916,7 +916,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+ 
+   crash_reporter::InitializeCrashKeys();
+ 
+-#if defined(OS_POSIX)
++#if defined(OS_POSIX) && !defined(OS_BSD)
+   ChromeCrashReporterClient::Create();
+ #endif
+ 
+@@ -928,7 +928,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
  #if defined(OS_WIN)
    child_process_logging::Init();
  #endif
@@ -121,16 +139,16 @@
    // Create an instance of the CPU class to parse /proc/cpuinfo and cache
    // cpu_brand info.
    base::CPU cpu_info;
-@@ -1028,7 +1028,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
-   InitializePDF();
- #endif
+@@ -1047,7 +1047,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+         locale;
+   }
  
 -#if defined(OS_POSIX) && !defined(OS_MACOSX)
 +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
    // Zygote needs to call InitCrashReporter() in RunZygote().
    if (process_type != service_manager::switches::kZygoteProcess) {
  #if defined(OS_ANDROID)
-@@ -1049,7 +1049,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -1068,7 +1068,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
      }
  #endif  // defined(OS_ANDROID)
    }
@@ -139,7 +157,7 @@
  
    // After all the platform Breakpads have been initialized, store the command
    // line for crash reporting.
-@@ -1059,7 +1059,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -1082,7 +1082,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 +166,7 @@
    AdjustLinuxOOMScore(process_type);
  #endif
  #if defined(OS_WIN)
-@@ -1105,7 +1105,7 @@ int ChromeMainDelegate::RunProcess(
+@@ -1128,7 +1128,7 @@ int ChromeMainDelegate::RunProcess(
      // This entry is not needed on Linux, where the NaCl loader
      // process is launched via nacl_helper instead.
  #if BUILDFLAG(ENABLE_NACL) && !defined(CHROME_MULTIPLE_DLL_BROWSER) && \
@@ -157,3 +175,21 @@
      {switches::kNaClLoaderProcess, NaClMain},
  #else
      {"<invalid>", NULL},  // To avoid constant array of size 0
+@@ -1156,7 +1156,7 @@ void ChromeMainDelegate::ProcessExiting(const std::str
+ #endif  // !defined(OS_ANDROID)
+ }
+ 

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