Fix ExecuteJavaScript failure with null CefRenderProcessHandler (see issue #2421 )

When CefApp::GetRenderProcessHandler returned null CefRenderFrameObserver::DidCreateScriptContext was returning early (not calling CefFrameImpl::OnContextCreated) and consequently queued actions such as JavaScript were never executed.
Update to Chromium version 92.0.4515.159
2025-06-05 21:39:12 +02:00 · 2021-08-18 18:05:18 -04:00 · 2021-08-17 15:59:55 +00:00 · 2021-08-04 15:19:32 -04:00 · 2021-08-04 18:46:00 +00:00 · 2021-08-04 14:20:31 -04:00
1789 changed files with 49949 additions and 86896 deletions
--- a/BUILD.gn
+++ b/BUILD.gn
--- a/CHROMIUM_BUILD_COMPATIBILITY.txt
+++ b/CHROMIUM_BUILD_COMPATIBILITY.txt
@@ -7,6 +7,6 @@
 # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding

 {
-  'chromium_checkout': 'refs/tags/106.0.5249.119',
-  'depot_tools_checkout': 'b7ec673ccc'
+  'chromium_checkout': 'refs/tags/92.0.4515.159',
+  'depot_tools_checkout': '58542b7fef'
 }
--- a/CHROMIUM_UPDATE.txt
+++ b/CHROMIUM_UPDATE.txt
@@ -43,6 +43,7 @@
    'content/browser/renderer_host/render_widget_host_view_base.*',
    'content/public/browser/content_browser_client.*',
    'content/public/browser/render_widget_host_view.h',
+    'content/public/browser/storage_partition.h',
    'content/public/browser/web_contents_delegate.h',
    'content/public/common/content_features.cc',
    'content/shell/BUILD.gn',
--- a/CMakeLists.txt.in
+++ b/CMakeLists.txt.in
@@ -11,9 +11,9 @@
 # CMake-generated project formats that have been tested with this CEF binary
 # distribution include:
 #
-# Linux:      Ninja, GCC 7.5.0+, Unix Makefiles
-# MacOS:      Ninja, Xcode 12.2 to 13.0
-# Windows:    Ninja, Visual Studio 2019+
+# Linux:      Ninja, Unix Makefiles
+# MacOS:      Ninja, Xcode 8+ (x86_64) or Xcode 12.2+ (ARM64)
+# Windows:    Ninja, Visual Studio 2015+
 #
 # Ninja is a cross-platform open-source tool for running fast builds using
 # pre-installed platform toolchains (GNU, clang, Xcode or MSVC). It can be
@@ -36,27 +36,25 @@
 #
 # The below requirements must be met to build this CEF binary distribution.
 #
-# - CMake version 3.19 or newer.
+# - CMake version 2.8.12.1 or newer.
 #
 # - Linux requirements:
-#   Currently supported distributions include Debian 10 (Buster), Ubuntu 18
-#   (Bionic Beaver), and related. Ubuntu 18.04 64-bit with GCC 7.5.0+ is
-#   recommended. Newer versions will likely also work but may not have been
-#   tested.
+#   Currently supported distributions include Debian Wheezy, Ubuntu Precise, and
+#   related. Ubuntu 18.04 64-bit is recommended. Newer versions will likely also
+#   work but may not have been tested.
 #   Required packages include:
 #     build-essential
 #     libgtk3.0-dev     (required by the cefclient target only)
 #
 # - MacOS requirements:
-#   Xcode 12.2 to 13.4 building on MacOS 10.15.4 (Catalina) or newer. Only
-#   64-bit builds are supported. The Xcode command-line tools must also be
-#   installed. Newer Xcode versions may not have been been tested and are not
-#   recommended.
+#   Xcode 8 or newer building on MacOS 10.11 (El Capitan) or newer for x86_64.
+#   Xcode 12.2 or newer building on MacOS 10.15.4 (Catalina) or newer for ARM64.
+#   Only 64-bit builds are supported. The Xcode command-line tools must also be
+#   installed.
 #
 # - Windows requirements:
-#   Visual Studio 2019 or newer building on Windows 7 or newer. Windows 10
-#   64-bit is recommended. Newer versions will likely also work but may not have
-#   been tested.
+#   Visual Studio 2015 Update 2 or newer building on Windows 7 or newer. Visual
+#   Studio 2019 and Windows 10 64-bit are recommended.
 #
 # BUILD EXAMPLES
 #
@@ -132,8 +130,7 @@
 # Global setup.
 #

-# For VS2019 and Xcode 12+ support.
-cmake_minimum_required(VERSION 3.19)
+cmake_minimum_required(VERSION 2.8.12.1)

 # Only generate Debug and Release configuration types.
 set(CMAKE_CONFIGURATION_TYPES Debug Release)
@@ -234,22 +231,3 @@ endif()

 # Display configuration settings.
 PRINT_CEF_CONFIG()
-
-
-#
-# Define the API documentation target.
-#
-
-find_package(Doxygen)
-if(DOXYGEN_FOUND)
-  add_custom_target(apidocs ALL
-    # Generate documentation in the docs/html directory.
-    COMMAND "${DOXYGEN_EXECUTABLE}" Doxyfile
-    # Write a docs/index.html file.
-    COMMAND ${CMAKE_COMMAND} -E echo "<html><head><meta http-equiv=\"refresh\" content=\"0;URL='html/index.html'\"/></head></html>" > docs/index.html
-    WORKING_DIRECTORY "${CEF_ROOT}"
-    COMMENT "Generating API documentation with Doxygen..."
-    VERBATIM )
-else()
-  message(WARNING "Doxygen must be installed to generate API documentation.")
-endif()
--- a/2781
+++ b/2781
--- a/README.md
+++ b/README.md
@@ -9,7 +9,8 @@ The Chromium Embedded Framework (CEF) is a simple framework for embedding Chromi
 * Branches and Building - https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
 * Announcements - https://groups.google.com/forum/#!forum/cef-announce
 * Support Forum - http://www.magpcss.org/ceforum/
-* C++ API Docs - [Stable release docs](https://cef-builds.spotifycdn.com/docs/stable.html) / [Beta release docs](https://cef-builds.spotifycdn.com/docs/beta.html)
+* CEF1 C++ API Docs - http://magpcss.org/ceforum/apidocs/
+* CEF3 C++ API Docs - http://magpcss.org/ceforum/apidocs3/
 * Downloads - https://cef-builds.spotifycdn.com/index.html
 * Donations - http://www.magpcss.org/ceforum/donate.php

@@ -28,7 +29,7 @@ Numerous individuals and organizations contribute time and resources to support

 # Getting Started

-Users new to CEF development should start by reading the [Tutorial](https://bitbucket.org/chromiumembedded/cef/wiki/Tutorial) Wiki page for an overview of CEF usage and then proceed to the [GeneralUsage](https://bitbucket.org/chromiumembedded/cef/wiki/GeneralUsage) Wiki page for a more in-depth discussion or architectural and usage issues. Complete API documentation is available [here](https://cef-builds.spotifycdn.com/docs/stable.html). CEF support and related discussion is available on the [CEF Forum](http://www.magpcss.org/ceforum/).
+Users new to CEF development should start by reading the [Tutorial](https://bitbucket.org/chromiumembedded/cef/wiki/Tutorial) Wiki page for an overview of CEF usage and then proceed to the [GeneralUsage](https://bitbucket.org/chromiumembedded/cef/wiki/GeneralUsage) Wiki page for a more in-depth discussion or architectural and usage issues. Complete API documentation is available [here](http://magpcss.org/ceforum/apidocs3/). CEF support and related discussion is available on the [CEF Forum](http://www.magpcss.org/ceforum/).

 # Binary Distributions

@@ -44,11 +45,15 @@ The base CEF framework includes support for the C and C++ programming languages.

 * .Net (CEF3) - https://github.com/cefsharp/CefSharp
 * .Net (CEF1) - https://bitbucket.org/fddima/cefglue
-* .Net/Mono (CEF3) - https://gitlab.com/xiliumhq/chromiumembedded/cefglue
-* Delphi - https://github.com/hgourvest/dcef3
-* Delphi - https://github.com/salvadordf/CEF4Delphi
+* .Net/Mono (CEF3) - https://bitbucket.org/xilium/xilium.cefglue
+* .Net (CEF3) - https://bitbucket.org/chromiumfx/chromiumfx
+* Delphi (CEF1) - http://code.google.com/p/delphichromiumembedded/
+* Delphi (CEF3) - https://github.com/hgourvest/dcef3
+* Delphi (CEF3) - https://github.com/salvadordf/CEF4Delphi
+* Go - https://github.com/richardwilkes/cef
 * Go - https://github.com/CzarekTomczak/cef2go
 * Java - https://bitbucket.org/chromiumembedded/java-cef
+* Java - http://code.google.com/p/javacef/
 * Python - http://code.google.com/p/cefpython/

 If you're the maintainer of a project not listed above and would like your project listed here please either post to the [CEF Forum](http://www.magpcss.org/ceforum/) or contact Marshall directly.
@@ -77,6 +82,6 @@ If you would like to contribute source code changes to CEF please follow the bel
 \- Submit a [pull request](https://bitbucket.org/chromiumembedded/cef/wiki/ContributingWithGit) or create a patch with your changes and attach it to the CEF issue. Changes should:

 * Be submitted against the current [CEF master branch](https://bitbucket.org/chromiumembedded/cef/src/?at=master) unless explicitly fixing a bug in a CEF release branch.
-* Follow the style of existing CEF source files. In general CEF uses the [Chromium C++ style guide](https://chromium.googlesource.com/chromium/src/+/master/styleguide/c++/c++.md).
+* Follow the style of existing CEF source files. In general CEF uses the [Chromium coding style](http://www.chromium.org/developers/coding-style).
 * Include new or modified unit tests as appropriate to the functionality.
 * Not include unnecessary or unrelated changes.
--- a/cef_create_projects.sh
+++ b/cef_create_projects.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-python3 tools/gclient_hook.py
+python tools/gclient_hook.py
--- a/cef_paths.gypi
+++ b/cef_paths.gypi
@@ -1,4 +1,4 @@
-# Copyright (c) 2022 The Chromium Embedded Framework Authors. All rights
+# Copyright (c) 2021 The Chromium Embedded Framework Authors. All rights
 # reserved. Use of this source code is governed by a BSD-style license that
 # can be found in the LICENSE file.
 #
@@ -8,7 +8,7 @@
 # by hand. See the translator.README.txt file in the tools directory for
 # more information.
 #
-# $hash=ffc0502a0275b74228f1fd642566d3f020e538a0$
+# $hash=d723a9f6637cec523b158a6750d3a64698b407c3$
 #

 {
@@ -22,7 +22,6 @@
      'include/cef_browser_process_handler.h',
      'include/cef_callback.h',
      'include/cef_client.h',
-      'include/cef_command_handler.h',
      'include/cef_command_line.h',
      'include/cef_context_menu_handler.h',
      'include/cef_cookie.h',
@@ -42,7 +41,6 @@
      'include/cef_focus_handler.h',
      'include/cef_frame.h',
      'include/cef_frame_handler.h',
-      'include/cef_i18n_util.h',
      'include/cef_image.h',
      'include/cef_jsdialog_handler.h',
      'include/cef_keyboard_handler.h',
@@ -55,7 +53,6 @@
      'include/cef_origin_whitelist.h',
      'include/cef_parser.h',
      'include/cef_path_util.h',
-      'include/cef_permission_handler.h',
      'include/cef_print_handler.h',
      'include/cef_print_settings.h',
      'include/cef_process_message.h',
@@ -64,6 +61,7 @@
      'include/cef_render_handler.h',
      'include/cef_render_process_handler.h',
      'include/cef_request.h',
+      'include/cef_request_callback.h',
      'include/cef_request_context.h',
      'include/cef_request_context_handler.h',
      'include/cef_request_handler.h',
@@ -75,8 +73,6 @@
      'include/cef_response_filter.h',
      'include/cef_scheme.h',
      'include/cef_server.h',
-      'include/cef_shared_memory_region.h',
-      'include/cef_shared_process_message_builder.h',
      'include/cef_ssl_info.h',
      'include/cef_ssl_status.h',
      'include/cef_stream.h',
@@ -88,11 +84,11 @@
      'include/cef_v8.h',
      'include/cef_values.h',
      'include/cef_waitable_event.h',
+      'include/cef_web_plugin.h',
      'include/cef_x509_certificate.h',
      'include/cef_xml_reader.h',
      'include/cef_zip_reader.h',
      'include/test/cef_test_helpers.h',
-      'include/test/cef_test_server.h',
      'include/test/cef_translator_test.h',
      'include/views/cef_box_layout.h',
      'include/views/cef_browser_view.h',
@@ -105,7 +101,6 @@
      'include/views/cef_layout.h',
      'include/views/cef_menu_button.h',
      'include/views/cef_menu_button_delegate.h',
-      'include/views/cef_overlay_controller.h',
      'include/views/cef_panel.h',
      'include/views/cef_panel_delegate.h',
      'include/views/cef_scroll_view.h',
@@ -125,7 +120,6 @@
      'include/capi/cef_browser_process_handler_capi.h',
      'include/capi/cef_callback_capi.h',
      'include/capi/cef_client_capi.h',
-      'include/capi/cef_command_handler_capi.h',
      'include/capi/cef_command_line_capi.h',
      'include/capi/cef_context_menu_handler_capi.h',
      'include/capi/cef_cookie_capi.h',
@@ -145,7 +139,6 @@
      'include/capi/cef_focus_handler_capi.h',
      'include/capi/cef_frame_capi.h',
      'include/capi/cef_frame_handler_capi.h',
-      'include/capi/cef_i18n_util_capi.h',
      'include/capi/cef_image_capi.h',
      'include/capi/cef_jsdialog_handler_capi.h',
      'include/capi/cef_keyboard_handler_capi.h',
@@ -158,7 +151,6 @@
      'include/capi/cef_origin_whitelist_capi.h',
      'include/capi/cef_parser_capi.h',
      'include/capi/cef_path_util_capi.h',
-      'include/capi/cef_permission_handler_capi.h',
      'include/capi/cef_print_handler_capi.h',
      'include/capi/cef_print_settings_capi.h',
      'include/capi/cef_process_message_capi.h',
@@ -167,6 +159,7 @@
      'include/capi/cef_render_handler_capi.h',
      'include/capi/cef_render_process_handler_capi.h',
      'include/capi/cef_request_capi.h',
+      'include/capi/cef_request_callback_capi.h',
      'include/capi/cef_request_context_capi.h',
      'include/capi/cef_request_context_handler_capi.h',
      'include/capi/cef_request_handler_capi.h',
@@ -178,8 +171,6 @@
      'include/capi/cef_response_filter_capi.h',
      'include/capi/cef_scheme_capi.h',
      'include/capi/cef_server_capi.h',
-      'include/capi/cef_shared_memory_region_capi.h',
-      'include/capi/cef_shared_process_message_builder_capi.h',
      'include/capi/cef_ssl_info_capi.h',
      'include/capi/cef_ssl_status_capi.h',
      'include/capi/cef_stream_capi.h',
@@ -191,11 +182,11 @@
      'include/capi/cef_v8_capi.h',
      'include/capi/cef_values_capi.h',
      'include/capi/cef_waitable_event_capi.h',
+      'include/capi/cef_web_plugin_capi.h',
      'include/capi/cef_x509_certificate_capi.h',
      'include/capi/cef_xml_reader_capi.h',
      'include/capi/cef_zip_reader_capi.h',
      'include/capi/test/cef_test_helpers_capi.h',
-      'include/capi/test/cef_test_server_capi.h',
      'include/capi/test/cef_translator_test_capi.h',
      'include/capi/views/cef_box_layout_capi.h',
      'include/capi/views/cef_browser_view_capi.h',
@@ -208,7 +199,6 @@
      'include/capi/views/cef_layout_capi.h',
      'include/capi/views/cef_menu_button_capi.h',
      'include/capi/views/cef_menu_button_delegate_capi.h',
-      'include/capi/views/cef_overlay_controller_capi.h',
      'include/capi/views/cef_panel_capi.h',
      'include/capi/views/cef_panel_delegate_capi.h',
      'include/capi/views/cef_scroll_view_capi.h',
@@ -252,8 +242,6 @@
      'libcef_dll/cpptoc/callback_cpptoc.h',
      'libcef_dll/ctocpp/client_ctocpp.cc',
      'libcef_dll/ctocpp/client_ctocpp.h',
-      'libcef_dll/ctocpp/command_handler_ctocpp.cc',
-      'libcef_dll/ctocpp/command_handler_ctocpp.h',
      'libcef_dll/cpptoc/command_line_cpptoc.cc',
      'libcef_dll/cpptoc/command_line_cpptoc.h',
      'libcef_dll/ctocpp/completion_callback_ctocpp.cc',
@@ -336,8 +324,6 @@
      'libcef_dll/cpptoc/list_value_cpptoc.h',
      'libcef_dll/ctocpp/load_handler_ctocpp.cc',
      'libcef_dll/ctocpp/load_handler_ctocpp.h',
-      'libcef_dll/cpptoc/media_access_callback_cpptoc.cc',
-      'libcef_dll/cpptoc/media_access_callback_cpptoc.h',
      'libcef_dll/ctocpp/media_observer_ctocpp.cc',
      'libcef_dll/ctocpp/media_observer_ctocpp.h',
      'libcef_dll/cpptoc/media_route_cpptoc.cc',
@@ -366,18 +352,12 @@
      'libcef_dll/cpptoc/navigation_entry_cpptoc.h',
      'libcef_dll/ctocpp/navigation_entry_visitor_ctocpp.cc',
      'libcef_dll/ctocpp/navigation_entry_visitor_ctocpp.h',
-      'libcef_dll/cpptoc/views/overlay_controller_cpptoc.cc',
-      'libcef_dll/cpptoc/views/overlay_controller_cpptoc.h',
      'libcef_dll/cpptoc/views/panel_cpptoc.cc',
      'libcef_dll/cpptoc/views/panel_cpptoc.h',
      'libcef_dll/ctocpp/views/panel_delegate_ctocpp.cc',
      'libcef_dll/ctocpp/views/panel_delegate_ctocpp.h',
      'libcef_dll/ctocpp/pdf_print_callback_ctocpp.cc',
      'libcef_dll/ctocpp/pdf_print_callback_ctocpp.h',
-      'libcef_dll/ctocpp/permission_handler_ctocpp.cc',
-      'libcef_dll/ctocpp/permission_handler_ctocpp.h',
-      'libcef_dll/cpptoc/permission_prompt_callback_cpptoc.cc',
-      'libcef_dll/cpptoc/permission_prompt_callback_cpptoc.h',
      'libcef_dll/cpptoc/post_data_cpptoc.cc',
      'libcef_dll/cpptoc/post_data_cpptoc.h',
      'libcef_dll/cpptoc/post_data_element_cpptoc.cc',
@@ -394,6 +374,8 @@
      'libcef_dll/cpptoc/process_message_cpptoc.h',
      'libcef_dll/ctocpp/read_handler_ctocpp.cc',
      'libcef_dll/ctocpp/read_handler_ctocpp.h',
+      'libcef_dll/ctocpp/register_cdm_callback_ctocpp.cc',
+      'libcef_dll/ctocpp/register_cdm_callback_ctocpp.h',
      'libcef_dll/cpptoc/registration_cpptoc.cc',
      'libcef_dll/cpptoc/registration_cpptoc.h',
      'libcef_dll/ctocpp/render_handler_ctocpp.cc',
@@ -402,6 +384,8 @@
      'libcef_dll/ctocpp/render_process_handler_ctocpp.h',
      'libcef_dll/cpptoc/request_cpptoc.cc',
      'libcef_dll/cpptoc/request_cpptoc.h',
+      'libcef_dll/cpptoc/request_callback_cpptoc.cc',
+      'libcef_dll/cpptoc/request_callback_cpptoc.h',
      'libcef_dll/cpptoc/request_context_cpptoc.cc',
      'libcef_dll/cpptoc/request_context_cpptoc.h',
      'libcef_dll/ctocpp/request_context_handler_ctocpp.cc',
@@ -430,8 +414,6 @@
      'libcef_dll/cpptoc/run_context_menu_callback_cpptoc.h',
      'libcef_dll/ctocpp/run_file_dialog_callback_ctocpp.cc',
      'libcef_dll/ctocpp/run_file_dialog_callback_ctocpp.h',
-      'libcef_dll/cpptoc/run_quick_menu_callback_cpptoc.cc',
-      'libcef_dll/cpptoc/run_quick_menu_callback_cpptoc.h',
      'libcef_dll/cpptoc/sslinfo_cpptoc.cc',
      'libcef_dll/cpptoc/sslinfo_cpptoc.h',
      'libcef_dll/cpptoc/sslstatus_cpptoc.cc',
@@ -450,10 +432,6 @@
      'libcef_dll/ctocpp/server_handler_ctocpp.h',
      'libcef_dll/ctocpp/set_cookie_callback_ctocpp.cc',
      'libcef_dll/ctocpp/set_cookie_callback_ctocpp.h',
-      'libcef_dll/cpptoc/shared_memory_region_cpptoc.cc',
-      'libcef_dll/cpptoc/shared_memory_region_cpptoc.h',
-      'libcef_dll/cpptoc/shared_process_message_builder_cpptoc.cc',
-      'libcef_dll/cpptoc/shared_process_message_builder_cpptoc.h',
      'libcef_dll/cpptoc/stream_reader_cpptoc.cc',
      'libcef_dll/cpptoc/stream_reader_cpptoc.h',
      'libcef_dll/cpptoc/stream_writer_cpptoc.cc',
@@ -464,12 +442,6 @@
      'libcef_dll/ctocpp/task_ctocpp.h',
      'libcef_dll/cpptoc/task_runner_cpptoc.cc',
      'libcef_dll/cpptoc/task_runner_cpptoc.h',
-      'libcef_dll/cpptoc/test/test_server_cpptoc.cc',
-      'libcef_dll/cpptoc/test/test_server_cpptoc.h',
-      'libcef_dll/cpptoc/test/test_server_connection_cpptoc.cc',
-      'libcef_dll/cpptoc/test/test_server_connection_cpptoc.h',
-      'libcef_dll/ctocpp/test/test_server_handler_ctocpp.cc',
-      'libcef_dll/ctocpp/test/test_server_handler_ctocpp.h',
      'libcef_dll/cpptoc/views/textfield_cpptoc.cc',
      'libcef_dll/cpptoc/views/textfield_cpptoc.h',
      'libcef_dll/ctocpp/views/textfield_delegate_ctocpp.cc',
@@ -528,6 +500,12 @@
      'libcef_dll/ctocpp/views/view_delegate_ctocpp.h',
      'libcef_dll/cpptoc/waitable_event_cpptoc.cc',
      'libcef_dll/cpptoc/waitable_event_cpptoc.h',
+      'libcef_dll/cpptoc/web_plugin_info_cpptoc.cc',
+      'libcef_dll/cpptoc/web_plugin_info_cpptoc.h',
+      'libcef_dll/ctocpp/web_plugin_info_visitor_ctocpp.cc',
+      'libcef_dll/ctocpp/web_plugin_info_visitor_ctocpp.h',
+      'libcef_dll/ctocpp/web_plugin_unstable_callback_ctocpp.cc',
+      'libcef_dll/ctocpp/web_plugin_unstable_callback_ctocpp.h',
      'libcef_dll/cpptoc/views/window_cpptoc.cc',
      'libcef_dll/cpptoc/views/window_cpptoc.h',
      'libcef_dll/ctocpp/views/window_delegate_ctocpp.cc',
@@ -576,8 +554,6 @@
      'libcef_dll/ctocpp/callback_ctocpp.h',
      'libcef_dll/cpptoc/client_cpptoc.cc',
      'libcef_dll/cpptoc/client_cpptoc.h',
-      'libcef_dll/cpptoc/command_handler_cpptoc.cc',
-      'libcef_dll/cpptoc/command_handler_cpptoc.h',
      'libcef_dll/ctocpp/command_line_ctocpp.cc',
      'libcef_dll/ctocpp/command_line_ctocpp.h',
      'libcef_dll/cpptoc/completion_callback_cpptoc.cc',
@@ -660,8 +636,6 @@
      'libcef_dll/ctocpp/list_value_ctocpp.h',
      'libcef_dll/cpptoc/load_handler_cpptoc.cc',
      'libcef_dll/cpptoc/load_handler_cpptoc.h',
-      'libcef_dll/ctocpp/media_access_callback_ctocpp.cc',
-      'libcef_dll/ctocpp/media_access_callback_ctocpp.h',
      'libcef_dll/cpptoc/media_observer_cpptoc.cc',
      'libcef_dll/cpptoc/media_observer_cpptoc.h',
      'libcef_dll/ctocpp/media_route_ctocpp.cc',
@@ -690,18 +664,12 @@
      'libcef_dll/ctocpp/navigation_entry_ctocpp.h',
      'libcef_dll/cpptoc/navigation_entry_visitor_cpptoc.cc',
      'libcef_dll/cpptoc/navigation_entry_visitor_cpptoc.h',
-      'libcef_dll/ctocpp/views/overlay_controller_ctocpp.cc',
-      'libcef_dll/ctocpp/views/overlay_controller_ctocpp.h',
      'libcef_dll/ctocpp/views/panel_ctocpp.cc',
      'libcef_dll/ctocpp/views/panel_ctocpp.h',
      'libcef_dll/cpptoc/views/panel_delegate_cpptoc.cc',
      'libcef_dll/cpptoc/views/panel_delegate_cpptoc.h',
      'libcef_dll/cpptoc/pdf_print_callback_cpptoc.cc',
      'libcef_dll/cpptoc/pdf_print_callback_cpptoc.h',
-      'libcef_dll/cpptoc/permission_handler_cpptoc.cc',
-      'libcef_dll/cpptoc/permission_handler_cpptoc.h',
-      'libcef_dll/ctocpp/permission_prompt_callback_ctocpp.cc',
-      'libcef_dll/ctocpp/permission_prompt_callback_ctocpp.h',
      'libcef_dll/ctocpp/post_data_ctocpp.cc',
      'libcef_dll/ctocpp/post_data_ctocpp.h',
      'libcef_dll/ctocpp/post_data_element_ctocpp.cc',
@@ -718,6 +686,8 @@
      'libcef_dll/ctocpp/process_message_ctocpp.h',
      'libcef_dll/cpptoc/read_handler_cpptoc.cc',
      'libcef_dll/cpptoc/read_handler_cpptoc.h',
+      'libcef_dll/cpptoc/register_cdm_callback_cpptoc.cc',
+      'libcef_dll/cpptoc/register_cdm_callback_cpptoc.h',
      'libcef_dll/ctocpp/registration_ctocpp.cc',
      'libcef_dll/ctocpp/registration_ctocpp.h',
      'libcef_dll/cpptoc/render_handler_cpptoc.cc',
@@ -726,6 +696,8 @@
      'libcef_dll/cpptoc/render_process_handler_cpptoc.h',
      'libcef_dll/ctocpp/request_ctocpp.cc',
      'libcef_dll/ctocpp/request_ctocpp.h',
+      'libcef_dll/ctocpp/request_callback_ctocpp.cc',
+      'libcef_dll/ctocpp/request_callback_ctocpp.h',
      'libcef_dll/ctocpp/request_context_ctocpp.cc',
      'libcef_dll/ctocpp/request_context_ctocpp.h',
      'libcef_dll/cpptoc/request_context_handler_cpptoc.cc',
@@ -754,8 +726,6 @@
      'libcef_dll/ctocpp/run_context_menu_callback_ctocpp.h',
      'libcef_dll/cpptoc/run_file_dialog_callback_cpptoc.cc',
      'libcef_dll/cpptoc/run_file_dialog_callback_cpptoc.h',
-      'libcef_dll/ctocpp/run_quick_menu_callback_ctocpp.cc',
-      'libcef_dll/ctocpp/run_quick_menu_callback_ctocpp.h',
      'libcef_dll/ctocpp/sslinfo_ctocpp.cc',
      'libcef_dll/ctocpp/sslinfo_ctocpp.h',
      'libcef_dll/ctocpp/sslstatus_ctocpp.cc',
@@ -774,10 +744,6 @@
      'libcef_dll/cpptoc/server_handler_cpptoc.h',
      'libcef_dll/cpptoc/set_cookie_callback_cpptoc.cc',
      'libcef_dll/cpptoc/set_cookie_callback_cpptoc.h',
-      'libcef_dll/ctocpp/shared_memory_region_ctocpp.cc',
-      'libcef_dll/ctocpp/shared_memory_region_ctocpp.h',
-      'libcef_dll/ctocpp/shared_process_message_builder_ctocpp.cc',
-      'libcef_dll/ctocpp/shared_process_message_builder_ctocpp.h',
      'libcef_dll/ctocpp/stream_reader_ctocpp.cc',
      'libcef_dll/ctocpp/stream_reader_ctocpp.h',
      'libcef_dll/ctocpp/stream_writer_ctocpp.cc',
@@ -788,12 +754,6 @@
      'libcef_dll/cpptoc/task_cpptoc.h',
      'libcef_dll/ctocpp/task_runner_ctocpp.cc',
      'libcef_dll/ctocpp/task_runner_ctocpp.h',
-      'libcef_dll/ctocpp/test/test_server_ctocpp.cc',
-      'libcef_dll/ctocpp/test/test_server_ctocpp.h',
-      'libcef_dll/ctocpp/test/test_server_connection_ctocpp.cc',
-      'libcef_dll/ctocpp/test/test_server_connection_ctocpp.h',
-      'libcef_dll/cpptoc/test/test_server_handler_cpptoc.cc',
-      'libcef_dll/cpptoc/test/test_server_handler_cpptoc.h',
      'libcef_dll/ctocpp/views/textfield_ctocpp.cc',
      'libcef_dll/ctocpp/views/textfield_ctocpp.h',
      'libcef_dll/cpptoc/views/textfield_delegate_cpptoc.cc',
@@ -852,6 +812,12 @@
      'libcef_dll/cpptoc/views/view_delegate_cpptoc.h',
      'libcef_dll/ctocpp/waitable_event_ctocpp.cc',
      'libcef_dll/ctocpp/waitable_event_ctocpp.h',
+      'libcef_dll/ctocpp/web_plugin_info_ctocpp.cc',
+      'libcef_dll/ctocpp/web_plugin_info_ctocpp.h',
+      'libcef_dll/cpptoc/web_plugin_info_visitor_cpptoc.cc',
+      'libcef_dll/cpptoc/web_plugin_info_visitor_cpptoc.h',
+      'libcef_dll/cpptoc/web_plugin_unstable_callback_cpptoc.cc',
+      'libcef_dll/cpptoc/web_plugin_unstable_callback_cpptoc.h',
      'libcef_dll/ctocpp/views/window_ctocpp.cc',
      'libcef_dll/ctocpp/views/window_ctocpp.h',
      'libcef_dll/cpptoc/views/window_delegate_cpptoc.cc',
--- a/cef_paths2.gypi
+++ b/cef_paths2.gypi
@@ -5,25 +5,23 @@
 {
  'variables': {
    'includes_common': [
-      'include/base/cef_atomic_flag.h',
      'include/base/cef_atomic_ref_count.h',
-      'include/base/cef_auto_reset.h',
+      'include/base/cef_atomicops.h',
      'include/base/cef_basictypes.h',
      'include/base/cef_bind.h',
+      'include/base/cef_bind_helpers.h',
      'include/base/cef_build.h',
      'include/base/cef_callback.h',
      'include/base/cef_callback_forward.h',
-      'include/base/cef_callback_helpers.h',
      'include/base/cef_callback_list.h',
      'include/base/cef_cancelable_callback.h',
-      'include/base/cef_compiler_specific.h',
      'include/base/cef_lock.h',
      'include/base/cef_logging.h',
      'include/base/cef_macros.h',
+      'include/base/cef_move.h',
      'include/base/cef_platform_thread.h',
-      'include/base/cef_ptr_util.h',
      'include/base/cef_ref_counted.h',
-      'include/base/cef_scoped_refptr.h',
+      'include/base/cef_scoped_ptr.h',
      'include/base/cef_template_util.h',
      'include/base/cef_thread_checker.h',
      'include/base/cef_trace_event.h',
@@ -33,15 +31,14 @@
      'include/base/internal/cef_callback_internal.h',
      'include/base/internal/cef_lock_impl.h',
      'include/base/internal/cef_raw_scoped_refptr_mismatch_checker.h',
-      'include/base/internal/cef_scoped_policy.h',
      'include/base/internal/cef_thread_checker_impl.h',
      'include/cef_api_hash.h',
      'include/cef_base.h',
+      'include/cef_config.h',
      'include/cef_version.h',
      'include/internal/cef_export.h',
      'include/internal/cef_ptr.h',
      'include/internal/cef_string_wrappers.h',
-      'include/internal/cef_time_wrappers.h',
      'include/internal/cef_types_wrappers.h',
    ],
    'includes_common_capi': [
@@ -55,7 +52,6 @@
      'include/internal/cef_time.h',
      'include/internal/cef_trace_event_internal.h',
      'include/internal/cef_types.h',
-      'include/internal/cef_types_geometry.h',
    ],
    'includes_capi': [
      'include/capi/cef_base_capi.h',
@@ -75,6 +71,9 @@
      'include/wrapper/cef_library_loader.h',
    ],
    'includes_win': [
+      'include/base/internal/cef_atomicops_arm64_msvc.h',
+      'include/base/internal/cef_atomicops_x86_msvc.h',
+      'include/base/internal/cef_bind_internal_win.h',
      'include/cef_sandbox_win.h',
      'include/internal/cef_win.h',
    ],
@@ -82,8 +81,8 @@
      'include/internal/cef_types_win.h',
    ],
    'includes_mac': [
-      'include/base/cef_scoped_typeref_mac.h',
-      'include/base/internal/cef_scoped_block_mac.h',
+      'include/base/internal/cef_atomicops_atomicword_compat.h',
+      'include/base/internal/cef_atomicops_mac.h',
      'include/cef_application_mac.h',
      'include/cef_sandbox_mac.h',
      'include/internal/cef_mac.h',
@@ -92,6 +91,10 @@
      'include/internal/cef_types_mac.h',
    ],
    'includes_linux': [
+      'include/base/internal/cef_atomicops_atomicword_compat.h',
+      'include/base/internal/cef_atomicops_arm_gcc.h',
+      'include/base/internal/cef_atomicops_arm64_gcc.h',
+      'include/base/internal/cef_atomicops_x86_gcc.h',
      'include/internal/cef_linux.h',
    ],
    'includes_linux_capi': [
@@ -112,14 +115,13 @@
      'libcef_dll/resource.h',
      'libcef_dll/shutdown_checker.cc',
      'libcef_dll/shutdown_checker.h',
-      'libcef_dll/template_util.h',
      'libcef_dll/transfer_util.cc',
      'libcef_dll/transfer_util.h',
      'libcef_dll/wrapper_types.h',
    ],
    'libcef_dll_wrapper_sources_base': [
-      'libcef_dll/base/cef_atomic_flag.cc',
-      'libcef_dll/base/cef_callback_helpers.cc',
+      'libcef_dll/base/cef_atomicops_x86_gcc.cc',
+      'libcef_dll/base/cef_bind_helpers.cc',
      'libcef_dll/base/cef_callback_internal.cc',
      'libcef_dll/base/cef_lock.cc',
      'libcef_dll/base/cef_lock_impl.cc',
@@ -137,9 +139,9 @@
      'libcef_dll/cpptoc/cpptoc_scoped.h',
      'libcef_dll/ctocpp/ctocpp_ref_counted.h',
      'libcef_dll/ctocpp/ctocpp_scoped.h',
+      'libcef_dll/ptr_util.h',
      'libcef_dll/shutdown_checker.cc',
      'libcef_dll/shutdown_checker.h',
-      'libcef_dll/template_util.h',
      'libcef_dll/transfer_util.cc',
      'libcef_dll/transfer_util.h',
      'libcef_dll/wrapper_types.h',
@@ -177,16 +179,12 @@
      'tests/shared/browser/resource_util.h',
    ],
    'shared_sources_common': [
-      'tests/shared/common/binary_value_utils.cc',
-      'tests/shared/common/binary_value_utils.h',
      'tests/shared/common/client_app.cc',
      'tests/shared/common/client_app.h',
      'tests/shared/common/client_app_other.cc',
      'tests/shared/common/client_app_other.h',
      'tests/shared/common/client_switches.cc',
      'tests/shared/common/client_switches.h',
-      'tests/shared/common/string_util.cc',
-      'tests/shared/common/string_util.h',
    ],
    'shared_sources_renderer': [
      'tests/shared/renderer/client_app_renderer.cc',
@@ -236,6 +234,8 @@
      'tests/cefclient/browser/client_types.h',
      'tests/cefclient/browser/dialog_test.cc',
      'tests/cefclient/browser/dialog_test.h',
+      'tests/cefclient/browser/drm_test.cc',
+      'tests/cefclient/browser/drm_test.h',
      'tests/cefclient/browser/image_cache.cc',
      'tests/cefclient/browser/image_cache.h',
      'tests/cefclient/browser/main_context.cc',
@@ -271,8 +271,6 @@
      'tests/cefclient/browser/urlrequest_test.h',
      'tests/cefclient/browser/views_menu_bar.cc',
      'tests/cefclient/browser/views_menu_bar.h',
-      'tests/cefclient/browser/views_overlay_controls.cc',
-      'tests/cefclient/browser/views_overlay_controls.h',
      'tests/cefclient/browser/views_style.cc',
      'tests/cefclient/browser/views_style.h',
      'tests/cefclient/browser/views_window.cc',
@@ -293,8 +291,6 @@
      'tests/cefclient/renderer/client_app_delegates_renderer.cc',
      'tests/cefclient/renderer/client_renderer.cc',
      'tests/cefclient/renderer/client_renderer.h',
-      'tests/cefclient/renderer/ipc_performance_test.cc',
-      'tests/cefclient/renderer/ipc_performance_test.h',
      'tests/cefclient/renderer/performance_test.cc',
      'tests/cefclient/renderer/performance_test.h',
      'tests/cefclient/renderer/performance_test_setup.h',
@@ -304,7 +300,7 @@
      'tests/cefclient/resources/binding.html',
      'tests/cefclient/resources/dialogs.html',
      'tests/cefclient/resources/draggable.html',
-      'tests/cefclient/resources/ipc_performance.html',
+      'tests/cefclient/resources/drm.html',
      'tests/cefclient/resources/localstorage.html',
      'tests/cefclient/resources/logo.png',
      'tests/cefclient/resources/media_router.html',
@@ -455,16 +451,9 @@
      'tests/cefsimple/cefsimple_linux.cc',
      'tests/cefsimple/simple_handler_linux.cc',
    ],
-    'ceftests_data_resources': [
-      'tests/ceftests/resources/net/data/ssl/certificates/expired_cert.pem',
-      'tests/ceftests/resources/net/data/ssl/certificates/localhost_cert.pem',
-      'tests/ceftests/resources/net/data/ssl/certificates/ok_cert.pem',
-      'tests/ceftests/resources/net/data/ssl/certificates/root_ca_cert.pem',
-    ],
    'ceftests_sources_common': [
      'tests/ceftests/audio_output_unittest.cc',
      'tests/ceftests/browser_info_map_unittest.cc',
-      'tests/ceftests/certificate_error_unittest.cc',
      'tests/ceftests/command_line_unittest.cc',
      'tests/ceftests/cookie_unittest.cc',
      'tests/ceftests/cors_unittest.cc',
@@ -484,26 +473,18 @@
      'tests/ceftests/file_util_unittest.cc',
      'tests/ceftests/frame_handler_unittest.cc',
      'tests/ceftests/frame_unittest.cc',
-      'tests/ceftests/hsts_redirect_unittest.cc',
      'tests/ceftests/image_unittest.cc',
      'tests/ceftests/image_util.cc',
      'tests/ceftests/image_util.h',
      'tests/ceftests/jsdialog_unittest.cc',
      'tests/ceftests/life_span_unittest.cc',
-      'tests/ceftests/media_access_unittest.cc',
-      'tests/ceftests/message_router_harness_unittest.cc',
-      'tests/ceftests/message_router_multi_query_unittest.cc',
-      'tests/ceftests/message_router_single_query_unittest.cc',
-      'tests/ceftests/message_router_threshold_unittest.cc',
-      'tests/ceftests/message_router_unittest_utils.cc',
-      'tests/ceftests/message_router_unittest_utils.h',
+      'tests/ceftests/message_router_unittest.cc',
      'tests/ceftests/navigation_unittest.cc',
      'tests/ceftests/os_rendering_unittest.cc',
      'tests/ceftests/osr_accessibility_unittest.cc',
      'tests/ceftests/osr_display_unittest.cc',
      'tests/ceftests/parser_unittest.cc',
-      'tests/ceftests/pdf_viewer_unittest.cc',
-      'tests/ceftests/permission_prompt_unittest.cc',
+      'tests/ceftests/plugin_unittest.cc',
      'tests/ceftests/preference_unittest.cc',
      'tests/ceftests/print_unittest.cc',
      'tests/ceftests/process_message_unittest.cc',
@@ -520,8 +501,6 @@
      'tests/ceftests/scheme_handler_unittest.cc',
      'tests/ceftests/scoped_temp_dir_unittest.cc',
      'tests/ceftests/server_unittest.cc',
-      'tests/ceftests/send_shared_process_message_unittest.cc',
-      "tests/ceftests/shared_process_message_unittest.cc",
      'tests/ceftests/stream_unittest.cc',
      'tests/ceftests/stream_resource_handler_unittest.cc',
      'tests/ceftests/string_unittest.cc',
@@ -533,21 +512,11 @@
      'tests/ceftests/test_request.h',
      'tests/ceftests/test_server.cc',
      'tests/ceftests/test_server.h',
-      'tests/ceftests/test_server_observer.h',
-      'tests/ceftests/test_server_observer.cc',
-      'tests/ceftests/test_server_observer_unittest.cc',
-      'tests/ceftests/test_server_manager.h',
-      'tests/ceftests/test_server_manager.cc',
-      'tests/ceftests/test_server_runner.h',
-      'tests/ceftests/test_server_runner.cc',
-      'tests/ceftests/test_server_runner_normal.cc',
-      'tests/ceftests/test_server_runner_test.cc',
      'tests/ceftests/test_server_unittest.cc',
      'tests/ceftests/test_suite.cc',
      'tests/ceftests/test_suite.h',
      'tests/ceftests/test_util.cc',
      'tests/ceftests/test_util.h',
-      'tests/ceftests/time_unittest.cc',
      'tests/ceftests/thread_helper.cc',
      'tests/ceftests/thread_helper.h',
      'tests/ceftests/thread_unittest.cc',
@@ -571,7 +540,6 @@
      'tests/ceftests/zip_reader_unittest.cc',
    ],
    'ceftests_sources_win': [
-      'tests/ceftests/resource_util_win_dir.cc',
      'tests/ceftests/resource_util_win_idmap.cc',
      'tests/ceftests/resources/win/ceftests.rc',
    ],
@@ -597,16 +565,9 @@
      'tests/ceftests/cors_unittest.cc',
      'tests/ceftests/dom_unittest.cc',
      'tests/ceftests/frame_unittest.cc',
-      'tests/ceftests/media_access_unittest.cc',
-      'tests/ceftests/message_router_harness_unittest.cc',
-      'tests/ceftests/message_router_multi_query_unittest.cc',
-      'tests/ceftests/message_router_single_query_unittest.cc',
-      'tests/ceftests/message_router_threshold_unittest.cc',
-      'tests/ceftests/message_router_unittest_utils.cc',
-      'tests/ceftests/message_router_unittest_utils.h',
+      'tests/ceftests/message_router_unittest.cc',
      'tests/ceftests/navigation_unittest.cc',
-      'tests/ceftests/pdf_viewer_unittest.cc',
-      'tests/ceftests/permission_prompt_unittest.cc',
+      'tests/ceftests/plugin_unittest.cc',
      'tests/ceftests/preference_unittest.cc',
      'tests/ceftests/process_message_unittest.cc',
      'tests/ceftests/request_handler_unittest.cc',
@@ -616,8 +577,6 @@
      'tests/ceftests/routing_test_handler.cc',
      'tests/ceftests/routing_test_handler.h',
      'tests/ceftests/scheme_handler_unittest.cc',
-      'tests/ceftests/send_shared_process_message_unittest.cc',
-      "tests/ceftests/shared_process_message_unittest.cc",
      'tests/ceftests/urlrequest_unittest.cc',
      'tests/ceftests/test_handler.cc',
      'tests/ceftests/test_handler.h',
@@ -625,14 +584,6 @@
      'tests/ceftests/test_request.h',
      'tests/ceftests/test_server.cc',
      'tests/ceftests/test_server.h',
-      'tests/ceftests/test_server_observer.h',
-      'tests/ceftests/test_server_observer.cc',
-      'tests/ceftests/test_server_manager.h',
-      'tests/ceftests/test_server_manager.cc',
-      'tests/ceftests/test_server_runner.h',
-      'tests/ceftests/test_server_runner.cc',
-      'tests/ceftests/test_server_runner_normal.cc',
-      'tests/ceftests/test_server_runner_test.cc',
      'tests/ceftests/test_suite.cc',
      'tests/ceftests/test_suite.h',
      'tests/ceftests/test_util.cc',
--- a/cmake/cef_macros.cmake.in
+++ b/cmake/cef_macros.cmake.in
@@ -95,62 +95,41 @@ macro(SET_CEF_TARGET_OUT_DIR)
  endif()
 endmacro()

-# Copy a list of files from one directory to another. Relative file paths are maintained.
+# Copy a list of files from one directory to another. Relative files paths are maintained.
+# The path component of the source |file_list| will be removed.
 macro(COPY_FILES target file_list source_dir target_dir)
  foreach(FILENAME ${file_list})
    set(source_file ${source_dir}/${FILENAME})
-
-    # Remove the target file path component.
    get_filename_component(target_name ${FILENAME} NAME)
    set(target_file ${target_dir}/${target_name})

-    COPY_SINGLE_FILE(${target} ${source_file} ${target_file})
-  endforeach()
-endmacro()
-
-# Copy a list of files from one directory to another. Relative file paths are maintained.
-macro(COPY_RESOURCES target file_list prefix_list source_dir target_dir)
-  foreach(FILENAME ${file_list})
-    set(source_file ${source_dir}/${FILENAME})
-
-    # Remove one or more prefixes from the source paths.
-    set(TARGET_FILENAME "${FILENAME}")
-    foreach(PREFIX ${prefix_list})
-      string(REGEX REPLACE "^.*${PREFIX}" "" TARGET_FILENAME ${TARGET_FILENAME})
-    endforeach()
-    set(target_file ${target_dir}/${TARGET_FILENAME})
-
-    COPY_SINGLE_FILE(${target} ${source_file} ${target_file})
-  endforeach()
-endmacro()
-
-macro(COPY_SINGLE_FILE target source_file target_file)
-  string(FIND ${source_file} "$<CONFIGURATION>" _pos)
-  if(NOT ${_pos} EQUAL -1)
-    # Must test with an actual configuration directory.
-    string(REPLACE "$<CONFIGURATION>" "Release" existing_source_file ${source_file})
-    if(NOT EXISTS ${existing_source_file})
-      string(REPLACE "$<CONFIGURATION>" "Debug" existing_source_file ${source_file})
+    string(FIND ${source_file} "$<CONFIGURATION>" _pos)
+    if(NOT ${_pos} EQUAL -1)
+      # Must test with an actual configuration directory.
+      string(REPLACE "$<CONFIGURATION>" "Release" existing_source_file ${source_file})
+      if(NOT EXISTS ${existing_source_file})
+        string(REPLACE "$<CONFIGURATION>" "Debug" existing_source_file ${source_file})
+      endif()
+    else()
+      set(existing_source_file ${source_file})
    endif()
-  else()
-    set(existing_source_file ${source_file})
-  endif()

-  if(IS_DIRECTORY ${existing_source_file})
-    add_custom_command(
-      TARGET ${target}
-      POST_BUILD
-      COMMAND ${CMAKE_COMMAND} -E copy_directory "${source_file}" "${target_file}"
-      VERBATIM
-      )
-  else()
-    add_custom_command(
-      TARGET ${target}
-      POST_BUILD
-      COMMAND ${CMAKE_COMMAND} -E copy_if_different "${source_file}" "${target_file}"
-      VERBATIM
-      )
-  endif()
+    if(IS_DIRECTORY ${existing_source_file})
+      add_custom_command(
+        TARGET ${target}
+        POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy_directory "${source_file}" "${target_file}"
+        VERBATIM
+        )
+    else()
+      add_custom_command(
+        TARGET ${target}
+        POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different "${source_file}" "${target_file}"
+        VERBATIM
+        )
+    endif()
+  endforeach()
 endmacro()


--- a/cmake/cef_variables.cmake.in
+++ b/cmake/cef_variables.cmake.in
@@ -105,7 +105,7 @@ if(OS_LINUX)
    -fno-rtti                       # Disable real-time type information
    -fno-threadsafe-statics         # Don't generate thread-safe statics
    -fvisibility-inlines-hidden     # Give hidden visibility to inlined class member functions
-    -std=c++17                      # Use the C++17 language standard
+    -std=gnu++11                    # Use the C++11 language standard including GNU extensions
    -Wsign-compare                  # Warn about mixed signed/unsigned type comparisons
    )
  list(APPEND CEF_COMPILER_FLAGS_DEBUG
@@ -222,11 +222,9 @@ if(OS_LINUX)
    libcef.so
    libEGL.so
    libGLESv2.so
-    libvk_swiftshader.so
-    libvulkan.so.1
    snapshot_blob.bin
    v8_context_snapshot.bin
-    vk_swiftshader_icd.json
+    swiftshader
    )

  # List of CEF resource files.
@@ -276,7 +274,7 @@ if(OS_MAC)
    -fno-threadsafe-statics         # Don't generate thread-safe statics
    -fobjc-call-cxx-cdtors          # Call the constructor/destructor of C++ instance variables in ObjC objects
    -fvisibility-inlines-hidden     # Give hidden visibility to inlined class member functions
-    -std=c++17                      # Use the C++17 language standard
+    -std=gnu++11                    # Use the C++11 language standard including GNU extensions
    -Wno-narrowing                  # Don't warn about type narrowing
    -Wsign-compare                  # Warn about mixed signed/unsigned type comparisons
    )
@@ -314,7 +312,7 @@ if(OS_MAC)

  # Find the newest available base SDK.
  execute_process(COMMAND xcode-select --print-path OUTPUT_VARIABLE XCODE_PATH OUTPUT_STRIP_TRAILING_WHITESPACE)
-  foreach(OS_VERSION 10.15 10.14 10.13)
+  foreach(OS_VERSION 10.15 10.14 10.13 10.12 10.11)
    set(SDK "${XCODE_PATH}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX${OS_VERSION}.sdk")
    if(NOT "${CMAKE_OSX_SYSROOT}" AND EXISTS "${SDK}" AND IS_DIRECTORY "${SDK}")
      set(CMAKE_OSX_SYSROOT ${SDK})
@@ -322,7 +320,7 @@ if(OS_MAC)
  endforeach()

  # Target SDK.
-  set(CEF_TARGET_SDK               "10.13")
+  set(CEF_TARGET_SDK               "10.11")
  list(APPEND CEF_COMPILER_FLAGS
    -mmacosx-version-min=${CEF_TARGET_SDK}
  )
@@ -409,7 +407,6 @@ if(OS_WINDOWS)
    /wd4100       # Ignore "unreferenced formal parameter" warning
    /wd4127       # Ignore "conditional expression is constant" warning
    /wd4244       # Ignore "conversion possible loss of data" warning
-    /wd4324       # Ignore "structure was padded due to alignment specifier" warning
    /wd4481       # Ignore "nonstandard extension used: override" warning
    /wd4512       # Ignore "assignment operator could not be generated" warning
    /wd4701       # Ignore "potentially uninitialized local variable" warning
@@ -426,9 +423,6 @@ if(OS_WINDOWS)
    /Ob2          # Inline any suitable function
    /GF           # Enable string pooling
    )
-  list(APPEND CEF_CXX_COMPILER_FLAGS
-    /std:c++17    # Use the C++17 language standard
-    )
  list(APPEND CEF_LINKER_FLAGS_DEBUG
    /DEBUG        # Generate debug information
    )
@@ -451,7 +445,6 @@ if(OS_WINDOWS)
  # Standard libraries.
  set(CEF_STANDARD_LIBS
    comctl32.lib
-    gdi32.lib
    rpcrt4.lib
    shlwapi.lib
    ws2_32.lib
@@ -475,9 +468,7 @@ if(OS_WINDOWS)
    libGLESv2.dll
    snapshot_blob.bin
    v8_context_snapshot.bin
-    vk_swiftshader.dll
-    vk_swiftshader_icd.json
-    vulkan-1.dll
+    swiftshader
    )

  if(NOT PROJECT_ARCH STREQUAL "arm64")
--- a/include/base/cef_atomic_flag.h
+++ b/include/base/cef_atomic_flag.h
@@ -1,97 +0,0 @@
-// Copyright (c) 2014 Marshall A. Greenblatt. Portions copyright (c) 2011
-// Google Inc. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//    * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//    * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//    * Neither the name of Google Inc. nor the name Chromium Embedded
-// Framework nor the names of its contributors may be used to endorse
-// or promote products derived from this software without specific prior
-// written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef CEF_INCLUDE_BASE_CEF_ATOMIC_FLAG_H_
-#define CEF_INCLUDE_BASE_CEF_ATOMIC_FLAG_H_
-#pragma once
-
-#if defined(USING_CHROMIUM_INCLUDES)
-// When building CEF include the Chromium header directly.
-#include "base/synchronization/atomic_flag.h"
-
-#else  // !USING_CHROMIUM_INCLUDES
-// The following is substantially similar to the Chromium implementation.
-// If the Chromium implementation diverges the below implementation should be
-// updated to match.
-
-#include <stdint.h>
-
-#include <atomic>
-
-#include "include/base/cef_thread_checker.h"
-
-namespace base {
-
-///
-/// A flag that can safely be set from one thread and read from other threads.
-///
-/// This class IS NOT intended for synchronization between threads.
-///
-class AtomicFlag {
- public:
-  AtomicFlag();
-
-  AtomicFlag(const AtomicFlag&) = delete;
-  AtomicFlag& operator=(const AtomicFlag&) = delete;
-
-  ~AtomicFlag();
-
-  ///
-  /// Set the flag. Must always be called from the same thread.
-  ///
-  void Set();
-
-  ///
-  /// Returns true iff the flag was set. If this returns true, the current
-  /// thread is guaranteed to be synchronized with all memory operations on the
-  /// thread which invoked Set() up until at least the first call to Set() on
-  /// it.
-  ///
-  bool IsSet() const {
-    // Inline here: this has a measurable performance impact on base::WeakPtr.
-    return flag_.load(std::memory_order_acquire) != 0;
-  }
-
-  ///
-  /// Resets the flag. Be careful when using this: callers might not expect
-  /// IsSet() to return false after returning true once.
-  ///
-  void UnsafeResetForTesting();
-
- private:
-  std::atomic<uint_fast8_t> flag_{0};
-  base::ThreadChecker set_thread_checker_;
-};
-
-}  // namespace base
-
-#endif  // !USING_CHROMIUM_INCLUDES
-
-#endif  // CEF_INCLUDE_BASE_CEF_ATOMIC_FLAG_H_
--- a/include/base/cef_atomic_ref_count.h
+++ b/include/base/cef_atomic_ref_count.h
@@ -43,78 +43,120 @@
 // When building CEF include the Chromium header directly.
 #include "base/atomic_ref_count.h"

+// Used when declaring a base::AtomicRefCount value. This is an object type with
+// Chromium headers.
+#define ATOMIC_DECLARATION (0)
+
+// Maintaining compatibility with AtompicRefCount* functions that were removed
+// from Chromium in http://crrev.com/ee96d561.
+namespace base {
+
+// Increment a reference count by 1.
+inline void AtomicRefCountInc(volatile AtomicRefCount* ptr) {
+  const_cast<AtomicRefCount*>(ptr)->Increment();
+}
+
+// Decrement a reference count by 1 and return whether the result is non-zero.
+// Insert barriers to ensure that state written before the reference count
+// became zero will be visible to a thread that has just made the count zero.
+inline bool AtomicRefCountDec(volatile AtomicRefCount* ptr) {
+  return const_cast<AtomicRefCount*>(ptr)->Decrement();
+}
+
+// Return whether the reference count is one.  If the reference count is used
+// in the conventional way, a refrerence count of 1 implies that the current
+// thread owns the reference and no other thread shares it.  This call performs
+// the test for a reference count of one, and performs the memory barrier
+// needed for the owning thread to act on the object, knowing that it has
+// exclusive access to the object.
+inline bool AtomicRefCountIsOne(volatile AtomicRefCount* ptr) {
+  return const_cast<AtomicRefCount*>(ptr)->IsOne();
+}
+
+// Return whether the reference count is zero.  With conventional object
+// referencing counting, the object will be destroyed, so the reference count
+// should never be zero.  Hence this is generally used for a debug check.
+inline bool AtomicRefCountIsZero(volatile AtomicRefCount* ptr) {
+  return const_cast<AtomicRefCount*>(ptr)->IsZero();
+}
+
+}  // namespace base
+
 #else  // !USING_CHROMIUM_INCLUDES
 // The following is substantially similar to the Chromium implementation.
 // If the Chromium implementation diverges the below implementation should be
 // updated to match.

-#include <atomic>
+#include "include/base/cef_atomicops.h"
+
+// Annotations are not currently supported.
+#define ANNOTATE_HAPPENS_BEFORE(obj) /* empty */
+#define ANNOTATE_HAPPENS_AFTER(obj)  /* empty */
+
+// Used when declaring a base::AtomicRefCount value. This is an integer/ptr type
+// with CEF headers.
+#define ATOMIC_DECLARATION = 0

 namespace base {

-class AtomicRefCount {
- public:
-  constexpr AtomicRefCount() : ref_count_(0) {}
-  explicit constexpr AtomicRefCount(int initial_value)
-      : ref_count_(initial_value) {}
+typedef subtle::Atomic32 AtomicRefCount;

-  ///
-  /// Increment a reference count.
-  /// Returns the previous value of the count.
-  ///
-  int Increment() { return Increment(1); }
+// Increment a reference count by "increment", which must exceed 0.
+inline void AtomicRefCountIncN(volatile AtomicRefCount* ptr,
+                               AtomicRefCount increment) {
+  subtle::NoBarrier_AtomicIncrement(ptr, increment);
+}

-  ///
-  /// Increment a reference count by "increment", which must exceed 0.
-  /// Returns the previous value of the count.
-  ///
-  int Increment(int increment) {
-    return ref_count_.fetch_add(increment, std::memory_order_relaxed);
+// Decrement a reference count by "decrement", which must exceed 0,
+// and return whether the result is non-zero.
+// Insert barriers to ensure that state written before the reference count
+// became zero will be visible to a thread that has just made the count zero.
+inline bool AtomicRefCountDecN(volatile AtomicRefCount* ptr,
+                               AtomicRefCount decrement) {
+  ANNOTATE_HAPPENS_BEFORE(ptr);
+  bool res = (subtle::Barrier_AtomicIncrement(ptr, -decrement) != 0);
+  if (!res) {
+    ANNOTATE_HAPPENS_AFTER(ptr);
  }
+  return res;
+}

-  ///
-  /// Decrement a reference count, and return whether the result is non-zero.
-  /// Insert barriers to ensure that state written before the reference count
-  /// became zero will be visible to a thread that has just made the count zero.
-  ///
-  bool Decrement() {
-    // TODO(jbroman): Technically this doesn't need to be an acquire operation
-    // unless the result is 1 (i.e., the ref count did indeed reach zero).
-    // However, there are toolchain issues that make that not work as well at
-    // present (notably TSAN doesn't like it).
-    return ref_count_.fetch_sub(1, std::memory_order_acq_rel) != 1;
+// Increment a reference count by 1.
+inline void AtomicRefCountInc(volatile AtomicRefCount* ptr) {
+  base::AtomicRefCountIncN(ptr, 1);
+}
+
+// Decrement a reference count by 1 and return whether the result is non-zero.
+// Insert barriers to ensure that state written before the reference count
+// became zero will be visible to a thread that has just made the count zero.
+inline bool AtomicRefCountDec(volatile AtomicRefCount* ptr) {
+  return base::AtomicRefCountDecN(ptr, 1);
+}
+
+// Return whether the reference count is one.  If the reference count is used
+// in the conventional way, a refrerence count of 1 implies that the current
+// thread owns the reference and no other thread shares it.  This call performs
+// the test for a reference count of one, and performs the memory barrier
+// needed for the owning thread to act on the object, knowing that it has
+// exclusive access to the object.
+inline bool AtomicRefCountIsOne(volatile AtomicRefCount* ptr) {
+  bool res = (subtle::Acquire_Load(ptr) == 1);
+  if (res) {
+    ANNOTATE_HAPPENS_AFTER(ptr);
  }
+  return res;
+}

-  ///
-  /// Return whether the reference count is one.  If the reference count is used
-  /// in the conventional way, a refrerence count of 1 implies that the current
-  /// thread owns the reference and no other thread shares it.  This call
-  /// performs the test for a reference count of one, and performs the memory
-  /// barrier needed for the owning thread to act on the object, knowing that it
-  /// has exclusive access to the object.
-  ///
-  bool IsOne() const { return ref_count_.load(std::memory_order_acquire) == 1; }
-
-  ///
-  /// Return whether the reference count is zero.  With conventional object
-  /// referencing counting, the object will be destroyed, so the reference count
-  /// should never be zero.  Hence this is generally used for a debug check.
-  ///
-  bool IsZero() const {
-    return ref_count_.load(std::memory_order_acquire) == 0;
+// Return whether the reference count is zero.  With conventional object
+// referencing counting, the object will be destroyed, so the reference count
+// should never be zero.  Hence this is generally used for a debug check.
+inline bool AtomicRefCountIsZero(volatile AtomicRefCount* ptr) {
+  bool res = (subtle::Acquire_Load(ptr) == 0);
+  if (res) {
+    ANNOTATE_HAPPENS_AFTER(ptr);
  }
-
-  ///
-  /// Returns the current reference count (with no barriers). This is subtle,
-  /// and should be used only for debugging.
-  ///
-  int SubtleRefCountForDebug() const {
-    return ref_count_.load(std::memory_order_relaxed);
-  }
-
- private:
-  std::atomic_int ref_count_;
-};
+  return res;
+}

 }  // namespace base

--- a/include/base/cef_atomicops.h
+++ b/include/base/cef_atomicops.h
@@ -0,0 +1,203 @@
+// Copyright (c) 2014 Marshall A. Greenblatt. Portions copyright (c) 2012
+// Google Inc. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//    * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//    * Neither the name of Google Inc. nor the name Chromium Embedded
+// Framework nor the names of its contributors may be used to endorse
+// or promote products derived from this software without specific prior
+// written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// For atomic operations on reference counts, see cef_atomic_ref_count.h.
+
+// The routines exported by this module are subtle.  If you use them, even if
+// you get the code right, it will depend on careful reasoning about atomicity
+// and memory ordering; it will be less readable, and harder to maintain.  If
+// you plan to use these routines, you should have a good reason, such as solid
+// evidence that performance would otherwise suffer, or there being no
+// alternative.  You should assume only properties explicitly guaranteed by the
+// specifications in this file.  You are almost certainly _not_ writing code
+// just for the x86; if you assume x86 semantics, x86 hardware bugs and
+// implementations on other archtectures will cause your code to break.  If you
+// do not know what you are doing, avoid these routines, and use a Mutex.
+//
+// It is incorrect to make direct assignments to/from an atomic variable.
+// You should use one of the Load or Store routines.  The NoBarrier
+// versions are provided when no barriers are needed:
+//   NoBarrier_Store()
+//   NoBarrier_Load()
+// Although there are currently no compiler enforcement, you are encouraged
+// to use these.
+//
+
+#ifndef CEF_INCLUDE_BASE_CEF_ATOMICOPS_H_
+#define CEF_INCLUDE_BASE_CEF_ATOMICOPS_H_
+#pragma once
+
+#if defined(BASE_ATOMICOPS_H_)
+// Do nothing if the Chromium header has already been included.
+// This can happen in cases where Chromium code is used directly by the
+// client application. When using Chromium code directly always include
+// the Chromium header first to avoid type conflicts.
+#elif defined(USING_CHROMIUM_INCLUDES)
+// When building CEF include the Chromium header directly.
+#include "base/atomicops.h"
+#else  // !USING_CHROMIUM_INCLUDES
+// The following is substantially similar to the Chromium implementation.
+// If the Chromium implementation diverges the below implementation should be
+// updated to match.
+
+#include <stdint.h>
+
+#include "include/base/cef_build.h"
+
+#if defined(OS_WIN) && defined(ARCH_CPU_64_BITS)
+// windows.h #defines this (only on x64). This causes problems because the
+// public API also uses MemoryBarrier at the public name for this fence. So, on
+// X64, undef it, and call its documented
+// (http://msdn.microsoft.com/en-us/library/windows/desktop/ms684208.aspx)
+// implementation directly.
+#undef MemoryBarrier
+#endif
+
+namespace base {
+namespace subtle {
+
+typedef int32_t Atomic32;
+#ifdef ARCH_CPU_64_BITS
+// We need to be able to go between Atomic64 and AtomicWord implicitly.  This
+// means Atomic64 and AtomicWord should be the same type on 64-bit.
+#if defined(__ILP32__) || defined(OS_NACL)
+// NaCl's intptr_t is not actually 64-bits on 64-bit!
+// http://code.google.com/p/nativeclient/issues/detail?id=1162
+typedef int64_t Atomic64;
+#else
+typedef intptr_t Atomic64;
+#endif
+#endif
+
+// Use AtomicWord for a machine-sized pointer.  It will use the Atomic32 or
+// Atomic64 routines below, depending on your architecture.
+typedef intptr_t AtomicWord;
+
+// Atomically execute:
+//      result = *ptr;
+//      if (*ptr == old_value)
+//        *ptr = new_value;
+//      return result;
+//
+// I.e., replace "*ptr" with "new_value" if "*ptr" used to be "old_value".
+// Always return the old value of "*ptr"
+//
+// This routine implies no memory barriers.
+Atomic32 NoBarrier_CompareAndSwap(volatile Atomic32* ptr,
+                                  Atomic32 old_value,
+                                  Atomic32 new_value);
+
+// Atomically store new_value into *ptr, returning the previous value held in
+// *ptr.  This routine implies no memory barriers.
+Atomic32 NoBarrier_AtomicExchange(volatile Atomic32* ptr, Atomic32 new_value);
+
+// Atomically increment *ptr by "increment".  Returns the new value of
+// *ptr with the increment applied.  This routine implies no memory barriers.
+Atomic32 NoBarrier_AtomicIncrement(volatile Atomic32* ptr, Atomic32 increment);
+
+Atomic32 Barrier_AtomicIncrement(volatile Atomic32* ptr, Atomic32 increment);
+
+// These following lower-level operations are typically useful only to people
+// implementing higher-level synchronization operations like spinlocks,
+// mutexes, and condition-variables.  They combine CompareAndSwap(), a load, or
+// a store with appropriate memory-ordering instructions.  "Acquire" operations
+// ensure that no later memory access can be reordered ahead of the operation.
+// "Release" operations ensure that no previous memory access can be reordered
+// after the operation.  "Barrier" operations have both "Acquire" and "Release"
+// semantics.   A MemoryBarrier() has "Barrier" semantics, but does no memory
+// access.
+Atomic32 Acquire_CompareAndSwap(volatile Atomic32* ptr,
+                                Atomic32 old_value,
+                                Atomic32 new_value);
+Atomic32 Release_CompareAndSwap(volatile Atomic32* ptr,
+                                Atomic32 old_value,
+                                Atomic32 new_value);
+
+void MemoryBarrier();
+void NoBarrier_Store(volatile Atomic32* ptr, Atomic32 value);
+void Acquire_Store(volatile Atomic32* ptr, Atomic32 value);
+void Release_Store(volatile Atomic32* ptr, Atomic32 value);
+
+Atomic32 NoBarrier_Load(volatile const Atomic32* ptr);
+Atomic32 Acquire_Load(volatile const Atomic32* ptr);
+Atomic32 Release_Load(volatile const Atomic32* ptr);
+
+// 64-bit atomic operations (only available on 64-bit processors).
+#ifdef ARCH_CPU_64_BITS
+Atomic64 NoBarrier_CompareAndSwap(volatile Atomic64* ptr,
+                                  Atomic64 old_value,
+                                  Atomic64 new_value);
+Atomic64 NoBarrier_AtomicExchange(volatile Atomic64* ptr, Atomic64 new_value);
+Atomic64 NoBarrier_AtomicIncrement(volatile Atomic64* ptr, Atomic64 increment);
+Atomic64 Barrier_AtomicIncrement(volatile Atomic64* ptr, Atomic64 increment);
+
+Atomic64 Acquire_CompareAndSwap(volatile Atomic64* ptr,
+                                Atomic64 old_value,
+                                Atomic64 new_value);
+Atomic64 Release_CompareAndSwap(volatile Atomic64* ptr,
+                                Atomic64 old_value,
+                                Atomic64 new_value);
+void NoBarrier_Store(volatile Atomic64* ptr, Atomic64 value);
+void Acquire_Store(volatile Atomic64* ptr, Atomic64 value);
+void Release_Store(volatile Atomic64* ptr, Atomic64 value);
+Atomic64 NoBarrier_Load(volatile const Atomic64* ptr);
+Atomic64 Acquire_Load(volatile const Atomic64* ptr);
+Atomic64 Release_Load(volatile const Atomic64* ptr);
+#endif  // ARCH_CPU_64_BITS
+
+}  // namespace subtle
+}  // namespace base
+
+// Include our platform specific implementation.
+#if defined(OS_WIN) && defined(COMPILER_MSVC) && defined(ARCH_CPU_X86_FAMILY)
+#include "include/base/internal/cef_atomicops_x86_msvc.h"
+#elif defined(OS_WIN) && (defined(__ARM_ARCH_ISA_A64) || defined(_M_ARM64))
+#include "include/base/internal/cef_atomicops_arm64_msvc.h"
+#elif defined(OS_MAC)
+#include "include/base/internal/cef_atomicops_mac.h"
+#elif defined(COMPILER_GCC) && defined(ARCH_CPU_X86_FAMILY)
+#include "include/base/internal/cef_atomicops_x86_gcc.h"
+#elif defined(COMPILER_GCC) && defined(__ARM_ARCH_ISA_A64)
+#include "include/base/internal/cef_atomicops_arm64_gcc.h"
+#elif defined(COMPILER_GCC) && defined(__ARM_ARCH)
+#include "include/base/internal/cef_atomicops_arm_gcc.h"
+#else
+#error "Atomic operations are not supported on your platform"
+#endif
+
+// On some platforms we need additional declarations to make
+// AtomicWord compatible with our other Atomic* types.
+#if defined(OS_MAC) || defined(OS_OPENBSD)
+#include "include/base/internal/cef_atomicops_atomicword_compat.h"
+#endif
+
+#endif  // !USING_CHROMIUM_INCLUDES
+
+#endif  // CEF_INCLUDE_BASE_CEF_ATOMICOPS_H_
--- a/include/base/cef_auto_reset.h
+++ b/include/base/cef_auto_reset.h
@@ -1,89 +0,0 @@
-// Copyright (c) 2014 Marshall A. Greenblatt. Portions copyright (c) 2011
-// Google Inc. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//    * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//    * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//    * Neither the name of Google Inc. nor the name Chromium Embedded
-// Framework nor the names of its contributors may be used to endorse
-// or promote products derived from this software without specific prior
-// written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// base::AutoReset<> is useful for setting a variable to a new value only within
-// a particular scope. An base::AutoReset<> object resets a variable to its
-// original value upon destruction, making it an alternative to writing
-// "var = false;" or "var = old_val;" at all of a block's exit points.
-//
-// This should be obvious, but note that an base::AutoReset<> instance should
-// have a shorter lifetime than its scoped_variable, to prevent invalid memory
-// writes when the base::AutoReset<> object is destroyed.
-
-#ifndef CEF_INCLUDE_BASE_CEF_AUTO_RESET_H_
-#define CEF_INCLUDE_BASE_CEF_AUTO_RESET_H_
-#pragma once
-
-#if defined(USING_CHROMIUM_INCLUDES)
-// When building CEF include the Chromium header directly.
-#include "base/auto_reset.h"
-#else  // !USING_CHROMIUM_INCLUDES
-// The following is substantially similar to the Chromium implementation.
-// If the Chromium implementation diverges the below implementation should be
-// updated to match.
-
-#include <utility>
-
-namespace base {
-
-template <typename T>
-class AutoReset {
- public:
-  template <typename U>
-  AutoReset(T* scoped_variable, U&& new_value)
-      : scoped_variable_(scoped_variable),
-        original_value_(
-            std::exchange(*scoped_variable_, std::forward<U>(new_value))) {}
-
-  AutoReset(AutoReset&& other)
-      : scoped_variable_(std::exchange(other.scoped_variable_, nullptr)),
-        original_value_(std::move(other.original_value_)) {}
-
-  AutoReset& operator=(AutoReset&& rhs) {
-    scoped_variable_ = std::exchange(rhs.scoped_variable_, nullptr);
-    original_value_ = std::move(rhs.original_value_);
-    return *this;
-  }
-
-  ~AutoReset() {
-    if (scoped_variable_)
-      *scoped_variable_ = std::move(original_value_);
-  }
-
- private:
-  T* scoped_variable_;
-  T original_value_;
-};
-
-}  // namespace base
-
-#endif  // !USING_CHROMIUM_INCLUDES
-
-#endif  // CEF_INCLUDE_BASE_CEF_AUTO_RESET_H_
--- a/include/base/cef_bind.h
+++ b/include/base/cef_bind.h
@@ -28,48 +28,16 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-///
-/// \file
-/// base::BindOnce() and base::BindRepeating() are helpers for creating
-/// base::OnceCallback and base::RepeatingCallback objects respectively.
-///
-/// For a runnable object of n-arity, the base::Bind*() family allows partial
-/// application of the first m arguments. The remaining n - m arguments must be
-/// passed when invoking the callback with Run().
-///
-/// <pre>
-///   // The first argument is bound at callback creation; the remaining
-///   // two must be passed when calling Run() on the callback object.
-///   base::OnceCallback<long(int, long)> cb = base::BindOnce(
-///       [](short x, int y, long z) { return x * y * z; }, 42);
-/// </pre>
-///
-/// When binding to a method, the receiver object must also be specified at
-/// callback creation time. When Run() is invoked, the method will be invoked on
-/// the specified receiver object.
-///
-/// <pre>
-///   class C : public base::RefCounted<C> { void F(); };
-///   auto instance = base::MakeRefCounted<C>();
-///   auto cb = base::BindOnce(&C::F, instance);
-///   std::move(cb).Run();  // Identical to instance->F()
-/// </pre>
-///
-/// See https://chromium.googlesource.com/chromium/src/+/lkgr/docs/callback.md
-/// for the full documentation.
-///
-
-// Implementation notes
-//
-// If you're reading the implementation, before proceeding further, you should
-// read the top comment of base/internal/cef_bind_internal.h for a definition
-// of common terms and concepts.
-
 #ifndef CEF_INCLUDE_BASE_CEF_BIND_H_
 #define CEF_INCLUDE_BASE_CEF_BIND_H_
 #pragma once

-#if defined(USING_CHROMIUM_INCLUDES)
+#if defined(BASE_BIND_H_)
+// Do nothing if the Chromium header has already been included.
+// This can happen in cases where Chromium code is used directly by the
+// client application. When using Chromium code directly always include
+// the Chromium header first to avoid type conflicts.
+#elif defined(USING_CHROMIUM_INCLUDES)
 // When building CEF include the Chromium header directly.
 #include "base/bind.h"
 #else  // !USING_CHROMIUM_INCLUDES
@@ -77,314 +45,529 @@
 // If the Chromium implementation diverges the below implementation should be
 // updated to match.

-#include <functional>
-#include <memory>
-#include <type_traits>
-#include <utility>
-
-#include "include/base/cef_build.h"
-#include "include/base/cef_compiler_specific.h"
-#include "include/base/cef_template_util.h"
 #include "include/base/internal/cef_bind_internal.h"
+#include "include/base/internal/cef_callback_internal.h"

-#if defined(OS_APPLE) && !HAS_FEATURE(objc_arc)
-#include "include/base/internal/cef_scoped_block_mac.h"
-#endif
+// -----------------------------------------------------------------------------
+// Usage documentation
+// -----------------------------------------------------------------------------
+//
+// See base/cef_callback.h for documentation.
+//
+//
+// -----------------------------------------------------------------------------
+// Implementation notes
+// -----------------------------------------------------------------------------
+//
+// If you're reading the implementation, before proceeding further, you should
+// read the top comment of base/bind_internal.h for a definition of common
+// terms and concepts.
+//
+// RETURN TYPES
+//
+// Though Bind()'s result is meant to be stored in a Callback<> type, it
+// cannot actually return the exact type without requiring a large amount
+// of extra template specializations. The problem is that in order to
+// discern the correct specialization of Callback<>, Bind would need to
+// unwrap the function signature to determine the signature's arity, and
+// whether or not it is a method.
+//
+// Each unique combination of (arity, function_type, num_prebound) where
+// function_type is one of {function, method, const_method} would require
+// one specialization.  We eventually have to do a similar number of
+// specializations anyways in the implementation (see the Invoker<>,
+// classes).  However, it is avoidable in Bind if we return the result
+// via an indirection like we do below.
+//
+// TODO(ajwong): We might be able to avoid this now, but need to test.
+//
+// It is possible to move most of the COMPILE_ASSERT asserts into BindState<>,
+// but it feels a little nicer to have the asserts here so people do not
+// need to crack open bind_internal.h.  On the other hand, it makes Bind()
+// harder to read.

 namespace base {

-///
-/// Bind as OnceCallback.
-///
-template <typename Functor, typename... Args>
-inline OnceCallback<internal::MakeUnboundRunType<Functor, Args...>> BindOnce(
-    Functor&& functor,
-    Args&&... args) {
-  static_assert(!internal::IsOnceCallback<std::decay_t<Functor>>() ||
-                    (std::is_rvalue_reference<Functor&&>() &&
-                     !std::is_const<std::remove_reference_t<Functor>>()),
-                "BindOnce requires non-const rvalue for OnceCallback binding."
-                " I.e.: base::BindOnce(std::move(callback)).");
-  static_assert(
-      conjunction<
-          internal::AssertBindArgIsNotBasePassed<std::decay_t<Args>>...>::value,
-      "Use std::move() instead of base::Passed() with base::BindOnce()");
+template <typename Functor>
+base::Callback<typename cef_internal::BindState<
+    typename cef_internal::FunctorTraits<Functor>::RunnableType,
+    typename cef_internal::FunctorTraits<Functor>::RunType,
+    void()>::UnboundRunType>
+Bind(Functor functor) {
+  // Typedefs for how to store and run the functor.
+  typedef
+      typename cef_internal::FunctorTraits<Functor>::RunnableType RunnableType;
+  typedef typename cef_internal::FunctorTraits<Functor>::RunType RunType;

-  return internal::BindImpl<OnceCallback>(std::forward<Functor>(functor),
-                                          std::forward<Args>(args)...);
+  typedef cef_internal::BindState<RunnableType, RunType, void()> BindState;
+
+  return Callback<typename BindState::UnboundRunType>(
+      new BindState(cef_internal::MakeRunnable(functor)));
 }

-///
-/// Bind as RepeatingCallback.
-///
-template <typename Functor, typename... Args>
-inline RepeatingCallback<internal::MakeUnboundRunType<Functor, Args...>>
-BindRepeating(Functor&& functor, Args&&... args) {
-  static_assert(
-      !internal::IsOnceCallback<std::decay_t<Functor>>(),
-      "BindRepeating cannot bind OnceCallback. Use BindOnce with std::move().");
+template <typename Functor, typename P1>
+base::Callback<typename cef_internal::BindState<
+    typename cef_internal::FunctorTraits<Functor>::RunnableType,
+    typename cef_internal::FunctorTraits<Functor>::RunType,
+    void(typename cef_internal::CallbackParamTraits<P1>::StorageType)>::
+                   UnboundRunType>
+Bind(Functor functor, const P1& p1) {
+  // Typedefs for how to store and run the functor.
+  typedef
+      typename cef_internal::FunctorTraits<Functor>::RunnableType RunnableType;
+  typedef typename cef_internal::FunctorTraits<Functor>::RunType RunType;

-  return internal::BindImpl<RepeatingCallback>(std::forward<Functor>(functor),
-                                               std::forward<Args>(args)...);
+  // Use RunnableType::RunType instead of RunType above because our
+  // checks should below for bound references need to know what the actual
+  // functor is going to interpret the argument as.
+  typedef cef_internal::FunctionTraits<typename RunnableType::RunType>
+      BoundFunctorTraits;
+
+  // Do not allow binding a non-const reference parameter. Non-const reference
+  // parameters are disallowed by the Google style guide.  Also, binding a
+  // non-const reference parameter can make for subtle bugs because the
+  // invoked function will receive a reference to the stored copy of the
+  // argument and not the original.
+  COMPILE_ASSERT(
+      !(is_non_const_reference<typename BoundFunctorTraits::A1Type>::value),
+      do_not_bind_functions_with_nonconst_ref);
+
+  // For methods, we need to be careful for parameter 1.  We do not require
+  // a scoped_refptr because BindState<> itself takes care of AddRef() for
+  // methods. We also disallow binding of an array as the method's target
+  // object.
+  COMPILE_ASSERT(cef_internal::HasIsMethodTag<RunnableType>::value ||
+                     !cef_internal::NeedsScopedRefptrButGetsRawPtr<P1>::value,
+                 p1_is_refcounted_type_and_needs_scoped_refptr);
+  COMPILE_ASSERT(!cef_internal::HasIsMethodTag<RunnableType>::value ||
+                     !is_array<P1>::value,
+                 first_bound_argument_to_method_cannot_be_array);
+  typedef cef_internal::BindState<
+      RunnableType, RunType,
+      void(typename cef_internal::CallbackParamTraits<P1>::StorageType)>
+      BindState;
+
+  return Callback<typename BindState::UnboundRunType>(
+      new BindState(cef_internal::MakeRunnable(functor), p1));
 }

-///
-/// Special cases for binding to a base::Callback without extra bound arguments.
-/// We CHECK() the validity of callback to guard against null pointers
-/// accidentally ending up in posted tasks, causing hard-to-debug crashes.
-///
-template <typename Signature>
-OnceCallback<Signature> BindOnce(OnceCallback<Signature> callback) {
-  CHECK(callback);
-  return callback;
+template <typename Functor, typename P1, typename P2>
+base::Callback<typename cef_internal::BindState<
+    typename cef_internal::FunctorTraits<Functor>::RunnableType,
+    typename cef_internal::FunctorTraits<Functor>::RunType,
+    void(typename cef_internal::CallbackParamTraits<P1>::StorageType,
+         typename cef_internal::CallbackParamTraits<P2>::StorageType)>::
+                   UnboundRunType>
+Bind(Functor functor, const P1& p1, const P2& p2) {
+  // Typedefs for how to store and run the functor.
+  typedef
+      typename cef_internal::FunctorTraits<Functor>::RunnableType RunnableType;
+  typedef typename cef_internal::FunctorTraits<Functor>::RunType RunType;
+
+  // Use RunnableType::RunType instead of RunType above because our
+  // checks should below for bound references need to know what the actual
+  // functor is going to interpret the argument as.
+  typedef cef_internal::FunctionTraits<typename RunnableType::RunType>
+      BoundFunctorTraits;
+
+  // Do not allow binding a non-const reference parameter. Non-const reference
+  // parameters are disallowed by the Google style guide.  Also, binding a
+  // non-const reference parameter can make for subtle bugs because the
+  // invoked function will receive a reference to the stored copy of the
+  // argument and not the original.
+  COMPILE_ASSERT(
+      !(is_non_const_reference<typename BoundFunctorTraits::A1Type>::value ||
+        is_non_const_reference<typename BoundFunctorTraits::A2Type>::value),
+      do_not_bind_functions_with_nonconst_ref);
+
+  // For methods, we need to be careful for parameter 1.  We do not require
+  // a scoped_refptr because BindState<> itself takes care of AddRef() for
+  // methods. We also disallow binding of an array as the method's target
+  // object.
+  COMPILE_ASSERT(cef_internal::HasIsMethodTag<RunnableType>::value ||
+                     !cef_internal::NeedsScopedRefptrButGetsRawPtr<P1>::value,
+                 p1_is_refcounted_type_and_needs_scoped_refptr);
+  COMPILE_ASSERT(!cef_internal::HasIsMethodTag<RunnableType>::value ||
+                     !is_array<P1>::value,
+                 first_bound_argument_to_method_cannot_be_array);
+  COMPILE_ASSERT(!cef_internal::NeedsScopedRefptrButGetsRawPtr<P2>::value,
+                 p2_is_refcounted_type_and_needs_scoped_refptr);
+  typedef cef_internal::BindState<
+      RunnableType, RunType,
+      void(typename cef_internal::CallbackParamTraits<P1>::StorageType,
+           typename cef_internal::CallbackParamTraits<P2>::StorageType)>
+      BindState;
+
+  return Callback<typename BindState::UnboundRunType>(
+      new BindState(cef_internal::MakeRunnable(functor), p1, p2));
 }

-template <typename Signature>
-OnceCallback<Signature> BindOnce(RepeatingCallback<Signature> callback) {
-  CHECK(callback);
-  return callback;
+template <typename Functor, typename P1, typename P2, typename P3>
+base::Callback<typename cef_internal::BindState<
+    typename cef_internal::FunctorTraits<Functor>::RunnableType,
+    typename cef_internal::FunctorTraits<Functor>::RunType,
+    void(typename cef_internal::CallbackParamTraits<P1>::StorageType,
+         typename cef_internal::CallbackParamTraits<P2>::StorageType,
+         typename cef_internal::CallbackParamTraits<P3>::StorageType)>::
+                   UnboundRunType>
+Bind(Functor functor, const P1& p1, const P2& p2, const P3& p3) {
+  // Typedefs for how to store and run the functor.
+  typedef
+      typename cef_internal::FunctorTraits<Functor>::RunnableType RunnableType;
+  typedef typename cef_internal::FunctorTraits<Functor>::RunType RunType;
+
+  // Use RunnableType::RunType instead of RunType above because our
+  // checks should below for bound references need to know what the actual
+  // functor is going to interpret the argument as.
+  typedef cef_internal::FunctionTraits<typename RunnableType::RunType>
+      BoundFunctorTraits;
+
+  // Do not allow binding a non-const reference parameter. Non-const reference
+  // parameters are disallowed by the Google style guide.  Also, binding a
+  // non-const reference parameter can make for subtle bugs because the
+  // invoked function will receive a reference to the stored copy of the
+  // argument and not the original.
+  COMPILE_ASSERT(
+      !(is_non_const_reference<typename BoundFunctorTraits::A1Type>::value ||
+        is_non_const_reference<typename BoundFunctorTraits::A2Type>::value ||
+        is_non_const_reference<typename BoundFunctorTraits::A3Type>::value),
+      do_not_bind_functions_with_nonconst_ref);
+
+  // For methods, we need to be careful for parameter 1.  We do not require
+  // a scoped_refptr because BindState<> itself takes care of AddRef() for
+  // methods. We also disallow binding of an array as the method's target
+  // object.
+  COMPILE_ASSERT(cef_internal::HasIsMethodTag<RunnableType>::value ||
+                     !cef_internal::NeedsScopedRefptrButGetsRawPtr<P1>::value,
+                 p1_is_refcounted_type_and_needs_scoped_refptr);
+  COMPILE_ASSERT(!cef_internal::HasIsMethodTag<RunnableType>::value ||
+                     !is_array<P1>::value,
+                 first_bound_argument_to_method_cannot_be_array);
+  COMPILE_ASSERT(!cef_internal::NeedsScopedRefptrButGetsRawPtr<P2>::value,
+                 p2_is_refcounted_type_and_needs_scoped_refptr);
+  COMPILE_ASSERT(!cef_internal::NeedsScopedRefptrButGetsRawPtr<P3>::value,
+                 p3_is_refcounted_type_and_needs_scoped_refptr);
+  typedef cef_internal::BindState<
+      RunnableType, RunType,
+      void(typename cef_internal::CallbackParamTraits<P1>::StorageType,
+           typename cef_internal::CallbackParamTraits<P2>::StorageType,
+           typename cef_internal::CallbackParamTraits<P3>::StorageType)>
+      BindState;
+
+  return Callback<typename BindState::UnboundRunType>(
+      new BindState(cef_internal::MakeRunnable(functor), p1, p2, p3));
 }

-template <typename Signature>
-RepeatingCallback<Signature> BindRepeating(
-    RepeatingCallback<Signature> callback) {
-  CHECK(callback);
-  return callback;
+template <typename Functor, typename P1, typename P2, typename P3, typename P4>
+base::Callback<typename cef_internal::BindState<
+    typename cef_internal::FunctorTraits<Functor>::RunnableType,
+    typename cef_internal::FunctorTraits<Functor>::RunType,
+    void(typename cef_internal::CallbackParamTraits<P1>::StorageType,
+         typename cef_internal::CallbackParamTraits<P2>::StorageType,
+         typename cef_internal::CallbackParamTraits<P3>::StorageType,
+         typename cef_internal::CallbackParamTraits<P4>::StorageType)>::
+                   UnboundRunType>
+Bind(Functor functor, const P1& p1, const P2& p2, const P3& p3, const P4& p4) {
+  // Typedefs for how to store and run the functor.
+  typedef
+      typename cef_internal::FunctorTraits<Functor>::RunnableType RunnableType;
+  typedef typename cef_internal::FunctorTraits<Functor>::RunType RunType;
+
+  // Use RunnableType::RunType instead of RunType above because our
+  // checks should below for bound references need to know what the actual
+  // functor is going to interpret the argument as.
+  typedef cef_internal::FunctionTraits<typename RunnableType::RunType>
+      BoundFunctorTraits;
+
+  // Do not allow binding a non-const reference parameter. Non-const reference
+  // parameters are disallowed by the Google style guide.  Also, binding a
+  // non-const reference parameter can make for subtle bugs because the
+  // invoked function will receive a reference to the stored copy of the
+  // argument and not the original.
+  COMPILE_ASSERT(
+      !(is_non_const_reference<typename BoundFunctorTraits::A1Type>::value ||
+        is_non_const_reference<typename BoundFunctorTraits::A2Type>::value ||
+        is_non_const_reference<typename BoundFunctorTraits::A3Type>::value ||
+        is_non_const_reference<typename BoundFunctorTraits::A4Type>::value),
+      do_not_bind_functions_with_nonconst_ref);
+
+  // For methods, we need to be careful for parameter 1.  We do not require
+  // a scoped_refptr because BindState<> itself takes care of AddRef() for
+  // methods. We also disallow binding of an array as the method's target
+  // object.
+  COMPILE_ASSERT(cef_internal::HasIsMethodTag<RunnableType>::value ||
+                     !cef_internal::NeedsScopedRefptrButGetsRawPtr<P1>::value,
+                 p1_is_refcounted_type_and_needs_scoped_refptr);
+  COMPILE_ASSERT(!cef_internal::HasIsMethodTag<RunnableType>::value ||
+                     !is_array<P1>::value,
+                 first_bound_argument_to_method_cannot_be_array);
+  COMPILE_ASSERT(!cef_internal::NeedsScopedRefptrButGetsRawPtr<P2>::value,
+                 p2_is_refcounted_type_and_needs_scoped_refptr);
+  COMPILE_ASSERT(!cef_internal::NeedsScopedRefptrButGetsRawPtr<P3>::value,
+                 p3_is_refcounted_type_and_needs_scoped_refptr);
+  COMPILE_ASSERT(!cef_internal::NeedsScopedRefptrButGetsRawPtr<P4>::value,
+                 p4_is_refcounted_type_and_needs_scoped_refptr);
+  typedef cef_internal::BindState<
+      RunnableType, RunType,
+      void(typename cef_internal::CallbackParamTraits<P1>::StorageType,
+           typename cef_internal::CallbackParamTraits<P2>::StorageType,
+           typename cef_internal::CallbackParamTraits<P3>::StorageType,
+           typename cef_internal::CallbackParamTraits<P4>::StorageType)>
+      BindState;
+
+  return Callback<typename BindState::UnboundRunType>(
+      new BindState(cef_internal::MakeRunnable(functor), p1, p2, p3, p4));
 }

-///
-/// Unretained() allows binding a non-refcounted class, and to disable
-/// refcounting on arguments that are refcounted objects.
-///
-/// EXAMPLE OF Unretained():
-///
-/// <pre>
-///   class Foo {
-///    public:
-///     void func() { cout << "Foo:f" << endl; }
-///   };
-///
-///   // In some function somewhere.
-///   Foo foo;
-///   OnceClosure foo_callback =
-///       BindOnce(&Foo::func, Unretained(&foo));
-///   std::move(foo_callback).Run();  // Prints "Foo:f".
-/// </pre>
-///
-/// Without the Unretained() wrapper on |&foo|, the above call would fail
-/// to compile because Foo does not support the AddRef() and Release() methods.
-///
-template <typename T>
-inline internal::UnretainedWrapper<T> Unretained(T* o) {
-  return internal::UnretainedWrapper<T>(o);
+template <typename Functor,
+          typename P1,
+          typename P2,
+          typename P3,
+          typename P4,
+          typename P5>
+base::Callback<typename cef_internal::BindState<
+    typename cef_internal::FunctorTraits<Functor>::RunnableType,
+    typename cef_internal::FunctorTraits<Functor>::RunType,
+    void(typename cef_internal::CallbackParamTraits<P1>::StorageType,
+         typename cef_internal::CallbackParamTraits<P2>::StorageType,
+         typename cef_internal::CallbackParamTraits<P3>::StorageType,
+         typename cef_internal::CallbackParamTraits<P4>::StorageType,
+         typename cef_internal::CallbackParamTraits<P5>::StorageType)>::
+                   UnboundRunType>
+Bind(Functor functor,
+     const P1& p1,
+     const P2& p2,
+     const P3& p3,
+     const P4& p4,
+     const P5& p5) {
+  // Typedefs for how to store and run the functor.
+  typedef
+      typename cef_internal::FunctorTraits<Functor>::RunnableType RunnableType;
+  typedef typename cef_internal::FunctorTraits<Functor>::RunType RunType;
+
+  // Use RunnableType::RunType instead of RunType above because our
+  // checks should below for bound references need to know what the actual
+  // functor is going to interpret the argument as.
+  typedef cef_internal::FunctionTraits<typename RunnableType::RunType>
+      BoundFunctorTraits;
+
+  // Do not allow binding a non-const reference parameter. Non-const reference
+  // parameters are disallowed by the Google style guide.  Also, binding a
+  // non-const reference parameter can make for subtle bugs because the
+  // invoked function will receive a reference to the stored copy of the
+  // argument and not the original.
+  COMPILE_ASSERT(
+      !(is_non_const_reference<typename BoundFunctorTraits::A1Type>::value ||
+        is_non_const_reference<typename BoundFunctorTraits::A2Type>::value ||
+        is_non_const_reference<typename BoundFunctorTraits::A3Type>::value ||
+        is_non_const_reference<typename BoundFunctorTraits::A4Type>::value ||
+        is_non_const_reference<typename BoundFunctorTraits::A5Type>::value),
+      do_not_bind_functions_with_nonconst_ref);
+
+  // For methods, we need to be careful for parameter 1.  We do not require
+  // a scoped_refptr because BindState<> itself takes care of AddRef() for
+  // methods. We also disallow binding of an array as the method's target
+  // object.
+  COMPILE_ASSERT(cef_internal::HasIsMethodTag<RunnableType>::value ||
+                     !cef_internal::NeedsScopedRefptrButGetsRawPtr<P1>::value,
+                 p1_is_refcounted_type_and_needs_scoped_refptr);
+  COMPILE_ASSERT(!cef_internal::HasIsMethodTag<RunnableType>::value ||
+                     !is_array<P1>::value,
+                 first_bound_argument_to_method_cannot_be_array);
+  COMPILE_ASSERT(!cef_internal::NeedsScopedRefptrButGetsRawPtr<P2>::value,
+                 p2_is_refcounted_type_and_needs_scoped_refptr);
+  COMPILE_ASSERT(!cef_internal::NeedsScopedRefptrButGetsRawPtr<P3>::value,
+                 p3_is_refcounted_type_and_needs_scoped_refptr);
+  COMPILE_ASSERT(!cef_internal::NeedsScopedRefptrButGetsRawPtr<P4>::value,
+                 p4_is_refcounted_type_and_needs_scoped_refptr);
+  COMPILE_ASSERT(!cef_internal::NeedsScopedRefptrButGetsRawPtr<P5>::value,
+                 p5_is_refcounted_type_and_needs_scoped_refptr);
+  typedef cef_internal::BindState<
+      RunnableType, RunType,
+      void(typename cef_internal::CallbackParamTraits<P1>::StorageType,
+           typename cef_internal::CallbackParamTraits<P2>::StorageType,
+           typename cef_internal::CallbackParamTraits<P3>::StorageType,
+           typename cef_internal::CallbackParamTraits<P4>::StorageType,
+           typename cef_internal::CallbackParamTraits<P5>::StorageType)>
+      BindState;
+
+  return Callback<typename BindState::UnboundRunType>(
+      new BindState(cef_internal::MakeRunnable(functor), p1, p2, p3, p4, p5));
 }

-///
-/// RetainedRef() accepts a ref counted object and retains a reference to it.
-/// When the callback is called, the object is passed as a raw pointer.
-///
-/// EXAMPLE OF RetainedRef():
-///
-/// <pre>
-///    void foo(RefCountedBytes* bytes) {}
-///
-///    scoped_refptr<RefCountedBytes> bytes = ...;
-///    OnceClosure callback = BindOnce(&foo, base::RetainedRef(bytes));
-///    std::move(callback).Run();
-/// </pre>
-///
-/// Without RetainedRef, the scoped_refptr would try to implicitly convert to
-/// a raw pointer and fail compilation:
-///
-/// <pre>
-///    OnceClosure callback = BindOnce(&foo, bytes); // ERROR!
-/// </pre>
-///
-template <typename T>
-inline internal::RetainedRefWrapper<T> RetainedRef(T* o) {
-  return internal::RetainedRefWrapper<T>(o);
-}
-template <typename T>
-inline internal::RetainedRefWrapper<T> RetainedRef(scoped_refptr<T> o) {
-  return internal::RetainedRefWrapper<T>(std::move(o));
+template <typename Functor,
+          typename P1,
+          typename P2,
+          typename P3,
+          typename P4,
+          typename P5,
+          typename P6>
+base::Callback<typename cef_internal::BindState<
+    typename cef_internal::FunctorTraits<Functor>::RunnableType,
+    typename cef_internal::FunctorTraits<Functor>::RunType,
+    void(typename cef_internal::CallbackParamTraits<P1>::StorageType,
+         typename cef_internal::CallbackParamTraits<P2>::StorageType,
+         typename cef_internal::CallbackParamTraits<P3>::StorageType,
+         typename cef_internal::CallbackParamTraits<P4>::StorageType,
+         typename cef_internal::CallbackParamTraits<P5>::StorageType,
+         typename cef_internal::CallbackParamTraits<P6>::StorageType)>::
+                   UnboundRunType>
+Bind(Functor functor,
+     const P1& p1,
+     const P2& p2,
+     const P3& p3,
+     const P4& p4,
+     const P5& p5,
+     const P6& p6) {
+  // Typedefs for how to store and run the functor.
+  typedef
+      typename cef_internal::FunctorTraits<Functor>::RunnableType RunnableType;
+  typedef typename cef_internal::FunctorTraits<Functor>::RunType RunType;
+
+  // Use RunnableType::RunType instead of RunType above because our
+  // checks should below for bound references need to know what the actual
+  // functor is going to interpret the argument as.
+  typedef cef_internal::FunctionTraits<typename RunnableType::RunType>
+      BoundFunctorTraits;
+
+  // Do not allow binding a non-const reference parameter. Non-const reference
+  // parameters are disallowed by the Google style guide.  Also, binding a
+  // non-const reference parameter can make for subtle bugs because the
+  // invoked function will receive a reference to the stored copy of the
+  // argument and not the original.
+  COMPILE_ASSERT(
+      !(is_non_const_reference<typename BoundFunctorTraits::A1Type>::value ||
+        is_non_const_reference<typename BoundFunctorTraits::A2Type>::value ||
+        is_non_const_reference<typename BoundFunctorTraits::A3Type>::value ||
+        is_non_const_reference<typename BoundFunctorTraits::A4Type>::value ||
+        is_non_const_reference<typename BoundFunctorTraits::A5Type>::value ||
+        is_non_const_reference<typename BoundFunctorTraits::A6Type>::value),
+      do_not_bind_functions_with_nonconst_ref);
+
+  // For methods, we need to be careful for parameter 1.  We do not require
+  // a scoped_refptr because BindState<> itself takes care of AddRef() for
+  // methods. We also disallow binding of an array as the method's target
+  // object.
+  COMPILE_ASSERT(cef_internal::HasIsMethodTag<RunnableType>::value ||
+                     !cef_internal::NeedsScopedRefptrButGetsRawPtr<P1>::value,
+                 p1_is_refcounted_type_and_needs_scoped_refptr);
+  COMPILE_ASSERT(!cef_internal::HasIsMethodTag<RunnableType>::value ||
+                     !is_array<P1>::value,
+                 first_bound_argument_to_method_cannot_be_array);
+  COMPILE_ASSERT(!cef_internal::NeedsScopedRefptrButGetsRawPtr<P2>::value,
+                 p2_is_refcounted_type_and_needs_scoped_refptr);
+  COMPILE_ASSERT(!cef_internal::NeedsScopedRefptrButGetsRawPtr<P3>::value,
+                 p3_is_refcounted_type_and_needs_scoped_refptr);
+  COMPILE_ASSERT(!cef_internal::NeedsScopedRefptrButGetsRawPtr<P4>::value,
+                 p4_is_refcounted_type_and_needs_scoped_refptr);
+  COMPILE_ASSERT(!cef_internal::NeedsScopedRefptrButGetsRawPtr<P5>::value,
+                 p5_is_refcounted_type_and_needs_scoped_refptr);
+  COMPILE_ASSERT(!cef_internal::NeedsScopedRefptrButGetsRawPtr<P6>::value,
+                 p6_is_refcounted_type_and_needs_scoped_refptr);
+  typedef cef_internal::BindState<
+      RunnableType, RunType,
+      void(typename cef_internal::CallbackParamTraits<P1>::StorageType,
+           typename cef_internal::CallbackParamTraits<P2>::StorageType,
+           typename cef_internal::CallbackParamTraits<P3>::StorageType,
+           typename cef_internal::CallbackParamTraits<P4>::StorageType,
+           typename cef_internal::CallbackParamTraits<P5>::StorageType,
+           typename cef_internal::CallbackParamTraits<P6>::StorageType)>
+      BindState;
+
+  return Callback<typename BindState::UnboundRunType>(new BindState(
+      cef_internal::MakeRunnable(functor), p1, p2, p3, p4, p5, p6));
 }

-///
-/// Owned() transfers ownership of an object to the callback resulting from
-/// bind; the object will be deleted when the callback is deleted.
-///
-/// EXAMPLE OF Owned():
-///
-/// <pre>
-///   void foo(int* arg) { cout << *arg << endl }
-///
-///   int* pn = new int(1);
-///   RepeatingClosure foo_callback = BindRepeating(&foo, Owned(pn));
-///
-///   foo_callback.Run();  // Prints "1"
-///   foo_callback.Run();  // Prints "1"
-///   *pn = 2;
-///   foo_callback.Run();  // Prints "2"
-///
-///   foo_callback.Reset();  // |pn| is deleted.  Also will happen when
-///                          // |foo_callback| goes out of scope.
-/// </pre>
-///
-/// Without Owned(), someone would have to know to delete |pn| when the last
-/// reference to the callback is deleted.
-///
-template <typename T>
-inline internal::OwnedWrapper<T> Owned(T* o) {
-  return internal::OwnedWrapper<T>(o);
-}
+template <typename Functor,
+          typename P1,
+          typename P2,
+          typename P3,
+          typename P4,
+          typename P5,
+          typename P6,
+          typename P7>
+base::Callback<typename cef_internal::BindState<
+    typename cef_internal::FunctorTraits<Functor>::RunnableType,
+    typename cef_internal::FunctorTraits<Functor>::RunType,
+    void(typename cef_internal::CallbackParamTraits<P1>::StorageType,
+         typename cef_internal::CallbackParamTraits<P2>::StorageType,
+         typename cef_internal::CallbackParamTraits<P3>::StorageType,
+         typename cef_internal::CallbackParamTraits<P4>::StorageType,
+         typename cef_internal::CallbackParamTraits<P5>::StorageType,
+         typename cef_internal::CallbackParamTraits<P6>::StorageType,
+         typename cef_internal::CallbackParamTraits<P7>::StorageType)>::
+                   UnboundRunType>
+Bind(Functor functor,
+     const P1& p1,
+     const P2& p2,
+     const P3& p3,
+     const P4& p4,
+     const P5& p5,
+     const P6& p6,
+     const P7& p7) {
+  // Typedefs for how to store and run the functor.
+  typedef
+      typename cef_internal::FunctorTraits<Functor>::RunnableType RunnableType;
+  typedef typename cef_internal::FunctorTraits<Functor>::RunType RunType;

-template <typename T, typename Deleter>
-inline internal::OwnedWrapper<T, Deleter> Owned(
-    std::unique_ptr<T, Deleter>&& ptr) {
-  return internal::OwnedWrapper<T, Deleter>(std::move(ptr));
-}
+  // Use RunnableType::RunType instead of RunType above because our
+  // checks should below for bound references need to know what the actual
+  // functor is going to interpret the argument as.
+  typedef cef_internal::FunctionTraits<typename RunnableType::RunType>
+      BoundFunctorTraits;

-///
-/// OwnedRef() stores an object in the callback resulting from
-/// bind and passes a reference to the object to the bound function.
-///
-/// EXAMPLE OF OwnedRef():
-///
-/// <pre>
-///   void foo(int& arg) { cout << ++arg << endl }
-///
-///   int counter = 0;
-///   RepeatingClosure foo_callback = BindRepeating(&foo, OwnedRef(counter));
-///
-///   foo_callback.Run();  // Prints "1"
-///   foo_callback.Run();  // Prints "2"
-///   foo_callback.Run();  // Prints "3"
-///
-///   cout << counter;     // Prints "0", OwnedRef creates a copy of counter.
-/// </pre>
-///
-///  Supports OnceCallbacks as well, useful to pass placeholder arguments:
-///
-/// <pre>
-///   void bar(int& ignore, const std::string& s) { cout << s << endl }
-///
-///   OnceClosure bar_callback = BindOnce(&bar, OwnedRef(0), "Hello");
-///
-///   std::move(bar_callback).Run(); // Prints "Hello"
-/// </pre>
-///
-/// Without OwnedRef() it would not be possible to pass a mutable reference to
-/// an object owned by the callback.
-///
-template <typename T>
-internal::OwnedRefWrapper<std::decay_t<T>> OwnedRef(T&& t) {
-  return internal::OwnedRefWrapper<std::decay_t<T>>(std::forward<T>(t));
-}
+  // Do not allow binding a non-const reference parameter. Non-const reference
+  // parameters are disallowed by the Google style guide.  Also, binding a
+  // non-const reference parameter can make for subtle bugs because the
+  // invoked function will receive a reference to the stored copy of the
+  // argument and not the original.
+  COMPILE_ASSERT(
+      !(is_non_const_reference<typename BoundFunctorTraits::A1Type>::value ||
+        is_non_const_reference<typename BoundFunctorTraits::A2Type>::value ||
+        is_non_const_reference<typename BoundFunctorTraits::A3Type>::value ||
+        is_non_const_reference<typename BoundFunctorTraits::A4Type>::value ||
+        is_non_const_reference<typename BoundFunctorTraits::A5Type>::value ||
+        is_non_const_reference<typename BoundFunctorTraits::A6Type>::value ||
+        is_non_const_reference<typename BoundFunctorTraits::A7Type>::value),
+      do_not_bind_functions_with_nonconst_ref);

-///
-/// Passed() is for transferring movable-but-not-copyable types (eg. unique_ptr)
-/// through a RepeatingCallback. Logically, this signifies a destructive
-/// transfer of the state of the argument into the target function. Invoking
-/// RepeatingCallback::Run() twice on a callback that was created with a
-/// Passed() argument will CHECK() because the first invocation would have
-/// already transferred ownership to the target function.
-///
-/// Note that Passed() is not necessary with BindOnce(), as std::move() does the
-/// same thing. Avoid Passed() in favor of std::move() with BindOnce().
-///
-/// EXAMPLE OF Passed():
-///
-/// <pre>
-///   void TakesOwnership(std::unique_ptr<Foo> arg) { }
-///   std::unique_ptr<Foo> CreateFoo() { return std::make_unique<Foo>();
-///   }
-///
-///   auto f = std::make_unique<Foo>();
-///
-///   // |cb| is given ownership of Foo(). |f| is now NULL.
-///   // You can use std::move(f) in place of &f, but it's more verbose.
-///   RepeatingClosure cb = BindRepeating(&TakesOwnership, Passed(&f));
-///
-///   // Run was never called so |cb| still owns Foo() and deletes
-///   // it on Reset().
-///   cb.Reset();
-///
-///   // |cb| is given a new Foo created by CreateFoo().
-///   cb = BindRepeating(&TakesOwnership, Passed(CreateFoo()));
-///
-///   // |arg| in TakesOwnership() is given ownership of Foo(). |cb|
-///   // no longer owns Foo() and, if reset, would not delete Foo().
-///   cb.Run();  // Foo() is now transferred to |arg| and deleted.
-///   cb.Run();  // This CHECK()s since Foo() already been used once.
-/// </pre>
-///
-/// We offer 2 syntaxes for calling Passed(). The first takes an rvalue and is
-/// best suited for use with the return value of a function or other temporary
-/// rvalues. The second takes a pointer to the scoper and is just syntactic
-/// sugar to avoid having to write Passed(std::move(scoper)).
-///
-/// Both versions of Passed() prevent T from being an lvalue reference. The
-/// first via use of enable_if, and the second takes a T* which will not bind to
-/// T&.
-///
-template <typename T,
-          std::enable_if_t<!std::is_lvalue_reference<T>::value>* = nullptr>
-inline internal::PassedWrapper<T> Passed(T&& scoper) {
-  return internal::PassedWrapper<T>(std::move(scoper));
-}
-template <typename T>
-inline internal::PassedWrapper<T> Passed(T* scoper) {
-  return internal::PassedWrapper<T>(std::move(*scoper));
-}
+  // For methods, we need to be careful for parameter 1.  We do not require
+  // a scoped_refptr because BindState<> itself takes care of AddRef() for
+  // methods. We also disallow binding of an array as the method's target
+  // object.
+  COMPILE_ASSERT(cef_internal::HasIsMethodTag<RunnableType>::value ||
+                     !cef_internal::NeedsScopedRefptrButGetsRawPtr<P1>::value,
+                 p1_is_refcounted_type_and_needs_scoped_refptr);
+  COMPILE_ASSERT(!cef_internal::HasIsMethodTag<RunnableType>::value ||
+                     !is_array<P1>::value,
+                 first_bound_argument_to_method_cannot_be_array);
+  COMPILE_ASSERT(!cef_internal::NeedsScopedRefptrButGetsRawPtr<P2>::value,
+                 p2_is_refcounted_type_and_needs_scoped_refptr);
+  COMPILE_ASSERT(!cef_internal::NeedsScopedRefptrButGetsRawPtr<P3>::value,
+                 p3_is_refcounted_type_and_needs_scoped_refptr);
+  COMPILE_ASSERT(!cef_internal::NeedsScopedRefptrButGetsRawPtr<P4>::value,
+                 p4_is_refcounted_type_and_needs_scoped_refptr);
+  COMPILE_ASSERT(!cef_internal::NeedsScopedRefptrButGetsRawPtr<P5>::value,
+                 p5_is_refcounted_type_and_needs_scoped_refptr);
+  COMPILE_ASSERT(!cef_internal::NeedsScopedRefptrButGetsRawPtr<P6>::value,
+                 p6_is_refcounted_type_and_needs_scoped_refptr);
+  COMPILE_ASSERT(!cef_internal::NeedsScopedRefptrButGetsRawPtr<P7>::value,
+                 p7_is_refcounted_type_and_needs_scoped_refptr);
+  typedef cef_internal::BindState<
+      RunnableType, RunType,
+      void(typename cef_internal::CallbackParamTraits<P1>::StorageType,
+           typename cef_internal::CallbackParamTraits<P2>::StorageType,
+           typename cef_internal::CallbackParamTraits<P3>::StorageType,
+           typename cef_internal::CallbackParamTraits<P4>::StorageType,
+           typename cef_internal::CallbackParamTraits<P5>::StorageType,
+           typename cef_internal::CallbackParamTraits<P6>::StorageType,
+           typename cef_internal::CallbackParamTraits<P7>::StorageType)>
+      BindState;

-///
-/// IgnoreResult() is used to adapt a function or callback with a return type to
-/// one with a void return. This is most useful if you have a function with,
-/// say, a pesky ignorable bool return that you want to use with PostTask or
-/// something else that expect a callback with a void return.
-///
-/// EXAMPLE OF IgnoreResult():
-///
-/// <pre>
-///   int DoSomething(int arg) { cout << arg << endl; }
-///
-///   // Assign to a callback with a void return type.
-///   OnceCallback<void(int)> cb = BindOnce(IgnoreResult(&DoSomething));
-///   std::move(cb).Run(1);  // Prints "1".
-///
-///   // Prints "2" on |ml|.
-///   ml->PostTask(FROM_HERE, BindOnce(IgnoreResult(&DoSomething), 2);
-/// </pre>
-///
-template <typename T>
-inline internal::IgnoreResultHelper<T> IgnoreResult(T data) {
-  return internal::IgnoreResultHelper<T>(std::move(data));
+  return Callback<typename BindState::UnboundRunType>(new BindState(
+      cef_internal::MakeRunnable(functor), p1, p2, p3, p4, p5, p6, p7));
 }

-#if defined(OS_APPLE) && !HAS_FEATURE(objc_arc)
-
-///
-/// RetainBlock() is used to adapt an Objective-C block when Automated Reference
-/// Counting (ARC) is disabled. This is unnecessary when ARC is enabled, as the
-/// BindOnce and BindRepeating already support blocks then.
-///
-/// EXAMPLE OF RetainBlock():
-///
-/// <pre>
-///   // Wrap the block and bind it to a callback.
-///   OnceCallback<void(int)> cb =
-///       BindOnce(RetainBlock(^(int n) { NSLog(@"%d", n); }));
-///   std::move(cb).Run(1);  // Logs "1".
-/// </pre>
-///
-template <typename R, typename... Args>
-base::mac::ScopedBlock<R (^)(Args...)> RetainBlock(R (^block)(Args...)) {
-  return base::mac::ScopedBlock<R (^)(Args...)>(block,
-                                                base::scoped_policy::RETAIN);
-}
-
-#endif  // defined(OS_APPLE) && !HAS_FEATURE(objc_arc)
-
 }  // namespace base

 #endif  // !USING_CHROMIUM_INCLUDES
--- a/include/base/cef_bind_helpers.h
+++ b/include/base/cef_bind_helpers.h
@@ -0,0 +1,579 @@
+// Copyright (c) 2014 Marshall A. Greenblatt. Portions copyright (c) 2011
+// Google Inc. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//    * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//    * Neither the name of Google Inc. nor the name Chromium Embedded
+// Framework nor the names of its contributors may be used to endorse
+// or promote products derived from this software without specific prior
+// written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// This defines a set of argument wrappers and related factory methods that
+// can be used specify the refcounting and reference semantics of arguments
+// that are bound by the Bind() function in base/bind.h.
+//
+// It also defines a set of simple functions and utilities that people want
+// when using Callback<> and Bind().
+//
+//
+// ARGUMENT BINDING WRAPPERS
+//
+// The wrapper functions are base::Unretained(), base::Owned(), base::Passed(),
+// base::ConstRef(), and base::IgnoreResult().
+//
+// Unretained() allows Bind() to bind a non-refcounted class, and to disable
+// refcounting on arguments that are refcounted objects.
+//
+// Owned() transfers ownership of an object to the Callback resulting from
+// bind; the object will be deleted when the Callback is deleted.
+//
+// Passed() is for transferring movable-but-not-copyable types (eg. scoped_ptr)
+// through a Callback. Logically, this signifies a destructive transfer of
+// the state of the argument into the target function.  Invoking
+// Callback::Run() twice on a Callback that was created with a Passed()
+// argument will CHECK() because the first invocation would have already
+// transferred ownership to the target function.
+//
+// ConstRef() allows binding a constant reference to an argument rather
+// than a copy.
+//
+// IgnoreResult() is used to adapt a function or Callback with a return type to
+// one with a void return. This is most useful if you have a function with,
+// say, a pesky ignorable bool return that you want to use with PostTask or
+// something else that expect a Callback with a void return.
+//
+// EXAMPLE OF Unretained():
+//
+//   class Foo {
+//    public:
+//     void func() { cout << "Foo:f" << endl; }
+//   };
+//
+//   // In some function somewhere.
+//   Foo foo;
+//   Closure foo_callback =
+//       Bind(&Foo::func, Unretained(&foo));
+//   foo_callback.Run();  // Prints "Foo:f".
+//
+// Without the Unretained() wrapper on |&foo|, the above call would fail
+// to compile because Foo does not support the AddRef() and Release() methods.
+//
+//
+// EXAMPLE OF Owned():
+//
+//   void foo(int* arg) { cout << *arg << endl }
+//
+//   int* pn = new int(1);
+//   Closure foo_callback = Bind(&foo, Owned(pn));
+//
+//   foo_callback.Run();  // Prints "1"
+//   foo_callback.Run();  // Prints "1"
+//   *n = 2;
+//   foo_callback.Run();  // Prints "2"
+//
+//   foo_callback.Reset();  // |pn| is deleted.  Also will happen when
+//                          // |foo_callback| goes out of scope.
+//
+// Without Owned(), someone would have to know to delete |pn| when the last
+// reference to the Callback is deleted.
+//
+//
+// EXAMPLE OF ConstRef():
+//
+//   void foo(int arg) { cout << arg << endl }
+//
+//   int n = 1;
+//   Closure no_ref = Bind(&foo, n);
+//   Closure has_ref = Bind(&foo, ConstRef(n));
+//
+//   no_ref.Run();  // Prints "1"
+//   has_ref.Run();  // Prints "1"
+//
+//   n = 2;
+//   no_ref.Run();  // Prints "1"
+//   has_ref.Run();  // Prints "2"
+//
+// Note that because ConstRef() takes a reference on |n|, |n| must outlive all
+// its bound callbacks.
+//
+//
+// EXAMPLE OF IgnoreResult():
+//
+//   int DoSomething(int arg) { cout << arg << endl; }
+//
+//   // Assign to a Callback with a void return type.
+//   Callback<void(int)> cb = Bind(IgnoreResult(&DoSomething));
+//   cb->Run(1);  // Prints "1".
+//
+//   // Prints "1" on |ml|.
+//   ml->PostTask(FROM_HERE, Bind(IgnoreResult(&DoSomething), 1);
+//
+//
+// EXAMPLE OF Passed():
+//
+//   void TakesOwnership(scoped_ptr<Foo> arg) { }
+//   scoped_ptr<Foo> CreateFoo() { return scoped_ptr<Foo>(new Foo()); }
+//
+//   scoped_ptr<Foo> f(new Foo());
+//
+//   // |cb| is given ownership of Foo(). |f| is now NULL.
+//   // You can use f.Pass() in place of &f, but it's more verbose.
+//   Closure cb = Bind(&TakesOwnership, Passed(&f));
+//
+//   // Run was never called so |cb| still owns Foo() and deletes
+//   // it on Reset().
+//   cb.Reset();
+//
+//   // |cb| is given a new Foo created by CreateFoo().
+//   cb = Bind(&TakesOwnership, Passed(CreateFoo()));
+//
+//   // |arg| in TakesOwnership() is given ownership of Foo(). |cb|
+//   // no longer owns Foo() and, if reset, would not delete Foo().
+//   cb.Run();  // Foo() is now transferred to |arg| and deleted.
+//   cb.Run();  // This CHECK()s since Foo() already been used once.
+//
+// Passed() is particularly useful with PostTask() when you are transferring
+// ownership of an argument into a task, but don't necessarily know if the
+// task will always be executed. This can happen if the task is cancellable
+// or if it is posted to a MessageLoopProxy.
+//
+//
+// SIMPLE FUNCTIONS AND UTILITIES.
+//
+//   DoNothing() - Useful for creating a Closure that does nothing when called.
+//   DeletePointer<T>() - Useful for creating a Closure that will delete a
+//                        pointer when invoked. Only use this when necessary.
+//                        In most cases MessageLoop::DeleteSoon() is a better
+//                        fit.
+
+#ifndef CEF_INCLUDE_BASE_CEF_BIND_HELPERS_H_
+#define CEF_INCLUDE_BASE_CEF_BIND_HELPERS_H_
+#pragma once
+
+#if defined(BASE_BIND_HELPERS_H_)
+// Do nothing if the Chromium header has already been included.
+// This can happen in cases where Chromium code is used directly by the
+// client application. When using Chromium code directly always include
+// the Chromium header first to avoid type conflicts.
+#elif defined(USING_CHROMIUM_INCLUDES)
+// When building CEF include the Chromium header directly.
+#include "base/bind_helpers.h"
+#else  // !USING_CHROMIUM_INCLUDES
+// The following is substantially similar to the Chromium implementation.
+// If the Chromium implementation diverges the below implementation should be
+// updated to match.
+
+#include "include/base/cef_basictypes.h"
+#include "include/base/cef_callback.h"
+#include "include/base/cef_template_util.h"
+#include "include/base/cef_weak_ptr.h"
+
+namespace base {
+namespace cef_internal {
+
+// Use the Substitution Failure Is Not An Error (SFINAE) trick to inspect T
+// for the existence of AddRef() and Release() functions of the correct
+// signature.
+//
+// http://en.wikipedia.org/wiki/Substitution_failure_is_not_an_error
+// http://stackoverflow.com/questions/257288/is-it-possible-to-write-a-c-template-to-check-for-a-functions-existence
+// http://stackoverflow.com/questions/4358584/sfinae-approach-comparison
+// http://stackoverflow.com/questions/1966362/sfinae-to-check-for-inherited-member-functions
+//
+// The last link in particular show the method used below.
+//
+// For SFINAE to work with inherited methods, we need to pull some extra tricks
+// with multiple inheritance.  In the more standard formulation, the overloads
+// of Check would be:
+//
+//   template <typename C>
+//   Yes NotTheCheckWeWant(Helper<&C::TargetFunc>*);
+//
+//   template <typename C>
+//   No NotTheCheckWeWant(...);
+//
+//   static const bool value = sizeof(NotTheCheckWeWant<T>(0)) == sizeof(Yes);
+//
+// The problem here is that template resolution will not match
+// C::TargetFunc if TargetFunc does not exist directly in C.  That is, if
+// TargetFunc in inherited from an ancestor, &C::TargetFunc will not match,
+// |value| will be false.  This formulation only checks for whether or
+// not TargetFunc exist directly in the class being introspected.
+//
+// To get around this, we play a dirty trick with multiple inheritance.
+// First, We create a class BaseMixin that declares each function that we
+// want to probe for.  Then we create a class Base that inherits from both T
+// (the class we wish to probe) and BaseMixin.  Note that the function
+// signature in BaseMixin does not need to match the signature of the function
+// we are probing for; thus it's easiest to just use void(void).
+//
+// Now, if TargetFunc exists somewhere in T, then &Base::TargetFunc has an
+// ambiguous resolution between BaseMixin and T.  This lets us write the
+// following:
+//
+//   template <typename C>
+//   No GoodCheck(Helper<&C::TargetFunc>*);
+//
+//   template <typename C>
+//   Yes GoodCheck(...);
+//
+//   static const bool value = sizeof(GoodCheck<Base>(0)) == sizeof(Yes);
+//
+// Notice here that the variadic version of GoodCheck() returns Yes here
+// instead of No like the previous one. Also notice that we calculate |value|
+// by specializing GoodCheck() on Base instead of T.
+//
+// We've reversed the roles of the variadic, and Helper overloads.
+// GoodCheck(Helper<&C::TargetFunc>*), when C = Base, fails to be a valid
+// substitution if T::TargetFunc exists. Thus GoodCheck<Base>(0) will resolve
+// to the variadic version if T has TargetFunc.  If T::TargetFunc does not
+// exist, then &C::TargetFunc is not ambiguous, and the overload resolution
+// will prefer GoodCheck(Helper<&C::TargetFunc>*).
+//
+// This method of SFINAE will correctly probe for inherited names, but it cannot
+// typecheck those names.  It's still a good enough sanity check though.
+//
+// Works on gcc-4.2, gcc-4.4, and Visual Studio 2008.
+//
+// TODO(ajwong): Move to ref_counted.h or template_util.h when we've vetted
+// this works well.
+//
+// TODO(ajwong): Make this check for Release() as well.
+// See http://crbug.com/82038.
+template <typename T>
+class SupportsAddRefAndRelease {
+  typedef char Yes[1];
+  typedef char No[2];
+
+  struct BaseMixin {
+    void AddRef();
+  };
+
+// MSVC warns when you try to use Base if T has a private destructor, the
+// common pattern for refcounted types. It does this even though no attempt to
+// instantiate Base is made.  We disable the warning for this definition.
+#if defined(OS_WIN)
+#pragma warning(push)
+#pragma warning(disable : 4624)
+#endif
+  struct Base : public T, public BaseMixin {};
+#if defined(OS_WIN)
+#pragma warning(pop)
+#endif
+
+  template <void (BaseMixin::*)(void)>
+  struct Helper {};
+
+  template <typename C>
+  static No& Check(Helper<&C::AddRef>*);
+
+  template <typename>
+  static Yes& Check(...);
+
+ public:
+  static const bool value = sizeof(Check<Base>(0)) == sizeof(Yes);
+};
+
+// Helpers to assert that arguments of a recounted type are bound with a
+// scoped_refptr.
+template <bool IsClasstype, typename T>
+struct UnsafeBindtoRefCountedArgHelper : false_type {};
+
+template <typename T>
+struct UnsafeBindtoRefCountedArgHelper<true, T>
+    : integral_constant<bool, SupportsAddRefAndRelease<T>::value> {};
+
+template <typename T>
+struct UnsafeBindtoRefCountedArg : false_type {};
+
+template <typename T>
+struct UnsafeBindtoRefCountedArg<T*>
+    : UnsafeBindtoRefCountedArgHelper<is_class<T>::value, T> {};
+
+template <typename T>
+class HasIsMethodTag {
+  typedef char Yes[1];
+  typedef char No[2];
+
+  template <typename U>
+  static Yes& Check(typename U::IsMethod*);
+
+  template <typename U>
+  static No& Check(...);
+
+ public:
+  static const bool value = sizeof(Check<T>(0)) == sizeof(Yes);
+};
+
+template <typename T>
+class UnretainedWrapper {
+ public:
+  explicit UnretainedWrapper(T* o) : ptr_(o) {}
+  T* get() const { return ptr_; }
+
+ private:
+  T* ptr_;
+};
+
+template <typename T>
+class ConstRefWrapper {
+ public:
+  explicit ConstRefWrapper(const T& o) : ptr_(&o) {}
+  const T& get() const { return *ptr_; }
+
+ private:
+  const T* ptr_;
+};
+
+template <typename T>
+struct IgnoreResultHelper {
+  explicit IgnoreResultHelper(T functor) : functor_(functor) {}
+
+  T functor_;
+};
+
+template <typename T>
+struct IgnoreResultHelper<Callback<T>> {
+  explicit IgnoreResultHelper(const Callback<T>& functor) : functor_(functor) {}
+
+  const Callback<T>& functor_;
+};
+
+// An alternate implementation is to avoid the destructive copy, and instead
+// specialize ParamTraits<> for OwnedWrapper<> to change the StorageType to
+// a class that is essentially a scoped_ptr<>.
+//
+// The current implementation has the benefit though of leaving ParamTraits<>
+// fully in callback_internal.h as well as avoiding type conversions during
+// storage.
+template <typename T>
+class OwnedWrapper {
+ public:
+  explicit OwnedWrapper(T* o) : ptr_(o) {}
+  ~OwnedWrapper() { delete ptr_; }
+  T* get() const { return ptr_; }
+  OwnedWrapper(const OwnedWrapper& other) {
+    ptr_ = other.ptr_;
+    other.ptr_ = NULL;
+  }
+
+ private:
+  mutable T* ptr_;
+};
+
+// PassedWrapper is a copyable adapter for a scoper that ignores const.
+//
+// It is needed to get around the fact that Bind() takes a const reference to
+// all its arguments.  Because Bind() takes a const reference to avoid
+// unnecessary copies, it is incompatible with movable-but-not-copyable
+// types; doing a destructive "move" of the type into Bind() would violate
+// the const correctness.
+//
+// This conundrum cannot be solved without either C++11 rvalue references or
+// a O(2^n) blowup of Bind() templates to handle each combination of regular
+// types and movable-but-not-copyable types.  Thus we introduce a wrapper type
+// that is copyable to transmit the correct type information down into
+// BindState<>. Ignoring const in this type makes sense because it is only
+// created when we are explicitly trying to do a destructive move.
+//
+// Two notes:
+//  1) PassedWrapper supports any type that has a "Pass()" function.
+//     This is intentional. The whitelisting of which specific types we
+//     support is maintained by CallbackParamTraits<>.
+//  2) is_valid_ is distinct from NULL because it is valid to bind a "NULL"
+//     scoper to a Callback and allow the Callback to execute once.
+template <typename T>
+class PassedWrapper {
+ public:
+  explicit PassedWrapper(T scoper) : is_valid_(true), scoper_(scoper.Pass()) {}
+  PassedWrapper(const PassedWrapper& other)
+      : is_valid_(other.is_valid_), scoper_(other.scoper_.Pass()) {}
+  T Pass() const {
+    CHECK(is_valid_);
+    is_valid_ = false;
+    return scoper_.Pass();
+  }
+
+ private:
+  mutable bool is_valid_;
+  mutable T scoper_;
+};
+
+// Unwrap the stored parameters for the wrappers above.
+template <typename T>
+struct UnwrapTraits {
+  typedef const T& ForwardType;
+  static ForwardType Unwrap(const T& o) { return o; }
+};
+
+template <typename T>
+struct UnwrapTraits<UnretainedWrapper<T>> {
+  typedef T* ForwardType;
+  static ForwardType Unwrap(UnretainedWrapper<T> unretained) {
+    return unretained.get();
+  }
+};
+
+template <typename T>
+struct UnwrapTraits<ConstRefWrapper<T>> {
+  typedef const T& ForwardType;
+  static ForwardType Unwrap(ConstRefWrapper<T> const_ref) {
+    return const_ref.get();
+  }
+};
+
+template <typename T>
+struct UnwrapTraits<scoped_refptr<T>> {
+  typedef T* ForwardType;
+  static ForwardType Unwrap(const scoped_refptr<T>& o) { return o.get(); }
+};
+
+template <typename T>
+struct UnwrapTraits<WeakPtr<T>> {
+  typedef const WeakPtr<T>& ForwardType;
+  static ForwardType Unwrap(const WeakPtr<T>& o) { return o; }
+};
+
+template <typename T>
+struct UnwrapTraits<OwnedWrapper<T>> {
+  typedef T* ForwardType;
+  static ForwardType Unwrap(const OwnedWrapper<T>& o) { return o.get(); }
+};
+
+template <typename T>
+struct UnwrapTraits<PassedWrapper<T>> {
+  typedef T ForwardType;
+  static T Unwrap(PassedWrapper<T>& o) { return o.Pass(); }
+};
+
+// Utility for handling different refcounting semantics in the Bind()
+// function.
+template <bool is_method, typename T>
+struct MaybeRefcount;
+
+template <typename T>
+struct MaybeRefcount<false, T> {
+  static void AddRef(const T&) {}
+  static void Release(const T&) {}
+};
+
+template <typename T, size_t n>
+struct MaybeRefcount<false, T[n]> {
+  static void AddRef(const T*) {}
+  static void Release(const T*) {}
+};
+
+template <typename T>
+struct MaybeRefcount<true, T> {
+  static void AddRef(const T&) {}
+  static void Release(const T&) {}
+};
+
+template <typename T>
+struct MaybeRefcount<true, T*> {
+  static void AddRef(T* o) { o->AddRef(); }
+  static void Release(T* o) { o->Release(); }
+};
+
+// No need to additionally AddRef() and Release() since we are storing a
+// scoped_refptr<> inside the storage object already.
+template <typename T>
+struct MaybeRefcount<true, scoped_refptr<T>> {
+  static void AddRef(const scoped_refptr<T>& o) {}
+  static void Release(const scoped_refptr<T>& o) {}
+};
+
+template <typename T>
+struct MaybeRefcount<true, const T*> {
+  static void AddRef(const T* o) { o->AddRef(); }
+  static void Release(const T* o) { o->Release(); }
+};
+
+// IsWeakMethod is a helper that determine if we are binding a WeakPtr<> to a
+// method.  It is used internally by Bind() to select the correct
+// InvokeHelper that will no-op itself in the event the WeakPtr<> for
+// the target object is invalidated.
+//
+// P1 should be the type of the object that will be received of the method.
+template <bool IsMethod, typename P1>
+struct IsWeakMethod : public false_type {};
+
+template <typename T>
+struct IsWeakMethod<true, WeakPtr<T>> : public true_type {};
+
+template <typename T>
+struct IsWeakMethod<true, ConstRefWrapper<WeakPtr<T>>> : public true_type {};
+
+}  // namespace cef_internal
+
+template <typename T>
+static inline cef_internal::UnretainedWrapper<T> Unretained(T* o) {
+  return cef_internal::UnretainedWrapper<T>(o);
+}
+
+template <typename T>
+static inline cef_internal::ConstRefWrapper<T> ConstRef(const T& o) {
+  return cef_internal::ConstRefWrapper<T>(o);
+}
+
+template <typename T>
+static inline cef_internal::OwnedWrapper<T> Owned(T* o) {
+  return cef_internal::OwnedWrapper<T>(o);
+}
+
+// We offer 2 syntaxes for calling Passed().  The first takes a temporary and
+// is best suited for use with the return value of a function. The second
+// takes a pointer to the scoper and is just syntactic sugar to avoid having
+// to write Passed(scoper.Pass()).
+template <typename T>
+static inline cef_internal::PassedWrapper<T> Passed(T scoper) {
+  return cef_internal::PassedWrapper<T>(scoper.Pass());
+}
+template <typename T>
+static inline cef_internal::PassedWrapper<T> Passed(T* scoper) {
+  return cef_internal::PassedWrapper<T>(scoper->Pass());
+}
+
+template <typename T>
+static inline cef_internal::IgnoreResultHelper<T> IgnoreResult(T data) {
+  return cef_internal::IgnoreResultHelper<T>(data);
+}
+
+template <typename T>
+static inline cef_internal::IgnoreResultHelper<Callback<T>> IgnoreResult(
+    const Callback<T>& data) {
+  return cef_internal::IgnoreResultHelper<Callback<T>>(data);
+}
+
+void DoNothing();
+
+template <typename T>
+void DeletePointer(T* obj) {
+  delete obj;
+}
+
+}  // namespace base
+
+#endif  // !USING_CHROMIUM_INCLUDES
+
+#endif  // CEF_INCLUDE_BASE_CEF_BIND_HELPERS_H_
--- a/include/base/cef_build.h
+++ b/include/base/cef_build.h
@@ -27,132 +27,61 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-/// \file
-/// This file adds defines about the platform we're currently building on.
-///
-/// <pre>
-///  Operating System:
-///    OS_AIX / OS_ANDROID / OS_ASMJS / OS_FREEBSD / OS_FUCHSIA / OS_IOS /
-///    OS_LINUX / OS_MAC / OS_NACL (SFI or NONSFI) / OS_NETBSD / OS_OPENBSD /
-///    OS_QNX / OS_SOLARIS / OS_WIN
-///  Operating System family:
-///    OS_APPLE: IOS or MAC
-///    OS_BSD: FREEBSD or NETBSD or OPENBSD
-///    OS_POSIX: AIX or ANDROID or ASMJS or CHROMEOS or FREEBSD or IOS or LINUX
-///              or MAC or NACL or NETBSD or OPENBSD or QNX or SOLARIS
-///
-///  /!\ Note: OS_CHROMEOS is set by the build system, not this file
-///
-///  Compiler:
-///    COMPILER_MSVC / COMPILER_GCC
-///
-///  Processor:
-///    ARCH_CPU_ARM64 / ARCH_CPU_ARMEL / ARCH_CPU_MIPS / ARCH_CPU_MIPS64 /
-///    ARCH_CPU_MIPS64EL / ARCH_CPU_MIPSEL / ARCH_CPU_PPC64 / ARCH_CPU_S390 /
-///    ARCH_CPU_S390X / ARCH_CPU_X86 / ARCH_CPU_X86_64
-///  Processor family:
-///    ARCH_CPU_ARM_FAMILY: ARMEL or ARM64
-///    ARCH_CPU_MIPS_FAMILY: MIPS64EL or MIPSEL or MIPS64 or MIPS
-///    ARCH_CPU_PPC64_FAMILY: PPC64
-///    ARCH_CPU_S390_FAMILY: S390 or S390X
-///    ARCH_CPU_X86_FAMILY: X86 or X86_64
-///  Processor features:
-///    ARCH_CPU_31_BITS / ARCH_CPU_32_BITS / ARCH_CPU_64_BITS
-///    ARCH_CPU_BIG_ENDIAN / ARCH_CPU_LITTLE_ENDIAN
-/// </pre>
-///
-
 #ifndef CEF_INCLUDE_BASE_CEF_BUILD_H_
 #define CEF_INCLUDE_BASE_CEF_BUILD_H_
 #pragma once

 #if defined(USING_CHROMIUM_INCLUDES)
 // When building CEF include the Chromium header directly.
-#include "build/build_config.h"
+#include "base/compiler_specific.h"
 #else  // !USING_CHROMIUM_INCLUDES
 // The following is substantially similar to the Chromium implementation.
 // If the Chromium implementation diverges the below implementation should be
 // updated to match.

-// A set of macros to use for platform detection.
-#if defined(ANDROID)
-#define OS_ANDROID 1
-#elif defined(__APPLE__)
-// Only include TargetConditionals after testing ANDROID as some Android builds
-// on the Mac have this header available and it's not needed unless the target
-// is really an Apple platform.
-#include <TargetConditionals.h>
-#if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE
-#define OS_IOS 1
-#else
-#define OS_MAC 1
-// For backwards compatibility.
-#define OS_MACOSX 1
-#endif  // defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE
-#elif defined(__linux__)
-#if !defined(OS_CHROMEOS)
-// Do not define OS_LINUX on Chrome OS build.
-// The OS_CHROMEOS macro is defined in GN.
-#define OS_LINUX 1
-#endif  // !defined(OS_CHROMEOS)
-// Include a system header to pull in features.h for glibc/uclibc macros.
-#include <unistd.h>
-#if defined(__GLIBC__) && !defined(__UCLIBC__)
-// We really are using glibc, not uClibc pretending to be glibc.
-#define LIBC_GLIBC 1
-#endif
-#elif defined(_WIN32)
+#if defined(_WIN32)
+#ifndef OS_WIN
 #define OS_WIN 1
-#elif defined(__Fuchsia__)
-#define OS_FUCHSIA 1
-#elif defined(__FreeBSD__)
-#define OS_FREEBSD 1
-#elif defined(__NetBSD__)
-#define OS_NETBSD 1
-#elif defined(__OpenBSD__)
-#define OS_OPENBSD 1
-#elif defined(__sun)
-#define OS_SOLARIS 1
-#elif defined(__QNXNTO__)
-#define OS_QNX 1
-#elif defined(_AIX)
-#define OS_AIX 1
-#elif defined(__asmjs__) || defined(__wasm__)
-#define OS_ASMJS 1
-#else
-#error Please add support for your platform in include/base/cef_build.h
 #endif
-// NOTE: Adding a new port? Please follow
-// https://chromium.googlesource.com/chromium/src/+/master/docs/new_port_policy.md
-
-#if defined(OS_MAC) || defined(OS_IOS)
+#elif defined(__APPLE__)
+// New platform defines after https://crbug.com/1105907.
+#ifndef OS_MAC
+#define OS_MAC 1
+#endif
+#ifndef OS_APPLE
 #define OS_APPLE 1
 #endif
-
-// For access to standard BSD features, use OS_BSD instead of a
-// more specific macro.
-#if defined(OS_FREEBSD) || defined(OS_NETBSD) || defined(OS_OPENBSD)
-#define OS_BSD 1
+// Old platform defines retained for backwards compatibility.
+#ifndef OS_MACOSX
+#define OS_MACOSX 1
+#endif
+#elif defined(__linux__)
+#ifndef OS_LINUX
+#define OS_LINUX 1
+#endif
+#else
+#error Please add support for your platform in cef_build.h
 #endif

 // For access to standard POSIXish features, use OS_POSIX instead of a
 // more specific macro.
-#if defined(OS_AIX) || defined(OS_ANDROID) || defined(OS_ASMJS) ||  \
-    defined(OS_FREEBSD) || defined(OS_IOS) || defined(OS_LINUX) ||  \
-    defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_NACL) ||  \
-    defined(OS_NETBSD) || defined(OS_OPENBSD) || defined(OS_QNX) || \
-    defined(OS_SOLARIS)
+#if defined(OS_MAC) || defined(OS_LINUX)
+#ifndef OS_POSIX
 #define OS_POSIX 1
 #endif
+#endif

-// Compiler detection. Note: clang masquerades as GCC on POSIX and as MSVC on
-// Windows.
+// Compiler detection.
 #if defined(__GNUC__)
+#ifndef COMPILER_GCC
 #define COMPILER_GCC 1
+#endif
 #elif defined(_MSC_VER)
+#ifndef COMPILER_MSVC
 #define COMPILER_MSVC 1
+#endif
 #else
-#error Please add support for your compiler in build/build_config.h
+#error Please add support for your compiler in cef_build.h
 #endif

 // Processor architecture detection.  For more info on what's defined, see:
@@ -169,26 +98,6 @@
 #define ARCH_CPU_X86 1
 #define ARCH_CPU_32_BITS 1
 #define ARCH_CPU_LITTLE_ENDIAN 1
-#elif defined(__s390x__)
-#define ARCH_CPU_S390_FAMILY 1
-#define ARCH_CPU_S390X 1
-#define ARCH_CPU_64_BITS 1
-#define ARCH_CPU_BIG_ENDIAN 1
-#elif defined(__s390__)
-#define ARCH_CPU_S390_FAMILY 1
-#define ARCH_CPU_S390 1
-#define ARCH_CPU_31_BITS 1
-#define ARCH_CPU_BIG_ENDIAN 1
-#elif (defined(__PPC64__) || defined(__PPC__)) && defined(__BIG_ENDIAN__)
-#define ARCH_CPU_PPC64_FAMILY 1
-#define ARCH_CPU_PPC64 1
-#define ARCH_CPU_64_BITS 1
-#define ARCH_CPU_BIG_ENDIAN 1
-#elif defined(__PPC64__)
-#define ARCH_CPU_PPC64_FAMILY 1
-#define ARCH_CPU_PPC64 1
-#define ARCH_CPU_64_BITS 1
-#define ARCH_CPU_LITTLE_ENDIAN 1
 #elif defined(__ARMEL__)
 #define ARCH_CPU_ARM_FAMILY 1
 #define ARCH_CPU_ARMEL 1
@@ -199,42 +108,21 @@
 #define ARCH_CPU_ARM64 1
 #define ARCH_CPU_64_BITS 1
 #define ARCH_CPU_LITTLE_ENDIAN 1
-#elif defined(__pnacl__) || defined(__asmjs__) || defined(__wasm__)
+#elif defined(__pnacl__)
 #define ARCH_CPU_32_BITS 1
 #define ARCH_CPU_LITTLE_ENDIAN 1
 #elif defined(__MIPSEL__)
-#if defined(__LP64__)
-#define ARCH_CPU_MIPS_FAMILY 1
-#define ARCH_CPU_MIPS64EL 1
-#define ARCH_CPU_64_BITS 1
-#define ARCH_CPU_LITTLE_ENDIAN 1
-#else
 #define ARCH_CPU_MIPS_FAMILY 1
 #define ARCH_CPU_MIPSEL 1
 #define ARCH_CPU_32_BITS 1
 #define ARCH_CPU_LITTLE_ENDIAN 1
-#endif
-#elif defined(__MIPSEB__)
-#if defined(__LP64__)
-#define ARCH_CPU_MIPS_FAMILY 1
-#define ARCH_CPU_MIPS64 1
-#define ARCH_CPU_64_BITS 1
-#define ARCH_CPU_BIG_ENDIAN 1
 #else
-#define ARCH_CPU_MIPS_FAMILY 1
-#define ARCH_CPU_MIPS 1
-#define ARCH_CPU_32_BITS 1
-#define ARCH_CPU_BIG_ENDIAN 1
-#endif
-#else
-#error Please add support for your architecture in include/base/cef_build.h
+#error Please add support for your architecture in cef_build.h
 #endif

 // Type detection for wchar_t.
 #if defined(OS_WIN)
 #define WCHAR_T_IS_UTF16
-#elif defined(OS_FUCHSIA)
-#define WCHAR_T_IS_UTF32
 #elif defined(OS_POSIX) && defined(COMPILER_GCC) && defined(__WCHAR_MAX__) && \
    (__WCHAR_MAX__ == 0x7fffffff || __WCHAR_MAX__ == 0xffffffff)
 #define WCHAR_T_IS_UTF32
@@ -246,18 +134,82 @@
 // short wchar works for them.
 #define WCHAR_T_IS_UTF16
 #else
-#error Please add support for your compiler in include/base/cef_build.h
+#error Please add support for your compiler in cef_build.h
 #endif

-#if defined(OS_ANDROID)
-// The compiler thinks std::string::const_iterator and "const char*" are
-// equivalent types.
-#define STD_STRING_ITERATOR_IS_CHAR_POINTER
-// The compiler thinks std::u16string::const_iterator and "char16*" are
-// equivalent types.
-#define BASE_STRING16_ITERATOR_IS_CHAR16_POINTER
+// Annotate a function indicating the caller must examine the return value.
+// Use like:
+//   int foo() WARN_UNUSED_RESULT;
+// To explicitly ignore a result, see |ignore_result()| in <base/macros.h>.
+#ifndef WARN_UNUSED_RESULT
+#if defined(COMPILER_GCC)
+#define WARN_UNUSED_RESULT __attribute__((warn_unused_result))
+#else
+#define WARN_UNUSED_RESULT
+#endif
+#endif  // WARN_UNUSED_RESULT
+
+// Annotate a typedef or function indicating it's ok if it's not used.
+// Use like:
+//   typedef Foo Bar ALLOW_UNUSED_TYPE;
+#ifndef ALLOW_UNUSED_TYPE
+#if defined(COMPILER_GCC)
+#define ALLOW_UNUSED_TYPE __attribute__((unused))
+#else
+#define ALLOW_UNUSED_TYPE
+#endif
+#endif  // ALLOW_UNUSED_TYPE
+
+// Annotate a variable indicating it's ok if the variable is not used.
+// (Typically used to silence a compiler warning when the assignment
+// is important for some other reason.)
+// Use like:
+//   int x = ...;
+//   ALLOW_UNUSED_LOCAL(x);
+#ifndef ALLOW_UNUSED_LOCAL
+#define ALLOW_UNUSED_LOCAL(x) false ? (void)x : (void)0
+#endif
+
+// Sanitizers annotations.
+#if defined(__has_attribute)
+#if __has_attribute(no_sanitize)
+#define NO_SANITIZE(what) __attribute__((no_sanitize(what)))
+#endif
+#endif
+#if !defined(NO_SANITIZE)
+#define NO_SANITIZE(what)
 #endif

 #endif  // !USING_CHROMIUM_INCLUDES

+// Annotate a virtual method indicating it must be overriding a virtual method
+// in the parent class.
+// Use like:
+//   void foo() OVERRIDE;
+// NOTE: This define should only be used in classes exposed to the client since
+// C++11 support may not be enabled in client applications. CEF internal classes
+// should use the `override` keyword directly.
+#ifndef OVERRIDE
+#if defined(__clang__)
+#define OVERRIDE override
+#elif defined(COMPILER_MSVC) && _MSC_VER >= 1600
+// Visual Studio 2010 and later support override.
+#define OVERRIDE override
+#elif defined(COMPILER_GCC) && __cplusplus >= 201103 && \
+    (__GNUC__ * 10000 + __GNUC_MINOR__ * 100) >= 40700
+// GCC 4.7 supports explicit virtual overrides when C++11 support is enabled.
+#define OVERRIDE override
+#else
+#define OVERRIDE
+#endif
+#endif  // OVERRIDE
+
+// Check for C++11 template alias support which was added in VS2013 and GCC4.7.
+// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2258.pdf
+#if __cplusplus > 199711L || (defined(_MSC_VER) && _MSC_VER >= 1800) || \
+    (defined(__GNUC__) &&                                               \
+     (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__ >= 40700))
+#define HAS_CPP11_TEMPLATE_ALIAS_SUPPORT
+#endif
+
 #endif  // CEF_INCLUDE_BASE_CEF_BUILD_H_
--- a/include/base/cef_callback.h
+++ b/include/base/cef_callback.h
@@ -28,44 +28,16 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-/// \file
-/// A callback is similar in concept to a function pointer: it wraps a runnable
-/// object such as a function, method, lambda, or even another callback,
-/// allowing the runnable object to be invoked later via the callback object.
-///
-/// Unlike function pointers, callbacks are created with base::BindOnce() or
-/// base::BindRepeating() and support partial function application.
-///
-/// A base::OnceCallback may be Run() at most once; a base::RepeatingCallback
-/// may be Run() any number of times. |is_null()| is guaranteed to return true
-/// for a moved-from callback.
-///
-/// <pre>
-///   // The lambda takes two arguments, but the first argument |x| is bound at
-///   // callback creation.
-///   base::OnceCallback<int(int)> cb = base::BindOnce([] (int x, int y) {
-///     return x + y;
-///   }, 1);
-///   // Run() only needs the remaining unbound argument |y|.
-///   printf("1 + 2 = %d\n", std::move(cb).Run(2));  // Prints 3
-///   printf("cb is null? %s\n",
-///          cb.is_null() ? "true" : "false");  // Prints true
-///   std::move(cb).Run(2);  // Crashes since |cb| has already run.
-/// </pre>
-///
-/// Callbacks also support cancellation. A common use is binding the receiver
-/// object as a WeakPtr<T>. If that weak pointer is invalidated, calling Run()
-/// will be a no-op. Note that |IsCancelled()| and |is_null()| are distinct:
-/// simply cancelling a callback will not also make it null.
-///
-/// See https://chromium.googlesource.com/chromium/src/+/lkgr/docs/callback.md
-/// for the full documentation.
-
 #ifndef CEF_INCLUDE_BASE_CEF_CALLBACK_H_
 #define CEF_INCLUDE_BASE_CEF_CALLBACK_H_
 #pragma once

-#if defined(USING_CHROMIUM_INCLUDES)
+#if defined(BASE_CALLBACK_H_)
+// Do nothing if the Chromium header has already been included.
+// This can happen in cases where Chromium code is used directly by the
+// client application. When using Chromium code directly always include
+// the Chromium header first to avoid type conflicts.
+#elif defined(USING_CHROMIUM_INCLUDES)
 // When building CEF include the Chromium header directly.
 #include "base/callback.h"
 #else  // !USING_CHROMIUM_INCLUDES
@@ -73,175 +45,755 @@
 // If the Chromium implementation diverges the below implementation should be
 // updated to match.

-#include <stddef.h>
-
-#include "include/base/cef_bind.h"
 #include "include/base/cef_callback_forward.h"
-#include "include/base/cef_logging.h"
+#include "include/base/cef_template_util.h"
 #include "include/base/internal/cef_callback_internal.h"

+// NOTE: Header files that do not require the full definition of Callback or
+// Closure should #include "base/cef_callback_forward.h" instead of this file.
+
+// -----------------------------------------------------------------------------
+// Introduction
+// -----------------------------------------------------------------------------
+//
+// The templated Callback class is a generalized function object. Together
+// with the Bind() function in bind.h, they provide a type-safe method for
+// performing partial application of functions.
+//
+// Partial application (or "currying") is the process of binding a subset of
+// a function's arguments to produce another function that takes fewer
+// arguments. This can be used to pass around a unit of delayed execution,
+// much like lexical closures are used in other languages. For example, it
+// is used in Chromium code to schedule tasks on different MessageLoops.
+//
+// A callback with no unbound input parameters (base::Callback<void(void)>)
+// is called a base::Closure. Note that this is NOT the same as what other
+// languages refer to as a closure -- it does not retain a reference to its
+// enclosing environment.
+//
+// MEMORY MANAGEMENT AND PASSING
+//
+// The Callback objects themselves should be passed by const-reference, and
+// stored by copy. They internally store their state via a refcounted class
+// and thus do not need to be deleted.
+//
+// The reason to pass via a const-reference is to avoid unnecessary
+// AddRef/Release pairs to the internal state.
+//
+//
+// -----------------------------------------------------------------------------
+// Quick reference for basic stuff
+// -----------------------------------------------------------------------------
+//
+// BINDING A BARE FUNCTION
+//
+//   int Return5() { return 5; }
+//   base::Callback<int(void)> func_cb = base::Bind(&Return5);
+//   LOG(INFO) << func_cb.Run();  // Prints 5.
+//
+// BINDING A CLASS METHOD
+//
+//   The first argument to bind is the member function to call, the second is
+//   the object on which to call it.
+//
+//   class Ref : public base::RefCountedThreadSafe<Ref> {
+//    public:
+//     int Foo() { return 3; }
+//     void PrintBye() { LOG(INFO) << "bye."; }
+//   };
+//   scoped_refptr<Ref> ref = new Ref();
+//   base::Callback<void(void)> ref_cb = base::Bind(&Ref::Foo, ref);
+//   LOG(INFO) << ref_cb.Run();  // Prints out 3.
+//
+//   By default the object must support RefCounted or you will get a compiler
+//   error. If you're passing between threads, be sure it's
+//   RefCountedThreadSafe! See "Advanced binding of member functions" below if
+//   you don't want to use reference counting.
+//
+// RUNNING A CALLBACK
+//
+//   Callbacks can be run with their "Run" method, which has the same
+//   signature as the template argument to the callback.
+//
+//   void DoSomething(const base::Callback<void(int, std::string)>& callback) {
+//     callback.Run(5, "hello");
+//   }
+//
+//   Callbacks can be run more than once (they don't get deleted or marked when
+//   run). However, this precludes using base::Passed (see below).
+//
+//   void DoSomething(const base::Callback<double(double)>& callback) {
+//     double myresult = callback.Run(3.14159);
+//     myresult += callback.Run(2.71828);
+//   }
+//
+// PASSING UNBOUND INPUT PARAMETERS
+//
+//   Unbound parameters are specified at the time a callback is Run(). They are
+//   specified in the Callback template type:
+//
+//   void MyFunc(int i, const std::string& str) {}
+//   base::Callback<void(int, const std::string&)> cb = base::Bind(&MyFunc);
+//   cb.Run(23, "hello, world");
+//
+// PASSING BOUND INPUT PARAMETERS
+//
+//   Bound parameters are specified when you create thee callback as arguments
+//   to Bind(). They will be passed to the function and the Run()ner of the
+//   callback doesn't see those values or even know that the function it's
+//   calling.
+//
+//   void MyFunc(int i, const std::string& str) {}
+//   base::Callback<void(void)> cb = base::Bind(&MyFunc, 23, "hello world");
+//   cb.Run();
+//
+//   A callback with no unbound input parameters (base::Callback<void(void)>)
+//   is called a base::Closure. So we could have also written:
+//
+//   base::Closure cb = base::Bind(&MyFunc, 23, "hello world");
+//
+//   When calling member functions, bound parameters just go after the object
+//   pointer.
+//
+//   base::Closure cb = base::Bind(&MyClass::MyFunc, this, 23, "hello world");
+//
+// PARTIAL BINDING OF PARAMETERS
+//
+//   You can specify some parameters when you create the callback, and specify
+//   the rest when you execute the callback.
+//
+//   void MyFunc(int i, const std::string& str) {}
+//   base::Callback<void(const std::string&)> cb = base::Bind(&MyFunc, 23);
+//   cb.Run("hello world");
+//
+//   When calling a function bound parameters are first, followed by unbound
+//   parameters.
+//
+//
+// -----------------------------------------------------------------------------
+// Quick reference for advanced binding
+// -----------------------------------------------------------------------------
+//
+// BINDING A CLASS METHOD WITH WEAK POINTERS
+//
+//   base::Bind(&MyClass::Foo, GetWeakPtr());
+//
+//   The callback will not be run if the object has already been destroyed.
+//   DANGER: weak pointers are not threadsafe, so don't use this
+//   when passing between threads!
+//
+// BINDING A CLASS METHOD WITH MANUAL LIFETIME MANAGEMENT
+//
+//   base::Bind(&MyClass::Foo, base::Unretained(this));
+//
+//   This disables all lifetime management on the object. You're responsible
+//   for making sure the object is alive at the time of the call. You break it,
+//   you own it!
+//
+// BINDING A CLASS METHOD AND HAVING THE CALLBACK OWN THE CLASS
+//
+//   MyClass* myclass = new MyClass;
+//   base::Bind(&MyClass::Foo, base::Owned(myclass));
+//
+//   The object will be deleted when the callback is destroyed, even if it's
+//   not run (like if you post a task during shutdown). Potentially useful for
+//   "fire and forget" cases.
+//
+// IGNORING RETURN VALUES
+//
+//   Sometimes you want to call a function that returns a value in a callback
+//   that doesn't expect a return value.
+//
+//   int DoSomething(int arg) { cout << arg << endl; }
+//   base::Callback<void<int>) cb =
+//       base::Bind(base::IgnoreResult(&DoSomething));
+//
+//
+// -----------------------------------------------------------------------------
+// Quick reference for binding parameters to Bind()
+// -----------------------------------------------------------------------------
+//
+// Bound parameters are specified as arguments to Bind() and are passed to the
+// function. A callback with no parameters or no unbound parameters is called a
+// Closure (base::Callback<void(void)> and base::Closure are the same thing).
+//
+// PASSING PARAMETERS OWNED BY THE CALLBACK
+//
+//   void Foo(int* arg) { cout << *arg << endl; }
+//   int* pn = new int(1);
+//   base::Closure foo_callback = base::Bind(&foo, base::Owned(pn));
+//
+//   The parameter will be deleted when the callback is destroyed, even if it's
+//   not run (like if you post a task during shutdown).
+//
+// PASSING PARAMETERS AS A scoped_ptr
+//
+//   void TakesOwnership(scoped_ptr<Foo> arg) {}
+//   scoped_ptr<Foo> f(new Foo);
+//   // f becomes null during the following call.
+//   base::Closure cb = base::Bind(&TakesOwnership, base::Passed(&f));
+//
+//   Ownership of the parameter will be with the callback until the it is run,
+//   when ownership is passed to the callback function. This means the callback
+//   can only be run once. If the callback is never run, it will delete the
+//   object when it's destroyed.
+//
+// PASSING PARAMETERS AS A scoped_refptr
+//
+//   void TakesOneRef(scoped_refptr<Foo> arg) {}
+//   scoped_refptr<Foo> f(new Foo)
+//   base::Closure cb = base::Bind(&TakesOneRef, f);
+//
+//   This should "just work." The closure will take a reference as long as it
+//   is alive, and another reference will be taken for the called function.
+//
+// PASSING PARAMETERS BY REFERENCE
+//
+//   Const references are *copied* unless ConstRef is used. Example:
+//
+//   void foo(const int& arg) { printf("%d %p\n", arg, &arg); }
+//   int n = 1;
+//   base::Closure has_copy = base::Bind(&foo, n);
+//   base::Closure has_ref = base::Bind(&foo, base::ConstRef(n));
+//   n = 2;
+//   foo(n);                        // Prints "2 0xaaaaaaaaaaaa"
+//   has_copy.Run();                // Prints "1 0xbbbbbbbbbbbb"
+//   has_ref.Run();                 // Prints "2 0xaaaaaaaaaaaa"
+//
+//   Normally parameters are copied in the closure. DANGER: ConstRef stores a
+//   const reference instead, referencing the original parameter. This means
+//   that you must ensure the object outlives the callback!
+//
+//
+// -----------------------------------------------------------------------------
+// Implementation notes
+// -----------------------------------------------------------------------------
+//
+// WHERE IS THIS DESIGN FROM:
+//
+// The design Callback and Bind is heavily influenced by C++'s
+// tr1::function/tr1::bind, and by the "Google Callback" system used inside
+// Google.
+//
+//
+// HOW THE IMPLEMENTATION WORKS:
+//
+// There are three main components to the system:
+//   1) The Callback classes.
+//   2) The Bind() functions.
+//   3) The arguments wrappers (e.g., Unretained() and ConstRef()).
+//
+// The Callback classes represent a generic function pointer. Internally,
+// it stores a refcounted piece of state that represents the target function
+// and all its bound parameters.  Each Callback specialization has a templated
+// constructor that takes an BindState<>*.  In the context of the constructor,
+// the static type of this BindState<> pointer uniquely identifies the
+// function it is representing, all its bound parameters, and a Run() method
+// that is capable of invoking the target.
+//
+// Callback's constructor takes the BindState<>* that has the full static type
+// and erases the target function type as well as the types of the bound
+// parameters.  It does this by storing a pointer to the specific Run()
+// function, and upcasting the state of BindState<>* to a
+// BindStateBase*. This is safe as long as this BindStateBase pointer
+// is only used with the stored Run() pointer.
+//
+// To BindState<> objects are created inside the Bind() functions.
+// These functions, along with a set of internal templates, are responsible for
+//
+//  - Unwrapping the function signature into return type, and parameters
+//  - Determining the number of parameters that are bound
+//  - Creating the BindState storing the bound parameters
+//  - Performing compile-time asserts to avoid error-prone behavior
+//  - Returning an Callback<> with an arity matching the number of unbound
+//    parameters and that knows the correct refcounting semantics for the
+//    target object if we are binding a method.
+//
+// The Bind functions do the above using type-inference, and template
+// specializations.
+//
+// By default Bind() will store copies of all bound parameters, and attempt
+// to refcount a target object if the function being bound is a class method.
+// These copies are created even if the function takes parameters as const
+// references. (Binding to non-const references is forbidden, see bind.h.)
+//
+// To change this behavior, we introduce a set of argument wrappers
+// (e.g., Unretained(), and ConstRef()).  These are simple container templates
+// that are passed by value, and wrap a pointer to argument.  See the
+// file-level comment in base/bind_helpers.h for more info.
+//
+// These types are passed to the Unwrap() functions, and the MaybeRefcount()
+// functions respectively to modify the behavior of Bind().  The Unwrap()
+// and MaybeRefcount() functions change behavior by doing partial
+// specialization based on whether or not a parameter is a wrapper type.
+//
+// ConstRef() is similar to tr1::cref.  Unretained() is specific to Chromium.
+//
+//
+// WHY NOT TR1 FUNCTION/BIND?
+//
+// Direct use of tr1::function and tr1::bind was considered, but ultimately
+// rejected because of the number of copy constructors invocations involved
+// in the binding of arguments during construction, and the forwarding of
+// arguments during invocation.  These copies will no longer be an issue in
+// C++0x because C++0x will support rvalue reference allowing for the compiler
+// to avoid these copies.  However, waiting for C++0x is not an option.
+//
+// Measured with valgrind on gcc version 4.4.3 (Ubuntu 4.4.3-4ubuntu5), the
+// tr1::bind call itself will invoke a non-trivial copy constructor three times
+// for each bound parameter.  Also, each when passing a tr1::function, each
+// bound argument will be copied again.
+//
+// In addition to the copies taken at binding and invocation, copying a
+// tr1::function causes a copy to be made of all the bound parameters and
+// state.
+//
+// Furthermore, in Chromium, it is desirable for the Callback to take a
+// reference on a target object when representing a class method call.  This
+// is not supported by tr1.
+//
+// Lastly, tr1::function and tr1::bind has a more general and flexible API.
+// This includes things like argument reordering by use of
+// tr1::bind::placeholder, support for non-const reference parameters, and some
+// limited amount of subtyping of the tr1::function object (e.g.,
+// tr1::function<int(int)> is convertible to tr1::function<void(int)>).
+//
+// These are not features that are required in Chromium. Some of them, such as
+// allowing for reference parameters, and subtyping of functions, may actually
+// become a source of errors. Removing support for these features actually
+// allows for a simpler implementation, and a terser Currying API.
+//
+//
+// WHY NOT GOOGLE CALLBACKS?
+//
+// The Google callback system also does not support refcounting.  Furthermore,
+// its implementation has a number of strange edge cases with respect to type
+// conversion of its arguments.  In particular, the argument's constness must
+// at times match exactly the function signature, or the type-inference might
+// break.  Given the above, writing a custom solution was easier.
+//
+//
+// MISSING FUNCTIONALITY
+//  - Invoking the return of Bind.  Bind(&foo).Run() does not work;
+//  - Binding arrays to functions that take a non-const pointer.
+//    Example:
+//      void Foo(const char* ptr);
+//      void Bar(char* ptr);
+//      Bind(&Foo, "test");
+//      Bind(&Bar, "test");  // This fails because ptr is not const.
+
 namespace base {

-template <typename R, typename... Args>
-class OnceCallback<R(Args...)> : public internal::CallbackBase {
+// First, we forward declare the Callback class template. This informs the
+// compiler that the template only has 1 type parameter which is the function
+// signature that the Callback is representing.
+//
+// After this, create template specializations for 0-7 parameters. Note that
+// even though the template typelist grows, the specialization still
+// only has one type: the function signature.
+//
+// If you are thinking of forward declaring Callback in your own header file,
+// please include "base/callback_forward.h" instead.
+template <typename Sig>
+class Callback;
+
+namespace cef_internal {
+template <typename Runnable, typename RunType, typename BoundArgsType>
+struct BindState;
+}  // namespace cef_internal
+
+template <typename R>
+class Callback<R(void)> : public cef_internal::CallbackBase {
 public:
-  using ResultType = R;
-  using RunType = R(Args...);
-  using PolymorphicInvoke = R (*)(internal::BindStateBase*,
-                                  internal::PassingType<Args>...);
+  typedef R(RunType)();

-  constexpr OnceCallback() = default;
-  OnceCallback(std::nullptr_t) = delete;
+  Callback() : CallbackBase(NULL) {}

-  explicit OnceCallback(internal::BindStateBase* bind_state)
-      : internal::CallbackBase(bind_state) {}
-
-  OnceCallback(const OnceCallback&) = delete;
-  OnceCallback& operator=(const OnceCallback&) = delete;
-
-  OnceCallback(OnceCallback&&) noexcept = default;
-  OnceCallback& operator=(OnceCallback&&) noexcept = default;
-
-  OnceCallback(RepeatingCallback<RunType> other)
-      : internal::CallbackBase(std::move(other)) {}
-
-  OnceCallback& operator=(RepeatingCallback<RunType> other) {
-    static_cast<internal::CallbackBase&>(*this) = std::move(other);
-    return *this;
+  // Note that this constructor CANNOT be explicit, and that Bind() CANNOT
+  // return the exact Callback<> type.  See base/bind.h for details.
+  template <typename Runnable, typename BindRunType, typename BoundArgsType>
+  Callback(
+      cef_internal::BindState<Runnable, BindRunType, BoundArgsType>* bind_state)
+      : CallbackBase(bind_state) {
+    // Force the assignment to a local variable of PolymorphicInvoke
+    // so the compiler will typecheck that the passed in Run() method has
+    // the correct type.
+    PolymorphicInvoke invoke_func =
+        &cef_internal::BindState<Runnable, BindRunType,
+                                 BoundArgsType>::InvokerType::Run;
+    polymorphic_invoke_ = reinterpret_cast<InvokeFuncStorage>(invoke_func);
  }

-  R Run(Args... args) const& {
-    static_assert(!sizeof(*this),
-                  "OnceCallback::Run() may only be invoked on a non-const "
-                  "rvalue, i.e. std::move(callback).Run().");
-    NOTREACHED();
+  bool Equals(const Callback& other) const {
+    return CallbackBase::Equals(other);
  }

-  R Run(Args... args) && {
-    // Move the callback instance into a local variable before the invocation,
-    // that ensures the internal state is cleared after the invocation.
-    // It's not safe to touch |this| after the invocation, since running the
-    // bound function may destroy |this|.
-    OnceCallback cb = std::move(*this);
+  R Run() const {
    PolymorphicInvoke f =
-        reinterpret_cast<PolymorphicInvoke>(cb.polymorphic_invoke());
-    return f(cb.bind_state_.get(), std::forward<Args>(args)...);
+        reinterpret_cast<PolymorphicInvoke>(polymorphic_invoke_);
+
+    return f(bind_state_.get());
  }

-  // Then() returns a new OnceCallback that receives the same arguments as
-  // |this|, and with the return type of |then|. The returned callback will:
-  // 1) Run the functor currently bound to |this| callback.
-  // 2) Run the |then| callback with the result from step 1 as its single
-  //    argument.
-  // 3) Return the value from running the |then| callback.
-  //
-  // Since this method generates a callback that is a replacement for `this`,
-  // `this` will be consumed and reset to a null callback to ensure the
-  // originally-bound functor can be run at most once.
-  template <typename ThenR, typename... ThenArgs>
-  OnceCallback<ThenR(Args...)> Then(OnceCallback<ThenR(ThenArgs...)> then) && {
-    CHECK(then);
-    return BindOnce(
-        internal::ThenHelper<
-            OnceCallback, OnceCallback<ThenR(ThenArgs...)>>::CreateTrampoline(),
-        std::move(*this), std::move(then));
-  }
-
-  // This overload is required; even though RepeatingCallback is implicitly
-  // convertible to OnceCallback, that conversion will not used when matching
-  // for template argument deduction.
-  template <typename ThenR, typename... ThenArgs>
-  OnceCallback<ThenR(Args...)> Then(
-      RepeatingCallback<ThenR(ThenArgs...)> then) && {
-    CHECK(then);
-    return BindOnce(
-        internal::ThenHelper<
-            OnceCallback,
-            RepeatingCallback<ThenR(ThenArgs...)>>::CreateTrampoline(),
-        std::move(*this), std::move(then));
-  }
+ private:
+  typedef R (*PolymorphicInvoke)(cef_internal::BindStateBase*);
 };

-template <typename R, typename... Args>
-class RepeatingCallback<R(Args...)> : public internal::CallbackBaseCopyable {
+template <typename R, typename A1>
+class Callback<R(A1)> : public cef_internal::CallbackBase {
 public:
-  using ResultType = R;
-  using RunType = R(Args...);
-  using PolymorphicInvoke = R (*)(internal::BindStateBase*,
-                                  internal::PassingType<Args>...);
+  typedef R(RunType)(A1);

-  constexpr RepeatingCallback() = default;
-  RepeatingCallback(std::nullptr_t) = delete;
+  Callback() : CallbackBase(NULL) {}

-  explicit RepeatingCallback(internal::BindStateBase* bind_state)
-      : internal::CallbackBaseCopyable(bind_state) {}
-
-  // Copyable and movable.
-  RepeatingCallback(const RepeatingCallback&) = default;
-  RepeatingCallback& operator=(const RepeatingCallback&) = default;
-  RepeatingCallback(RepeatingCallback&&) noexcept = default;
-  RepeatingCallback& operator=(RepeatingCallback&&) noexcept = default;
-
-  bool operator==(const RepeatingCallback& other) const {
-    return EqualsInternal(other);
+  // Note that this constructor CANNOT be explicit, and that Bind() CANNOT
+  // return the exact Callback<> type.  See base/bind.h for details.
+  template <typename Runnable, typename BindRunType, typename BoundArgsType>
+  Callback(
+      cef_internal::BindState<Runnable, BindRunType, BoundArgsType>* bind_state)
+      : CallbackBase(bind_state) {
+    // Force the assignment to a local variable of PolymorphicInvoke
+    // so the compiler will typecheck that the passed in Run() method has
+    // the correct type.
+    PolymorphicInvoke invoke_func =
+        &cef_internal::BindState<Runnable, BindRunType,
+                                 BoundArgsType>::InvokerType::Run;
+    polymorphic_invoke_ = reinterpret_cast<InvokeFuncStorage>(invoke_func);
  }

-  bool operator!=(const RepeatingCallback& other) const {
-    return !operator==(other);
+  bool Equals(const Callback& other) const {
+    return CallbackBase::Equals(other);
  }

-  R Run(Args... args) const& {
+  R Run(typename cef_internal::CallbackParamTraits<A1>::ForwardType a1) const {
    PolymorphicInvoke f =
-        reinterpret_cast<PolymorphicInvoke>(this->polymorphic_invoke());
-    return f(this->bind_state_.get(), std::forward<Args>(args)...);
+        reinterpret_cast<PolymorphicInvoke>(polymorphic_invoke_);
+
+    return f(bind_state_.get(), cef_internal::CallbackForward(a1));
  }

-  R Run(Args... args) && {
-    // Move the callback instance into a local variable before the invocation,
-    // that ensures the internal state is cleared after the invocation.
-    // It's not safe to touch |this| after the invocation, since running the
-    // bound function may destroy |this|.
-    RepeatingCallback cb = std::move(*this);
-    PolymorphicInvoke f =
-        reinterpret_cast<PolymorphicInvoke>(cb.polymorphic_invoke());
-    return f(std::move(cb).bind_state_.get(), std::forward<Args>(args)...);
-  }
-
-  // Then() returns a new RepeatingCallback that receives the same arguments as
-  // |this|, and with the return type of |then|. The
-  // returned callback will:
-  // 1) Run the functor currently bound to |this| callback.
-  // 2) Run the |then| callback with the result from step 1 as its single
-  //    argument.
-  // 3) Return the value from running the |then| callback.
-  //
-  // If called on an rvalue (e.g. std::move(cb).Then(...)), this method
-  // generates a callback that is a replacement for `this`. Therefore, `this`
-  // will be consumed and reset to a null callback to ensure the
-  // originally-bound functor will be run at most once.
-  template <typename ThenR, typename... ThenArgs>
-  RepeatingCallback<ThenR(Args...)> Then(
-      RepeatingCallback<ThenR(ThenArgs...)> then) const& {
-    CHECK(then);
-    return BindRepeating(
-        internal::ThenHelper<
-            RepeatingCallback,
-            RepeatingCallback<ThenR(ThenArgs...)>>::CreateTrampoline(),
-        *this, std::move(then));
-  }
-
-  template <typename ThenR, typename... ThenArgs>
-  RepeatingCallback<ThenR(Args...)> Then(
-      RepeatingCallback<ThenR(ThenArgs...)> then) && {
-    CHECK(then);
-    return BindRepeating(
-        internal::ThenHelper<
-            RepeatingCallback,
-            RepeatingCallback<ThenR(ThenArgs...)>>::CreateTrampoline(),
-        std::move(*this), std::move(then));
-  }
+ private:
+  typedef R (*PolymorphicInvoke)(
+      cef_internal::BindStateBase*,
+      typename cef_internal::CallbackParamTraits<A1>::ForwardType);
 };

+template <typename R, typename A1, typename A2>
+class Callback<R(A1, A2)> : public cef_internal::CallbackBase {
+ public:
+  typedef R(RunType)(A1, A2);
+
+  Callback() : CallbackBase(NULL) {}
+
+  // Note that this constructor CANNOT be explicit, and that Bind() CANNOT
+  // return the exact Callback<> type.  See base/bind.h for details.
+  template <typename Runnable, typename BindRunType, typename BoundArgsType>
+  Callback(
+      cef_internal::BindState<Runnable, BindRunType, BoundArgsType>* bind_state)
+      : CallbackBase(bind_state) {
+    // Force the assignment to a local variable of PolymorphicInvoke
+    // so the compiler will typecheck that the passed in Run() method has
+    // the correct type.
+    PolymorphicInvoke invoke_func =
+        &cef_internal::BindState<Runnable, BindRunType,
+                                 BoundArgsType>::InvokerType::Run;
+    polymorphic_invoke_ = reinterpret_cast<InvokeFuncStorage>(invoke_func);
+  }
+
+  bool Equals(const Callback& other) const {
+    return CallbackBase::Equals(other);
+  }
+
+  R Run(typename cef_internal::CallbackParamTraits<A1>::ForwardType a1,
+        typename cef_internal::CallbackParamTraits<A2>::ForwardType a2) const {
+    PolymorphicInvoke f =
+        reinterpret_cast<PolymorphicInvoke>(polymorphic_invoke_);
+
+    return f(bind_state_.get(), cef_internal::CallbackForward(a1),
+             cef_internal::CallbackForward(a2));
+  }
+
+ private:
+  typedef R (*PolymorphicInvoke)(
+      cef_internal::BindStateBase*,
+      typename cef_internal::CallbackParamTraits<A1>::ForwardType,
+      typename cef_internal::CallbackParamTraits<A2>::ForwardType);
+};
+
+template <typename R, typename A1, typename A2, typename A3>
+class Callback<R(A1, A2, A3)> : public cef_internal::CallbackBase {
+ public:
+  typedef R(RunType)(A1, A2, A3);
+
+  Callback() : CallbackBase(NULL) {}
+
+  // Note that this constructor CANNOT be explicit, and that Bind() CANNOT
+  // return the exact Callback<> type.  See base/bind.h for details.
+  template <typename Runnable, typename BindRunType, typename BoundArgsType>
+  Callback(
+      cef_internal::BindState<Runnable, BindRunType, BoundArgsType>* bind_state)
+      : CallbackBase(bind_state) {
+    // Force the assignment to a local variable of PolymorphicInvoke
+    // so the compiler will typecheck that the passed in Run() method has
+    // the correct type.
+    PolymorphicInvoke invoke_func =
+        &cef_internal::BindState<Runnable, BindRunType,
+                                 BoundArgsType>::InvokerType::Run;
+    polymorphic_invoke_ = reinterpret_cast<InvokeFuncStorage>(invoke_func);
+  }
+
+  bool Equals(const Callback& other) const {
+    return CallbackBase::Equals(other);
+  }
+
+  R Run(typename cef_internal::CallbackParamTraits<A1>::ForwardType a1,
+        typename cef_internal::CallbackParamTraits<A2>::ForwardType a2,
+        typename cef_internal::CallbackParamTraits<A3>::ForwardType a3) const {
+    PolymorphicInvoke f =
+        reinterpret_cast<PolymorphicInvoke>(polymorphic_invoke_);
+
+    return f(bind_state_.get(), cef_internal::CallbackForward(a1),
+             cef_internal::CallbackForward(a2),
+             cef_internal::CallbackForward(a3));
+  }
+
+ private:
+  typedef R (*PolymorphicInvoke)(
+      cef_internal::BindStateBase*,
+      typename cef_internal::CallbackParamTraits<A1>::ForwardType,
+      typename cef_internal::CallbackParamTraits<A2>::ForwardType,
+      typename cef_internal::CallbackParamTraits<A3>::ForwardType);
+};
+
+template <typename R, typename A1, typename A2, typename A3, typename A4>
+class Callback<R(A1, A2, A3, A4)> : public cef_internal::CallbackBase {
+ public:
+  typedef R(RunType)(A1, A2, A3, A4);
+
+  Callback() : CallbackBase(NULL) {}
+
+  // Note that this constructor CANNOT be explicit, and that Bind() CANNOT
+  // return the exact Callback<> type.  See base/bind.h for details.
+  template <typename Runnable, typename BindRunType, typename BoundArgsType>
+  Callback(
+      cef_internal::BindState<Runnable, BindRunType, BoundArgsType>* bind_state)
+      : CallbackBase(bind_state) {
+    // Force the assignment to a local variable of PolymorphicInvoke
+    // so the compiler will typecheck that the passed in Run() method has
+    // the correct type.
+    PolymorphicInvoke invoke_func =
+        &cef_internal::BindState<Runnable, BindRunType,
+                                 BoundArgsType>::InvokerType::Run;
+    polymorphic_invoke_ = reinterpret_cast<InvokeFuncStorage>(invoke_func);
+  }
+
+  bool Equals(const Callback& other) const {
+    return CallbackBase::Equals(other);
+  }
+
+  R Run(typename cef_internal::CallbackParamTraits<A1>::ForwardType a1,
+        typename cef_internal::CallbackParamTraits<A2>::ForwardType a2,
+        typename cef_internal::CallbackParamTraits<A3>::ForwardType a3,
+        typename cef_internal::CallbackParamTraits<A4>::ForwardType a4) const {
+    PolymorphicInvoke f =
+        reinterpret_cast<PolymorphicInvoke>(polymorphic_invoke_);
+
+    return f(bind_state_.get(), cef_internal::CallbackForward(a1),
+             cef_internal::CallbackForward(a2),
+             cef_internal::CallbackForward(a3),
+             cef_internal::CallbackForward(a4));
+  }
+
+ private:
+  typedef R (*PolymorphicInvoke)(
+      cef_internal::BindStateBase*,
+      typename cef_internal::CallbackParamTraits<A1>::ForwardType,
+      typename cef_internal::CallbackParamTraits<A2>::ForwardType,
+      typename cef_internal::CallbackParamTraits<A3>::ForwardType,
+      typename cef_internal::CallbackParamTraits<A4>::ForwardType);
+};
+
+template <typename R,
+          typename A1,
+          typename A2,
+          typename A3,
+          typename A4,
+          typename A5>
+class Callback<R(A1, A2, A3, A4, A5)> : public cef_internal::CallbackBase {
+ public:
+  typedef R(RunType)(A1, A2, A3, A4, A5);
+
+  Callback() : CallbackBase(NULL) {}
+
+  // Note that this constructor CANNOT be explicit, and that Bind() CANNOT
+  // return the exact Callback<> type.  See base/bind.h for details.
+  template <typename Runnable, typename BindRunType, typename BoundArgsType>
+  Callback(
+      cef_internal::BindState<Runnable, BindRunType, BoundArgsType>* bind_state)
+      : CallbackBase(bind_state) {
+    // Force the assignment to a local variable of PolymorphicInvoke
+    // so the compiler will typecheck that the passed in Run() method has
+    // the correct type.
+    PolymorphicInvoke invoke_func =
+        &cef_internal::BindState<Runnable, BindRunType,
+                                 BoundArgsType>::InvokerType::Run;
+    polymorphic_invoke_ = reinterpret_cast<InvokeFuncStorage>(invoke_func);
+  }
+
+  bool Equals(const Callback& other) const {
+    return CallbackBase::Equals(other);
+  }
+
+  R Run(typename cef_internal::CallbackParamTraits<A1>::ForwardType a1,
+        typename cef_internal::CallbackParamTraits<A2>::ForwardType a2,
+        typename cef_internal::CallbackParamTraits<A3>::ForwardType a3,
+        typename cef_internal::CallbackParamTraits<A4>::ForwardType a4,
+        typename cef_internal::CallbackParamTraits<A5>::ForwardType a5) const {
+    PolymorphicInvoke f =
+        reinterpret_cast<PolymorphicInvoke>(polymorphic_invoke_);
+
+    return f(
+        bind_state_.get(), cef_internal::CallbackForward(a1),
+        cef_internal::CallbackForward(a2), cef_internal::CallbackForward(a3),
+        cef_internal::CallbackForward(a4), cef_internal::CallbackForward(a5));
+  }
+
+ private:
+  typedef R (*PolymorphicInvoke)(
+      cef_internal::BindStateBase*,
+      typename cef_internal::CallbackParamTraits<A1>::ForwardType,
+      typename cef_internal::CallbackParamTraits<A2>::ForwardType,
+      typename cef_internal::CallbackParamTraits<A3>::ForwardType,
+      typename cef_internal::CallbackParamTraits<A4>::ForwardType,
+      typename cef_internal::CallbackParamTraits<A5>::ForwardType);
+};
+
+template <typename R,
+          typename A1,
+          typename A2,
+          typename A3,
+          typename A4,
+          typename A5,
+          typename A6>
+class Callback<R(A1, A2, A3, A4, A5, A6)> : public cef_internal::CallbackBase {
+ public:
+  typedef R(RunType)(A1, A2, A3, A4, A5, A6);
+
+  Callback() : CallbackBase(NULL) {}
+
+  // Note that this constructor CANNOT be explicit, and that Bind() CANNOT
+  // return the exact Callback<> type.  See base/bind.h for details.
+  template <typename Runnable, typename BindRunType, typename BoundArgsType>
+  Callback(
+      cef_internal::BindState<Runnable, BindRunType, BoundArgsType>* bind_state)
+      : CallbackBase(bind_state) {
+    // Force the assignment to a local variable of PolymorphicInvoke
+    // so the compiler will typecheck that the passed in Run() method has
+    // the correct type.
+    PolymorphicInvoke invoke_func =
+        &cef_internal::BindState<Runnable, BindRunType,
+                                 BoundArgsType>::InvokerType::Run;
+    polymorphic_invoke_ = reinterpret_cast<InvokeFuncStorage>(invoke_func);
+  }
+
+  bool Equals(const Callback& other) const {
+    return CallbackBase::Equals(other);
+  }
+
+  R Run(typename cef_internal::CallbackParamTraits<A1>::ForwardType a1,
+        typename cef_internal::CallbackParamTraits<A2>::ForwardType a2,
+        typename cef_internal::CallbackParamTraits<A3>::ForwardType a3,
+        typename cef_internal::CallbackParamTraits<A4>::ForwardType a4,
+        typename cef_internal::CallbackParamTraits<A5>::ForwardType a5,
+        typename cef_internal::CallbackParamTraits<A6>::ForwardType a6) const {
+    PolymorphicInvoke f =
+        reinterpret_cast<PolymorphicInvoke>(polymorphic_invoke_);
+
+    return f(
+        bind_state_.get(), cef_internal::CallbackForward(a1),
+        cef_internal::CallbackForward(a2), cef_internal::CallbackForward(a3),
+        cef_internal::CallbackForward(a4), cef_internal::CallbackForward(a5),
+        cef_internal::CallbackForward(a6));
+  }
+
+ private:
+  typedef R (*PolymorphicInvoke)(
+      cef_internal::BindStateBase*,
+      typename cef_internal::CallbackParamTraits<A1>::ForwardType,
+      typename cef_internal::CallbackParamTraits<A2>::ForwardType,
+      typename cef_internal::CallbackParamTraits<A3>::ForwardType,
+      typename cef_internal::CallbackParamTraits<A4>::ForwardType,
+      typename cef_internal::CallbackParamTraits<A5>::ForwardType,
+      typename cef_internal::CallbackParamTraits<A6>::ForwardType);
+};
+
+template <typename R,
+          typename A1,
+          typename A2,
+          typename A3,
+          typename A4,
+          typename A5,
+          typename A6,
+          typename A7>
+class Callback<R(A1, A2, A3, A4, A5, A6, A7)>
+    : public cef_internal::CallbackBase {
+ public:
+  typedef R(RunType)(A1, A2, A3, A4, A5, A6, A7);
+
+  Callback() : CallbackBase(NULL) {}
+
+  // Note that this constructor CANNOT be explicit, and that Bind() CANNOT
+  // return the exact Callback<> type.  See base/bind.h for details.
+  template <typename Runnable, typename BindRunType, typename BoundArgsType>
+  Callback(
+      cef_internal::BindState<Runnable, BindRunType, BoundArgsType>* bind_state)
+      : CallbackBase(bind_state) {
+    // Force the assignment to a local variable of PolymorphicInvoke
+    // so the compiler will typecheck that the passed in Run() method has
+    // the correct type.
+    PolymorphicInvoke invoke_func =
+        &cef_internal::BindState<Runnable, BindRunType,
+                                 BoundArgsType>::InvokerType::Run;
+    polymorphic_invoke_ = reinterpret_cast<InvokeFuncStorage>(invoke_func);
+  }
+
+  bool Equals(const Callback& other) const {
+    return CallbackBase::Equals(other);
+  }
+
+  R Run(typename cef_internal::CallbackParamTraits<A1>::ForwardType a1,
+        typename cef_internal::CallbackParamTraits<A2>::ForwardType a2,
+        typename cef_internal::CallbackParamTraits<A3>::ForwardType a3,
+        typename cef_internal::CallbackParamTraits<A4>::ForwardType a4,
+        typename cef_internal::CallbackParamTraits<A5>::ForwardType a5,
+        typename cef_internal::CallbackParamTraits<A6>::ForwardType a6,
+        typename cef_internal::CallbackParamTraits<A7>::ForwardType a7) const {
+    PolymorphicInvoke f =
+        reinterpret_cast<PolymorphicInvoke>(polymorphic_invoke_);
+
+    return f(
+        bind_state_.get(), cef_internal::CallbackForward(a1),
+        cef_internal::CallbackForward(a2), cef_internal::CallbackForward(a3),
+        cef_internal::CallbackForward(a4), cef_internal::CallbackForward(a5),
+        cef_internal::CallbackForward(a6), cef_internal::CallbackForward(a7));
+  }
+
+ private:
+  typedef R (*PolymorphicInvoke)(
+      cef_internal::BindStateBase*,
+      typename cef_internal::CallbackParamTraits<A1>::ForwardType,
+      typename cef_internal::CallbackParamTraits<A2>::ForwardType,
+      typename cef_internal::CallbackParamTraits<A3>::ForwardType,
+      typename cef_internal::CallbackParamTraits<A4>::ForwardType,
+      typename cef_internal::CallbackParamTraits<A5>::ForwardType,
+      typename cef_internal::CallbackParamTraits<A6>::ForwardType,
+      typename cef_internal::CallbackParamTraits<A7>::ForwardType);
+};
+
+// Syntactic sugar to make Callbacks<void(void)> easier to declare since it
+// will be used in a lot of APIs with delayed execution.
+typedef Callback<void(void)> Closure;
+
 }  // namespace base

 #endif  // !USING_CHROMIUM_INCLUDES
--- a/include/base/cef_callback_forward.h
+++ b/include/base/cef_callback_forward.h
@@ -32,7 +32,12 @@
 #define INCLUDE_BASE_CEF_CALLBACK_FORWARD_H_
 #pragma once

-#if defined(USING_CHROMIUM_INCLUDES)
+#if defined(BASE_CALLBACK_FORWARD_H_)
+// Do nothing if the Chromium header has already been included.
+// This can happen in cases where Chromium code is used directly by the
+// client application. When using Chromium code directly always include
+// the Chromium header first to avoid type conflicts.
+#elif defined(USING_CHROMIUM_INCLUDES)
 // When building CEF include the Chromium header directly.
 #include "base/callback_forward.h"
 #else  // !USING_CHROMIUM_INCLUDES
@@ -42,19 +47,10 @@

 namespace base {

-template <typename Signature>
-class OnceCallback;
+template <typename Sig>
+class Callback;

-template <typename Signature>
-class RepeatingCallback;
-
-///
-/// Syntactic sugar to make OnceClosure<void()> and RepeatingClosure<void()>
-/// easier to declare since they will be used in a lot of APIs with delayed
-/// execution.
-///
-using OnceClosure = OnceCallback<void()>;
-using RepeatingClosure = RepeatingCallback<void()>;
+typedef Callback<void(void)> Closure;

 }  // namespace base

--- a/include/base/cef_callback_helpers.h
+++ b/include/base/cef_callback_helpers.h
@@ -1,261 +0,0 @@
-// Copyright (c) 2014 Marshall A. Greenblatt. Portions copyright (c) 2012
-// Google Inc. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//    * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//    * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//    * Neither the name of Google Inc. nor the name Chromium Embedded
-// Framework nor the names of its contributors may be used to endorse
-// or promote products derived from this software without specific prior
-// written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// This defines helpful methods for dealing with Callbacks.  Because Callbacks
-// are implemented using templates, with a class per callback signature, adding
-// methods to Callback<> itself is unattractive (lots of extra code gets
-// generated).  Instead, consider adding methods here.
-
-#ifndef CEF_INCLUDE_BASE_CEF_CALLBACK_HELPERS_H_
-#define CEF_INCLUDE_BASE_CEF_CALLBACK_HELPERS_H_
-#pragma once
-
-#if defined(USING_CHROMIUM_INCLUDES)
-// When building CEF include the Chromium header directly.
-#include "base/callback_helpers.h"
-#else  // !USING_CHROMIUM_INCLUDES
-// The following is substantially similar to the Chromium implementation.
-// If the Chromium implementation diverges the below implementation should be
-// updated to match.
-
-#include <atomic>
-#include <memory>
-#include <type_traits>
-#include <utility>
-
-#include "include/base/cef_bind.h"
-#include "include/base/cef_callback.h"
-#include "include/base/cef_logging.h"
-
-namespace base {
-
-namespace internal {
-
-template <typename T>
-struct IsBaseCallbackImpl : std::false_type {};
-
-template <typename R, typename... Args>
-struct IsBaseCallbackImpl<OnceCallback<R(Args...)>> : std::true_type {};
-
-template <typename R, typename... Args>
-struct IsBaseCallbackImpl<RepeatingCallback<R(Args...)>> : std::true_type {};
-
-template <typename T>
-struct IsOnceCallbackImpl : std::false_type {};
-
-template <typename R, typename... Args>
-struct IsOnceCallbackImpl<OnceCallback<R(Args...)>> : std::true_type {};
-
-}  // namespace internal
-
-///
-/// IsBaseCallback<T>::value is true when T is any of the Closure or Callback
-/// family of types.
-///
-template <typename T>
-using IsBaseCallback = internal::IsBaseCallbackImpl<std::decay_t<T>>;
-
-///
-/// IsOnceCallback<T>::value is true when T is a OnceClosure or OnceCallback
-/// type.
-///
-template <typename T>
-using IsOnceCallback = internal::IsOnceCallbackImpl<std::decay_t<T>>;
-
-///
-/// SFINAE friendly enabler allowing to overload methods for both Repeating and
-/// OnceCallbacks.
-///
-/// Usage:
-/// <pre>
-///   template <template <typename> class CallbackType,
-///             ... other template args ...,
-///             typename = EnableIfIsBaseCallback<CallbackType>>
-///   void DoStuff(CallbackType<...> cb, ...);
-/// </pre>
-///
-template <template <typename> class CallbackType>
-using EnableIfIsBaseCallback =
-    std::enable_if_t<IsBaseCallback<CallbackType<void()>>::value>;
-
-namespace internal {
-
-template <typename... Args>
-class OnceCallbackHolder final {
- public:
-  OnceCallbackHolder(OnceCallback<void(Args...)> callback,
-                     bool ignore_extra_runs)
-      : callback_(std::move(callback)), ignore_extra_runs_(ignore_extra_runs) {
-    DCHECK(callback_);
-  }
-  OnceCallbackHolder(const OnceCallbackHolder&) = delete;
-  OnceCallbackHolder& operator=(const OnceCallbackHolder&) = delete;
-
-  void Run(Args... args) {
-    if (has_run_.exchange(true)) {
-      CHECK(ignore_extra_runs_) << "Both OnceCallbacks returned by "
-                                   "base::SplitOnceCallback() were run. "
-                                   "At most one of the pair should be run.";
-      return;
-    }
-    DCHECK(callback_);
-    std::move(callback_).Run(std::forward<Args>(args)...);
-  }
-
- private:
-  volatile std::atomic_bool has_run_{false};
-  base::OnceCallback<void(Args...)> callback_;
-  const bool ignore_extra_runs_;
-};
-
-}  // namespace internal
-
-///
-/// Wraps the given OnceCallback into a RepeatingCallback that relays its
-/// invocation to the original OnceCallback on the first invocation. The
-/// following invocations are just ignored.
-///
-/// Note that this deliberately subverts the Once/Repeating paradigm of
-/// Callbacks but helps ease the migration from old-style Callbacks. Avoid if
-/// possible; use if necessary for migration.
-///
-// TODO(tzik): Remove it. https://crbug.com/730593
-template <typename... Args>
-RepeatingCallback<void(Args...)> AdaptCallbackForRepeating(
-    OnceCallback<void(Args...)> callback) {
-  using Helper = internal::OnceCallbackHolder<Args...>;
-  return base::BindRepeating(
-      &Helper::Run, std::make_unique<Helper>(std::move(callback),
-                                             /*ignore_extra_runs=*/true));
-}
-
-///
-/// Wraps the given OnceCallback and returns two OnceCallbacks with an identical
-/// signature. On first invokation of either returned callbacks, the original
-/// callback is invoked. Invoking the remaining callback results in a crash.
-///
-template <typename... Args>
-std::pair<OnceCallback<void(Args...)>, OnceCallback<void(Args...)>>
-SplitOnceCallback(OnceCallback<void(Args...)> callback) {
-  using Helper = internal::OnceCallbackHolder<Args...>;
-  auto wrapped_once = base::BindRepeating(
-      &Helper::Run, std::make_unique<Helper>(std::move(callback),
-                                             /*ignore_extra_runs=*/false));
-  return std::make_pair(wrapped_once, wrapped_once);
-}
-
-///
-/// ScopedClosureRunner is akin to std::unique_ptr<> for Closures. It ensures
-/// that the Closure is executed no matter how the current scope exits.
-/// If you are looking for "ScopedCallback", "CallbackRunner", or
-/// "CallbackScoper" this is the class you want.
-///
-class ScopedClosureRunner {
- public:
-  ScopedClosureRunner();
-  explicit ScopedClosureRunner(OnceClosure closure);
-  ScopedClosureRunner(ScopedClosureRunner&& other);
-  // Runs the current closure if it's set, then replaces it with the closure
-  // from |other|. This is akin to how unique_ptr frees the contained pointer in
-  // its move assignment operator. If you need to explicitly avoid running any
-  // current closure, use ReplaceClosure().
-  ScopedClosureRunner& operator=(ScopedClosureRunner&& other);
-  ~ScopedClosureRunner();
-
-  explicit operator bool() const { return !!closure_; }
-
-  // Calls the current closure and resets it, so it wont be called again.
-  void RunAndReset();
-
-  // Replaces closure with the new one releasing the old one without calling it.
-  void ReplaceClosure(OnceClosure closure);
-
-  // Releases the Closure without calling.
-  [[nodiscard]] OnceClosure Release();
-
- private:
-  OnceClosure closure_;
-};
-
-///
-/// Creates a null callback.
-///
-class NullCallback {
- public:
-  template <typename R, typename... Args>
-  operator RepeatingCallback<R(Args...)>() const {
-    return RepeatingCallback<R(Args...)>();
-  }
-  template <typename R, typename... Args>
-  operator OnceCallback<R(Args...)>() const {
-    return OnceCallback<R(Args...)>();
-  }
-};
-
-///
-/// Creates a callback that does nothing when called.
-///
-class DoNothing {
- public:
-  template <typename... Args>
-  operator RepeatingCallback<void(Args...)>() const {
-    return Repeatedly<Args...>();
-  }
-  template <typename... Args>
-  operator OnceCallback<void(Args...)>() const {
-    return Once<Args...>();
-  }
-  // Explicit way of specifying a specific callback type when the compiler can't
-  // deduce it.
-  template <typename... Args>
-  static RepeatingCallback<void(Args...)> Repeatedly() {
-    return BindRepeating([](Args... args) {});
-  }
-  template <typename... Args>
-  static OnceCallback<void(Args...)> Once() {
-    return BindOnce([](Args... args) {});
-  }
-};
-
-///
-/// Useful for creating a Closure that will delete a pointer when invoked. Only
-/// use this when necessary. In most cases MessageLoop::DeleteSoon() is a better
-/// fit.
-///
-template <typename T>
-void DeletePointer(T* obj) {
-  delete obj;
-}
-
-}  // namespace base
-
-#endif  // !USING_CHROMIUM_INCLUDES
-
-#endif  // CEF_INCLUDE_BASE_CEF_CALLBACK_HELPERS_H_
--- a/include/base/cef_callback_list.h
+++ b/include/base/cef_callback_list.h
@@ -28,63 +28,16 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-///
-/// \file
-/// A container for a list of callbacks. Provides callers the ability to
-/// manually or automatically unregister callbacks at any time, including during
-/// callback notification.
-///
-/// TYPICAL USAGE:
-///
-/// <pre>
-/// class MyWidget {
-///  public:
-///   using CallbackList = base::RepeatingCallbackList<void(const Foo&)>;
-///
-///   // Registers |cb| to be called whenever NotifyFoo() is executed.
-///   CallbackListSubscription RegisterCallback(CallbackList::CallbackType cb) {
-///     return callback_list_.Add(std::move(cb));
-///   }
-///
-///  private:
-///   // Calls all registered callbacks, with |foo| as the supplied arg.
-///   void NotifyFoo(const Foo& foo) {
-///     callback_list_.Notify(foo);
-///   }
-///
-///   CallbackList callback_list_;
-/// };
-///
-///
-/// class MyWidgetListener {
-///  private:
-///   void OnFoo(const Foo& foo) {
-///     // Called whenever MyWidget::NotifyFoo() is executed, unless
-///     // |foo_subscription_| has been destroyed.
-///   }
-///
-///   // Automatically deregisters the callback when deleted (e.g. in
-///   // ~MyWidgetListener()).  Unretained(this) is safe here since the
-///   // ScopedClosureRunner does not outlive |this|.
-///   CallbackListSubscription foo_subscription_ =
-///       MyWidget::Get()->RegisterCallback(
-///           base::BindRepeating(&MyWidgetListener::OnFoo,
-///                               base::Unretained(this)));
-/// };
-/// </pre>
-///
-/// UNSUPPORTED:
-///
-/// * Destroying the CallbackList during callback notification.
-///
-/// This is possible to support, but not currently necessary.
-///
-
 #ifndef CEF_INCLUDE_BASE_CEF_CALLBACK_LIST_H_
 #define CEF_INCLUDE_BASE_CEF_CALLBACK_LIST_H_
 #pragma once

-#if defined(USING_CHROMIUM_INCLUDES)
+#if defined(BASE_CALLBACK_LIST_H_)
+// Do nothing if the Chromium header has already been included.
+// This can happen in cases where Chromium code is used directly by the
+// client application. When using Chromium code directly always include
+// the Chromium header first to avoid type conflicts.
+#elif defined(USING_CHROMIUM_INCLUDES)
 // When building CEF include the Chromium header directly.
 #include "base/callback_list.h"
 #else  // !USING_CHROMIUM_INCLUDES
@@ -92,303 +45,402 @@
 // If the Chromium implementation diverges the below implementation should be
 // updated to match.

-#include <algorithm>
 #include <list>
-#include <memory>
-#include <utility>

-#include "include/base/cef_auto_reset.h"
-#include "include/base/cef_bind.h"
+#include "include/base/cef_basictypes.h"
+#include "include/base/cef_build.h"
 #include "include/base/cef_callback.h"
-#include "include/base/cef_callback_helpers.h"
 #include "include/base/cef_logging.h"
-#include "include/base/cef_weak_ptr.h"
+#include "include/base/cef_macros.h"
+#include "include/base/cef_scoped_ptr.h"
+#include "include/base/internal/cef_callback_internal.h"
+
+// OVERVIEW:
+//
+// A container for a list of callbacks.  Unlike a normal STL vector or list,
+// this container can be modified during iteration without invalidating the
+// iterator. It safely handles the case of a callback removing itself
+// or another callback from the list while callbacks are being run.
+//
+// TYPICAL USAGE:
+//
+// class MyWidget {
+//  public:
+//   ...
+//
+//   typedef base::Callback<void(const Foo&)> OnFooCallback;
+//
+//   scoped_ptr<base::CallbackList<void(const Foo&)>::Subscription>
+//   RegisterCallback(const OnFooCallback& cb) {
+//     return callback_list_.Add(cb);
+//   }
+//
+//  private:
+//   void NotifyFoo(const Foo& foo) {
+//      callback_list_.Notify(foo);
+//   }
+//
+//   base::CallbackList<void(const Foo&)> callback_list_;
+//
+//   DISALLOW_COPY_AND_ASSIGN(MyWidget);
+// };
+//
+//
+// class MyWidgetListener {
+//  public:
+//   MyWidgetListener::MyWidgetListener() {
+//     foo_subscription_ = MyWidget::GetCurrent()->RegisterCallback(
+//             base::Bind(&MyWidgetListener::OnFoo, this)));
+//   }
+//
+//   MyWidgetListener::~MyWidgetListener() {
+//      // Subscription gets deleted automatically and will deregister
+//      // the callback in the process.
+//   }
+//
+//  private:
+//   void OnFoo(const Foo& foo) {
+//     // Do something.
+//   }
+//
+//   scoped_ptr<base::CallbackList<void(const Foo&)>::Subscription>
+//       foo_subscription_;
+//
+//   DISALLOW_COPY_AND_ASSIGN(MyWidgetListener);
+// };

 namespace base {
-namespace internal {
-template <typename CallbackListImpl>
-class CallbackListBase;
-}  // namespace internal

-template <typename Signature>
-class OnceCallbackList;
+namespace cef_internal {

-template <typename Signature>
-class RepeatingCallbackList;
-
-// A trimmed-down version of ScopedClosureRunner that can be used to guarantee a
-// closure is run on destruction. This is designed to be used by
-// CallbackListBase to run CancelCallback() when this subscription dies;
-// consumers can avoid callbacks on dead objects by ensuring the subscription
-// returned by CallbackListBase::Add() does not outlive the bound object in the
-// callback. A typical way to do this is to bind a callback to a member function
-// on `this` and store the returned subscription as a member variable.
-class CallbackListSubscription {
- public:
-  CallbackListSubscription();
-  CallbackListSubscription(CallbackListSubscription&& subscription);
-  CallbackListSubscription& operator=(CallbackListSubscription&& subscription);
-  ~CallbackListSubscription();
-
-  explicit operator bool() const { return !!closure_; }
-
- private:
-  template <typename T>
-  friend class internal::CallbackListBase;
-
-  explicit CallbackListSubscription(base::OnceClosure closure);
-
-  void Run();
-
-  OnceClosure closure_;
-};
-
-namespace internal {
-
-// From base/stl_util.h.
-template <class T, class Allocator, class Predicate>
-size_t EraseIf(std::list<T, Allocator>& container, Predicate pred) {
-  size_t old_size = container.size();
-  container.remove_if(pred);
-  return old_size - container.size();
-}
-
-// A traits class to break circular type dependencies between CallbackListBase
-// and its subclasses.
-template <typename CallbackList>
-struct CallbackListTraits;
-
-// NOTE: It's important that Callbacks provide iterator stability when items are
-// added to the end, so e.g. a std::vector<> is not suitable here.
-template <typename Signature>
-struct CallbackListTraits<OnceCallbackList<Signature>> {
-  using CallbackType = OnceCallback<Signature>;
-  using Callbacks = std::list<CallbackType>;
-};
-template <typename Signature>
-struct CallbackListTraits<RepeatingCallbackList<Signature>> {
-  using CallbackType = RepeatingCallback<Signature>;
-  using Callbacks = std::list<CallbackType>;
-};
-
-template <typename CallbackListImpl>
+template <typename CallbackType>
 class CallbackListBase {
 public:
-  using CallbackType =
-      typename CallbackListTraits<CallbackListImpl>::CallbackType;
-  static_assert(IsBaseCallback<CallbackType>::value, "");
+  class Subscription {
+   public:
+    Subscription(CallbackListBase<CallbackType>* list,
+                 typename std::list<CallbackType>::iterator iter)
+        : list_(list), iter_(iter) {}

-  // TODO(crbug.com/1103086): Update references to use this directly and by
-  // value, then remove.
-  using Subscription = CallbackListSubscription;
-
-  CallbackListBase() = default;
-  CallbackListBase(const CallbackListBase&) = delete;
-  CallbackListBase& operator=(const CallbackListBase&) = delete;
-
-  ~CallbackListBase() {
-    // Destroying the list during iteration is unsupported and will cause a UAF.
-    CHECK(!iterating_);
-  }
-
-  // Registers |cb| for future notifications. Returns a CallbackListSubscription
-  // whose destruction will cancel |cb|.
-  [[nodiscard]] CallbackListSubscription Add(CallbackType cb) {
-    DCHECK(!cb.is_null());
-    return CallbackListSubscription(base::BindOnce(
-        &CallbackListBase::CancelCallback, weak_ptr_factory_.GetWeakPtr(),
-        callbacks_.insert(callbacks_.end(), std::move(cb))));
-  }
-
-  // Registers |cb| for future notifications. Provides no way for the caller to
-  // cancel, so this is only safe for cases where the callback is guaranteed to
-  // live at least as long as this list (e.g. if it's bound on the same object
-  // that owns the list).
-  // TODO(pkasting): Attempt to use Add() instead and see if callers can relax
-  // other lifetime/ordering mechanisms as a result.
-  void AddUnsafe(CallbackType cb) {
-    DCHECK(!cb.is_null());
-    callbacks_.push_back(std::move(cb));
-  }
-
-  // Registers |removal_callback| to be run after elements are removed from the
-  // list of registered callbacks.
-  void set_removal_callback(const RepeatingClosure& removal_callback) {
-    removal_callback_ = removal_callback;
-  }
-
-  // Returns whether the list of registered callbacks is empty (from an external
-  // perspective -- meaning no remaining callbacks are live).
-  bool empty() const {
-    return std::all_of(callbacks_.cbegin(), callbacks_.cend(),
-                       [](const auto& callback) { return callback.is_null(); });
-  }
-
-  // Calls all registered callbacks that are not canceled beforehand. If any
-  // callbacks are unregistered, notifies any registered removal callback at the
-  // end.
-  //
-  // Arguments must be copyable, since they must be supplied to all callbacks.
-  // Move-only types would be destructively modified by passing them to the
-  // first callback and not reach subsequent callbacks as intended.
-  //
-  // Notify() may be called re-entrantly, in which case the nested call
-  // completes before the outer one continues. Callbacks are only ever added at
-  // the end and canceled callbacks are not pruned from the list until the
-  // outermost iteration completes, so existing iterators should never be
-  // invalidated. However, this does mean that a callback added during a nested
-  // call can be notified by outer calls -- meaning it will be notified about
-  // things that happened before it was added -- if its subscription outlives
-  // the reentrant Notify() call.
-  template <typename... RunArgs>
-  void Notify(RunArgs&&... args) {
-    if (empty())
-      return;  // Nothing to do.
-
-    {
-      AutoReset<bool> iterating(&iterating_, true);
-
-      // Skip any callbacks that are canceled during iteration.
-      // NOTE: Since RunCallback() may call Add(), it's not safe to cache the
-      // value of callbacks_.end() across loop iterations.
-      const auto next_valid = [this](const auto it) {
-        return std::find_if_not(it, callbacks_.end(), [](const auto& callback) {
-          return callback.is_null();
-        });
-      };
-      for (auto it = next_valid(callbacks_.begin()); it != callbacks_.end();
-           it = next_valid(it))
-        // NOTE: Intentionally does not call std::forward<RunArgs>(args)...,
-        // since that would allow move-only arguments.
-        static_cast<CallbackListImpl*>(this)->RunCallback(it++, args...);
+    ~Subscription() {
+      if (list_->active_iterator_count_) {
+        iter_->Reset();
+      } else {
+        list_->callbacks_.erase(iter_);
+        if (!list_->removal_callback_.is_null())
+          list_->removal_callback_.Run();
+      }
    }

-    // Re-entrant invocations shouldn't prune anything from the list. This can
-    // invalidate iterators from underneath higher call frames. It's safe to
-    // simply do nothing, since the outermost frame will continue through here
-    // and prune all null callbacks below.
-    if (iterating_)
-      return;
+   private:
+    CallbackListBase<CallbackType>* list_;
+    typename std::list<CallbackType>::iterator iter_;

-    // Any null callbacks remaining in the list were canceled due to
-    // Subscription destruction during iteration, and can safely be erased now.
-    const size_t erased_callbacks =
-        EraseIf(callbacks_, [](const auto& cb) { return cb.is_null(); });
+    DISALLOW_COPY_AND_ASSIGN(Subscription);
+  };

-    // Run |removal_callback_| if any callbacks were canceled. Note that we
-    // cannot simply compare list sizes before and after iterating, since
-    // notification may result in Add()ing new callbacks as well as canceling
-    // them. Also note that if this is a OnceCallbackList, the OnceCallbacks
-    // that were executed above have all been removed regardless of whether
-    // they're counted in |erased_callbacks_|.
-    if (removal_callback_ &&
-        (erased_callbacks || IsOnceCallback<CallbackType>::value))
-      removal_callback_.Run();  // May delete |this|!
+  // Add a callback to the list. The callback will remain registered until the
+  // returned Subscription is destroyed, which must occur before the
+  // CallbackList is destroyed.
+  scoped_ptr<Subscription> Add(const CallbackType& cb) WARN_UNUSED_RESULT {
+    DCHECK(!cb.is_null());
+    return scoped_ptr<Subscription>(
+        new Subscription(this, callbacks_.insert(callbacks_.end(), cb)));
+  }
+
+  // Sets a callback which will be run when a subscription list is changed.
+  void set_removal_callback(const Closure& callback) {
+    removal_callback_ = callback;
+  }
+
+  // Returns true if there are no subscriptions. This is only valid to call when
+  // not looping through the list.
+  bool empty() {
+    DCHECK_EQ(0, active_iterator_count_);
+    return callbacks_.empty();
  }

 protected:
-  using Callbacks = typename CallbackListTraits<CallbackListImpl>::Callbacks;
+  // An iterator class that can be used to access the list of callbacks.
+  class Iterator {
+   public:
+    explicit Iterator(CallbackListBase<CallbackType>* list)
+        : list_(list), list_iter_(list_->callbacks_.begin()) {
+      ++list_->active_iterator_count_;
+    }

-  // Holds non-null callbacks, which will be called during Notify().
-  Callbacks callbacks_;
+    Iterator(const Iterator& iter)
+        : list_(iter.list_), list_iter_(iter.list_iter_) {
+      ++list_->active_iterator_count_;
+    }

- private:
-  // Cancels the callback pointed to by |it|, which is guaranteed to be valid.
-  void CancelCallback(const typename Callbacks::iterator& it) {
-    if (static_cast<CallbackListImpl*>(this)->CancelNullCallback(it))
-      return;
+    ~Iterator() {
+      if (list_ && --list_->active_iterator_count_ == 0) {
+        list_->Compact();
+      }
+    }

-    if (iterating_) {
-      // Calling erase() here is unsafe, since the loop in Notify() may be
-      // referencing this same iterator, e.g. if adjacent callbacks'
-      // Subscriptions are both destroyed when the first one is Run().  Just
-      // reset the callback and let Notify() clean it up at the end.
-      it->Reset();
-    } else {
-      callbacks_.erase(it);
-      if (removal_callback_)
-        removal_callback_.Run();  // May delete |this|!
+    CallbackType* GetNext() {
+      while ((list_iter_ != list_->callbacks_.end()) && list_iter_->is_null())
+        ++list_iter_;
+
+      CallbackType* cb = NULL;
+      if (list_iter_ != list_->callbacks_.end()) {
+        cb = &(*list_iter_);
+        ++list_iter_;
+      }
+      return cb;
+    }
+
+   private:
+    CallbackListBase<CallbackType>* list_;
+    typename std::list<CallbackType>::iterator list_iter_;
+  };
+
+  CallbackListBase() : active_iterator_count_(0) {}
+
+  ~CallbackListBase() {
+    DCHECK_EQ(0, active_iterator_count_);
+    DCHECK_EQ(0U, callbacks_.size());
+  }
+
+  // Returns an instance of a CallbackListBase::Iterator which can be used
+  // to run callbacks.
+  Iterator GetIterator() { return Iterator(this); }
+
+  // Compact the list: remove any entries which were NULLed out during
+  // iteration.
+  void Compact() {
+    typename std::list<CallbackType>::iterator it = callbacks_.begin();
+    bool updated = false;
+    while (it != callbacks_.end()) {
+      if ((*it).is_null()) {
+        updated = true;
+        it = callbacks_.erase(it);
+      } else {
+        ++it;
+      }
+
+      if (updated && !removal_callback_.is_null())
+        removal_callback_.Run();
    }
  }

-  // Set while Notify() is traversing |callbacks_|.  Used primarily to avoid
-  // invalidating iterators that may be in use.
-  bool iterating_ = false;
+ private:
+  std::list<CallbackType> callbacks_;
+  int active_iterator_count_;
+  Closure removal_callback_;

-  // Called after elements are removed from |callbacks_|.
-  RepeatingClosure removal_callback_;
-
-  WeakPtrFactory<CallbackListBase> weak_ptr_factory_{this};
+  DISALLOW_COPY_AND_ASSIGN(CallbackListBase);
 };

-}  // namespace internal
+}  // namespace cef_internal

-template <typename Signature>
-class OnceCallbackList
-    : public internal::CallbackListBase<OnceCallbackList<Signature>> {
- private:
-  friend internal::CallbackListBase<OnceCallbackList>;
-  using Traits = internal::CallbackListTraits<OnceCallbackList>;
+template <typename Sig>
+class CallbackList;

-  // Runs the current callback, which may cancel it or any other callbacks.
-  template <typename... RunArgs>
-  void RunCallback(typename Traits::Callbacks::iterator it, RunArgs&&... args) {
-    // OnceCallbacks still have Subscriptions with outstanding iterators;
-    // splice() removes them from |callbacks_| without invalidating those.
-    null_callbacks_.splice(null_callbacks_.end(), this->callbacks_, it);
+template <>
+class CallbackList<void(void)>
+    : public cef_internal::CallbackListBase<Callback<void(void)>> {
+ public:
+  typedef Callback<void(void)> CallbackType;

-    // NOTE: Intentionally does not call std::forward<RunArgs>(args)...; see
-    // comments in Notify().
-    std::move(*it).Run(args...);
-  }
+  CallbackList() {}

-  // If |it| refers to an already-canceled callback, does any necessary cleanup
-  // and returns true.  Otherwise returns false.
-  bool CancelNullCallback(const typename Traits::Callbacks::iterator& it) {
-    if (it->is_null()) {
-      null_callbacks_.erase(it);
-      return true;
+  void Notify() {
+    cef_internal::CallbackListBase<CallbackType>::Iterator it =
+        this->GetIterator();
+    CallbackType* cb;
+    while ((cb = it.GetNext()) != NULL) {
+      cb->Run();
    }
-    return false;
  }

-  // Holds null callbacks whose Subscriptions are still alive, so the
-  // Subscriptions will still contain valid iterators.  Only needed for
-  // OnceCallbacks, since RepeatingCallbacks are not canceled except by
-  // Subscription destruction.
-  typename Traits::Callbacks null_callbacks_;
-};
-
-template <typename Signature>
-class RepeatingCallbackList
-    : public internal::CallbackListBase<RepeatingCallbackList<Signature>> {
 private:
-  friend internal::CallbackListBase<RepeatingCallbackList>;
-  using Traits = internal::CallbackListTraits<RepeatingCallbackList>;
-  // Runs the current callback, which may cancel it or any other callbacks.
-  template <typename... RunArgs>
-  void RunCallback(typename Traits::Callbacks::iterator it, RunArgs&&... args) {
-    // NOTE: Intentionally does not call std::forward<RunArgs>(args)...; see
-    // comments in Notify().
-    it->Run(args...);
-  }
-
-  // If |it| refers to an already-canceled callback, does any necessary cleanup
-  // and returns true.  Otherwise returns false.
-  bool CancelNullCallback(const typename Traits::Callbacks::iterator& it) {
-    // Because at most one Subscription can point to a given callback, and
-    // RepeatingCallbacks are only reset by CancelCallback(), no one should be
-    // able to request cancellation of a canceled RepeatingCallback.
-    DCHECK(!it->is_null());
-    return false;
-  }
+  DISALLOW_COPY_AND_ASSIGN(CallbackList);
 };

-///
-/// Syntactic sugar to parallel that used for Callbacks.
-///
-using OnceClosureList = OnceCallbackList<void()>;
-using RepeatingClosureList = RepeatingCallbackList<void()>;
+template <typename A1>
+class CallbackList<void(A1)>
+    : public cef_internal::CallbackListBase<Callback<void(A1)>> {
+ public:
+  typedef Callback<void(A1)> CallbackType;
+
+  CallbackList() {}
+
+  void Notify(typename cef_internal::CallbackParamTraits<A1>::ForwardType a1) {
+    typename cef_internal::CallbackListBase<CallbackType>::Iterator it =
+        this->GetIterator();
+    CallbackType* cb;
+    while ((cb = it.GetNext()) != NULL) {
+      cb->Run(a1);
+    }
+  }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(CallbackList);
+};
+
+template <typename A1, typename A2>
+class CallbackList<void(A1, A2)>
+    : public cef_internal::CallbackListBase<Callback<void(A1, A2)>> {
+ public:
+  typedef Callback<void(A1, A2)> CallbackType;
+
+  CallbackList() {}
+
+  void Notify(typename cef_internal::CallbackParamTraits<A1>::ForwardType a1,
+              typename cef_internal::CallbackParamTraits<A2>::ForwardType a2) {
+    typename cef_internal::CallbackListBase<CallbackType>::Iterator it =
+        this->GetIterator();
+    CallbackType* cb;
+    while ((cb = it.GetNext()) != NULL) {
+      cb->Run(a1, a2);
+    }
+  }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(CallbackList);
+};
+
+template <typename A1, typename A2, typename A3>
+class CallbackList<void(A1, A2, A3)>
+    : public cef_internal::CallbackListBase<Callback<void(A1, A2, A3)>> {
+ public:
+  typedef Callback<void(A1, A2, A3)> CallbackType;
+
+  CallbackList() {}
+
+  void Notify(typename cef_internal::CallbackParamTraits<A1>::ForwardType a1,
+              typename cef_internal::CallbackParamTraits<A2>::ForwardType a2,
+              typename cef_internal::CallbackParamTraits<A3>::ForwardType a3) {
+    typename cef_internal::CallbackListBase<CallbackType>::Iterator it =
+        this->GetIterator();
+    CallbackType* cb;
+    while ((cb = it.GetNext()) != NULL) {
+      cb->Run(a1, a2, a3);
+    }
+  }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(CallbackList);
+};
+
+template <typename A1, typename A2, typename A3, typename A4>
+class CallbackList<void(A1, A2, A3, A4)>
+    : public cef_internal::CallbackListBase<Callback<void(A1, A2, A3, A4)>> {
+ public:
+  typedef Callback<void(A1, A2, A3, A4)> CallbackType;
+
+  CallbackList() {}
+
+  void Notify(typename cef_internal::CallbackParamTraits<A1>::ForwardType a1,
+              typename cef_internal::CallbackParamTraits<A2>::ForwardType a2,
+              typename cef_internal::CallbackParamTraits<A3>::ForwardType a3,
+              typename cef_internal::CallbackParamTraits<A4>::ForwardType a4) {
+    typename cef_internal::CallbackListBase<CallbackType>::Iterator it =
+        this->GetIterator();
+    CallbackType* cb;
+    while ((cb = it.GetNext()) != NULL) {
+      cb->Run(a1, a2, a3, a4);
+    }
+  }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(CallbackList);
+};
+
+template <typename A1, typename A2, typename A3, typename A4, typename A5>
+class CallbackList<void(A1, A2, A3, A4, A5)>
+    : public cef_internal::CallbackListBase<
+          Callback<void(A1, A2, A3, A4, A5)>> {
+ public:
+  typedef Callback<void(A1, A2, A3, A4, A5)> CallbackType;
+
+  CallbackList() {}
+
+  void Notify(typename cef_internal::CallbackParamTraits<A1>::ForwardType a1,
+              typename cef_internal::CallbackParamTraits<A2>::ForwardType a2,
+              typename cef_internal::CallbackParamTraits<A3>::ForwardType a3,
+              typename cef_internal::CallbackParamTraits<A4>::ForwardType a4,
+              typename cef_internal::CallbackParamTraits<A5>::ForwardType a5) {
+    typename cef_internal::CallbackListBase<CallbackType>::Iterator it =
+        this->GetIterator();
+    CallbackType* cb;
+    while ((cb = it.GetNext()) != NULL) {
+      cb->Run(a1, a2, a3, a4, a5);
+    }
+  }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(CallbackList);
+};
+
+template <typename A1,
+          typename A2,
+          typename A3,
+          typename A4,
+          typename A5,
+          typename A6>
+class CallbackList<void(A1, A2, A3, A4, A5, A6)>
+    : public cef_internal::CallbackListBase<
+          Callback<void(A1, A2, A3, A4, A5, A6)>> {
+ public:
+  typedef Callback<void(A1, A2, A3, A4, A5, A6)> CallbackType;
+
+  CallbackList() {}
+
+  void Notify(typename cef_internal::CallbackParamTraits<A1>::ForwardType a1,
+              typename cef_internal::CallbackParamTraits<A2>::ForwardType a2,
+              typename cef_internal::CallbackParamTraits<A3>::ForwardType a3,
+              typename cef_internal::CallbackParamTraits<A4>::ForwardType a4,
+              typename cef_internal::CallbackParamTraits<A5>::ForwardType a5,
+              typename cef_internal::CallbackParamTraits<A6>::ForwardType a6) {
+    typename cef_internal::CallbackListBase<CallbackType>::Iterator it =
+        this->GetIterator();
+    CallbackType* cb;
+    while ((cb = it.GetNext()) != NULL) {
+      cb->Run(a1, a2, a3, a4, a5, a6);
+    }
+  }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(CallbackList);
+};
+
+template <typename A1,
+          typename A2,
+          typename A3,
+          typename A4,
+          typename A5,
+          typename A6,
+          typename A7>
+class CallbackList<void(A1, A2, A3, A4, A5, A6, A7)>
+    : public cef_internal::CallbackListBase<
+          Callback<void(A1, A2, A3, A4, A5, A6, A7)>> {
+ public:
+  typedef Callback<void(A1, A2, A3, A4, A5, A6, A7)> CallbackType;
+
+  CallbackList() {}
+
+  void Notify(typename cef_internal::CallbackParamTraits<A1>::ForwardType a1,
+              typename cef_internal::CallbackParamTraits<A2>::ForwardType a2,
+              typename cef_internal::CallbackParamTraits<A3>::ForwardType a3,
+              typename cef_internal::CallbackParamTraits<A4>::ForwardType a4,
+              typename cef_internal::CallbackParamTraits<A5>::ForwardType a5,
+              typename cef_internal::CallbackParamTraits<A6>::ForwardType a6,
+              typename cef_internal::CallbackParamTraits<A7>::ForwardType a7) {
+    typename cef_internal::CallbackListBase<CallbackType>::Iterator it =
+        this->GetIterator();
+    CallbackType* cb;
+    while ((cb = it.GetNext()) != NULL) {
+      cb->Run(a1, a2, a3, a4, a5, a6, a7);
+    }
+  }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(CallbackList);
+};

 }  // namespace base

--- a/include/base/cef_cancelable_callback.h
+++ b/include/base/cef_cancelable_callback.h
@@ -27,58 +27,54 @@
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-///
-/// \file
-/// CancelableCallback is a wrapper around base::Callback that allows
-/// cancellation of a callback. CancelableCallback takes a reference on the
-/// wrapped callback until this object is destroyed or Reset()/Cancel() are
-/// called.
-///
-/// NOTE:
-///
-/// Calling CancelableCallback::Cancel() brings the object back to its natural,
-/// default-constructed state, i.e., CancelableCallback::callback() will return
-/// a null callback.
-///
-/// THREAD-SAFETY:
-///
-/// CancelableCallback objects must be created on, posted to, cancelled on, and
-/// destroyed on the same thread.
-///
-///
-/// EXAMPLE USAGE:
-///
-/// In the following example, the test is verifying that RunIntensiveTest()
-/// Quit()s the message loop within 4 seconds. The cancelable callback is posted
-/// to the message loop, the intensive test runs, the message loop is run,
-/// then the callback is cancelled.
-///
-/// <pre>
-///   RunLoop run_loop;
-///
-///   void TimeoutCallback(const std::string& timeout_message) {
-///     FAIL() << timeout_message;
-///     run_loop.QuitWhenIdle();
-///   }
-///
-///   CancelableOnceClosure timeout(
-///       base::BindOnce(&TimeoutCallback, "Test timed out."));
-///   ThreadTaskRunnerHandle::Get()->PostDelayedTask(FROM_HERE,
-///                                                  timeout.callback(),
-///                                                  TimeDelta::FromSeconds(4));
-///   RunIntensiveTest();
-///   run_loop.Run();
-///   // Hopefully this is hit before the timeout callback runs.
-///   timeout.Cancel();
-/// </pre>
-///
+//
+// CancelableCallback is a wrapper around base::Callback that allows
+// cancellation of a callback. CancelableCallback takes a reference on the
+// wrapped callback until this object is destroyed or Reset()/Cancel() are
+// called.
+//
+// NOTE:
+//
+// Calling CancelableCallback::Cancel() brings the object back to its natural,
+// default-constructed state, i.e., CancelableCallback::callback() will return
+// a null callback.
+//
+// THREAD-SAFETY:
+//
+// CancelableCallback objects must be created on, posted to, cancelled on, and
+// destroyed on the same thread.
+//
+//
+// EXAMPLE USAGE:
+//
+// In the following example, the test is verifying that RunIntensiveTest()
+// Quit()s the message loop within 4 seconds. The cancelable callback is posted
+// to the message loop, the intensive test runs, the message loop is run,
+// then the callback is cancelled.
+//
+// void TimeoutCallback(const std::string& timeout_message) {
+//   FAIL() << timeout_message;
+//   MessageLoop::current()->QuitWhenIdle();
+// }
+//
+// CancelableClosure timeout(base::Bind(&TimeoutCallback, "Test timed out."));
+// MessageLoop::current()->PostDelayedTask(FROM_HERE, timeout.callback(),
+//                                         4000)  // 4 seconds to run.
+// RunIntensiveTest();
+// MessageLoop::current()->Run();
+// timeout.Cancel();  // Hopefully this is hit before the timeout callback runs.
+//

 #ifndef CEF_INCLUDE_BASE_CEF_CANCELABLE_CALLBACK_H_
 #define CEF_INCLUDE_BASE_CEF_CANCELABLE_CALLBACK_H_
 #pragma once

-#if defined(USING_CHROMIUM_INCLUDES)
+#if defined(BASE_CANCELABLE_CALLBACK_H_)
+// Do nothing if the Chromium header has already been included.
+// This can happen in cases where Chromium code is used directly by the
+// client application. When using Chromium code directly always include
+// the Chromium header first to avoid type conflicts.
+#elif defined(USING_CHROMIUM_INCLUDES)
 // When building CEF include the Chromium header directly.
 #include "base/cancelable_callback.h"
 #else  // !USING_CHROMIUM_INCLUDES
@@ -86,36 +82,37 @@
 // If the Chromium implementation diverges the below implementation should be
 // updated to match.

-#include <utility>
-
 #include "include/base/cef_bind.h"
+#include "include/base/cef_build.h"
 #include "include/base/cef_callback.h"
-#include "include/base/cef_compiler_specific.h"
 #include "include/base/cef_logging.h"
+#include "include/base/cef_macros.h"
 #include "include/base/cef_weak_ptr.h"
 #include "include/base/internal/cef_callback_internal.h"

 namespace base {
-namespace internal {

-template <typename CallbackType>
-class CancelableCallbackImpl {
+template <typename Sig>
+class CancelableCallback;
+
+template <>
+class CancelableCallback<void(void)> {
 public:
-  CancelableCallbackImpl() = default;
-  CancelableCallbackImpl(const CancelableCallbackImpl&) = delete;
-  CancelableCallbackImpl& operator=(const CancelableCallbackImpl&) = delete;
+  CancelableCallback() : weak_factory_(this) {}

  // |callback| must not be null.
-  explicit CancelableCallbackImpl(CallbackType callback)
-      : callback_(std::move(callback)) {
-    DCHECK(callback_);
+  explicit CancelableCallback(const base::Callback<void(void)>& callback)
+      : weak_factory_(this), callback_(callback) {
+    DCHECK(!callback.is_null());
+    InitializeForwarder();
  }

-  ~CancelableCallbackImpl() = default;
+  ~CancelableCallback() {}

  // Cancels and drops the reference to the wrapped callback.
  void Cancel() {
-    weak_ptr_factory_.InvalidateWeakPtrs();
+    weak_factory_.InvalidateWeakPtrs();
+    forwarder_.Reset();
    callback_.Reset();
  }

@@ -124,68 +121,170 @@ class CancelableCallbackImpl {

  // Sets |callback| as the closure that may be cancelled. |callback| may not
  // be null. Outstanding and any previously wrapped callbacks are cancelled.
-  void Reset(CallbackType callback) {
-    DCHECK(callback);
+  void Reset(const base::Callback<void(void)>& callback) {
+    DCHECK(!callback.is_null());
+
    // Outstanding tasks (e.g., posted to a message loop) must not be called.
    Cancel();
-    callback_ = std::move(callback);
+
+    // |forwarder_| is no longer valid after Cancel(), so re-bind.
+    InitializeForwarder();
+
+    callback_ = callback;
  }

  // Returns a callback that can be disabled by calling Cancel().
-  CallbackType callback() const {
-    if (!callback_)
-      return CallbackType();
-    CallbackType forwarder;
-    MakeForwarder(&forwarder);
-    return forwarder;
-  }
+  const base::Callback<void(void)>& callback() const { return forwarder_; }

 private:
-  template <typename... Args>
-  void MakeForwarder(RepeatingCallback<void(Args...)>* out) const {
-    using ForwarderType = void (CancelableCallbackImpl::*)(Args...);
-    ForwarderType forwarder = &CancelableCallbackImpl::ForwardRepeating;
-    *out = BindRepeating(forwarder, weak_ptr_factory_.GetWeakPtr());
+  void Forward() { callback_.Run(); }
+
+  // Helper method to bind |forwarder_| using a weak pointer from
+  // |weak_factory_|.
+  void InitializeForwarder() {
+    forwarder_ = base::Bind(&CancelableCallback<void(void)>::Forward,
+                            weak_factory_.GetWeakPtr());
  }

-  template <typename... Args>
-  void MakeForwarder(OnceCallback<void(Args...)>* out) const {
-    using ForwarderType = void (CancelableCallbackImpl::*)(Args...);
-    ForwarderType forwarder = &CancelableCallbackImpl::ForwardOnce;
-    *out = BindOnce(forwarder, weak_ptr_factory_.GetWeakPtr());
-  }
+  // Used to ensure Forward() is not run when this object is destroyed.
+  base::WeakPtrFactory<CancelableCallback<void(void)>> weak_factory_;

-  template <typename... Args>
-  void ForwardRepeating(Args... args) {
-    callback_.Run(std::forward<Args>(args)...);
-  }
-
-  template <typename... Args>
-  void ForwardOnce(Args... args) {
-    weak_ptr_factory_.InvalidateWeakPtrs();
-    std::move(callback_).Run(std::forward<Args>(args)...);
-  }
+  // The wrapper closure.
+  base::Callback<void(void)> forwarder_;

  // The stored closure that may be cancelled.
-  CallbackType callback_;
-  mutable base::WeakPtrFactory<CancelableCallbackImpl> weak_ptr_factory_{this};
+  base::Callback<void(void)> callback_;
+
+  DISALLOW_COPY_AND_ASSIGN(CancelableCallback);
 };

-}  // namespace internal
+template <typename A1>
+class CancelableCallback<void(A1)> {
+ public:
+  CancelableCallback() : weak_factory_(this) {}

-///
-/// Consider using base::WeakPtr directly instead of base::CancelableCallback
-/// for the task cancellation.
-///
-template <typename Signature>
-using CancelableOnceCallback =
-    internal::CancelableCallbackImpl<OnceCallback<Signature>>;
-using CancelableOnceClosure = CancelableOnceCallback<void()>;
+  // |callback| must not be null.
+  explicit CancelableCallback(const base::Callback<void(A1)>& callback)
+      : weak_factory_(this), callback_(callback) {
+    DCHECK(!callback.is_null());
+    InitializeForwarder();
+  }

-template <typename Signature>
-using CancelableRepeatingCallback =
-    internal::CancelableCallbackImpl<RepeatingCallback<Signature>>;
-using CancelableRepeatingClosure = CancelableRepeatingCallback<void()>;
+  ~CancelableCallback() {}
+
+  // Cancels and drops the reference to the wrapped callback.
+  void Cancel() {
+    weak_factory_.InvalidateWeakPtrs();
+    forwarder_.Reset();
+    callback_.Reset();
+  }
+
+  // Returns true if the wrapped callback has been cancelled.
+  bool IsCancelled() const { return callback_.is_null(); }
+
+  // Sets |callback| as the closure that may be cancelled. |callback| may not
+  // be null. Outstanding and any previously wrapped callbacks are cancelled.
+  void Reset(const base::Callback<void(A1)>& callback) {
+    DCHECK(!callback.is_null());
+
+    // Outstanding tasks (e.g., posted to a message loop) must not be called.
+    Cancel();
+
+    // |forwarder_| is no longer valid after Cancel(), so re-bind.
+    InitializeForwarder();
+
+    callback_ = callback;
+  }
+
+  // Returns a callback that can be disabled by calling Cancel().
+  const base::Callback<void(A1)>& callback() const { return forwarder_; }
+
+ private:
+  void Forward(A1 a1) const { callback_.Run(a1); }
+
+  // Helper method to bind |forwarder_| using a weak pointer from
+  // |weak_factory_|.
+  void InitializeForwarder() {
+    forwarder_ = base::Bind(&CancelableCallback<void(A1)>::Forward,
+                            weak_factory_.GetWeakPtr());
+  }
+
+  // Used to ensure Forward() is not run when this object is destroyed.
+  base::WeakPtrFactory<CancelableCallback<void(A1)>> weak_factory_;
+
+  // The wrapper closure.
+  base::Callback<void(A1)> forwarder_;
+
+  // The stored closure that may be cancelled.
+  base::Callback<void(A1)> callback_;
+
+  DISALLOW_COPY_AND_ASSIGN(CancelableCallback);
+};
+
+template <typename A1, typename A2>
+class CancelableCallback<void(A1, A2)> {
+ public:
+  CancelableCallback() : weak_factory_(this) {}
+
+  // |callback| must not be null.
+  explicit CancelableCallback(const base::Callback<void(A1, A2)>& callback)
+      : weak_factory_(this), callback_(callback) {
+    DCHECK(!callback.is_null());
+    InitializeForwarder();
+  }
+
+  ~CancelableCallback() {}
+
+  // Cancels and drops the reference to the wrapped callback.
+  void Cancel() {
+    weak_factory_.InvalidateWeakPtrs();
+    forwarder_.Reset();
+    callback_.Reset();
+  }
+
+  // Returns true if the wrapped callback has been cancelled.
+  bool IsCancelled() const { return callback_.is_null(); }
+
+  // Sets |callback| as the closure that may be cancelled. |callback| may not
+  // be null. Outstanding and any previously wrapped callbacks are cancelled.
+  void Reset(const base::Callback<void(A1, A2)>& callback) {
+    DCHECK(!callback.is_null());
+
+    // Outstanding tasks (e.g., posted to a message loop) must not be called.
+    Cancel();
+
+    // |forwarder_| is no longer valid after Cancel(), so re-bind.
+    InitializeForwarder();
+
+    callback_ = callback;
+  }
+
+  // Returns a callback that can be disabled by calling Cancel().
+  const base::Callback<void(A1, A2)>& callback() const { return forwarder_; }
+
+ private:
+  void Forward(A1 a1, A2 a2) const { callback_.Run(a1, a2); }
+
+  // Helper method to bind |forwarder_| using a weak pointer from
+  // |weak_factory_|.
+  void InitializeForwarder() {
+    forwarder_ = base::Bind(&CancelableCallback<void(A1, A2)>::Forward,
+                            weak_factory_.GetWeakPtr());
+  }
+
+  // Used to ensure Forward() is not run when this object is destroyed.
+  base::WeakPtrFactory<CancelableCallback<void(A1, A2)>> weak_factory_;
+
+  // The wrapper closure.
+  base::Callback<void(A1, A2)> forwarder_;
+
+  // The stored closure that may be cancelled.
+  base::Callback<void(A1, A2)> callback_;
+
+  DISALLOW_COPY_AND_ASSIGN(CancelableCallback);
+};
+
+typedef CancelableCallback<void(void)> CancelableClosure;

 }  // namespace base

--- a/include/base/cef_compiler_specific.h
+++ b/include/base/cef_compiler_specific.h
@@ -1,389 +0,0 @@
-// Copyright (c) 2021 Marshall A. Greenblatt. Portions copyright (c) 2012
-// Google Inc. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//    * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//    * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//    * Neither the name of Google Inc. nor the name Chromium Embedded
-// Framework nor the names of its contributors may be used to endorse
-// or promote products derived from this software without specific prior
-// written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef CEF_INCLUDE_BASE_CEF_COMPILER_SPECIFIC_H_
-#define CEF_INCLUDE_BASE_CEF_COMPILER_SPECIFIC_H_
-#pragma once
-
-#if defined(USING_CHROMIUM_INCLUDES)
-// When building CEF include the Chromium header directly.
-#include "base/compiler_specific.h"
-#else  // !USING_CHROMIUM_INCLUDES
-// The following is substantially similar to the Chromium implementation.
-// If the Chromium implementation diverges the below implementation should be
-// updated to match.
-
-#include "include/base/cef_build.h"
-
-// This is a wrapper around `__has_cpp_attribute`, which can be used to test for
-// the presence of an attribute. In case the compiler does not support this
-// macro it will simply evaluate to 0.
-//
-// References:
-// https://wg21.link/sd6#testing-for-the-presence-of-an-attribute-__has_cpp_attribute
-// https://wg21.link/cpp.cond#:__has_cpp_attribute
-#if defined(__has_cpp_attribute)
-#define HAS_CPP_ATTRIBUTE(x) __has_cpp_attribute(x)
-#else
-#define HAS_CPP_ATTRIBUTE(x) 0
-#endif
-
-// A wrapper around `__has_builtin`, similar to HAS_CPP_ATTRIBUTE.
-#if defined(__has_builtin)
-#define HAS_BUILTIN(x) __has_builtin(x)
-#else
-#define HAS_BUILTIN(x) 0
-#endif
-
-// __has_feature and __has_attribute don't exist for MSVC.
-#if !defined(__has_feature)
-#define __has_feature(x) 0
-#endif  // !defined(__has_feature)
-
-#if !defined(__has_attribute)
-#define __has_attribute(x) 0
-#endif  // !defined(__has_attribute)
-
-// Annotate a function indicating it should not be inlined.
-// Use like:
-//   NOINLINE void DoStuff() { ... }
-#if defined(COMPILER_GCC)
-#define NOINLINE __attribute__((noinline))
-#elif defined(COMPILER_MSVC)
-#define NOINLINE __declspec(noinline)
-#else
-#define NOINLINE
-#endif
-
-#if defined(COMPILER_GCC) && defined(NDEBUG)
-#define ALWAYS_INLINE inline __attribute__((__always_inline__))
-#elif defined(COMPILER_MSVC) && defined(NDEBUG)
-#define ALWAYS_INLINE __forceinline
-#else
-#define ALWAYS_INLINE inline
-#endif
-
-// Annotate a function indicating it should never be tail called. Useful to make
-// sure callers of the annotated function are never omitted from call-stacks.
-// To provide the complementary behavior (prevent the annotated function from
-// being omitted) look at NOINLINE. Also note that this doesn't prevent code
-// folding of multiple identical caller functions into a single signature. To
-// prevent code folding, see NO_CODE_FOLDING() in base/debug/alias.h.
-// Use like:
-//   void NOT_TAIL_CALLED FooBar();
-#if defined(__clang__) && __has_attribute(not_tail_called)
-#define NOT_TAIL_CALLED __attribute__((not_tail_called))
-#else
-#define NOT_TAIL_CALLED
-#endif
-
-// Specify memory alignment for structs, classes, etc.
-// Use like:
-//   class ALIGNAS(16) MyClass { ... }
-//   ALIGNAS(16) int array[4];
-//
-// In most places you can use the C++11 keyword "alignas", which is preferred.
-//
-// But compilers have trouble mixing __attribute__((...)) syntax with
-// alignas(...) syntax.
-//
-// Doesn't work in clang or gcc:
-//   struct alignas(16) __attribute__((packed)) S { char c; };
-// Works in clang but not gcc:
-//   struct __attribute__((packed)) alignas(16) S2 { char c; };
-// Works in clang and gcc:
-//   struct alignas(16) S3 { char c; } __attribute__((packed));
-//
-// There are also some attributes that must be specified *before* a class
-// definition: visibility (used for exporting functions/classes) is one of
-// these attributes. This means that it is not possible to use alignas() with a
-// class that is marked as exported.
-#if defined(COMPILER_MSVC)
-#define ALIGNAS(byte_alignment) __declspec(align(byte_alignment))
-#elif defined(COMPILER_GCC)
-#define ALIGNAS(byte_alignment) __attribute__((aligned(byte_alignment)))
-#endif
-
-// In case the compiler supports it NO_UNIQUE_ADDRESS evaluates to the C++20
-// attribute [[no_unique_address]]. This allows annotating data members so that
-// they need not have an address distinct from all other non-static data members
-// of its class.
-//
-// References:
-// * https://en.cppreference.com/w/cpp/language/attributes/no_unique_address
-// * https://wg21.link/dcl.attr.nouniqueaddr
-#if HAS_CPP_ATTRIBUTE(no_unique_address)
-#define NO_UNIQUE_ADDRESS [[no_unique_address]]
-#else
-#define NO_UNIQUE_ADDRESS
-#endif
-
-// Tell the compiler a function is using a printf-style format string.
-// |format_param| is the one-based index of the format string parameter;
-// |dots_param| is the one-based index of the "..." parameter.
-// For v*printf functions (which take a va_list), pass 0 for dots_param.
-// (This is undocumented but matches what the system C headers do.)
-// For member functions, the implicit this parameter counts as index 1.
-#if defined(COMPILER_GCC) || defined(__clang__)
-#define PRINTF_FORMAT(format_param, dots_param) \
-  __attribute__((format(printf, format_param, dots_param)))
-#else
-#define PRINTF_FORMAT(format_param, dots_param)
-#endif
-
-// WPRINTF_FORMAT is the same, but for wide format strings.
-// This doesn't appear to yet be implemented in any compiler.
-// See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38308 .
-#define WPRINTF_FORMAT(format_param, dots_param)
-// If available, it would look like:
-//   __attribute__((format(wprintf, format_param, dots_param)))
-
-// Sanitizers annotations.
-#if defined(__has_attribute)
-#if __has_attribute(no_sanitize)
-#define NO_SANITIZE(what) __attribute__((no_sanitize(what)))
-#endif
-#endif
-#if !defined(NO_SANITIZE)
-#define NO_SANITIZE(what)
-#endif
-
-// MemorySanitizer annotations.
-#if defined(MEMORY_SANITIZER) && !defined(OS_NACL)
-#include <sanitizer/msan_interface.h>
-
-// Mark a memory region fully initialized.
-// Use this to annotate code that deliberately reads uninitialized data, for
-// example a GC scavenging root set pointers from the stack.
-#define MSAN_UNPOISON(p, size) __msan_unpoison(p, size)
-
-// Check a memory region for initializedness, as if it was being used here.
-// If any bits are uninitialized, crash with an MSan report.
-// Use this to sanitize data which MSan won't be able to track, e.g. before
-// passing data to another process via shared memory.
-#define MSAN_CHECK_MEM_IS_INITIALIZED(p, size) \
-  __msan_check_mem_is_initialized(p, size)
-#else  // MEMORY_SANITIZER
-#define MSAN_UNPOISON(p, size)
-#define MSAN_CHECK_MEM_IS_INITIALIZED(p, size)
-#endif  // MEMORY_SANITIZER
-
-// DISABLE_CFI_PERF -- Disable Control Flow Integrity for perf reasons.
-#if !defined(DISABLE_CFI_PERF)
-#if defined(__clang__) && defined(OFFICIAL_BUILD)
-#define DISABLE_CFI_PERF __attribute__((no_sanitize("cfi")))
-#else
-#define DISABLE_CFI_PERF
-#endif
-#endif
-
-// DISABLE_CFI_ICALL -- Disable Control Flow Integrity indirect call checks.
-#if !defined(DISABLE_CFI_ICALL)
-#if defined(OS_WIN)
-// Windows also needs __declspec(guard(nocf)).
-#define DISABLE_CFI_ICALL NO_SANITIZE("cfi-icall") __declspec(guard(nocf))
-#else
-#define DISABLE_CFI_ICALL NO_SANITIZE("cfi-icall")
-#endif
-#endif
-#if !defined(DISABLE_CFI_ICALL)
-#define DISABLE_CFI_ICALL
-#endif
-
-// Macro useful for writing cross-platform function pointers.
-#if !defined(CDECL)
-#if defined(OS_WIN)
-#define CDECL __cdecl
-#else  // defined(OS_WIN)
-#define CDECL
-#endif  // defined(OS_WIN)
-#endif  // !defined(CDECL)
-
-// Macro for hinting that an expression is likely to be false.
-#if !defined(UNLIKELY)
-#if defined(COMPILER_GCC) || defined(__clang__)
-#define UNLIKELY(x) __builtin_expect(!!(x), 0)
-#else
-#define UNLIKELY(x) (x)
-#endif  // defined(COMPILER_GCC)
-#endif  // !defined(UNLIKELY)
-
-#if !defined(LIKELY)
-#if defined(COMPILER_GCC) || defined(__clang__)
-#define LIKELY(x) __builtin_expect(!!(x), 1)
-#else
-#define LIKELY(x) (x)
-#endif  // defined(COMPILER_GCC)
-#endif  // !defined(LIKELY)
-
-// Compiler feature-detection.
-// clang.llvm.org/docs/LanguageExtensions.html#has-feature-and-has-extension
-#if defined(__has_feature)
-#define HAS_FEATURE(FEATURE) __has_feature(FEATURE)
-#else
-#define HAS_FEATURE(FEATURE) 0
-#endif
-
-// Macro for telling -Wimplicit-fallthrough that a fallthrough is intentional.
-#if defined(__clang__)
-#define FALLTHROUGH [[clang::fallthrough]]
-#else
-#define FALLTHROUGH
-#endif
-
-#if defined(COMPILER_GCC)
-#define PRETTY_FUNCTION __PRETTY_FUNCTION__
-#elif defined(COMPILER_MSVC)
-#define PRETTY_FUNCTION __FUNCSIG__
-#else
-// See https://en.cppreference.com/w/c/language/function_definition#func
-#define PRETTY_FUNCTION __func__
-#endif
-
-#if !defined(CPU_ARM_NEON)
-#if defined(__arm__)
-#if !defined(__ARMEB__) && !defined(__ARM_EABI__) && !defined(__EABI__) && \
-    !defined(__VFP_FP__) && !defined(_WIN32_WCE) && !defined(ANDROID)
-#error Chromium does not support middle endian architecture
-#endif
-#if defined(__ARM_NEON__)
-#define CPU_ARM_NEON 1
-#endif
-#endif  // defined(__arm__)
-#endif  // !defined(CPU_ARM_NEON)
-
-#if !defined(HAVE_MIPS_MSA_INTRINSICS)
-#if defined(__mips_msa) && defined(__mips_isa_rev) && (__mips_isa_rev >= 5)
-#define HAVE_MIPS_MSA_INTRINSICS 1
-#endif
-#endif
-
-#if defined(__clang__) && __has_attribute(uninitialized)
-// Attribute "uninitialized" disables -ftrivial-auto-var-init=pattern for
-// the specified variable.
-// Library-wide alternative is
-// 'configs -= [ "//build/config/compiler:default_init_stack_vars" ]' in .gn
-// file.
-//
-// See "init_stack_vars" in build/config/compiler/BUILD.gn and
-// http://crbug.com/977230
-// "init_stack_vars" is enabled for non-official builds and we hope to enable it
-// in official build in 2020 as well. The flag writes fixed pattern into
-// uninitialized parts of all local variables. In rare cases such initialization
-// is undesirable and attribute can be used:
-//   1. Degraded performance
-// In most cases compiler is able to remove additional stores. E.g. if memory is
-// never accessed or properly initialized later. Preserved stores mostly will
-// not affect program performance. However if compiler failed on some
-// performance critical code we can get a visible regression in a benchmark.
-//   2. memset, memcpy calls
-// Compiler may replaces some memory writes with memset or memcpy calls. This is
-// not -ftrivial-auto-var-init specific, but it can happen more likely with the
-// flag. It can be a problem if code is not linked with C run-time library.
-//
-// Note: The flag is security risk mitigation feature. So in future the
-// attribute uses should be avoided when possible. However to enable this
-// mitigation on the most of the code we need to be less strict now and minimize
-// number of exceptions later. So if in doubt feel free to use attribute, but
-// please document the problem for someone who is going to cleanup it later.
-// E.g. platform, bot, benchmark or test name in patch description or next to
-// the attribute.
-#define STACK_UNINITIALIZED __attribute__((uninitialized))
-#else
-#define STACK_UNINITIALIZED
-#endif
-
-// The ANALYZER_ASSUME_TRUE(bool arg) macro adds compiler-specific hints
-// to Clang which control what code paths are statically analyzed,
-// and is meant to be used in conjunction with assert & assert-like functions.
-// The expression is passed straight through if analysis isn't enabled.
-//
-// ANALYZER_SKIP_THIS_PATH() suppresses static analysis for the current
-// codepath and any other branching codepaths that might follow.
-#if defined(__clang_analyzer__)
-
-inline constexpr bool AnalyzerNoReturn() __attribute__((analyzer_noreturn)) {
-  return false;
-}
-
-inline constexpr bool AnalyzerAssumeTrue(bool arg) {
-  // AnalyzerNoReturn() is invoked and analysis is terminated if |arg| is
-  // false.
-  return arg || AnalyzerNoReturn();
-}
-
-#define ANALYZER_ASSUME_TRUE(arg) ::AnalyzerAssumeTrue(!!(arg))
-#define ANALYZER_SKIP_THIS_PATH() static_cast<void>(::AnalyzerNoReturn())
-#define ANALYZER_ALLOW_UNUSED(var) static_cast<void>(var);
-
-#else  // !defined(__clang_analyzer__)
-
-#define ANALYZER_ASSUME_TRUE(arg) (arg)
-#define ANALYZER_SKIP_THIS_PATH()
-#define ANALYZER_ALLOW_UNUSED(var) static_cast<void>(var);
-
-#endif  // defined(__clang_analyzer__)
-
-// Use nomerge attribute to disable optimization of merging multiple same calls.
-#if defined(__clang__) && __has_attribute(nomerge)
-#define NOMERGE [[clang::nomerge]]
-#else
-#define NOMERGE
-#endif
-
-// Marks a type as being eligible for the "trivial" ABI despite having a
-// non-trivial destructor or copy/move constructor. Such types can be relocated
-// after construction by simply copying their memory, which makes them eligible
-// to be passed in registers. The canonical example is std::unique_ptr.
-//
-// Use with caution; this has some subtle effects on constructor/destructor
-// ordering and will be very incorrect if the type relies on its address
-// remaining constant. When used as a function argument (by value), the value
-// may be constructed in the caller's stack frame, passed in a register, and
-// then used and destructed in the callee's stack frame. A similar thing can
-// occur when values are returned.
-//
-// TRIVIAL_ABI is not needed for types which have a trivial destructor and
-// copy/move constructors, such as base::TimeTicks and other POD.
-//
-// It is also not likely to be effective on types too large to be passed in one
-// or two registers on typical target ABIs.
-//
-// See also:
-//   https://clang.llvm.org/docs/AttributeReference.html#trivial-abi
-//   https://libcxx.llvm.org/docs/DesignDocs/UniquePtrTrivialAbi.html
-#if defined(__clang__) && __has_attribute(trivial_abi)
-#define TRIVIAL_ABI [[clang::trivial_abi]]
-#else
-#define TRIVIAL_ABI
-#endif
-
-#endif  // !USING_CHROMIUM_INCLUDES
-#endif  // CEF_INCLUDE_BASE_CEF_COMPILER_SPECIFIC_H_
--- a/include/base/cef_lock.h
+++ b/include/base/cef_lock.h
@@ -32,7 +32,12 @@
 #define CEF_INCLUDE_BASE_CEF_LOCK_H_
 #pragma once

-#if defined(USING_CHROMIUM_INCLUDES)
+#if defined(BASE_SYNCHRONIZATION_LOCK_H_)
+// Do nothing if the Chromium header has already been included.
+// This can happen in cases where Chromium code is used directly by the
+// client application. When using Chromium code directly always include
+// the Chromium header first to avoid type conflicts.
+#elif defined(USING_CHROMIUM_INCLUDES)
 // When building CEF include the Chromium header directly.
 #include "base/synchronization/lock.h"
 #else  // !USING_CHROMIUM_INCLUDES
@@ -41,35 +46,28 @@
 // updated to match.

 #include "include/base/cef_logging.h"
+#include "include/base/cef_macros.h"
 #include "include/base/cef_platform_thread.h"
 #include "include/base/internal/cef_lock_impl.h"

 namespace base {
 namespace cef_internal {

-///
-/// A convenient wrapper for an OS specific critical section.  The only real
-/// intelligence in this class is in debug mode for the support for the
-/// AssertAcquired() method.
-///
+// A convenient wrapper for an OS specific critical section.  The only real
+// intelligence in this class is in debug mode for the support for the
+// AssertAcquired() method.
 class Lock {
 public:
 #if !DCHECK_IS_ON()  // Optimized wrapper implementation
  Lock() : lock_() {}
-
-  Lock(const Lock&) = delete;
-  Lock& operator=(const Lock&) = delete;
-
  ~Lock() {}
  void Acquire() { lock_.Lock(); }
  void Release() { lock_.Unlock(); }

-  ///
-  /// If the lock is not held, take it and return true. If the lock is already
-  /// held by another thread, immediately return false. This must not be called
-  /// by a thread already holding the lock (what happens is undefined and an
-  /// assertion may fail).
-  ///
+  // If the lock is not held, take it and return true. If the lock is already
+  // held by another thread, immediately return false. This must not be called
+  // by a thread already holding the lock (what happens is undefined and an
+  // assertion may fail).
  bool Try() { return lock_.Try(); }

  // Null implementation if not debug.
@@ -118,11 +116,11 @@ class Lock {

  // Platform specific underlying lock implementation.
  LockImpl lock_;
+
+  DISALLOW_COPY_AND_ASSIGN(Lock);
 };

-///
-/// A helper class that acquires the given Lock while the AutoLock is in scope.
-///
+// A helper class that acquires the given Lock while the AutoLock is in scope.
 class AutoLock {
 public:
  struct AlreadyAcquired {};
@@ -133,9 +131,6 @@ class AutoLock {
    lock_.AssertAcquired();
  }

-  AutoLock(const AutoLock&) = delete;
-  AutoLock& operator=(const AutoLock&) = delete;
-
  ~AutoLock() {
    lock_.AssertAcquired();
    lock_.Release();
@@ -143,12 +138,11 @@ class AutoLock {

 private:
  Lock& lock_;
+  DISALLOW_COPY_AND_ASSIGN(AutoLock);
 };

-///
-/// AutoUnlock is a helper that will Release() the |lock| argument in the
-/// constructor, and re-Acquire() it in the destructor.
-///
+// AutoUnlock is a helper that will Release() the |lock| argument in the
+// constructor, and re-Acquire() it in the destructor.
 class AutoUnlock {
 public:
  explicit AutoUnlock(Lock& lock) : lock_(lock) {
@@ -157,13 +151,11 @@ class AutoUnlock {
    lock_.Release();
  }

-  AutoUnlock(const AutoUnlock&) = delete;
-  AutoUnlock& operator=(const AutoUnlock&) = delete;
-
  ~AutoUnlock() { lock_.Acquire(); }

 private:
  Lock& lock_;
+  DISALLOW_COPY_AND_ASSIGN(AutoUnlock);
 };

 }  // namespace cef_internal
@@ -171,9 +163,9 @@ class AutoUnlock {
 // Implement classes in the cef_internal namespace and then expose them to the
 // base namespace. This avoids conflicts with the base.lib implementation when
 // linking sandbox support on Windows.
+using cef_internal::Lock;
 using cef_internal::AutoLock;
 using cef_internal::AutoUnlock;
-using cef_internal::Lock;

 }  // namespace base

--- a/include/base/cef_logging.h
+++ b/include/base/cef_logging.h
@@ -27,130 +27,110 @@
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-///
-/// \file
-/// A bunch of macros for logging.
-///
-/// NOTE: The contents of this file are only available to applications that link
-/// against the libcef_dll_wrapper target.
-///
-/// WARNING: Logging macros should not be used in the main/browser process
-/// before calling CefInitialize or in sub-processes before calling
-/// CefExecuteProcess.
-///
-/// INSTRUCTIONS:
-///
-/// The way to log things is to stream things to LOG(<a particular severity
-/// level>). E.g.,
-///
-/// <pre>
-///   LOG(INFO) << "Found " << num_cookies << " cookies";
-/// </pre>
-///
-/// You can also do conditional logging:
-///
-/// <pre>
-///   LOG_IF(INFO, num_cookies > 10) << "Got lots of cookies";
-/// </pre>
-///
-/// The CHECK(condition) macro is active in both debug and release builds and
-/// effectively performs a LOG(FATAL) which terminates the process and
-/// generates a crashdump unless a debugger is attached.
-///
-/// There are also "debug mode" logging macros like the ones above:
-///
-/// <pre>
-///   DLOG(INFO) << "Found cookies";
-///
-///   DLOG_IF(INFO, num_cookies > 10) << "Got lots of cookies";
-/// </pre>
-///
-/// All "debug mode" logging is compiled away to nothing for non-debug mode
-/// compiles.  LOG_IF and development flags also work well together
-/// because the code can be compiled away sometimes.
-///
-/// We also have
-///
-/// <pre>
-///   LOG_ASSERT(assertion);
-///   DLOG_ASSERT(assertion);
-/// </pre>
-///
-/// which is syntactic sugar for "{,D}LOG_IF(FATAL, assert fails) << assertion;"
-///
-/// There are "verbose level" logging macros.  They look like
-///
-/// <pre>
-///   VLOG(1) << "I'm printed when you run the program with --v=1 or more";
-///   VLOG(2) << "I'm printed when you run the program with --v=2 or more";
-/// </pre>
-///
-/// These always log at the INFO log level (when they log at all).
-/// The verbose logging can also be turned on module-by-module.  For instance,
-/// <pre>
-///    --vmodule=profile=2,icon_loader=1,browser_*=3,*/chromeos/*=4 --v=0
-/// </pre>
-/// will cause:
-/// 1. VLOG(2) and lower messages to be printed from profile.{h,cc}
-/// 2. VLOG(1) and lower messages to be printed from icon_loader.{h,cc}
-/// 3. VLOG(3) and lower messages to be printed from files prefixed with
-///    "browser"
-/// 4. VLOG(4) and lower messages to be printed from files under a
-///    "chromeos" directory.
-/// 5. VLOG(0) and lower messages to be printed from elsewhere
-///
-/// The wildcarding functionality shown by (c) supports both '*' (match
-/// 0 or more characters) and '?' (match any single character)
-/// wildcards.  Any pattern containing a forward or backward slash will
-/// be tested against the whole pathname and not just the module.
-/// E.g., "*/foo/bar/*=2" would change the logging level for all code
-/// in source files under a "foo/bar" directory.
-///
-/// There's also VLOG_IS_ON(n) "verbose level" condition macro. To be used as
-///
-/// <pre>
-///   if (VLOG_IS_ON(2)) {
-///     // do some logging preparation and logging
-///     // that can't be accomplished with just VLOG(2) << ...;
-///   }
-/// </pre>
-///
-/// There is also a VLOG_IF "verbose level" condition macro for sample
-/// cases, when some extra computation and preparation for logs is not
-/// needed.
-///
-/// <pre>
-///   VLOG_IF(1, (size > 1024))
-///      << "I'm printed when size is more than 1024 and when you run the "
-///         "program with --v=1 or more";
-/// </pre>
-///
-/// We also override the standard 'assert' to use 'DLOG_ASSERT'.
-///
-/// Lastly, there is:
-///
-/// <pre>
-///   PLOG(ERROR) << "Couldn't do foo";
-///   DPLOG(ERROR) << "Couldn't do foo";
-///   PLOG_IF(ERROR, cond) << "Couldn't do foo";
-///   DPLOG_IF(ERROR, cond) << "Couldn't do foo";
-///   PCHECK(condition) << "Couldn't do foo";
-///   DPCHECK(condition) << "Couldn't do foo";
-/// </pre>
-///
-/// which append the last system error to the message in string form (taken from
-/// GetLastError() on Windows and errno on POSIX).
-///
-/// The supported severity levels for macros that allow you to specify one
-/// are (in increasing order of severity) INFO, WARNING, ERROR, and FATAL.
-///
-/// Very important: logging a message at the FATAL severity level causes
-/// the program to terminate (after the message is logged).
-///
-/// There is the special severity of DFATAL, which logs FATAL in debug mode,
-/// ERROR in normal mode.
-///
+//
+// ---------------------------------------------------------------------------
+//
+// The contents of this file are only available to applications that link
+// against the libcef_dll_wrapper target.
+//
+// WARNING: Logging macros should not be used in the main/browser process before
+// calling CefInitialize or in sub-processes before calling CefExecuteProcess.
+//
+// Instructions
+// ------------
+//
+// Make a bunch of macros for logging.  The way to log things is to stream
+// things to LOG(<a particular severity level>).  E.g.,
+//
+//   LOG(INFO) << "Found " << num_cookies << " cookies";
+//
+// You can also do conditional logging:
+//
+//   LOG_IF(INFO, num_cookies > 10) << "Got lots of cookies";
+//
+// The CHECK(condition) macro is active in both debug and release builds and
+// effectively performs a LOG(FATAL) which terminates the process and
+// generates a crashdump unless a debugger is attached.
+//
+// There are also "debug mode" logging macros like the ones above:
+//
+//   DLOG(INFO) << "Found cookies";
+//
+//   DLOG_IF(INFO, num_cookies > 10) << "Got lots of cookies";
+//
+// All "debug mode" logging is compiled away to nothing for non-debug mode
+// compiles.  LOG_IF and development flags also work well together
+// because the code can be compiled away sometimes.
+//
+// We also have
+//
+//   LOG_ASSERT(assertion);
+//   DLOG_ASSERT(assertion);
+//
+// which is syntactic sugar for {,D}LOG_IF(FATAL, assert fails) << assertion;
+//
+// There are "verbose level" logging macros.  They look like
+//
+//   VLOG(1) << "I'm printed when you run the program with --v=1 or more";
+//   VLOG(2) << "I'm printed when you run the program with --v=2 or more";
+//
+// These always log at the INFO log level (when they log at all).
+// The verbose logging can also be turned on module-by-module.  For instance,
+//    --vmodule=profile=2,icon_loader=1,browser_*=3,*/chromeos/*=4 --v=0
+// will cause:
+//   a. VLOG(2) and lower messages to be printed from profile.{h,cc}
+//   b. VLOG(1) and lower messages to be printed from icon_loader.{h,cc}
+//   c. VLOG(3) and lower messages to be printed from files prefixed with
+//      "browser"
+//   d. VLOG(4) and lower messages to be printed from files under a
+//     "chromeos" directory.
+//   e. VLOG(0) and lower messages to be printed from elsewhere
+//
+// The wildcarding functionality shown by (c) supports both '*' (match
+// 0 or more characters) and '?' (match any single character)
+// wildcards.  Any pattern containing a forward or backward slash will
+// be tested against the whole pathname and not just the module.
+// E.g., "*/foo/bar/*=2" would change the logging level for all code
+// in source files under a "foo/bar" directory.
+//
+// There's also VLOG_IS_ON(n) "verbose level" condition macro. To be used as
+//
+//   if (VLOG_IS_ON(2)) {
+//     // do some logging preparation and logging
+//     // that can't be accomplished with just VLOG(2) << ...;
+//   }
+//
+// There is also a VLOG_IF "verbose level" condition macro for sample
+// cases, when some extra computation and preparation for logs is not
+// needed.
+//
+//   VLOG_IF(1, (size > 1024))
+//      << "I'm printed when size is more than 1024 and when you run the "
+//         "program with --v=1 or more";
+//
+// We also override the standard 'assert' to use 'DLOG_ASSERT'.
+//
+// Lastly, there is:
+//
+//   PLOG(ERROR) << "Couldn't do foo";
+//   DPLOG(ERROR) << "Couldn't do foo";
+//   PLOG_IF(ERROR, cond) << "Couldn't do foo";
+//   DPLOG_IF(ERROR, cond) << "Couldn't do foo";
+//   PCHECK(condition) << "Couldn't do foo";
+//   DPCHECK(condition) << "Couldn't do foo";
+//
+// which append the last system error to the message in string form (taken from
+// GetLastError() on Windows and errno on POSIX).
+//
+// The supported severity levels for macros that allow you to specify one
+// are (in increasing order of severity) INFO, WARNING, ERROR, and FATAL.
+//
+// Very important: logging a message at the FATAL severity level causes
+// the program to terminate (after the message is logged).
+//
+// There is the special severity of DFATAL, which logs FATAL in debug mode,
+// ERROR in normal mode.
+//

 #ifndef CEF_INCLUDE_BASE_CEF_LOGGING_H_
 #define CEF_INCLUDE_BASE_CEF_LOGGING_H_
@@ -184,6 +164,7 @@
 #include <string>

 #include "include/base/cef_build.h"
+#include "include/base/cef_macros.h"
 #include "include/internal/cef_logging_internal.h"

 namespace cef {
@@ -221,21 +202,21 @@ const LogSeverity LOG_DFATAL = LOG_FATAL;
 // A few definitions of macros that don't generate much code. These are used
 // by LOG() and LOG_IF, etc. Since these are used all over our code, it's
 // better to have compact code for these operations.
-#define COMPACT_GOOGLE_LOG_EX_INFO(ClassName, ...)                        \
-  ::cef::logging::ClassName(__FILE__, __LINE__, ::cef::logging::LOG_INFO, \
-                            ##__VA_ARGS__)
-#define COMPACT_GOOGLE_LOG_EX_WARNING(ClassName, ...)                        \
-  ::cef::logging::ClassName(__FILE__, __LINE__, ::cef::logging::LOG_WARNING, \
-                            ##__VA_ARGS__)
-#define COMPACT_GOOGLE_LOG_EX_ERROR(ClassName, ...)                        \
-  ::cef::logging::ClassName(__FILE__, __LINE__, ::cef::logging::LOG_ERROR, \
-                            ##__VA_ARGS__)
-#define COMPACT_GOOGLE_LOG_EX_FATAL(ClassName, ...)                        \
-  ::cef::logging::ClassName(__FILE__, __LINE__, ::cef::logging::LOG_FATAL, \
-                            ##__VA_ARGS__)
-#define COMPACT_GOOGLE_LOG_EX_DFATAL(ClassName, ...)                        \
-  ::cef::logging::ClassName(__FILE__, __LINE__, ::cef::logging::LOG_DFATAL, \
-                            ##__VA_ARGS__)
+#define COMPACT_GOOGLE_LOG_EX_INFO(ClassName, ...)                    \
+  cef::logging::ClassName(__FILE__, __LINE__, cef::logging::LOG_INFO, \
+                          ##__VA_ARGS__)
+#define COMPACT_GOOGLE_LOG_EX_WARNING(ClassName, ...)                    \
+  cef::logging::ClassName(__FILE__, __LINE__, cef::logging::LOG_WARNING, \
+                          ##__VA_ARGS__)
+#define COMPACT_GOOGLE_LOG_EX_ERROR(ClassName, ...)                    \
+  cef::logging::ClassName(__FILE__, __LINE__, cef::logging::LOG_ERROR, \
+                          ##__VA_ARGS__)
+#define COMPACT_GOOGLE_LOG_EX_FATAL(ClassName, ...)                    \
+  cef::logging::ClassName(__FILE__, __LINE__, cef::logging::LOG_FATAL, \
+                          ##__VA_ARGS__)
+#define COMPACT_GOOGLE_LOG_EX_DFATAL(ClassName, ...)                    \
+  cef::logging::ClassName(__FILE__, __LINE__, cef::logging::LOG_DFATAL, \
+                          ##__VA_ARGS__)

 #define COMPACT_GOOGLE_LOG_INFO COMPACT_GOOGLE_LOG_EX_INFO(LogMessage)
 #define COMPACT_GOOGLE_LOG_WARNING COMPACT_GOOGLE_LOG_EX_WARNING(LogMessage)
@@ -602,9 +583,6 @@ class LogMessage {
             LogSeverity severity,
             std::string* result);

-  LogMessage(const LogMessage&) = delete;
-  LogMessage& operator=(const LogMessage&) = delete;
-
  ~LogMessage();

  std::ostream& stream() { return stream_; }
@@ -636,6 +614,8 @@ class LogMessage {

  SaveLastError last_error_;
 #endif
+
+  DISALLOW_COPY_AND_ASSIGN(LogMessage);
 };

 // A non-macro interface to the log facility; (useful
@@ -675,9 +655,6 @@ class Win32ErrorLogMessage {
                       LogSeverity severity,
                       SystemErrorCode err);

-  Win32ErrorLogMessage(const Win32ErrorLogMessage&) = delete;
-  Win32ErrorLogMessage& operator=(const Win32ErrorLogMessage&) = delete;
-
  // Appends the error message before destructing the encapsulated class.
  ~Win32ErrorLogMessage();

@@ -686,6 +663,8 @@ class Win32ErrorLogMessage {
 private:
  SystemErrorCode err_;
  LogMessage log_message_;
+
+  DISALLOW_COPY_AND_ASSIGN(Win32ErrorLogMessage);
 };
 #elif defined(OS_POSIX)
 // Appends a formatted system message of the errno type
@@ -696,9 +675,6 @@ class ErrnoLogMessage {
                  LogSeverity severity,
                  SystemErrorCode err);

-  ErrnoLogMessage(const ErrnoLogMessage&) = delete;
-  ErrnoLogMessage& operator=(const ErrnoLogMessage&) = delete;
-
  // Appends the error message before destructing the encapsulated class.
  ~ErrnoLogMessage();

@@ -707,6 +683,8 @@ class ErrnoLogMessage {
 private:
  SystemErrorCode err_;
  LogMessage log_message_;
+
+  DISALLOW_COPY_AND_ASSIGN(ErrnoLogMessage);
 };
 #endif  // OS_WIN

--- a/include/base/cef_macros.h
+++ b/include/base/cef_macros.h
@@ -32,32 +32,189 @@
 #define CEF_INCLUDE_BASE_CEF_MACROS_H_
 #pragma once

-#if !defined(USING_CHROMIUM_INCLUDES)
+#if defined(USING_CHROMIUM_INCLUDES)
+// When building CEF include the Chromium header directly.
+#include "base/macros.h"
+
+#else  // !USING_CHROMIUM_INCLUDES
 // The following is substantially similar to the Chromium implementation.
 // If the Chromium implementation diverges the below implementation should be
 // updated to match.

-// ALL DISALLOW_xxx MACROS ARE DEPRECATED; DO NOT USE IN NEW CODE.
-// Use explicit deletions instead. For more information see
-// https://chromium.googlesource.com/chromium/src/+/lkgr/styleguide/c++/c++-dos-and-donts.md#explicitly-declare-class-copyability_movability
+#include <stddef.h>                  // For size_t.
+#include "include/base/cef_build.h"  // For COMPILER_MSVC

-// DEPRECATED: See above. Makes a class uncopyable.
-#define DISALLOW_COPY(TypeName) TypeName(const TypeName&) = delete
+#if !defined(arraysize)

-// DEPRECATED: See above. Makes a class unassignable.
-#define DISALLOW_ASSIGN(TypeName) TypeName& operator=(const TypeName&) = delete
+// The arraysize(arr) macro returns the # of elements in an array arr.
+// The expression is a compile-time constant, and therefore can be
+// used in defining new arrays, for example.  If you use arraysize on
+// a pointer by mistake, you will get a compile-time error.
+//
+// One caveat is that arraysize() doesn't accept any array of an
+// anonymous type or a type defined inside a function.  In these rare
+// cases, you have to use the unsafe ARRAYSIZE_UNSAFE() macro below.  This is
+// due to a limitation in C++'s template system.  The limitation might
+// eventually be removed, but it hasn't happened yet.

-// DEPRECATED: See above. Makes a class uncopyable and unassignable.
+// This template function declaration is used in defining arraysize.
+// Note that the function doesn't need an implementation, as we only
+// use its type.
+template <typename T, size_t N>
+char (&ArraySizeHelper(T (&array)[N]))[N];
+
+// That gcc wants both of these prototypes seems mysterious. VC, for
+// its part, can't decide which to use (another mystery). Matching of
+// template overloads: the final frontier.
+#ifndef _MSC_VER
+template <typename T, size_t N>
+char (&ArraySizeHelper(const T (&array)[N]))[N];
+#endif
+
+#define arraysize(array) (sizeof(ArraySizeHelper(array)))
+
+#endif  // !arraysize
+
+#if !defined(DISALLOW_COPY_AND_ASSIGN)
+
+// A macro to disallow the copy constructor and operator= functions
+// This should be used in the private: declarations for a class
 #define DISALLOW_COPY_AND_ASSIGN(TypeName) \
-  DISALLOW_COPY(TypeName);                 \
-  DISALLOW_ASSIGN(TypeName)
+  TypeName(const TypeName&);               \
+  void operator=(const TypeName&)

-// DEPRECATED: See above. Disallow all implicit constructors, namely the
+#endif  // !DISALLOW_COPY_AND_ASSIGN
+
+#if !defined(DISALLOW_IMPLICIT_CONSTRUCTORS)
+
+// A macro to disallow all the implicit constructors, namely the
 // default constructor, copy constructor and operator= functions.
+//
+// This should be used in the private: declarations for a class
+// that wants to prevent anyone from instantiating it. This is
+// especially useful for classes containing only static methods.
 #define DISALLOW_IMPLICIT_CONSTRUCTORS(TypeName) \
-  TypeName() = delete;                           \
+  TypeName();                                    \
  DISALLOW_COPY_AND_ASSIGN(TypeName)

+#endif  // !DISALLOW_IMPLICIT_CONSTRUCTORS
+
+#if !defined(COMPILE_ASSERT)
+
+// The COMPILE_ASSERT macro can be used to verify that a compile time
+// expression is true. For example, you could use it to verify the
+// size of a static array:
+//
+//   COMPILE_ASSERT(ARRAYSIZE_UNSAFE(content_type_names) == CONTENT_NUM_TYPES,
+//                  content_type_names_incorrect_size);
+//
+// or to make sure a struct is smaller than a certain size:
+//
+//   COMPILE_ASSERT(sizeof(foo) < 128, foo_too_large);
+//
+// The second argument to the macro is the name of the variable. If
+// the expression is false, most compilers will issue a warning/error
+// containing the name of the variable.
+
+#if __cplusplus >= 201103L
+
+// Under C++11, just use static_assert.
+#define COMPILE_ASSERT(expr, msg) static_assert(expr, #msg)
+
+#else
+
+namespace cef {
+
+template <bool>
+struct CompileAssert {};
+
+}  // namespace cef
+
+#define COMPILE_ASSERT(expr, msg)          \
+  typedef cef::CompileAssert<(bool(expr))> \
+      msg[bool(expr) ? 1 : -1] ALLOW_UNUSED_TYPE
+
+// Implementation details of COMPILE_ASSERT:
+//
+// - COMPILE_ASSERT works by defining an array type that has -1
+//   elements (and thus is invalid) when the expression is false.
+//
+// - The simpler definition
+//
+//     #define COMPILE_ASSERT(expr, msg) typedef char msg[(expr) ? 1 : -1]
+//
+//   does not work, as gcc supports variable-length arrays whose sizes
+//   are determined at run-time (this is gcc's extension and not part
+//   of the C++ standard).  As a result, gcc fails to reject the
+//   following code with the simple definition:
+//
+//     int foo;
+//     COMPILE_ASSERT(foo, msg); // not supposed to compile as foo is
+//                               // not a compile-time constant.
+//
+// - By using the type CompileAssert<(bool(expr))>, we ensures that
+//   expr is a compile-time constant.  (Template arguments must be
+//   determined at compile-time.)
+//
+// - The outer parentheses in CompileAssert<(bool(expr))> are necessary
+//   to work around a bug in gcc 3.4.4 and 4.0.1.  If we had written
+//
+//     CompileAssert<bool(expr)>
+//
+//   instead, these compilers will refuse to compile
+//
+//     COMPILE_ASSERT(5 > 0, some_message);
+//
+//   (They seem to think the ">" in "5 > 0" marks the end of the
+//   template argument list.)
+//
+// - The array size is (bool(expr) ? 1 : -1), instead of simply
+//
+//     ((expr) ? 1 : -1).
+//
+//   This is to avoid running into a bug in MS VC 7.1, which
+//   causes ((0.0) ? 1 : -1) to incorrectly evaluate to 1.
+
+#endif  // !(__cplusplus >= 201103L)
+
+#endif  // !defined(COMPILE_ASSERT)
+
 #endif  // !USING_CHROMIUM_INCLUDES

+#if !defined(MSVC_PUSH_DISABLE_WARNING) && defined(COMPILER_MSVC)
+
+// MSVC_PUSH_DISABLE_WARNING pushes |n| onto a stack of warnings to be disabled.
+// The warning remains disabled until popped by MSVC_POP_WARNING.
+#define MSVC_PUSH_DISABLE_WARNING(n) \
+  __pragma(warning(push)) __pragma(warning(disable : n))
+
+// MSVC_PUSH_WARNING_LEVEL pushes |n| as the global warning level.  The level
+// remains in effect until popped by MSVC_POP_WARNING().  Use 0 to disable all
+// warnings.
+#define MSVC_PUSH_WARNING_LEVEL(n) __pragma(warning(push, n))
+
+// Pop effects of innermost MSVC_PUSH_* macro.
+#define MSVC_POP_WARNING() __pragma(warning(pop))
+
+#endif  // !defined(MSVC_PUSH_DISABLE_WARNING) && defined(COMPILER_MSVC)
+
+#if !defined(ALLOW_THIS_IN_INITIALIZER_LIST)
+#if defined(COMPILER_MSVC)
+// Allows |this| to be passed as an argument in constructor initializer lists.
+// This uses push/pop instead of the seemingly simpler suppress feature to avoid
+// having the warning be disabled for more than just |code|.
+//
+// Example usage:
+// Foo::Foo() : x(NULL), ALLOW_THIS_IN_INITIALIZER_LIST(y(this)), z(3) {}
+//
+// Compiler warning C4355: 'this': used in base member initializer list:
+// http://msdn.microsoft.com/en-us/library/3c594ae3(VS.80).aspx
+#define ALLOW_THIS_IN_INITIALIZER_LIST(code) \
+  MSVC_PUSH_DISABLE_WARNING(4355)            \
+  code MSVC_POP_WARNING()
+#else  // !COMPILER_MSVC
+#define ALLOW_THIS_IN_INITIALIZER_LIST(code) code
+#endif  // !COMPILER_MSVC
+#endif  // !ALLOW_THIS_IN_INITIALIZER_LIST
+
 #endif  // CEF_INCLUDE_BASE_CEF_MACROS_H_
--- a/include/base/cef_move.h
+++ b/include/base/cef_move.h
@@ -0,0 +1,261 @@
+// Copyright (c) 2014 Marshall A. Greenblatt. Portions copyright (c) 2012
+// Google Inc. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//    * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//    * Neither the name of Google Inc. nor the name Chromium Embedded
+// Framework nor the names of its contributors may be used to endorse
+// or promote products derived from this software without specific prior
+// written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#ifndef CEF_INCLUDE_BASE_CEF_MOVE_H_
+#define CEF_INCLUDE_BASE_CEF_MOVE_H_
+
+#if defined(MOVE_ONLY_TYPE_FOR_CPP_03)
+// Do nothing if the macro in this header has already been defined.
+// This can happen in cases where Chromium code is used directly by the
+// client application. When using Chromium code directly always include
+// the Chromium header first to avoid type conflicts.
+#elif defined(USING_CHROMIUM_INCLUDES)
+// When building CEF include the Chromium header directly.
+#include "base/move.h"
+#else  // !USING_CHROMIUM_INCLUDES
+// The following is substantially similar to the Chromium implementation.
+// If the Chromium implementation diverges the below implementation should be
+// updated to match.
+
+// Macro with the boilerplate that makes a type move-only in C++03.
+//
+// USAGE
+//
+// This macro should be used instead of DISALLOW_COPY_AND_ASSIGN to create
+// a "move-only" type.  Unlike DISALLOW_COPY_AND_ASSIGN, this macro should be
+// the first line in a class declaration.
+//
+// A class using this macro must call .Pass() (or somehow be an r-value already)
+// before it can be:
+//
+//   * Passed as a function argument
+//   * Used as the right-hand side of an assignment
+//   * Returned from a function
+//
+// Each class will still need to define their own "move constructor" and "move
+// operator=" to make this useful.  Here's an example of the macro, the move
+// constructor, and the move operator= from the scoped_ptr class:
+//
+//  template <typename T>
+//  class scoped_ptr {
+//     MOVE_ONLY_TYPE_FOR_CPP_03(scoped_ptr, RValue)
+//   public:
+//    scoped_ptr(RValue& other) : ptr_(other.release()) { }
+//    scoped_ptr& operator=(RValue& other) {
+//      swap(other);
+//      return *this;
+//    }
+//  };
+//
+// Note that the constructor must NOT be marked explicit.
+//
+// For consistency, the second parameter to the macro should always be RValue
+// unless you have a strong reason to do otherwise.  It is only exposed as a
+// macro parameter so that the move constructor and move operator= don't look
+// like they're using a phantom type.
+//
+//
+// HOW THIS WORKS
+//
+// For a thorough explanation of this technique, see:
+//
+//   http://en.wikibooks.org/wiki/More_C%2B%2B_Idioms/Move_Constructor
+//
+// The summary is that we take advantage of 2 properties:
+//
+//   1) non-const references will not bind to r-values.
+//   2) C++ can apply one user-defined conversion when initializing a
+//      variable.
+//
+// The first lets us disable the copy constructor and assignment operator
+// by declaring private version of them with a non-const reference parameter.
+//
+// For l-values, direct initialization still fails like in
+// DISALLOW_COPY_AND_ASSIGN because the copy constructor and assignment
+// operators are private.
+//
+// For r-values, the situation is different. The copy constructor and
+// assignment operator are not viable due to (1), so we are trying to call
+// a non-existent constructor and non-existing operator= rather than a private
+// one.  Since we have not committed an error quite yet, we can provide an
+// alternate conversion sequence and a constructor.  We add
+//
+//   * a private struct named "RValue"
+//   * a user-defined conversion "operator RValue()"
+//   * a "move constructor" and "move operator=" that take the RValue& as
+//     their sole parameter.
+//
+// Only r-values will trigger this sequence and execute our "move constructor"
+// or "move operator=."  L-values will match the private copy constructor and
+// operator= first giving a "private in this context" error.  This combination
+// gives us a move-only type.
+//
+// For signaling a destructive transfer of data from an l-value, we provide a
+// method named Pass() which creates an r-value for the current instance
+// triggering the move constructor or move operator=.
+//
+// Other ways to get r-values is to use the result of an expression like a
+// function call.
+//
+// Here's an example with comments explaining what gets triggered where:
+//
+//    class Foo {
+//      MOVE_ONLY_TYPE_FOR_CPP_03(Foo, RValue);
+//
+//     public:
+//       ... API ...
+//       Foo(RValue other);           // Move constructor.
+//       Foo& operator=(RValue rhs);  // Move operator=
+//    };
+//
+//    Foo MakeFoo();  // Function that returns a Foo.
+//
+//    Foo f;
+//    Foo f_copy(f);  // ERROR: Foo(Foo&) is private in this context.
+//    Foo f_assign;
+//    f_assign = f;   // ERROR: operator=(Foo&) is private in this context.
+//
+//
+//    Foo f(MakeFoo());      // R-value so alternate conversion executed.
+//    Foo f_copy(f.Pass());  // R-value so alternate conversion executed.
+//    f = f_copy.Pass();     // R-value so alternate conversion executed.
+//
+//
+// IMPLEMENTATION SUBTLETIES WITH RValue
+//
+// The RValue struct is just a container for a pointer back to the original
+// object. It should only ever be created as a temporary, and no external
+// class should ever declare it or use it in a parameter.
+//
+// It is tempting to want to use the RValue type in function parameters, but
+// excluding the limited usage here for the move constructor and move
+// operator=, doing so would mean that the function could take both r-values
+// and l-values equially which is unexpected.  See COMPARED To Boost.Move for
+// more details.
+//
+// An alternate, and incorrect, implementation of the RValue class used by
+// Boost.Move makes RValue a fieldless child of the move-only type. RValue&
+// is then used in place of RValue in the various operators.  The RValue& is
+// "created" by doing *reinterpret_cast<RValue*>(this).  This has the appeal
+// of never creating a temporary RValue struct even with optimizations
+// disabled.  Also, by virtue of inheritance you can treat the RValue
+// reference as if it were the move-only type itself.  Unfortunately,
+// using the result of this reinterpret_cast<> is actually undefined behavior
+// due to C++98 5.2.10.7. In certain compilers (e.g., NaCl) the optimizer
+// will generate non-working code.
+//
+// In optimized builds, both implementations generate the same assembly so we
+// choose the one that adheres to the standard.
+//
+//
+// WHY HAVE typedef void MoveOnlyTypeForCPP03
+//
+// Callback<>/Bind() needs to understand movable-but-not-copyable semantics
+// to call .Pass() appropriately when it is expected to transfer the value.
+// The cryptic typedef MoveOnlyTypeForCPP03 is added to make this check
+// easy and automatic in helper templates for Callback<>/Bind().
+// See IsMoveOnlyType template and its usage in base/callback_internal.h
+// for more details.
+//
+//
+// COMPARED TO C++11
+//
+// In C++11, you would implement this functionality using an r-value reference
+// and our .Pass() method would be replaced with a call to std::move().
+//
+// This emulation also has a deficiency where it uses up the single
+// user-defined conversion allowed by C++ during initialization.  This can
+// cause problems in some API edge cases.  For instance, in scoped_ptr, it is
+// impossible to make a function "void Foo(scoped_ptr<Parent> p)" accept a
+// value of type scoped_ptr<Child> even if you add a constructor to
+// scoped_ptr<> that would make it look like it should work.  C++11 does not
+// have this deficiency.
+//
+//
+// COMPARED TO Boost.Move
+//
+// Our implementation similar to Boost.Move, but we keep the RValue struct
+// private to the move-only type, and we don't use the reinterpret_cast<> hack.
+//
+// In Boost.Move, RValue is the boost::rv<> template.  This type can be used
+// when writing APIs like:
+//
+//   void MyFunc(boost::rv<Foo>& f)
+//
+// that can take advantage of rv<> to avoid extra copies of a type.  However you
+// would still be able to call this version of MyFunc with an l-value:
+//
+//   Foo f;
+//   MyFunc(f);  // Uh oh, we probably just destroyed |f| w/o calling Pass().
+//
+// unless someone is very careful to also declare a parallel override like:
+//
+//   void MyFunc(const Foo& f)
+//
+// that would catch the l-values first.  This was declared unsafe in C++11 and
+// a C++11 compiler will explicitly fail MyFunc(f).  Unfortunately, we cannot
+// ensure this in C++03.
+//
+// Since we have no need for writing such APIs yet, our implementation keeps
+// RValue private and uses a .Pass() method to do the conversion instead of
+// trying to write a version of "std::move()." Writing an API like std::move()
+// would require the RValue struct to be public.
+//
+//
+// CAVEATS
+//
+// If you include a move-only type as a field inside a class that does not
+// explicitly declare a copy constructor, the containing class's implicit
+// copy constructor will change from Containing(const Containing&) to
+// Containing(Containing&).  This can cause some unexpected errors.
+//
+//   http://llvm.org/bugs/show_bug.cgi?id=11528
+//
+// The workaround is to explicitly declare your copy constructor.
+//
+#define MOVE_ONLY_TYPE_FOR_CPP_03(type, rvalue_type)       \
+ private:                                                  \
+  struct rvalue_type {                                     \
+    explicit rvalue_type(type* object) : object(object) {} \
+    type* object;                                          \
+  };                                                       \
+  type(type&);                                             \
+  void operator=(type&);                                   \
+                                                           \
+ public:                                                   \
+  operator rvalue_type() { return rvalue_type(this); }     \
+  type Pass() { return type(rvalue_type(this)); }          \
+  typedef void MoveOnlyTypeForCPP03;                       \
+                                                           \
+ private:
+
+#endif  // !USING_CHROMIUM_INCLUDES
+
+#endif  // CEF_INCLUDE_BASE_CEF_MOVE_H_
--- a/include/base/cef_platform_thread.h
+++ b/include/base/cef_platform_thread.h
@@ -35,7 +35,12 @@
 #ifndef CEF_INCLUDE_BASE_PLATFORM_THREAD_H_
 #define CEF_INCLUDE_BASE_PLATFORM_THREAD_H_

-#if defined(USING_CHROMIUM_INCLUDES)
+#if defined(BASE_THREADING_PLATFORM_THREAD_H_)
+// Do nothing if the Chromium header has already been included.
+// This can happen in cases where Chromium code is used directly by the
+// client application. When using Chromium code directly always include
+// the Chromium header first to avoid type conflicts.
+#elif defined(USING_CHROMIUM_INCLUDES)
 // When building CEF include the Chromium header directly.
 #include "base/threading/platform_thread.h"
 #else  // !USING_CHROMIUM_INCLUDES
@@ -49,21 +54,17 @@

 namespace base {

-///
-/// Used for logging. Always an integer value.
-///
+// Used for logging. Always an integer value.
 typedef cef_platform_thread_id_t PlatformThreadId;

-///
-/// Used for thread checking and debugging.
-/// Meant to be as fast as possible.
-/// These are produced by PlatformThread::CurrentRef(), and used to later
-/// check if we are on the same thread or not by using ==. These are safe
-/// to copy between threads, but can't be copied to another process as they
-/// have no meaning there. Also, the internal identifier can be re-used
-/// after a thread dies, so a PlatformThreadRef cannot be reliably used
-/// to distinguish a new thread from an old, dead thread.
-///
+// Used for thread checking and debugging.
+// Meant to be as fast as possible.
+// These are produced by PlatformThread::CurrentRef(), and used to later
+// check if we are on the same thread or not by using ==. These are safe
+// to copy between threads, but can't be copied to another process as they
+// have no meaning there. Also, the internal identifier can be re-used
+// after a thread dies, so a PlatformThreadRef cannot be reliably used
+// to distinguish a new thread from an old, dead thread.
 class PlatformThreadRef {
 public:
  typedef cef_platform_thread_handle_t RefType;
@@ -80,24 +81,18 @@ class PlatformThreadRef {
  RefType id_;
 };

-///
-/// A namespace for low-level thread functions.
-/// Chromium uses a class with static methods but CEF uses an actual namespace
-/// to avoid linker problems with the sandbox libaries on Windows.
-///
+// A namespace for low-level thread functions.
+// Chromium uses a class with static methods but CEF uses an actual namespace
+// to avoid linker problems with the sandbox libaries on Windows.
 namespace PlatformThread {

-///
-/// Gets the current thread id, which may be useful for logging purposes.
-///
+// Gets the current thread id, which may be useful for logging purposes.
 inline PlatformThreadId CurrentId() {
  return cef_get_current_platform_thread_id();
 }

-///
-/// Gets the current thread reference, which can be used to check if
-/// we're on the right thread quickly.
-///
+// Gets the current thread reference, which can be used to check if
+// we're on the right thread quickly.
 inline PlatformThreadRef CurrentRef() {
  return PlatformThreadRef(cef_get_current_platform_thread_handle());
 }
--- a/include/base/cef_ptr_util.h
+++ b/include/base/cef_ptr_util.h
@@ -1,60 +0,0 @@
-// Copyright (c) 2021 Marshall A. Greenblatt. Portions copyright (c) 2015
-// Google Inc. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//    * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//    * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//    * Neither the name of Google Inc. nor the name Chromium Embedded
-// Framework nor the names of its contributors may be used to endorse
-// or promote products derived from this software without specific prior
-// written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef INCLUDE_BASE_CEF_PTR_UTIL_H_
-#define INCLUDE_BASE_CEF_PTR_UTIL_H_
-#pragma once
-
-#if defined(USING_CHROMIUM_INCLUDES)
-// When building CEF include the Chromium header directly.
-#include "base/memory/ptr_util.h"
-#else  // !USING_CHROMIUM_INCLUDES
-// The following is substantially similar to the Chromium implementation.
-// If the Chromium implementation diverges the below implementation should be
-// updated to match.
-
-#include <memory>
-#include <utility>
-
-namespace base {
-
-///
-/// Helper to transfer ownership of a raw pointer to a std::unique_ptr<T>.
-/// Note that std::unique_ptr<T> has very different semantics from
-/// std::unique_ptr<T[]>: do not use this helper for array allocations.
-///
-template <typename T>
-std::unique_ptr<T> WrapUnique(T* ptr) {
-  return std::unique_ptr<T>(ptr);
-}
-
-}  // namespace base
-
-#endif  // INCLUDE_BASE_CEF_PTR_UTIL_H_
--- a/include/base/cef_ref_counted.h
+++ b/include/base/cef_ref_counted.h
@@ -33,7 +33,12 @@
 #define CEF_INCLUDE_BASE_CEF_REF_COUNTED_H_
 #pragma once

-#if defined(USING_CHROMIUM_INCLUDES)
+#if defined(BASE_MEMORY_REF_COUNTED_H_)
+// Do nothing if the Chromium header has already been included.
+// This can happen in cases where Chromium code is used directly by the
+// client application. When using Chromium code directly always include
+// the Chromium header first to avoid type conflicts.
+#elif defined(USING_CHROMIUM_INCLUDES)
 // When building CEF include the Chromium header directly.
 #include "base/memory/ref_counted.h"
 #else  // !USING_CHROMIUM_INCLUDES
@@ -41,19 +46,15 @@
 // If the Chromium implementation diverges the below implementation should be
 // updated to match.

-#include <stddef.h>
-
-#include <utility>
+#include <cassert>

 #include "include/base/cef_atomic_ref_count.h"
 #include "include/base/cef_build.h"
-#include "include/base/cef_compiler_specific.h"
 #include "include/base/cef_logging.h"
-#include "include/base/cef_scoped_refptr.h"
-#include "include/base/cef_template_util.h"
-#include "include/base/cef_thread_checker.h"
+#include "include/base/cef_macros.h"

 namespace base {
+
 namespace cef_subtle {

 class RefCountedBase {
@@ -62,22 +63,15 @@ class RefCountedBase {
  bool HasAtLeastOneRef() const { return ref_count_ >= 1; }

 protected:
-  explicit RefCountedBase(StartRefCountFromZeroTag) {
+  RefCountedBase()
+      : ref_count_(0)
 #if DCHECK_IS_ON()
-    thread_checker_.DetachFromThread();
+        ,
+        in_dtor_(false)
 #endif
+  {
  }

-  explicit RefCountedBase(StartRefCountFromOneTag) : ref_count_(1) {
-#if DCHECK_IS_ON()
-    needs_adopt_ref_ = true;
-    thread_checker_.DetachFromThread();
-#endif
-  }
-
-  RefCountedBase(const RefCountedBase&) = delete;
-  RefCountedBase& operator=(const RefCountedBase&) = delete;
-
  ~RefCountedBase() {
 #if DCHECK_IS_ON()
    DCHECK(in_dtor_) << "RefCounted object deleted without calling Release()";
@@ -87,168 +81,16 @@ class RefCountedBase {
  void AddRef() const {
 #if DCHECK_IS_ON()
    DCHECK(!in_dtor_);
-    DCHECK(!needs_adopt_ref_)
-        << "This RefCounted object is created with non-zero reference count."
-        << " The first reference to such a object has to be made by AdoptRef or"
-        << " MakeRefCounted.";
-    if (ref_count_ >= 1) {
-      DCHECK(CalledOnValidThread());
-    }
 #endif
-
-    AddRefImpl();
+    ++ref_count_;
  }

  // Returns true if the object should self-delete.
  bool Release() const {
-    ReleaseImpl();
-
 #if DCHECK_IS_ON()
    DCHECK(!in_dtor_);
-    if (ref_count_ == 0)
-      in_dtor_ = true;
-
-    if (ref_count_ >= 1)
-      DCHECK(CalledOnValidThread());
-    if (ref_count_ == 1)
-      thread_checker_.DetachFromThread();
 #endif
-
-    return ref_count_ == 0;
-  }
-
-  // Returns true if it is safe to read or write the object, from a thread
-  // safety standpoint. Should be DCHECK'd from the methods of RefCounted
-  // classes if there is a danger of objects being shared across threads.
-  //
-  // This produces fewer false positives than adding a separate ThreadChecker
-  // into the subclass, because it automatically detaches from the thread when
-  // the reference count is 1 (and never fails if there is only one reference).
-  //
-  // This means unlike a separate ThreadChecker, it will permit a singly
-  // referenced object to be passed between threads (not holding a reference on
-  // the sending thread), but will trap if the sending thread holds onto a
-  // reference, or if the object is accessed from multiple threads
-  // simultaneously.
-  bool IsOnValidThread() const {
-#if DCHECK_IS_ON()
-    return ref_count_ <= 1 || CalledOnValidThread();
-#else
-    return true;
-#endif
-  }
-
- private:
-  template <typename U>
-  friend scoped_refptr<U> base::AdoptRef(U*);
-
-  void Adopted() const {
-#if DCHECK_IS_ON()
-    DCHECK(needs_adopt_ref_);
-    needs_adopt_ref_ = false;
-#endif
-  }
-
-#if defined(ARCH_CPU_64_BITS)
-  void AddRefImpl() const;
-  void ReleaseImpl() const;
-#else
-  void AddRefImpl() const { ++ref_count_; }
-  void ReleaseImpl() const { --ref_count_; }
-#endif
-
-#if DCHECK_IS_ON()
-  bool CalledOnValidThread() const;
-#endif
-
-  mutable uint32_t ref_count_ = 0;
-  static_assert(std::is_unsigned<decltype(ref_count_)>::value,
-                "ref_count_ must be an unsigned type.");
-
-#if DCHECK_IS_ON()
-  mutable bool needs_adopt_ref_ = false;
-  mutable bool in_dtor_ = false;
-  mutable ThreadChecker thread_checker_;
-#endif
-};
-
-class RefCountedThreadSafeBase {
- public:
-  bool HasOneRef() const;
-  bool HasAtLeastOneRef() const;
-
- protected:
-  explicit constexpr RefCountedThreadSafeBase(StartRefCountFromZeroTag) {}
-  explicit constexpr RefCountedThreadSafeBase(StartRefCountFromOneTag)
-      : ref_count_(1) {
-#if DCHECK_IS_ON()
-    needs_adopt_ref_ = true;
-#endif
-  }
-
-  RefCountedThreadSafeBase(const RefCountedThreadSafeBase&) = delete;
-  RefCountedThreadSafeBase& operator=(const RefCountedThreadSafeBase&) = delete;
-
-#if DCHECK_IS_ON()
-  ~RefCountedThreadSafeBase();
-#else
-  ~RefCountedThreadSafeBase() = default;
-#endif
-
-// Release and AddRef are suitable for inlining on X86 because they generate
-// very small code threads. On other platforms (ARM), it causes a size
-// regression and is probably not worth it.
-#if defined(ARCH_CPU_X86_FAMILY)
-  // Returns true if the object should self-delete.
-  bool Release() const { return ReleaseImpl(); }
-  void AddRef() const { AddRefImpl(); }
-  void AddRefWithCheck() const { AddRefWithCheckImpl(); }
-#else
-  // Returns true if the object should self-delete.
-  bool Release() const;
-  void AddRef() const;
-  void AddRefWithCheck() const;
-#endif
-
- private:
-  template <typename U>
-  friend scoped_refptr<U> base::AdoptRef(U*);
-
-  void Adopted() const {
-#if DCHECK_IS_ON()
-    DCHECK(needs_adopt_ref_);
-    needs_adopt_ref_ = false;
-#endif
-  }
-
-  ALWAYS_INLINE void AddRefImpl() const {
-#if DCHECK_IS_ON()
-    DCHECK(!in_dtor_);
-    DCHECK(!needs_adopt_ref_)
-        << "This RefCounted object is created with non-zero reference count."
-        << " The first reference to such a object has to be made by AdoptRef or"
-        << " MakeRefCounted.";
-#endif
-    ref_count_.Increment();
-  }
-
-  ALWAYS_INLINE void AddRefWithCheckImpl() const {
-#if DCHECK_IS_ON()
-    DCHECK(!in_dtor_);
-    DCHECK(!needs_adopt_ref_)
-        << "This RefCounted object is created with non-zero reference count."
-        << " The first reference to such a object has to be made by AdoptRef or"
-        << " MakeRefCounted.";
-#endif
-    CHECK(ref_count_.Increment() > 0);
-  }
-
-  ALWAYS_INLINE bool ReleaseImpl() const {
-#if DCHECK_IS_ON()
-    DCHECK(!in_dtor_);
-    DCHECK(!ref_count_.IsZero());
-#endif
-    if (!ref_count_.Decrement()) {
+    if (--ref_count_ == 0) {
 #if DCHECK_IS_ON()
      in_dtor_ = true;
 #endif
@@ -257,148 +99,80 @@ class RefCountedThreadSafeBase {
    return false;
  }

-  mutable AtomicRefCount ref_count_{0};
+ private:
+  mutable int ref_count_;
 #if DCHECK_IS_ON()
-  mutable bool needs_adopt_ref_ = false;
-  mutable bool in_dtor_ = false;
+  mutable bool in_dtor_;
 #endif
+
+  DISALLOW_COPY_AND_ASSIGN(RefCountedBase);
 };

-// ScopedAllowCrossThreadRefCountAccess disables the check documented on
-// RefCounted below for rare pre-existing use cases where thread-safety was
-// guaranteed through other means (e.g. explicit sequencing of calls across
-// execution threads when bouncing between threads in order). New callers
-// should refrain from using this (callsites handling thread-safety through
-// locks should use RefCountedThreadSafe per the overhead of its atomics being
-// negligible compared to locks anyways and callsites doing explicit sequencing
-// should properly std::move() the ref to avoid hitting this check).
-// TODO(tzik): Cleanup existing use cases and remove
-// ScopedAllowCrossThreadRefCountAccess.
-class ScopedAllowCrossThreadRefCountAccess final {
+class RefCountedThreadSafeBase {
 public:
+  bool HasOneRef() const;
+  bool HasAtLeastOneRef() const;
+
+ protected:
+  RefCountedThreadSafeBase();
+  ~RefCountedThreadSafeBase();
+
+  void AddRef() const;
+
+  // Returns true if the object should self-delete.
+  bool Release() const;
+
+ private:
+  mutable AtomicRefCount ref_count_;
 #if DCHECK_IS_ON()
-  ScopedAllowCrossThreadRefCountAccess();
-  ~ScopedAllowCrossThreadRefCountAccess();
-#else
-  ScopedAllowCrossThreadRefCountAccess() {}
-  ~ScopedAllowCrossThreadRefCountAccess() {}
+  mutable bool in_dtor_;
 #endif
+
+  DISALLOW_COPY_AND_ASSIGN(RefCountedThreadSafeBase);
 };

 }  // namespace cef_subtle

-using ScopedAllowCrossThreadRefCountAccess =
-    cef_subtle::ScopedAllowCrossThreadRefCountAccess;
-
-///
-/// The reference count starts from zero by default, and we intended to migrate
-/// to start-from-one ref count. Put REQUIRE_ADOPTION_FOR_REFCOUNTED_TYPE() to
-/// the ref counted class to opt-in.
-///
-/// If an object has start-from-one ref count, the first scoped_refptr need to
-/// be created by base::AdoptRef() or base::MakeRefCounted(). We can use
-/// base::MakeRefCounted() to create create both type of ref counted object.
-///
-/// The motivations to use start-from-one ref count are:
-///  - Start-from-one ref count doesn't need the ref count increment for the
-///    first reference.
-///  - It can detect an invalid object acquisition for a being-deleted object
-///    that has zero ref count. That tends to happen on custom deleter that
-///    delays the deletion.
-///    TODO(tzik): Implement invalid acquisition detection.
-///  - Behavior parity to Blink's WTF::RefCounted, whose count starts from one.
-///    And start-from-one ref count is a step to merge WTF::RefCounted into
-///    base::RefCounted.
-///
-#define REQUIRE_ADOPTION_FOR_REFCOUNTED_TYPE()                 \
-  static constexpr ::base::cef_subtle::StartRefCountFromOneTag \
-      kRefCountPreference = ::base::cef_subtle::kStartRefCountFromOneTag
-
-template <class T, typename Traits>
-class RefCounted;
-
-///
-/// Default traits for RefCounted<T>.  Deletes the object when its ref count
-/// reaches 0. Overload to delete it on a different thread etc.
-///
-template <typename T>
-struct DefaultRefCountedTraits {
-  static void Destruct(const T* x) {
-    RefCounted<T, DefaultRefCountedTraits>::DeleteInternal(x);
-  }
-};
-
-///
-/// A base class for reference counted classes. Otherwise, known as a cheap
-/// knock-off of WebKit's RefCounted<T> class. To use this, just extend your
-/// class from it like so:
-///
-/// <pre>
-///   class MyFoo : public base::RefCounted<MyFoo> {
-///    ...
-///    private:
-///     friend class base::RefCounted<MyFoo>;
-///     ~MyFoo();
-///   };
-/// </pre>
-///
-/// Usage Notes:
-/// 1. You should always make your destructor non-public, to avoid any code
-///    deleting the object accidentally while there are references to it.
-/// 2. You should always make the ref-counted base class a friend of your class,
-///    so that it can access the destructor.
-///
-/// The ref count manipulation to RefCounted is NOT thread safe and has DCHECKs
-/// to trap unsafe cross thread usage. A subclass instance of RefCounted can be
-/// passed to another execution thread only when its ref count is 1. If the ref
-/// count is more than 1, the RefCounted class verifies the ref updates are made
-/// on the same execution thread as the previous ones. The subclass can also
-/// manually call IsOnValidThread to trap other non-thread-safe accesses; see
-/// the documentation for that method.
-///
-template <class T, typename Traits = DefaultRefCountedTraits<T>>
+//
+// A base class for reference counted classes.  Otherwise, known as a cheap
+// knock-off of WebKit's RefCounted<T> class.  To use this guy just extend your
+// class from it like so:
+//
+//   class MyFoo : public base::RefCounted<MyFoo> {
+//    ...
+//    private:
+//     friend class base::RefCounted<MyFoo>;
+//     ~MyFoo();
+//   };
+//
+// You should always make your destructor private, to avoid any code deleting
+// the object accidently while there are references to it.
+template <class T>
 class RefCounted : public cef_subtle::RefCountedBase {
 public:
-  static constexpr cef_subtle::StartRefCountFromZeroTag kRefCountPreference =
-      cef_subtle::kStartRefCountFromZeroTag;
-
-  RefCounted() : cef_subtle::RefCountedBase(T::kRefCountPreference) {}
-
-  RefCounted(const RefCounted&) = delete;
-  RefCounted& operator=(const RefCounted&) = delete;
+  RefCounted() {}

  void AddRef() const { cef_subtle::RefCountedBase::AddRef(); }

  void Release() const {
    if (cef_subtle::RefCountedBase::Release()) {
-      // Prune the code paths which the static analyzer may take to simulate
-      // object destruction. Use-after-free errors aren't possible given the
-      // lifetime guarantees of the refcounting system.
-      ANALYZER_SKIP_THIS_PATH();
-
-      Traits::Destruct(static_cast<const T*>(this));
+      delete static_cast<const T*>(this);
    }
  }

 protected:
-  ~RefCounted() = default;
+  ~RefCounted() {}

 private:
-  friend struct DefaultRefCountedTraits<T>;
-  template <typename U>
-  static void DeleteInternal(const U* x) {
-    delete x;
-  }
+  DISALLOW_COPY_AND_ASSIGN(RefCounted<T>);
 };

 // Forward declaration.
 template <class T, typename Traits>
 class RefCountedThreadSafe;

-///
-/// Default traits for RefCountedThreadSafe<T>. Deletes the object when its ref
-/// count reaches 0. Overload to delete it on a different thread etc.
-///
+// Default traits for RefCountedThreadSafe<T>.  Deletes the object when its ref
+// count reaches 0.  Overload to delete it on a different thread etc.
 template <typename T>
 struct DefaultRefCountedThreadSafeTraits {
  static void Destruct(const T* x) {
@@ -410,100 +184,187 @@ struct DefaultRefCountedThreadSafeTraits {
  }
 };

-///
-/// A thread-safe variant of RefCounted<T>
-///
-/// <pre>
-///   class MyFoo : public base::RefCountedThreadSafe<MyFoo> {
-///    ...
-///   };
-/// </pre>
-///
-/// If you're using the default trait, then you should add compile time
-/// asserts that no one else is deleting your object.  i.e.
-/// <pre>
-///    private:
-///     friend class base::RefCountedThreadSafe<MyFoo>;
-///     ~MyFoo();
-/// </pre>
-///
-/// We can use REQUIRE_ADOPTION_FOR_REFCOUNTED_TYPE() with RefCountedThreadSafe
-/// too. See the comment above the RefCounted definition for details.
-///
+//
+// A thread-safe variant of RefCounted<T>
+//
+//   class MyFoo : public base::RefCountedThreadSafe<MyFoo> {
+//    ...
+//   };
+//
+// If you're using the default trait, then you should add compile time
+// asserts that no one else is deleting your object.  i.e.
+//    private:
+//     friend class base::RefCountedThreadSafe<MyFoo>;
+//     ~MyFoo();
 template <class T, typename Traits = DefaultRefCountedThreadSafeTraits<T>>
 class RefCountedThreadSafe : public cef_subtle::RefCountedThreadSafeBase {
 public:
-  static constexpr cef_subtle::StartRefCountFromZeroTag kRefCountPreference =
-      cef_subtle::kStartRefCountFromZeroTag;
+  RefCountedThreadSafe() {}

-  explicit RefCountedThreadSafe()
-      : cef_subtle::RefCountedThreadSafeBase(T::kRefCountPreference) {}
-
-  RefCountedThreadSafe(const RefCountedThreadSafe&) = delete;
-  RefCountedThreadSafe& operator=(const RefCountedThreadSafe&) = delete;
-
-  void AddRef() const { AddRefImpl(T::kRefCountPreference); }
+  void AddRef() const { cef_subtle::RefCountedThreadSafeBase::AddRef(); }

  void Release() const {
    if (cef_subtle::RefCountedThreadSafeBase::Release()) {
-      ANALYZER_SKIP_THIS_PATH();
      Traits::Destruct(static_cast<const T*>(this));
    }
  }

 protected:
-  ~RefCountedThreadSafe() = default;
+  ~RefCountedThreadSafe() {}

 private:
  friend struct DefaultRefCountedThreadSafeTraits<T>;
-  template <typename U>
-  static void DeleteInternal(const U* x) {
-    delete x;
-  }
+  static void DeleteInternal(const T* x) { delete x; }

-  void AddRefImpl(cef_subtle::StartRefCountFromZeroTag) const {
-    cef_subtle::RefCountedThreadSafeBase::AddRef();
-  }
-
-  void AddRefImpl(cef_subtle::StartRefCountFromOneTag) const {
-    cef_subtle::RefCountedThreadSafeBase::AddRefWithCheck();
-  }
+  DISALLOW_COPY_AND_ASSIGN(RefCountedThreadSafe);
 };

-///
-/// A thread-safe wrapper for some piece of data so we can place other
-/// things in scoped_refptrs<>.
-///
+//
+// A thread-safe wrapper for some piece of data so we can place other
+// things in scoped_refptrs<>.
+//
 template <typename T>
 class RefCountedData
    : public base::RefCountedThreadSafe<base::RefCountedData<T>> {
 public:
  RefCountedData() : data() {}
  RefCountedData(const T& in_value) : data(in_value) {}
-  RefCountedData(T&& in_value) : data(std::move(in_value)) {}
-  template <typename... Args>
-  explicit RefCountedData(in_place_t, Args&&... args)
-      : data(std::forward<Args>(args)...) {}

  T data;

 private:
  friend class base::RefCountedThreadSafe<base::RefCountedData<T>>;
-  ~RefCountedData() = default;
+  ~RefCountedData() {}
 };

-template <typename T>
-bool operator==(const RefCountedData<T>& lhs, const RefCountedData<T>& rhs) {
-  return lhs.data == rhs.data;
-}
-
-template <typename T>
-bool operator!=(const RefCountedData<T>& lhs, const RefCountedData<T>& rhs) {
-  return !(lhs == rhs);
-}
-
 }  // namespace base

+//
+// A smart pointer class for reference counted objects.  Use this class instead
+// of calling AddRef and Release manually on a reference counted object to
+// avoid common memory leaks caused by forgetting to Release an object
+// reference.  Sample usage:
+//
+//   class MyFoo : public RefCounted<MyFoo> {
+//    ...
+//   };
+//
+//   void some_function() {
+//     scoped_refptr<MyFoo> foo = new MyFoo();
+//     foo->Method(param);
+//     // |foo| is released when this function returns
+//   }
+//
+//   void some_other_function() {
+//     scoped_refptr<MyFoo> foo = new MyFoo();
+//     ...
+//     foo = NULL;  // explicitly releases |foo|
+//     ...
+//     if (foo)
+//       foo->Method(param);
+//   }
+//
+// The above examples show how scoped_refptr<T> acts like a pointer to T.
+// Given two scoped_refptr<T> classes, it is also possible to exchange
+// references between the two objects, like so:
+//
+//   {
+//     scoped_refptr<MyFoo> a = new MyFoo();
+//     scoped_refptr<MyFoo> b;
+//
+//     b.swap(a);
+//     // now, |b| references the MyFoo object, and |a| references NULL.
+//   }
+//
+// To make both |a| and |b| in the above example reference the same MyFoo
+// object, simply use the assignment operator:
+//
+//   {
+//     scoped_refptr<MyFoo> a = new MyFoo();
+//     scoped_refptr<MyFoo> b;
+//
+//     b = a;
+//     // now, |a| and |b| each own a reference to the same MyFoo object.
+//   }
+//
+template <class T>
+class scoped_refptr {
+ public:
+  typedef T element_type;
+
+  scoped_refptr() : ptr_(NULL) {}
+
+  scoped_refptr(T* p) : ptr_(p) {
+    if (ptr_)
+      ptr_->AddRef();
+  }
+
+  scoped_refptr(const scoped_refptr<T>& r) : ptr_(r.ptr_) {
+    if (ptr_)
+      ptr_->AddRef();
+  }
+
+  template <typename U>
+  scoped_refptr(const scoped_refptr<U>& r) : ptr_(r.get()) {
+    if (ptr_)
+      ptr_->AddRef();
+  }
+
+  ~scoped_refptr() {
+    if (ptr_)
+      ptr_->Release();
+  }
+
+  T* get() const { return ptr_; }
+
+  // Allow scoped_refptr<C> to be used in boolean expression
+  // and comparison operations.
+  operator T*() const { return ptr_; }
+
+  T* operator->() const {
+    assert(ptr_ != NULL);
+    return ptr_;
+  }
+
+  scoped_refptr<T>& operator=(T* p) {
+    // AddRef first so that self assignment should work
+    if (p)
+      p->AddRef();
+    T* old_ptr = ptr_;
+    ptr_ = p;
+    if (old_ptr)
+      old_ptr->Release();
+    return *this;
+  }
+
+  scoped_refptr<T>& operator=(const scoped_refptr<T>& r) {
+    return *this = r.ptr_;
+  }
+
+  template <typename U>
+  scoped_refptr<T>& operator=(const scoped_refptr<U>& r) {
+    return *this = r.get();
+  }
+
+  void swap(T** pp) {
+    T* p = ptr_;
+    ptr_ = *pp;
+    *pp = p;
+  }
+
+  void swap(scoped_refptr<T>& r) { swap(&r.ptr_); }
+
+ protected:
+  T* ptr_;
+};
+
+// Handy utility for creating a scoped_refptr<T> out of a T* explicitly without
+// having to retype all the template arguments
+template <typename T>
+scoped_refptr<T> make_scoped_refptr(T* t) {
+  return scoped_refptr<T>(t);
+}
+
 #endif  // !USING_CHROMIUM_INCLUDES

 #endif  // CEF_INCLUDE_BASE_CEF_REF_COUNTED_H_
--- a/include/base/cef_scoped_ptr.h
+++ b/include/base/cef_scoped_ptr.h
@@ -0,0 +1,625 @@
+// Copyright (c) 2014 Marshall A. Greenblatt. Portions copyright (c) 2012
+// Google Inc. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//    * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//    * Neither the name of Google Inc. nor the name Chromium Embedded
+// Framework nor the names of its contributors may be used to endorse
+// or promote products derived from this software without specific prior
+// written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Scopers help you manage ownership of a pointer, helping you easily manage a
+// pointer within a scope, and automatically destroying the pointer at the end
+// of a scope.  There are two main classes you will use, which correspond to the
+// operators new/delete and new[]/delete[].
+//
+// Example usage (scoped_ptr<T>):
+//   {
+//     scoped_ptr<Foo> foo(new Foo("wee"));
+//   }  // foo goes out of scope, releasing the pointer with it.
+//
+//   {
+//     scoped_ptr<Foo> foo;          // No pointer managed.
+//     foo.reset(new Foo("wee"));    // Now a pointer is managed.
+//     foo.reset(new Foo("wee2"));   // Foo("wee") was destroyed.
+//     foo.reset(new Foo("wee3"));   // Foo("wee2") was destroyed.
+//     foo->Method();                // Foo::Method() called.
+//     foo.get()->Method();          // Foo::Method() called.
+//     SomeFunc(foo.release());      // SomeFunc takes ownership, foo no longer
+//                                   // manages a pointer.
+//     foo.reset(new Foo("wee4"));   // foo manages a pointer again.
+//     foo.reset();                  // Foo("wee4") destroyed, foo no longer
+//                                   // manages a pointer.
+//   }  // foo wasn't managing a pointer, so nothing was destroyed.
+//
+// Example usage (scoped_ptr<T[]>):
+//   {
+//     scoped_ptr<Foo[]> foo(new Foo[100]);
+//     foo.get()->Method();  // Foo::Method on the 0th element.
+//     foo[10].Method();     // Foo::Method on the 10th element.
+//   }
+//
+// These scopers also implement part of the functionality of C++11 unique_ptr
+// in that they are "movable but not copyable."  You can use the scopers in
+// the parameter and return types of functions to signify ownership transfer
+// in to and out of a function.  When calling a function that has a scoper
+// as the argument type, it must be called with the result of an analogous
+// scoper's Pass() function or another function that generates a temporary;
+// passing by copy will NOT work.  Here is an example using scoped_ptr:
+//
+//   void TakesOwnership(scoped_ptr<Foo> arg) {
+//     // Do something with arg
+//   }
+//   scoped_ptr<Foo> CreateFoo() {
+//     // No need for calling Pass() because we are constructing a temporary
+//     // for the return value.
+//     return scoped_ptr<Foo>(new Foo("new"));
+//   }
+//   scoped_ptr<Foo> PassThru(scoped_ptr<Foo> arg) {
+//     return arg.Pass();
+//   }
+//
+//   {
+//     scoped_ptr<Foo> ptr(new Foo("yay"));  // ptr manages Foo("yay").
+//     TakesOwnership(ptr.Pass());           // ptr no longer owns Foo("yay").
+//     scoped_ptr<Foo> ptr2 = CreateFoo();   // ptr2 owns the return Foo.
+//     scoped_ptr<Foo> ptr3 =                // ptr3 now owns what was in ptr2.
+//         PassThru(ptr2.Pass());            // ptr2 is correspondingly NULL.
+//   }
+//
+// Notice that if you do not call Pass() when returning from PassThru(), or
+// when invoking TakesOwnership(), the code will not compile because scopers
+// are not copyable; they only implement move semantics which require calling
+// the Pass() function to signify a destructive transfer of state. CreateFoo()
+// is different though because we are constructing a temporary on the return
+// line and thus can avoid needing to call Pass().
+//
+// Pass() properly handles upcast in initialization, i.e. you can use a
+// scoped_ptr<Child> to initialize a scoped_ptr<Parent>:
+//
+//   scoped_ptr<Foo> foo(new Foo());
+//   scoped_ptr<FooParent> parent(foo.Pass());
+//
+// PassAs<>() should be used to upcast return value in return statement:
+//
+//   scoped_ptr<Foo> CreateFoo() {
+//     scoped_ptr<FooChild> result(new FooChild());
+//     return result.PassAs<Foo>();
+//   }
+//
+// Note that PassAs<>() is implemented only for scoped_ptr<T>, but not for
+// scoped_ptr<T[]>. This is because casting array pointers may not be safe.
+
+#ifndef CEF_INCLUDE_BASE_CEF_MEMORY_SCOPED_PTR_H_
+#define CEF_INCLUDE_BASE_CEF_MEMORY_SCOPED_PTR_H_
+#pragma once
+
+#if defined(BASE_MEMORY_SCOPED_PTR_H_)
+// Do nothing if the Chromium header has already been included.
+// This can happen in cases where Chromium code is used directly by the
+// client application. When using Chromium code directly always include
+// the Chromium header first to avoid type conflicts.
+#elif defined(USING_CHROMIUM_INCLUDES)
+// Do nothing when building CEF.
+#else  // !USING_CHROMIUM_INCLUDES
+// The following is substantially similar to the Chromium implementation.
+// If the Chromium implementation diverges the below implementation should be
+// updated to match.
+
+// This is an implementation designed to match the anticipated future TR2
+// implementation of the scoped_ptr class.
+
+#include <assert.h>
+#include <stddef.h>
+#include <stdlib.h>
+
+#include <algorithm>  // For std::swap().
+
+#include "include/base/cef_basictypes.h"
+#include "include/base/cef_build.h"
+#include "include/base/cef_macros.h"
+#include "include/base/cef_move.h"
+#include "include/base/cef_template_util.h"
+
+namespace base {
+
+namespace subtle {
+class RefCountedBase;
+class RefCountedThreadSafeBase;
+}  // namespace subtle
+
+// Function object which deletes its parameter, which must be a pointer.
+// If C is an array type, invokes 'delete[]' on the parameter; otherwise,
+// invokes 'delete'. The default deleter for scoped_ptr<T>.
+template <class T>
+struct DefaultDeleter {
+  DefaultDeleter() {}
+  template <typename U>
+  DefaultDeleter(const DefaultDeleter<U>& other) {
+    // IMPLEMENTATION NOTE: C++11 20.7.1.1.2p2 only provides this constructor
+    // if U* is implicitly convertible to T* and U is not an array type.
+    //
+    // Correct implementation should use SFINAE to disable this
+    // constructor. However, since there are no other 1-argument constructors,
+    // using a COMPILE_ASSERT() based on is_convertible<> and requiring
+    // complete types is simpler and will cause compile failures for equivalent
+    // misuses.
+    //
+    // Note, the is_convertible<U*, T*> check also ensures that U is not an
+    // array. T is guaranteed to be a non-array, so any U* where U is an array
+    // cannot convert to T*.
+    enum { T_must_be_complete = sizeof(T) };
+    enum { U_must_be_complete = sizeof(U) };
+    COMPILE_ASSERT((base::is_convertible<U*, T*>::value),
+                   U_ptr_must_implicitly_convert_to_T_ptr);
+  }
+  inline void operator()(T* ptr) const {
+    enum { type_must_be_complete = sizeof(T) };
+    delete ptr;
+  }
+};
+
+// Specialization of DefaultDeleter for array types.
+template <class T>
+struct DefaultDeleter<T[]> {
+  inline void operator()(T* ptr) const {
+    enum { type_must_be_complete = sizeof(T) };
+    delete[] ptr;
+  }
+
+ private:
+  // Disable this operator for any U != T because it is undefined to execute
+  // an array delete when the static type of the array mismatches the dynamic
+  // type.
+  //
+  // References:
+  //   C++98 [expr.delete]p3
+  //   http://cplusplus.github.com/LWG/lwg-defects.html#938
+  template <typename U>
+  void operator()(U* array) const;
+};
+
+template <class T, int n>
+struct DefaultDeleter<T[n]> {
+  // Never allow someone to declare something like scoped_ptr<int[10]>.
+  COMPILE_ASSERT(sizeof(T) == -1, do_not_use_array_with_size_as_type);
+};
+
+// Function object which invokes 'free' on its parameter, which must be
+// a pointer. Can be used to store malloc-allocated pointers in scoped_ptr:
+//
+// scoped_ptr<int, base::FreeDeleter> foo_ptr(
+//     static_cast<int*>(malloc(sizeof(int))));
+struct FreeDeleter {
+  inline void operator()(void* ptr) const { free(ptr); }
+};
+
+namespace cef_internal {
+
+template <typename T>
+struct IsNotRefCounted {
+  enum {
+    value =
+        !base::is_convertible<T*, base::subtle::RefCountedBase*>::value &&
+        !base::is_convertible<T*,
+                              base::subtle::RefCountedThreadSafeBase*>::value
+  };
+};
+
+// Minimal implementation of the core logic of scoped_ptr, suitable for
+// reuse in both scoped_ptr and its specializations.
+template <class T, class D>
+class scoped_ptr_impl {
+ public:
+  explicit scoped_ptr_impl(T* p) : data_(p) {}
+
+  // Initializer for deleters that have data parameters.
+  scoped_ptr_impl(T* p, const D& d) : data_(p, d) {}
+
+  // Templated constructor that destructively takes the value from another
+  // scoped_ptr_impl.
+  template <typename U, typename V>
+  scoped_ptr_impl(scoped_ptr_impl<U, V>* other)
+      : data_(other->release(), other->get_deleter()) {
+    // We do not support move-only deleters.  We could modify our move
+    // emulation to have base::subtle::move() and base::subtle::forward()
+    // functions that are imperfect emulations of their C++11 equivalents,
+    // but until there's a requirement, just assume deleters are copyable.
+  }
+
+  template <typename U, typename V>
+  void TakeState(scoped_ptr_impl<U, V>* other) {
+    // See comment in templated constructor above regarding lack of support
+    // for move-only deleters.
+    reset(other->release());
+    get_deleter() = other->get_deleter();
+  }
+
+  ~scoped_ptr_impl() {
+    if (data_.ptr != NULL) {
+      // Not using get_deleter() saves one function call in non-optimized
+      // builds.
+      static_cast<D&>(data_)(data_.ptr);
+    }
+  }
+
+  void reset(T* p) {
+    // This is a self-reset, which is no longer allowed: http://crbug.com/162971
+    if (p != NULL && p == data_.ptr)
+      abort();
+
+    // Note that running data_.ptr = p can lead to undefined behavior if
+    // get_deleter()(get()) deletes this. In order to prevent this, reset()
+    // should update the stored pointer before deleting its old value.
+    //
+    // However, changing reset() to use that behavior may cause current code to
+    // break in unexpected ways. If the destruction of the owned object
+    // dereferences the scoped_ptr when it is destroyed by a call to reset(),
+    // then it will incorrectly dispatch calls to |p| rather than the original
+    // value of |data_.ptr|.
+    //
+    // During the transition period, set the stored pointer to NULL while
+    // deleting the object. Eventually, this safety check will be removed to
+    // prevent the scenario initially described from occuring and
+    // http://crbug.com/176091 can be closed.
+    T* old = data_.ptr;
+    data_.ptr = NULL;
+    if (old != NULL)
+      static_cast<D&>(data_)(old);
+    data_.ptr = p;
+  }
+
+  T* get() const { return data_.ptr; }
+
+  D& get_deleter() { return data_; }
+  const D& get_deleter() const { return data_; }
+
+  void swap(scoped_ptr_impl& p2) {
+    // Standard swap idiom: 'using std::swap' ensures that std::swap is
+    // present in the overload set, but we call swap unqualified so that
+    // any more-specific overloads can be used, if available.
+    using std::swap;
+    swap(static_cast<D&>(data_), static_cast<D&>(p2.data_));
+    swap(data_.ptr, p2.data_.ptr);
+  }
+
+  T* release() {
+    T* old_ptr = data_.ptr;
+    data_.ptr = NULL;
+    return old_ptr;
+  }
+
+ private:
+  // Needed to allow type-converting constructor.
+  template <typename U, typename V>
+  friend class scoped_ptr_impl;
+
+  // Use the empty base class optimization to allow us to have a D
+  // member, while avoiding any space overhead for it when D is an
+  // empty class.  See e.g. http://www.cantrip.org/emptyopt.html for a good
+  // discussion of this technique.
+  struct Data : public D {
+    explicit Data(T* ptr_in) : ptr(ptr_in) {}
+    Data(T* ptr_in, const D& other) : D(other), ptr(ptr_in) {}
+    T* ptr;
+  };
+
+  Data data_;
+
+  DISALLOW_COPY_AND_ASSIGN(scoped_ptr_impl);
+};
+
+}  // namespace cef_internal
+
+}  // namespace base
+
+// A scoped_ptr<T> is like a T*, except that the destructor of scoped_ptr<T>
+// automatically deletes the pointer it holds (if any).
+// That is, scoped_ptr<T> owns the T object that it points to.
+// Like a T*, a scoped_ptr<T> may hold either NULL or a pointer to a T object.
+// Also like T*, scoped_ptr<T> is thread-compatible, and once you
+// dereference it, you get the thread safety guarantees of T.
+//
+// The size of scoped_ptr is small. On most compilers, when using the
+// DefaultDeleter, sizeof(scoped_ptr<T>) == sizeof(T*). Custom deleters will
+// increase the size proportional to whatever state they need to have. See
+// comments inside scoped_ptr_impl<> for details.
+//
+// Current implementation targets having a strict subset of  C++11's
+// unique_ptr<> features. Known deficiencies include not supporting move-only
+// deleteres, function pointers as deleters, and deleters with reference
+// types.
+template <class T, class D = base::DefaultDeleter<T>>
+class scoped_ptr {
+  MOVE_ONLY_TYPE_FOR_CPP_03(scoped_ptr, RValue)
+
+  COMPILE_ASSERT(base::cef_internal::IsNotRefCounted<T>::value,
+                 T_is_refcounted_type_and_needs_scoped_refptr);
+
+ public:
+  // The element and deleter types.
+  typedef T element_type;
+  typedef D deleter_type;
+
+  // Constructor.  Defaults to initializing with NULL.
+  scoped_ptr() : impl_(NULL) {}
+
+  // Constructor.  Takes ownership of p.
+  explicit scoped_ptr(element_type* p) : impl_(p) {}
+
+  // Constructor.  Allows initialization of a stateful deleter.
+  scoped_ptr(element_type* p, const D& d) : impl_(p, d) {}
+
+  // Constructor.  Allows construction from a scoped_ptr rvalue for a
+  // convertible type and deleter.
+  //
+  // IMPLEMENTATION NOTE: C++11 unique_ptr<> keeps this constructor distinct
+  // from the normal move constructor. By C++11 20.7.1.2.1.21, this constructor
+  // has different post-conditions if D is a reference type. Since this
+  // implementation does not support deleters with reference type,
+  // we do not need a separate move constructor allowing us to avoid one
+  // use of SFINAE. You only need to care about this if you modify the
+  // implementation of scoped_ptr.
+  template <typename U, typename V>
+  scoped_ptr(scoped_ptr<U, V> other) : impl_(&other.impl_) {
+    COMPILE_ASSERT(!base::is_array<U>::value, U_cannot_be_an_array);
+  }
+
+  // Constructor.  Move constructor for C++03 move emulation of this type.
+  scoped_ptr(RValue rvalue) : impl_(&rvalue.object->impl_) {}
+
+  // operator=.  Allows assignment from a scoped_ptr rvalue for a convertible
+  // type and deleter.
+  //
+  // IMPLEMENTATION NOTE: C++11 unique_ptr<> keeps this operator= distinct from
+  // the normal move assignment operator. By C++11 20.7.1.2.3.4, this templated
+  // form has different requirements on for move-only Deleters. Since this
+  // implementation does not support move-only Deleters, we do not need a
+  // separate move assignment operator allowing us to avoid one use of SFINAE.
+  // You only need to care about this if you modify the implementation of
+  // scoped_ptr.
+  template <typename U, typename V>
+  scoped_ptr& operator=(scoped_ptr<U, V> rhs) {
+    COMPILE_ASSERT(!base::is_array<U>::value, U_cannot_be_an_array);
+    impl_.TakeState(&rhs.impl_);
+    return *this;
+  }
+
+  // Reset.  Deletes the currently owned object, if any.
+  // Then takes ownership of a new object, if given.
+  void reset(element_type* p = NULL) { impl_.reset(p); }
+
+  // Accessors to get the owned object.
+  // operator* and operator-> will assert() if there is no current object.
+  element_type& operator*() const {
+    assert(impl_.get() != NULL);
+    return *impl_.get();
+  }
+  element_type* operator->() const {
+    assert(impl_.get() != NULL);
+    return impl_.get();
+  }
+  element_type* get() const { return impl_.get(); }
+
+  // Access to the deleter.
+  deleter_type& get_deleter() { return impl_.get_deleter(); }
+  const deleter_type& get_deleter() const { return impl_.get_deleter(); }
+
+  // Allow scoped_ptr<element_type> to be used in boolean expressions, but not
+  // implicitly convertible to a real bool (which is dangerous).
+  //
+  // Note that this trick is only safe when the == and != operators
+  // are declared explicitly, as otherwise "scoped_ptr1 ==
+  // scoped_ptr2" will compile but do the wrong thing (i.e., convert
+  // to Testable and then do the comparison).
+ private:
+  typedef base::cef_internal::scoped_ptr_impl<element_type, deleter_type>
+      scoped_ptr::*Testable;
+
+ public:
+  operator Testable() const { return impl_.get() ? &scoped_ptr::impl_ : NULL; }
+
+  // Comparison operators.
+  // These return whether two scoped_ptr refer to the same object, not just to
+  // two different but equal objects.
+  bool operator==(const element_type* p) const { return impl_.get() == p; }
+  bool operator!=(const element_type* p) const { return impl_.get() != p; }
+
+  // Swap two scoped pointers.
+  void swap(scoped_ptr& p2) { impl_.swap(p2.impl_); }
+
+  // Release a pointer.
+  // The return value is the current pointer held by this object.
+  // If this object holds a NULL pointer, the return value is NULL.
+  // After this operation, this object will hold a NULL pointer,
+  // and will not own the object any more.
+  element_type* release() WARN_UNUSED_RESULT { return impl_.release(); }
+
+  // C++98 doesn't support functions templates with default parameters which
+  // makes it hard to write a PassAs() that understands converting the deleter
+  // while preserving simple calling semantics.
+  //
+  // Until there is a use case for PassAs() with custom deleters, just ignore
+  // the custom deleter.
+  template <typename PassAsType>
+  scoped_ptr<PassAsType> PassAs() {
+    return scoped_ptr<PassAsType>(Pass());
+  }
+
+ private:
+  // Needed to reach into |impl_| in the constructor.
+  template <typename U, typename V>
+  friend class scoped_ptr;
+  base::cef_internal::scoped_ptr_impl<element_type, deleter_type> impl_;
+
+  // Forbidden for API compatibility with std::unique_ptr.
+  explicit scoped_ptr(int disallow_construction_from_null);
+
+  // Forbid comparison of scoped_ptr types.  If U != T, it totally
+  // doesn't make sense, and if U == T, it still doesn't make sense
+  // because you should never have the same object owned by two different
+  // scoped_ptrs.
+  template <class U>
+  bool operator==(scoped_ptr<U> const& p2) const;
+  template <class U>
+  bool operator!=(scoped_ptr<U> const& p2) const;
+};
+
+template <class T, class D>
+class scoped_ptr<T[], D> {
+  MOVE_ONLY_TYPE_FOR_CPP_03(scoped_ptr, RValue)
+
+ public:
+  // The element and deleter types.
+  typedef T element_type;
+  typedef D deleter_type;
+
+  // Constructor.  Defaults to initializing with NULL.
+  scoped_ptr() : impl_(NULL) {}
+
+  // Constructor. Stores the given array. Note that the argument's type
+  // must exactly match T*. In particular:
+  // - it cannot be a pointer to a type derived from T, because it is
+  //   inherently unsafe in the general case to access an array through a
+  //   pointer whose dynamic type does not match its static type (eg., if
+  //   T and the derived types had different sizes access would be
+  //   incorrectly calculated). Deletion is also always undefined
+  //   (C++98 [expr.delete]p3). If you're doing this, fix your code.
+  // - it cannot be NULL, because NULL is an integral expression, not a
+  //   pointer to T. Use the no-argument version instead of explicitly
+  //   passing NULL.
+  // - it cannot be const-qualified differently from T per unique_ptr spec
+  //   (http://cplusplus.github.com/LWG/lwg-active.html#2118). Users wanting
+  //   to work around this may use implicit_cast<const T*>().
+  //   However, because of the first bullet in this comment, users MUST
+  //   NOT use implicit_cast<Base*>() to upcast the static type of the array.
+  explicit scoped_ptr(element_type* array) : impl_(array) {}
+
+  // Constructor.  Move constructor for C++03 move emulation of this type.
+  scoped_ptr(RValue rvalue) : impl_(&rvalue.object->impl_) {}
+
+  // operator=.  Move operator= for C++03 move emulation of this type.
+  scoped_ptr& operator=(RValue rhs) {
+    impl_.TakeState(&rhs.object->impl_);
+    return *this;
+  }
+
+  // Reset.  Deletes the currently owned array, if any.
+  // Then takes ownership of a new object, if given.
+  void reset(element_type* array = NULL) { impl_.reset(array); }
+
+  // Accessors to get the owned array.
+  element_type& operator[](size_t i) const {
+    assert(impl_.get() != NULL);
+    return impl_.get()[i];
+  }
+  element_type* get() const { return impl_.get(); }
+
+  // Access to the deleter.
+  deleter_type& get_deleter() { return impl_.get_deleter(); }
+  const deleter_type& get_deleter() const { return impl_.get_deleter(); }
+
+  // Allow scoped_ptr<element_type> to be used in boolean expressions, but not
+  // implicitly convertible to a real bool (which is dangerous).
+ private:
+  typedef base::cef_internal::scoped_ptr_impl<element_type, deleter_type>
+      scoped_ptr::*Testable;
+
+ public:
+  operator Testable() const { return impl_.get() ? &scoped_ptr::impl_ : NULL; }
+
+  // Comparison operators.
+  // These return whether two scoped_ptr refer to the same object, not just to
+  // two different but equal objects.
+  bool operator==(element_type* array) const { return impl_.get() == array; }
+  bool operator!=(element_type* array) const { return impl_.get() != array; }
+
+  // Swap two scoped pointers.
+  void swap(scoped_ptr& p2) { impl_.swap(p2.impl_); }
+
+  // Release a pointer.
+  // The return value is the current pointer held by this object.
+  // If this object holds a NULL pointer, the return value is NULL.
+  // After this operation, this object will hold a NULL pointer,
+  // and will not own the object any more.
+  element_type* release() WARN_UNUSED_RESULT { return impl_.release(); }
+
+ private:
+  // Force element_type to be a complete type.
+  enum { type_must_be_complete = sizeof(element_type) };
+
+  // Actually hold the data.
+  base::cef_internal::scoped_ptr_impl<element_type, deleter_type> impl_;
+
+  // Disable initialization from any type other than element_type*, by
+  // providing a constructor that matches such an initialization, but is
+  // private and has no definition. This is disabled because it is not safe to
+  // call delete[] on an array whose static type does not match its dynamic
+  // type.
+  template <typename U>
+  explicit scoped_ptr(U* array);
+  explicit scoped_ptr(int disallow_construction_from_null);
+
+  // Disable reset() from any type other than element_type*, for the same
+  // reasons as the constructor above.
+  template <typename U>
+  void reset(U* array);
+  void reset(int disallow_reset_from_null);
+
+  // Forbid comparison of scoped_ptr types.  If U != T, it totally
+  // doesn't make sense, and if U == T, it still doesn't make sense
+  // because you should never have the same object owned by two different
+  // scoped_ptrs.
+  template <class U>
+  bool operator==(scoped_ptr<U> const& p2) const;
+  template <class U>
+  bool operator!=(scoped_ptr<U> const& p2) const;
+};
+
+// Free functions
+template <class T, class D>
+void swap(scoped_ptr<T, D>& p1, scoped_ptr<T, D>& p2) {
+  p1.swap(p2);
+}
+
+template <class T, class D>
+bool operator==(T* p1, const scoped_ptr<T, D>& p2) {
+  return p1 == p2.get();
+}
+
+template <class T, class D>
+bool operator!=(T* p1, const scoped_ptr<T, D>& p2) {
+  return p1 != p2.get();
+}
+
+// A function to convert T* into scoped_ptr<T>
+// Doing e.g. make_scoped_ptr(new FooBarBaz<type>(arg)) is a shorter notation
+// for scoped_ptr<FooBarBaz<type> >(new FooBarBaz<type>(arg))
+template <typename T>
+scoped_ptr<T> make_scoped_ptr(T* ptr) {
+  return scoped_ptr<T>(ptr);
+}
+
+#endif  // !USING_CHROMIUM_INCLUDES
+
+#endif  // CEF_INCLUDE_BASE_CEF_MEMORY_SCOPED_PTR_H_
--- a/include/base/cef_scoped_refptr.h
+++ b/include/base/cef_scoped_refptr.h
@@ -1,418 +0,0 @@
-// Copyright (c) 2017 Marshall A. Greenblatt. Portions copyright (c) 2011
-// Google Inc. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//    * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//    * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//    * Neither the name of Google Inc. nor the name Chromium Embedded
-// Framework nor the names of its contributors may be used to endorse
-// or promote products derived from this software without specific prior
-// written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef CEF_INCLUDE_BASE_CEF_SCOPED_REFPTR_H_
-#define CEF_INCLUDE_BASE_CEF_SCOPED_REFPTR_H_
-#pragma once
-
-#if defined(USING_CHROMIUM_INCLUDES)
-// When building CEF include the Chromium header directly.
-#include "base/memory/scoped_refptr.h"
-#else  // !USING_CHROMIUM_INCLUDES
-// The following is substantially similar to the Chromium implementation.
-// If the Chromium implementation diverges the below implementation should be
-// updated to match.
-
-#include <stddef.h>
-
-#include <iosfwd>
-#include <type_traits>
-#include <utility>
-
-#include "include/base/cef_logging.h"
-
-template <class T>
-class scoped_refptr;
-
-namespace base {
-
-template <class, typename>
-class RefCounted;
-template <class, typename>
-class RefCountedThreadSafe;
-class SequencedTaskRunner;
-class WrappedPromise;
-
-template <typename T>
-scoped_refptr<T> AdoptRef(T* t);
-
-namespace internal {
-
-class BasePromise;
-
-}  // namespace internal
-
-namespace cef_subtle {
-
-enum AdoptRefTag { kAdoptRefTag };
-enum StartRefCountFromZeroTag { kStartRefCountFromZeroTag };
-enum StartRefCountFromOneTag { kStartRefCountFromOneTag };
-
-template <typename T, typename U, typename V>
-constexpr bool IsRefCountPreferenceOverridden(const T*,
-                                              const RefCounted<U, V>*) {
-  return !std::is_same<std::decay_t<decltype(T::kRefCountPreference)>,
-                       std::decay_t<decltype(U::kRefCountPreference)>>::value;
-}
-
-template <typename T, typename U, typename V>
-constexpr bool IsRefCountPreferenceOverridden(
-    const T*,
-    const RefCountedThreadSafe<U, V>*) {
-  return !std::is_same<std::decay_t<decltype(T::kRefCountPreference)>,
-                       std::decay_t<decltype(U::kRefCountPreference)>>::value;
-}
-
-constexpr bool IsRefCountPreferenceOverridden(...) {
-  return false;
-}
-
-}  // namespace cef_subtle
-
-// Creates a scoped_refptr from a raw pointer without incrementing the reference
-// count. Use this only for a newly created object whose reference count starts
-// from 1 instead of 0.
-template <typename T>
-scoped_refptr<T> AdoptRef(T* obj) {
-  using Tag = std::decay_t<decltype(T::kRefCountPreference)>;
-  static_assert(std::is_same<cef_subtle::StartRefCountFromOneTag, Tag>::value,
-                "Use AdoptRef only if the reference count starts from one.");
-
-  DCHECK(obj);
-  DCHECK(obj->HasOneRef());
-  obj->Adopted();
-  return scoped_refptr<T>(obj, cef_subtle::kAdoptRefTag);
-}
-
-namespace cef_subtle {
-
-template <typename T>
-scoped_refptr<T> AdoptRefIfNeeded(T* obj, StartRefCountFromZeroTag) {
-  return scoped_refptr<T>(obj);
-}
-
-template <typename T>
-scoped_refptr<T> AdoptRefIfNeeded(T* obj, StartRefCountFromOneTag) {
-  return AdoptRef(obj);
-}
-
-}  // namespace cef_subtle
-
-// Constructs an instance of T, which is a ref counted type, and wraps the
-// object into a scoped_refptr<T>.
-template <typename T, typename... Args>
-scoped_refptr<T> MakeRefCounted(Args&&... args) {
-  T* obj = new T(std::forward<Args>(args)...);
-  return cef_subtle::AdoptRefIfNeeded(obj, T::kRefCountPreference);
-}
-
-// Takes an instance of T, which is a ref counted type, and wraps the object
-// into a scoped_refptr<T>.
-template <typename T>
-scoped_refptr<T> WrapRefCounted(T* t) {
-  return scoped_refptr<T>(t);
-}
-
-}  // namespace base
-
-///
-/// A smart pointer class for reference counted objects.  Use this class instead
-/// of calling AddRef and Release manually on a reference counted object to
-/// avoid common memory leaks caused by forgetting to Release an object
-/// reference. Sample usage:
-///
-/// <pre>
-///   class MyFoo : public RefCounted<MyFoo> {
-///    ...
-///    private:
-///     friend class RefCounted<MyFoo>;  // Allow destruction by RefCounted<>.
-///     ~MyFoo();                        // Destructor must be
-///     private/protected.
-///   };
-///
-///   void some_function() {
-///     scoped_refptr<MyFoo> foo = MakeRefCounted<MyFoo>();
-///     foo->Method(param);
-///     // |foo| is released when this function returns
-///   }
-///
-///   void some_other_function() {
-///     scoped_refptr<MyFoo> foo = MakeRefCounted<MyFoo>();
-///     ...
-///     foo.reset();  // explicitly releases |foo|
-///     ...
-///     if (foo)
-///       foo->Method(param);
-///   }
-/// </pre>
-///
-/// The above examples show how scoped_refptr<T> acts like a pointer to T.
-/// Given two scoped_refptr<T> classes, it is also possible to exchange
-/// references between the two objects, like so:
-///
-/// <pre>
-///   {
-///     scoped_refptr<MyFoo> a = MakeRefCounted<MyFoo>();
-///     scoped_refptr<MyFoo> b;
-///
-///     b.swap(a);
-///     // now, |b| references the MyFoo object, and |a| references nullptr.
-///   }
-/// </pre>
-///
-/// To make both |a| and |b| in the above example reference the same MyFoo
-/// object, simply use the assignment operator:
-///
-/// <pre>
-///   {
-///     scoped_refptr<MyFoo> a = MakeRefCounted<MyFoo>();
-///     scoped_refptr<MyFoo> b;
-///
-///     b = a;
-///     // now, |a| and |b| each own a reference to the same MyFoo object.
-///   }
-/// </pre>
-///
-/// Also see Chromium's ownership and calling conventions:
-/// https://chromium.googlesource.com/chromium/src/+/lkgr/styleguide/c++/c++.md#object-ownership-and-calling-conventions
-/// Specifically:
-///   If the function (at least sometimes) takes a ref on a refcounted object,
-///   declare the param as scoped_refptr<T>. The caller can decide whether it
-///   wishes to transfer ownership (by calling std::move(t) when passing t) or
-///   retain its ref (by simply passing t directly).
-///   In other words, use scoped_refptr like you would a std::unique_ptr except
-///   in the odd case where it's required to hold on to a ref while handing one
-///   to another component (if a component merely needs to use t on the stack
-///   without keeping a ref: pass t as a raw T*).
-///
-template <class T>
-class TRIVIAL_ABI scoped_refptr {
- public:
-  typedef T element_type;
-
-  constexpr scoped_refptr() = default;
-
-  // Allow implicit construction from nullptr.
-  constexpr scoped_refptr(std::nullptr_t) {}
-
-  // Constructs from a raw pointer. Note that this constructor allows implicit
-  // conversion from T* to scoped_refptr<T> which is strongly discouraged. If
-  // you are creating a new ref-counted object please use
-  // base::MakeRefCounted<T>() or base::WrapRefCounted<T>(). Otherwise you
-  // should move or copy construct from an existing scoped_refptr<T> to the
-  // ref-counted object.
-  scoped_refptr(T* p) : ptr_(p) {
-    if (ptr_)
-      AddRef(ptr_);
-  }
-
-  // Copy constructor. This is required in addition to the copy conversion
-  // constructor below.
-  scoped_refptr(const scoped_refptr& r) : scoped_refptr(r.ptr_) {}
-
-  // Copy conversion constructor.
-  template <typename U,
-            typename = typename std::enable_if<
-                std::is_convertible<U*, T*>::value>::type>
-  scoped_refptr(const scoped_refptr<U>& r) : scoped_refptr(r.ptr_) {}
-
-  // Move constructor. This is required in addition to the move conversion
-  // constructor below.
-  scoped_refptr(scoped_refptr&& r) noexcept : ptr_(r.ptr_) { r.ptr_ = nullptr; }
-
-  // Move conversion constructor.
-  template <typename U,
-            typename = typename std::enable_if<
-                std::is_convertible<U*, T*>::value>::type>
-  scoped_refptr(scoped_refptr<U>&& r) noexcept : ptr_(r.ptr_) {
-    r.ptr_ = nullptr;
-  }
-
-  ~scoped_refptr() {
-    static_assert(!base::cef_subtle::IsRefCountPreferenceOverridden(
-                      static_cast<T*>(nullptr), static_cast<T*>(nullptr)),
-                  "It's unsafe to override the ref count preference."
-                  " Please remove REQUIRE_ADOPTION_FOR_REFCOUNTED_TYPE"
-                  " from subclasses.");
-    if (ptr_)
-      Release(ptr_);
-  }
-
-  T* get() const { return ptr_; }
-
-  T& operator*() const {
-    DCHECK(ptr_);
-    return *ptr_;
-  }
-
-  T* operator->() const {
-    DCHECK(ptr_);
-    return ptr_;
-  }
-
-  scoped_refptr& operator=(std::nullptr_t) {
-    reset();
-    return *this;
-  }
-
-  scoped_refptr& operator=(T* p) { return *this = scoped_refptr(p); }
-
-  // Unified assignment operator.
-  scoped_refptr& operator=(scoped_refptr r) noexcept {
-    swap(r);
-    return *this;
-  }
-
-  // Sets managed object to null and releases reference to the previous managed
-  // object, if it existed.
-  void reset() { scoped_refptr().swap(*this); }
-
-  // Returns the owned pointer (if any), releasing ownership to the caller. The
-  // caller is responsible for managing the lifetime of the reference.
-  [[nodiscard]] T* release();
-
-  void swap(scoped_refptr& r) noexcept { std::swap(ptr_, r.ptr_); }
-
-  explicit operator bool() const { return ptr_ != nullptr; }
-
-  template <typename U>
-  bool operator==(const scoped_refptr<U>& rhs) const {
-    return ptr_ == rhs.get();
-  }
-
-  template <typename U>
-  bool operator!=(const scoped_refptr<U>& rhs) const {
-    return !operator==(rhs);
-  }
-
-  template <typename U>
-  bool operator<(const scoped_refptr<U>& rhs) const {
-    return ptr_ < rhs.get();
-  }
-
- protected:
-  T* ptr_ = nullptr;
-
- private:
-  template <typename U>
-  friend scoped_refptr<U> base::AdoptRef(U*);
-  friend class ::base::SequencedTaskRunner;
-
-  // Friend access so these classes can use the constructor below as part of a
-  // binary size optimization.
-  friend class ::base::internal::BasePromise;
-  friend class ::base::WrappedPromise;
-
-  scoped_refptr(T* p, base::cef_subtle::AdoptRefTag) : ptr_(p) {}
-
-  // Friend required for move constructors that set r.ptr_ to null.
-  template <typename U>
-  friend class scoped_refptr;
-
-  // Non-inline helpers to allow:
-  //     class Opaque;
-  //     extern template class scoped_refptr<Opaque>;
-  // Otherwise the compiler will complain that Opaque is an incomplete type.
-  static void AddRef(T* ptr);
-  static void Release(T* ptr);
-};
-
-template <typename T>
-T* scoped_refptr<T>::release() {
-  T* ptr = ptr_;
-  ptr_ = nullptr;
-  return ptr;
-}
-
-// static
-template <typename T>
-void scoped_refptr<T>::AddRef(T* ptr) {
-  ptr->AddRef();
-}
-
-// static
-template <typename T>
-void scoped_refptr<T>::Release(T* ptr) {
-  ptr->Release();
-}
-
-template <typename T, typename U>
-bool operator==(const scoped_refptr<T>& lhs, const U* rhs) {
-  return lhs.get() == rhs;
-}
-
-template <typename T, typename U>
-bool operator==(const T* lhs, const scoped_refptr<U>& rhs) {
-  return lhs == rhs.get();
-}
-
-template <typename T>
-bool operator==(const scoped_refptr<T>& lhs, std::nullptr_t null) {
-  return !static_cast<bool>(lhs);
-}
-
-template <typename T>
-bool operator==(std::nullptr_t null, const scoped_refptr<T>& rhs) {
-  return !static_cast<bool>(rhs);
-}
-
-template <typename T, typename U>
-bool operator!=(const scoped_refptr<T>& lhs, const U* rhs) {
-  return !operator==(lhs, rhs);
-}
-
-template <typename T, typename U>
-bool operator!=(const T* lhs, const scoped_refptr<U>& rhs) {
-  return !operator==(lhs, rhs);
-}
-
-template <typename T>
-bool operator!=(const scoped_refptr<T>& lhs, std::nullptr_t null) {
-  return !operator==(lhs, null);
-}
-
-template <typename T>
-bool operator!=(std::nullptr_t null, const scoped_refptr<T>& rhs) {
-  return !operator==(null, rhs);
-}
-
-template <typename T>
-std::ostream& operator<<(std::ostream& out, const scoped_refptr<T>& p) {
-  return out << p.get();
-}
-
-template <typename T>
-void swap(scoped_refptr<T>& lhs, scoped_refptr<T>& rhs) noexcept {
-  lhs.swap(rhs);
-}
-
-#endif  // !USING_CHROMIUM_INCLUDES
-
-#endif  // CEF_INCLUDE_BASE_CEF_SCOPED_REFPTR_H_
--- a/include/base/cef_scoped_typeref_mac.h
+++ b/include/base/cef_scoped_typeref_mac.h
@@ -1,184 +0,0 @@
-// Copyright (c) 2021 Marshall A. Greenblatt. Portions copyright (c) 2013
-// Google Inc. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//    * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//    * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//    * Neither the name of Google Inc. nor the name Chromium Embedded
-// Framework nor the names of its contributors may be used to endorse
-// or promote products derived from this software without specific prior
-// written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef CEF_INCLUDE_BASE_CEF_SCOPED_TYPEREF_MAC_H_
-#define CEF_INCLUDE_BASE_CEF_SCOPED_TYPEREF_MAC_H_
-#pragma once
-
-#if defined(USING_CHROMIUM_INCLUDES)
-// When building CEF include the Chromium header directly.
-#include "base/mac/scoped_typeref.h"
-#else  // !USING_CHROMIUM_INCLUDES
-// The following is substantially similar to the Chromium implementation.
-// If the Chromium implementation diverges the below implementation should be
-// updated to match.
-
-#include "include/base/cef_logging.h"
-#include "include/base/internal/cef_scoped_policy.h"
-
-namespace base {
-
-template <typename T>
-struct ScopedTypeRefTraits;
-
-///
-/// ScopedTypeRef<> is patterned after std::unique_ptr<>, but maintains
-/// ownership of a reference to any type that is maintained by Retain and
-/// Release methods.
-///
-/// The Traits structure must provide the Retain and Release methods for type T.
-/// A default ScopedTypeRefTraits is used but not defined, and should be defined
-/// for each type to use this interface. For example, an appropriate definition
-/// of ScopedTypeRefTraits for CGLContextObj would be:
-///
-/// <pre>
-///   template<>
-///   struct ScopedTypeRefTraits<CGLContextObj> {
-///     static CGLContextObj InvalidValue() { return nullptr; }
-///     static CGLContextObj Retain(CGLContextObj object) {
-///       CGLContextRetain(object);
-///       return object;
-///     }
-///     static void Release(CGLContextObj object) { CGLContextRelease(object); }
-///   };
-/// </pre>
-///
-/// For the many types that have pass-by-pointer create functions, the function
-/// InitializeInto() is provided to allow direct initialization and assumption
-/// of ownership of the object. For example, continuing to use the above
-/// CGLContextObj specialization:
-///
-/// <pre>
-///   base::ScopedTypeRef<CGLContextObj> context;
-///   CGLCreateContext(pixel_format, share_group, context.InitializeInto());
-/// </pre>
-///
-/// For initialization with an existing object, the caller may specify whether
-/// the ScopedTypeRef<> being initialized is assuming the caller's existing
-/// ownership of the object (and should not call Retain in initialization) or if
-/// it should not assume this ownership and must create its own (by calling
-/// Retain in initialization). This behavior is based on the |policy| parameter,
-/// with |ASSUME| for the former and |RETAIN| for the latter. The default policy
-/// is to |ASSUME|.
-///
-template <typename T, typename Traits = ScopedTypeRefTraits<T>>
-class ScopedTypeRef {
- public:
-  using element_type = T;
-
-  explicit constexpr ScopedTypeRef(
-      element_type object = Traits::InvalidValue(),
-      base::scoped_policy::OwnershipPolicy policy = base::scoped_policy::ASSUME)
-      : object_(object) {
-    if (object_ && policy == base::scoped_policy::RETAIN)
-      object_ = Traits::Retain(object_);
-  }
-
-  ScopedTypeRef(const ScopedTypeRef<T, Traits>& that) : object_(that.object_) {
-    if (object_)
-      object_ = Traits::Retain(object_);
-  }
-
-  // This allows passing an object to a function that takes its superclass.
-  template <typename R, typename RTraits>
-  explicit ScopedTypeRef(const ScopedTypeRef<R, RTraits>& that_as_subclass)
-      : object_(that_as_subclass.get()) {
-    if (object_)
-      object_ = Traits::Retain(object_);
-  }
-
-  ScopedTypeRef(ScopedTypeRef<T, Traits>&& that) : object_(that.object_) {
-    that.object_ = Traits::InvalidValue();
-  }
-
-  ~ScopedTypeRef() {
-    if (object_)
-      Traits::Release(object_);
-  }
-
-  ScopedTypeRef& operator=(const ScopedTypeRef<T, Traits>& that) {
-    reset(that.get(), base::scoped_policy::RETAIN);
-    return *this;
-  }
-
-  // This is to be used only to take ownership of objects that are created
-  // by pass-by-pointer create functions. To enforce this, require that the
-  // object be reset to NULL before this may be used.
-  [[nodiscard]] element_type* InitializeInto() {
-    DCHECK(!object_);
-    return &object_;
-  }
-
-  void reset(const ScopedTypeRef<T, Traits>& that) {
-    reset(that.get(), base::scoped_policy::RETAIN);
-  }
-
-  void reset(element_type object = Traits::InvalidValue(),
-             base::scoped_policy::OwnershipPolicy policy =
-                 base::scoped_policy::ASSUME) {
-    if (object && policy == base::scoped_policy::RETAIN)
-      object = Traits::Retain(object);
-    if (object_)
-      Traits::Release(object_);
-    object_ = object;
-  }
-
-  bool operator==(const element_type& that) const { return object_ == that; }
-
-  bool operator!=(const element_type& that) const { return object_ != that; }
-
-  operator element_type() const { return object_; }
-
-  element_type get() const { return object_; }
-
-  void swap(ScopedTypeRef& that) {
-    element_type temp = that.object_;
-    that.object_ = object_;
-    object_ = temp;
-  }
-
-  // ScopedTypeRef<>::release() is like std::unique_ptr<>::release.  It is NOT
-  // a wrapper for Release().  To force a ScopedTypeRef<> object to call
-  // Release(), use ScopedTypeRef<>::reset().
-  [[nodiscard]] element_type release() {
-    element_type temp = object_;
-    object_ = Traits::InvalidValue();
-    return temp;
-  }
-
- private:
-  element_type object_;
-};
-
-}  // namespace base
-
-#endif  // !USING_CHROMIUM_INCLUDES
-
-#endif  // CEF_INCLUDE_BASE_CEF_SCOPED_TYPEREF_MAC_H_
--- a/include/base/cef_template_util.h
+++ b/include/base/cef_template_util.h
@@ -32,7 +32,12 @@
 #define CEF_INCLUDE_BASE_CEF_TEMPLATE_UTIL_H_
 #pragma once

-#if defined(USING_CHROMIUM_INCLUDES)
+#if defined(BASE_TEMPLATE_UTIL_H_)
+// Do nothing if the Chromium header has already been included.
+// This can happen in cases where Chromium code is used directly by the
+// client application. When using Chromium code directly always include
+// the Chromium header first to avoid type conflicts.
+#elif defined(USING_CHROMIUM_INCLUDES)
 // When building CEF include the Chromium header directly.
 #include "base/template_util.h"
 #else  // !USING_CHROMIUM_INCLUDES
@@ -40,375 +45,170 @@
 // If the Chromium implementation diverges the below implementation should be
 // updated to match.

-#include <stddef.h>
-#include <iosfwd>
-#include <iterator>
-#include <type_traits>
-#include <utility>
-#include <vector>
+#include <cstddef>  // For size_t.

 #include "include/base/cef_build.h"

-// Some versions of libstdc++ have partial support for type_traits, but misses
-// a smaller subset while removing some of the older non-standard stuff. Assume
-// that all versions below 5.0 fall in this category, along with one 5.0
-// experimental release. Test for this by consulting compiler major version,
-// the only reliable option available, so theoretically this could fail should
-// you attempt to mix an earlier version of libstdc++ with >= GCC5. But
-// that's unlikely to work out, especially as GCC5 changed ABI.
-#define CR_GLIBCXX_5_0_0 20150123
-#if (defined(__GNUC__) && __GNUC__ < 5) || \
-    (defined(__GLIBCXX__) && __GLIBCXX__ == CR_GLIBCXX_5_0_0)
-#define CR_USE_FALLBACKS_FOR_OLD_EXPERIMENTAL_GLIBCXX
-#endif
-
-// This hacks around using gcc with libc++ which has some incompatibilies.
-// - is_trivially_* doesn't work: https://llvm.org/bugs/show_bug.cgi?id=27538
-// TODO(danakj): Remove this when android builders are all using a newer version
-// of gcc, or the android ndk is updated to a newer libc++ that works with older
-// gcc versions.
-#if !defined(__clang__) && defined(_LIBCPP_VERSION)
-#define CR_USE_FALLBACKS_FOR_GCC_WITH_LIBCXX
-#endif
-
 namespace base {

-template <class T> struct is_non_const_reference : std::false_type {};
-template <class T> struct is_non_const_reference<T&> : std::true_type {};
-template <class T> struct is_non_const_reference<const T&> : std::false_type {};
+// template definitions from tr1

-namespace internal {
-
-// Implementation detail of base::void_t below.
-template <typename...>
-struct make_void {
-  using type = void;
+template <class T, T v>
+struct integral_constant {
+  static const T value = v;
+  typedef T value_type;
+  typedef integral_constant<T, v> type;
 };

-}  // namespace internal
+template <class T, T v>
+const T integral_constant<T, v>::value;

-// base::void_t is an implementation of std::void_t from C++17.
-//
-// We use |base::internal::make_void| as a helper struct to avoid a C++14
-// defect:
-//   http://en.cppreference.com/w/cpp/types/void_t
-//   http://open-std.org/JTC1/SC22/WG21/docs/cwg_defects.html#1558
-template <typename... Ts>
-using void_t = typename ::base::internal::make_void<Ts...>::type;
+typedef integral_constant<bool, true> true_type;
+typedef integral_constant<bool, false> false_type;

-namespace internal {
-
-// Uses expression SFINAE to detect whether using operator<< would work.
-template <typename T, typename = void>
-struct SupportsOstreamOperator : std::false_type {};
-template <typename T>
-struct SupportsOstreamOperator<T,
-                               decltype(void(std::declval<std::ostream&>()
-                                             << std::declval<T>()))>
-    : std::true_type {};
-
-template <typename T, typename = void>
-struct SupportsToString : std::false_type {};
-template <typename T>
-struct SupportsToString<T, decltype(void(std::declval<T>().ToString()))>
-    : std::true_type {};
-
-// Used to detect whether the given type is an iterator.  This is normally used
-// with std::enable_if to provide disambiguation for functions that take
-// templatzed iterators as input.
-template <typename T, typename = void>
-struct is_iterator : std::false_type {};
-
-template <typename T>
-struct is_iterator<T,
-                   void_t<typename std::iterator_traits<T>::iterator_category>>
-    : std::true_type {};
-
-// Helper to express preferences in an overload set. If more than one overload
-// are available for a given set of parameters the overload with the higher
-// priority will be chosen.
-template <size_t I>
-struct priority_tag : priority_tag<I - 1> {};
-
-template <>
-struct priority_tag<0> {};
-
-}  // namespace internal
-
-// is_trivially_copyable is especially hard to get right.
-// - Older versions of libstdc++ will fail to have it like they do for other
-//   type traits. This has become a subset of the second point, but used to be
-//   handled independently.
-// - An experimental release of gcc includes most of type_traits but misses
-//   is_trivially_copyable, so we still have to avoid using libstdc++ in this
-//   case, which is covered by CR_USE_FALLBACKS_FOR_OLD_EXPERIMENTAL_GLIBCXX.
-// - When compiling libc++ from before r239653, with a gcc compiler, the
-//   std::is_trivially_copyable can fail. So we need to work around that by not
-//   using the one in libc++ in this case. This is covered by the
-//   CR_USE_FALLBACKS_FOR_GCC_WITH_LIBCXX define, and is discussed in
-//   https://llvm.org/bugs/show_bug.cgi?id=27538#c1 where they point out that
-//   in libc++'s commit r239653 this is fixed by libc++ checking for gcc 5.1.
-// - In both of the above cases we are using the gcc compiler. When defining
-//   this ourselves on compiler intrinsics, the __is_trivially_copyable()
-//   intrinsic is not available on gcc before version 5.1 (see the discussion in
-//   https://llvm.org/bugs/show_bug.cgi?id=27538#c1 again), so we must check for
-//   that version.
-// - When __is_trivially_copyable() is not available because we are on gcc older
-//   than 5.1, we need to fall back to something, so we use __has_trivial_copy()
-//   instead based on what was done one-off in bit_cast() previously.
-
-// TODO(crbug.com/554293): Remove this when all platforms have this in the std
-// namespace and it works with gcc as needed.
-#if defined(CR_USE_FALLBACKS_FOR_OLD_EXPERIMENTAL_GLIBCXX) || \
-    defined(CR_USE_FALLBACKS_FOR_GCC_WITH_LIBCXX)
-template <typename T>
-struct is_trivially_copyable {
-// TODO(danakj): Remove this when android builders are all using a newer version
-// of gcc, or the android ndk is updated to a newer libc++ that does this for
-// us.
-#if _GNUC_VER >= 501
-  static constexpr bool value = __is_trivially_copyable(T);
-#else
-  static constexpr bool value =
-      __has_trivial_copy(T) && __has_trivial_destructor(T);
-#endif
-};
-#else
 template <class T>
-using is_trivially_copyable = std::is_trivially_copyable<T>;
-#endif
+struct is_pointer : false_type {};
+template <class T>
+struct is_pointer<T*> : true_type {};

-#if defined(__GNUC__) && !defined(__clang__) && __GNUC__ <= 7
-// Workaround for g++7 and earlier family.
-// Due to https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80654, without this
-// Optional<std::vector<T>> where T is non-copyable causes a compile error.
-// As we know it is not trivially copy constructible, explicitly declare so.
+// Member function pointer detection up to four params. Add more as needed
+// below. This is built-in to C++ 11, and we can remove this when we switch.
 template <typename T>
-struct is_trivially_copy_constructible
-    : std::is_trivially_copy_constructible<T> {};
+struct is_member_function_pointer : false_type {};

-template <typename... T>
-struct is_trivially_copy_constructible<std::vector<T...>> : std::false_type {};
-#else
-// Otherwise use std::is_trivially_copy_constructible as is.
-template <typename T>
-using is_trivially_copy_constructible = std::is_trivially_copy_constructible<T>;
-#endif
+template <typename R, typename Z>
+struct is_member_function_pointer<R (Z::*)()> : true_type {};
+template <typename R, typename Z>
+struct is_member_function_pointer<R (Z::*)() const> : true_type {};

-// base::in_place_t is an implementation of std::in_place_t from
-// C++17. A tag type used to request in-place construction in template vararg
-// constructors.
+template <typename R, typename Z, typename A>
+struct is_member_function_pointer<R (Z::*)(A)> : true_type {};
+template <typename R, typename Z, typename A>
+struct is_member_function_pointer<R (Z::*)(A) const> : true_type {};

-// Specification:
-// https://en.cppreference.com/w/cpp/utility/in_place
-struct in_place_t {};
-constexpr in_place_t in_place = {};
+template <typename R, typename Z, typename A, typename B>
+struct is_member_function_pointer<R (Z::*)(A, B)> : true_type {};
+template <typename R, typename Z, typename A, typename B>
+struct is_member_function_pointer<R (Z::*)(A, B) const> : true_type {};

-// base::in_place_type_t is an implementation of std::in_place_type_t from
-// C++17. A tag type used for in-place construction when the type to construct
-// needs to be specified, such as with base::unique_any, designed to be a
-// drop-in replacement.
+template <typename R, typename Z, typename A, typename B, typename C>
+struct is_member_function_pointer<R (Z::*)(A, B, C)> : true_type {};
+template <typename R, typename Z, typename A, typename B, typename C>
+struct is_member_function_pointer<R (Z::*)(A, B, C) const> : true_type {};

-// Specification:
-// http://en.cppreference.com/w/cpp/utility/in_place
-template <typename T>
-struct in_place_type_t {};
+template <typename R,
+          typename Z,
+          typename A,
+          typename B,
+          typename C,
+          typename D>
+struct is_member_function_pointer<R (Z::*)(A, B, C, D)> : true_type {};
+template <typename R,
+          typename Z,
+          typename A,
+          typename B,
+          typename C,
+          typename D>
+struct is_member_function_pointer<R (Z::*)(A, B, C, D) const> : true_type {};

-template <typename T>
-struct is_in_place_type_t {
-  static constexpr bool value = false;
+template <class T, class U>
+struct is_same : public false_type {};
+template <class T>
+struct is_same<T, T> : true_type {};
+
+template <class>
+struct is_array : public false_type {};
+template <class T, size_t n>
+struct is_array<T[n]> : public true_type {};
+template <class T>
+struct is_array<T[]> : public true_type {};
+
+template <class T>
+struct is_non_const_reference : false_type {};
+template <class T>
+struct is_non_const_reference<T&> : true_type {};
+template <class T>
+struct is_non_const_reference<const T&> : false_type {};
+
+template <class T>
+struct is_const : false_type {};
+template <class T>
+struct is_const<const T> : true_type {};
+
+template <class T>
+struct is_void : false_type {};
+template <>
+struct is_void<void> : true_type {};
+
+namespace cef_internal {
+
+// Types YesType and NoType are guaranteed such that sizeof(YesType) <
+// sizeof(NoType).
+typedef char YesType;
+
+struct NoType {
+  YesType dummy[2];
 };

-template <typename... Ts>
-struct is_in_place_type_t<in_place_type_t<Ts...>> {
-  static constexpr bool value = true;
+// This class is an implementation detail for is_convertible, and you
+// don't need to know how it works to use is_convertible. For those
+// who care: we declare two different functions, one whose argument is
+// of type To and one with a variadic argument list. We give them
+// return types of different size, so we can use sizeof to trick the
+// compiler into telling us which function it would have chosen if we
+// had called it with an argument of type From.  See Alexandrescu's
+// _Modern C++ Design_ for more details on this sort of trick.
+
+struct ConvertHelper {
+  template <typename To>
+  static YesType Test(To);
+
+  template <typename To>
+  static NoType Test(...);
+
+  template <typename From>
+  static From& Create();
 };

-// C++14 implementation of C++17's std::bool_constant.
-//
-// Reference: https://en.cppreference.com/w/cpp/types/integral_constant
-// Specification: https://wg21.link/meta.type.synop
-template <bool B>
-using bool_constant = std::integral_constant<bool, B>;
+// Used to determine if a type is a struct/union/class. Inspired by Boost's
+// is_class type_trait implementation.
+struct IsClassHelper {
+  template <typename C>
+  static YesType Test(void (C::*)(void));

-// C++14 implementation of C++17's std::conjunction.
-//
-// Reference: https://en.cppreference.com/w/cpp/types/conjunction
-// Specification: https://wg21.link/meta.logical#1.itemdecl:1
-template <typename...>
-struct conjunction : std::true_type {};
-
-template <typename B1>
-struct conjunction<B1> : B1 {};
-
-template <typename B1, typename... Bn>
-struct conjunction<B1, Bn...>
-    : std::conditional_t<static_cast<bool>(B1::value), conjunction<Bn...>, B1> {
+  template <typename C>
+  static NoType Test(...);
 };

-// C++14 implementation of C++17's std::disjunction.
+}  // namespace cef_internal
+
+// Inherits from true_type if From is convertible to To, false_type otherwise.
 //
-// Reference: https://en.cppreference.com/w/cpp/types/disjunction
-// Specification: https://wg21.link/meta.logical#itemdecl:2
-template <typename...>
-struct disjunction : std::false_type {};
-
-template <typename B1>
-struct disjunction<B1> : B1 {};
-
-template <typename B1, typename... Bn>
-struct disjunction<B1, Bn...>
-    : std::conditional_t<static_cast<bool>(B1::value), B1, disjunction<Bn...>> {
-};
-
-// C++14 implementation of C++17's std::negation.
-//
-// Reference: https://en.cppreference.com/w/cpp/types/negation
-// Specification: https://wg21.link/meta.logical#itemdecl:3
-template <typename B>
-struct negation : bool_constant<!static_cast<bool>(B::value)> {};
-
-// Implementation of C++17's invoke_result.
-//
-// This implementation adds references to `Functor` and `Args` to work around
-// some quirks of std::result_of. See the #Notes section of [1] for details.
-//
-// References:
-// [1] https://en.cppreference.com/w/cpp/types/result_of
-// [2] https://wg21.link/meta.trans.other#lib:invoke_result
-#if ((defined(_MSVC_LANG) && _MSVC_LANG >= 201703L) || __cplusplus >= 201703L)
-template <typename Functor, typename... Args>
-using invoke_result = std::invoke_result<Functor, Args...>;
-#else
-template <typename Functor, typename... Args>
-using invoke_result = std::result_of<Functor && (Args && ...)>;
-#endif
-
-// Implementation of C++17's std::invoke_result_t.
-//
-// Reference: https://wg21.link/meta.type.synop#lib:invoke_result_t
-template <typename Functor, typename... Args>
-using invoke_result_t = typename invoke_result<Functor, Args...>::type;
-
-namespace internal {
-
-// Base case, `InvokeResult` does not have a nested type member. This means `F`
-// could not be invoked with `Args...` and thus is not invocable.
-template <typename InvokeResult, typename R, typename = void>
-struct IsInvocableImpl : std::false_type {};
-
-// Happy case, `InvokeResult` does have a nested type member. Now check whether
-// `InvokeResult::type` is convertible to `R`. Short circuit in case
-// `std::is_void<R>`.
-template <typename InvokeResult, typename R>
-struct IsInvocableImpl<InvokeResult, R, void_t<typename InvokeResult::type>>
-    : disjunction<std::is_void<R>,
-                  std::is_convertible<typename InvokeResult::type, R>> {};
-
-}  // namespace internal
-
-// Implementation of C++17's std::is_invocable_r.
-//
-// Returns whether `F` can be invoked with `Args...` and the result is
-// convertible to `R`.
-//
-// Reference: https://wg21.link/meta.rel#lib:is_invocable_r
-template <typename R, typename F, typename... Args>
-struct is_invocable_r
-    : internal::IsInvocableImpl<invoke_result<F, Args...>, R> {};
-
-// Implementation of C++17's std::is_invocable.
-//
-// Returns whether `F` can be invoked with `Args...`.
-//
-// Reference: https://wg21.link/meta.rel#lib:is_invocable
-template <typename F, typename... Args>
-struct is_invocable : is_invocable_r<void, F, Args...> {};
-
-namespace internal {
-
-// The indirection with std::is_enum<T> is required, because instantiating
-// std::underlying_type_t<T> when T is not an enum is UB prior to C++20.
-template <typename T, bool = std::is_enum<T>::value>
-struct IsScopedEnumImpl : std::false_type {};
+// Note that if the type is convertible, this will be a true_type REGARDLESS
+// of whether or not the conversion would emit a warning.
+template <typename From, typename To>
+struct is_convertible
+    : integral_constant<bool,
+                        sizeof(cef_internal::ConvertHelper::Test<To>(
+                            cef_internal::ConvertHelper::Create<From>())) ==
+                            sizeof(cef_internal::YesType)> {};

 template <typename T>
-struct IsScopedEnumImpl<T, /*std::is_enum<T>::value=*/true>
-    : negation<std::is_convertible<T, std::underlying_type_t<T>>> {};
+struct is_class
+    : integral_constant<bool,
+                        sizeof(cef_internal::IsClassHelper::Test<T>(0)) ==
+                            sizeof(cef_internal::YesType)> {};

-}  // namespace internal
+template <bool B, class T = void>
+struct enable_if {};

-// Implementation of C++23's std::is_scoped_enum
-//
-// Reference: https://en.cppreference.com/w/cpp/types/is_scoped_enum
-template <typename T>
-struct is_scoped_enum : internal::IsScopedEnumImpl<T> {};
-
-// Implementation of C++20's std::remove_cvref.
-//
-// References:
-// - https://en.cppreference.com/w/cpp/types/remove_cvref
-// - https://wg21.link/meta.trans.other#lib:remove_cvref
-template <typename T>
-struct remove_cvref {
-  using type = std::remove_cv_t<std::remove_reference_t<T>>;
-};
-
-// Implementation of C++20's std::remove_cvref_t.
-//
-// References:
-// - https://en.cppreference.com/w/cpp/types/remove_cvref
-// - https://wg21.link/meta.type.synop#lib:remove_cvref_t
-template <typename T>
-using remove_cvref_t = typename remove_cvref<T>::type;
-
-// Simplified implementation of C++20's std::iter_value_t.
-// As opposed to std::iter_value_t, this implementation does not restrict
-// the type of `Iter` and does not consider specializations of
-// `indirectly_readable_traits`.
-//
-// Reference: https://wg21.link/readable.traits#2
-template <typename Iter>
-using iter_value_t =
-    typename std::iterator_traits<remove_cvref_t<Iter>>::value_type;
-
-// Simplified implementation of C++20's std::iter_reference_t.
-// As opposed to std::iter_reference_t, this implementation does not restrict
-// the type of `Iter`.
-//
-// Reference: https://wg21.link/iterator.synopsis#:~:text=iter_reference_t
-template <typename Iter>
-using iter_reference_t = decltype(*std::declval<Iter&>());
-
-// Simplified implementation of C++20's std::indirect_result_t. As opposed to
-// std::indirect_result_t, this implementation does not restrict the type of
-// `Func` and `Iters`.
-//
-// Reference: https://wg21.link/iterator.synopsis#:~:text=indirect_result_t
-template <typename Func, typename... Iters>
-using indirect_result_t = invoke_result_t<Func, iter_reference_t<Iters>...>;
-
-// Simplified implementation of C++20's std::projected. As opposed to
-// std::projected, this implementation does not explicitly restrict the type of
-// `Iter` and `Proj`, but rather does so implicitly by requiring
-// `indirect_result_t<Proj, Iter>` is a valid type. This is required for SFINAE
-// friendliness.
-//
-// Reference: https://wg21.link/projected
-template <typename Iter,
-          typename Proj,
-          typename IndirectResultT = indirect_result_t<Proj, Iter>>
-struct projected {
-  using value_type = remove_cvref_t<IndirectResultT>;
-
-  IndirectResultT operator*() const;  // not defined
+template <class T>
+struct enable_if<true, T> {
+  typedef T type;
 };

 }  // namespace base

-#undef CR_USE_FALLBACKS_FOR_GCC_WITH_LIBCXX
-#undef CR_USE_FALLBACKS_FOR_OLD_EXPERIMENTAL_GLIBCXX
-
 #endif  // !USING_CHROMIUM_INCLUDES

 #endif  // CEF_INCLUDE_BASE_CEF_TEMPLATE_UTIL_H_
--- a/include/base/cef_thread_checker.h
+++ b/include/base/cef_thread_checker.h
@@ -32,7 +32,12 @@
 #define CEF_INCLUDE_BASE_THREAD_CHECKER_H_
 #pragma once

-#if defined(USING_CHROMIUM_INCLUDES)
+#if defined(BASE_THREADING_THREAD_CHECKER_H_)
+// Do nothing if the Chromium header has already been included.
+// This can happen in cases where Chromium code is used directly by the
+// client application. When using Chromium code directly always include
+// the Chromium header first to avoid type conflicts.
+#elif defined(USING_CHROMIUM_INCLUDES)
 // When building CEF include the Chromium header directly.
 #include "base/threading/thread_checker.h"
 #else  // !USING_CHROMIUM_INCLUDES
@@ -43,12 +48,10 @@
 #include "include/base/cef_logging.h"
 #include "include/base/internal/cef_thread_checker_impl.h"

-///
-/// Apart from debug builds, we also enable the thread checker in
-/// builds with DCHECK_ALWAYS_ON so that trybots and waterfall bots
-/// with this define will get the same level of thread checking as
-/// debug bots.
-///
+// Apart from debug builds, we also enable the thread checker in
+// builds with DCHECK_ALWAYS_ON so that trybots and waterfall bots
+// with this define will get the same level of thread checking as
+// debug bots.
 #if DCHECK_IS_ON()
 #define ENABLE_THREAD_CHECKER 1
 #else
@@ -59,12 +62,10 @@ namespace base {

 namespace cef_internal {

-///
-/// Do nothing implementation, for use in release mode.
-///
-/// Note: You should almost always use the ThreadChecker class to get the
-/// right version for your build configuration.
-///
+// Do nothing implementation, for use in release mode.
+//
+// Note: You should almost always use the ThreadChecker class to get the
+// right version for your build configuration.
 class ThreadCheckerDoNothing {
 public:
  bool CalledOnValidThread() const { return true; }
@@ -74,42 +75,37 @@ class ThreadCheckerDoNothing {

 }  // namespace cef_internal

-///
-/// ThreadChecker is a helper class used to help verify that some methods of a
-/// class are called from the same thread. It provides identical functionality
-/// to base::NonThreadSafe, but it is meant to be held as a member variable,
-/// rather than inherited from base::NonThreadSafe.
-///
-/// While inheriting from base::NonThreadSafe may give a clear indication about
-/// the thread-safety of a class, it may also lead to violations of the style
-/// guide with regard to multiple inheritance. The choice between having a
-/// ThreadChecker member and inheriting from base::NonThreadSafe should be based
-/// on whether:
-///  - Derived classes need to know the thread they belong to, as opposed to
-///    having that functionality fully encapsulated in the base class.
-///  - Derived classes should be able to reassign the base class to another
-///    thread, via DetachFromThread.
-///
-/// If neither of these are true, then having a ThreadChecker member and calling
-/// CalledOnValidThread is the preferable solution.
-///
-/// Example:
-///
-/// <pre>
-///   class MyClass {
-///    public:
-///     void Foo() {
-///       DCHECK(thread_checker_.CalledOnValidThread());
-///       ... (do stuff) ...
-///     }
-///
-///    private:
-///     ThreadChecker thread_checker_;
-///   }
-/// </pre>
-///
-/// In Release mode, CalledOnValidThread will always return true.
-///
+// ThreadChecker is a helper class used to help verify that some methods of a
+// class are called from the same thread. It provides identical functionality to
+// base::NonThreadSafe, but it is meant to be held as a member variable, rather
+// than inherited from base::NonThreadSafe.
+//
+// While inheriting from base::NonThreadSafe may give a clear indication about
+// the thread-safety of a class, it may also lead to violations of the style
+// guide with regard to multiple inheritance. The choice between having a
+// ThreadChecker member and inheriting from base::NonThreadSafe should be based
+// on whether:
+//  - Derived classes need to know the thread they belong to, as opposed to
+//    having that functionality fully encapsulated in the base class.
+//  - Derived classes should be able to reassign the base class to another
+//    thread, via DetachFromThread.
+//
+// If neither of these are true, then having a ThreadChecker member and calling
+// CalledOnValidThread is the preferable solution.
+//
+// Example:
+// class MyClass {
+//  public:
+//   void Foo() {
+//     DCHECK(thread_checker_.CalledOnValidThread());
+//     ... (do stuff) ...
+//   }
+//
+//  private:
+//   ThreadChecker thread_checker_;
+// }
+//
+// In Release mode, CalledOnValidThread will always return true.
 #if ENABLE_THREAD_CHECKER
 class ThreadChecker : public cef_internal::ThreadCheckerImpl {};
 #else
--- a/include/base/cef_trace_event.h
+++ b/include/base/cef_trace_event.h
@@ -29,141 +29,124 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 ///
-/// \file
-/// Trace events are for tracking application performance and resource usage.
-/// Macros are provided to track:
-///    Begin and end of function calls
-///    Counters
-///
-/// Events are issued against categories. Whereas LOG's categories are
-/// statically defined, TRACE categories are created implicitly with a string.
-/// For example: <pre>
-///   TRACE_EVENT_INSTANT0("MY_SUBSYSTEM", "SomeImportantEvent")
-/// </pre>
-///
-/// Events can be INSTANT, or can be pairs of BEGIN and END in the same scope:
-/// <pre>
-///   TRACE_EVENT_BEGIN0("MY_SUBSYSTEM", "SomethingCostly")
-///   doSomethingCostly()
-///   TRACE_EVENT_END0("MY_SUBSYSTEM", "SomethingCostly")
-/// </pre>
-/// Note: Our tools can't always determine the correct BEGIN/END pairs unless
-/// these are used in the same scope. Use ASYNC_BEGIN/ASYNC_END macros if you
-/// need them to be in separate scopes.
-///
-/// A common use case is to trace entire function scopes. This issues a trace
-/// BEGIN and END automatically:
-/// <pre>
-///   void doSomethingCostly() {
-///     TRACE_EVENT0("MY_SUBSYSTEM", "doSomethingCostly");
-///     ...
-///   }
-/// </pre>
-///
-/// Additional parameters can be associated with an event:
-/// <pre>
-///   void doSomethingCostly2(int howMuch) {
-///     TRACE_EVENT1("MY_SUBSYSTEM", "doSomethingCostly",
-///         "howMuch", howMuch);
-///     ...
-///   }
-/// </pre>
-///
-/// The trace system will automatically add to this information the current
-/// process id, thread id, and a timestamp in microseconds.
-///
-/// To trace an asynchronous procedure such as an IPC send/receive, use
-/// ASYNC_BEGIN and ASYNC_END:
-/// <pre>
-///   [single threaded sender code]
-///     static int send_count = 0;
-///     ++send_count;
-///     TRACE_EVENT_ASYNC_BEGIN0("ipc", "message", send_count);
-///     Send(new MyMessage(send_count));
-///   [receive code]
-///     void OnMyMessage(send_count) {
-///       TRACE_EVENT_ASYNC_END0("ipc", "message", send_count);
-///     }
-/// </pre>
-/// The third parameter is a unique ID to match ASYNC_BEGIN/ASYNC_END pairs.
-/// ASYNC_BEGIN and ASYNC_END can occur on any thread of any traced process.
-/// Pointers can be used for the ID parameter, and they will be mangled
-/// internally so that the same pointer on two different processes will not
-/// match. For example:
-/// <pre>
-///   class MyTracedClass {
-///    public:
-///     MyTracedClass() {
-///       TRACE_EVENT_ASYNC_BEGIN0("category", "MyTracedClass", this);
-///     }
-///     ~MyTracedClass() {
-///       TRACE_EVENT_ASYNC_END0("category", "MyTracedClass", this);
-///     }
-///   }
-/// </pre>
-///
-/// The trace event also supports counters, which is a way to track a quantity
-/// as it varies over time. Counters are created with the following macro:
-/// <pre>
-///   TRACE_COUNTER1("MY_SUBSYSTEM", "myCounter", g_myCounterValue);
-/// </pre>
-///
-/// Counters are process-specific. The macro itself can be issued from any
-/// thread, however.
-///
-/// Sometimes, you want to track two counters at once. You can do this with two
-/// counter macros:
-/// <pre>
-///   TRACE_COUNTER1("MY_SUBSYSTEM", "myCounter0", g_myCounterValue[0]);
-///   TRACE_COUNTER1("MY_SUBSYSTEM", "myCounter1", g_myCounterValue[1]);
-/// </pre>
-/// Or you can do it with a combined macro:
-/// <pre>
-///   TRACE_COUNTER2("MY_SUBSYSTEM", "myCounter",
-///       "bytesPinned", g_myCounterValue[0],
-///       "bytesAllocated", g_myCounterValue[1]);
-/// </pre>
-/// This indicates to the tracing UI that these counters should be displayed
-/// in a single graph, as a summed area chart.
-///
-/// Since counters are in a global namespace, you may want to disembiguate with
-/// a unique ID, by using the TRACE_COUNTER_ID* variations.
-///
-/// By default, trace collection is compiled in, but turned off at runtime.
-/// Collecting trace data is the responsibility of the embedding application. In
-/// CEF's case, calling BeginTracing will turn on tracing on all active
-/// processes.
-///
-///
-/// Memory scoping note:
-/// Tracing copies the pointers, not the string content, of the strings passed
-/// in for category, name, and arg_names.  Thus, the following code will cause
-/// problems:
-/// <pre>
-///     char* str = strdup("impprtantName");
-///     TRACE_EVENT_INSTANT0("SUBSYSTEM", str);  // BAD!
-///     free(str);                   // Trace system now has dangling pointer
-/// </pre>
-///
-/// To avoid this issue with the |name| and |arg_name| parameters, use the
-/// TRACE_EVENT_COPY_XXX overloads of the macros at additional runtime
-/// overhead.
-///
-/// Notes: The category must always be in a long-lived char* (i.e. static
-///        const). The |arg_values|, when used, are always deep copied with
-///        the _COPY macros.
-///
-///
-/// Thread Safety:
-/// All macros are thread safe and can be used from any process.
+// Trace events are for tracking application performance and resource usage.
+// Macros are provided to track:
+//    Begin and end of function calls
+//    Counters
+//
+// Events are issued against categories. Whereas LOG's categories are statically
+// defined, TRACE categories are created implicitly with a string. For example:
+//   TRACE_EVENT_INSTANT0("MY_SUBSYSTEM", "SomeImportantEvent")
+//
+// Events can be INSTANT, or can be pairs of BEGIN and END in the same scope:
+//   TRACE_EVENT_BEGIN0("MY_SUBSYSTEM", "SomethingCostly")
+//   doSomethingCostly()
+//   TRACE_EVENT_END0("MY_SUBSYSTEM", "SomethingCostly")
+// Note: Our tools can't always determine the correct BEGIN/END pairs unless
+// these are used in the same scope. Use ASYNC_BEGIN/ASYNC_END macros if you
+// need them to be in separate scopes.
+//
+// A common use case is to trace entire function scopes. This issues a trace
+// BEGIN and END automatically:
+//   void doSomethingCostly() {
+//     TRACE_EVENT0("MY_SUBSYSTEM", "doSomethingCostly");
+//     ...
+//   }
+//
+// Additional parameters can be associated with an event:
+//   void doSomethingCostly2(int howMuch) {
+//     TRACE_EVENT1("MY_SUBSYSTEM", "doSomethingCostly",
+//         "howMuch", howMuch);
+//     ...
+//   }
+//
+// The trace system will automatically add to this information the current
+// process id, thread id, and a timestamp in microseconds.
+//
+// To trace an asynchronous procedure such as an IPC send/receive, use
+// ASYNC_BEGIN and ASYNC_END:
+//   [single threaded sender code]
+//     static int send_count = 0;
+//     ++send_count;
+//     TRACE_EVENT_ASYNC_BEGIN0("ipc", "message", send_count);
+//     Send(new MyMessage(send_count));
+//   [receive code]
+//     void OnMyMessage(send_count) {
+//       TRACE_EVENT_ASYNC_END0("ipc", "message", send_count);
+//     }
+// The third parameter is a unique ID to match ASYNC_BEGIN/ASYNC_END pairs.
+// ASYNC_BEGIN and ASYNC_END can occur on any thread of any traced process.
+// Pointers can be used for the ID parameter, and they will be mangled
+// internally so that the same pointer on two different processes will not
+// match. For example:
+//   class MyTracedClass {
+//    public:
+//     MyTracedClass() {
+//       TRACE_EVENT_ASYNC_BEGIN0("category", "MyTracedClass", this);
+//     }
+//     ~MyTracedClass() {
+//       TRACE_EVENT_ASYNC_END0("category", "MyTracedClass", this);
+//     }
+//   }
+//
+// The trace event also supports counters, which is a way to track a quantity
+// as it varies over time. Counters are created with the following macro:
+//   TRACE_COUNTER1("MY_SUBSYSTEM", "myCounter", g_myCounterValue);
+//
+// Counters are process-specific. The macro itself can be issued from any
+// thread, however.
+//
+// Sometimes, you want to track two counters at once. You can do this with two
+// counter macros:
+//   TRACE_COUNTER1("MY_SUBSYSTEM", "myCounter0", g_myCounterValue[0]);
+//   TRACE_COUNTER1("MY_SUBSYSTEM", "myCounter1", g_myCounterValue[1]);
+// Or you can do it with a combined macro:
+//   TRACE_COUNTER2("MY_SUBSYSTEM", "myCounter",
+//       "bytesPinned", g_myCounterValue[0],
+//       "bytesAllocated", g_myCounterValue[1]);
+// This indicates to the tracing UI that these counters should be displayed
+// in a single graph, as a summed area chart.
+//
+// Since counters are in a global namespace, you may want to disembiguate with a
+// unique ID, by using the TRACE_COUNTER_ID* variations.
+//
+// By default, trace collection is compiled in, but turned off at runtime.
+// Collecting trace data is the responsibility of the embedding application. In
+// CEF's case, calling BeginTracing will turn on tracing on all active
+// processes.
+//
+//
+// Memory scoping note:
+// Tracing copies the pointers, not the string content, of the strings passed
+// in for category, name, and arg_names.  Thus, the following code will cause
+// problems:
+//     char* str = strdup("impprtantName");
+//     TRACE_EVENT_INSTANT0("SUBSYSTEM", str);  // BAD!
+//     free(str);                   // Trace system now has dangling pointer
+//
+// To avoid this issue with the |name| and |arg_name| parameters, use the
+// TRACE_EVENT_COPY_XXX overloads of the macros at additional runtime
+// overhead.
+// Notes: The category must always be in a long-lived char* (i.e. static const).
+//        The |arg_values|, when used, are always deep copied with the _COPY
+//        macros.
+//
+//
+// Thread Safety:
+// All macros are thread safe and can be used from any process.
 ///

 #ifndef CEF_INCLUDE_BASE_CEF_TRACE_EVENT_H_
 #define CEF_INCLUDE_BASE_CEF_TRACE_EVENT_H_
 #pragma once

-#if defined(USING_CHROMIUM_INCLUDES)
-/// When building CEF include the Chromium header directly.
+#if defined(TRACE_EVENT0)
+// Do nothing if the macros provided by this header already exist.
+// This can happen in cases where Chromium code is used directly by the
+// client application. When using Chromium code directly always include
+// the Chromium header first to avoid type conflicts.
+#elif defined(USING_CHROMIUM_INCLUDES)
+// When building CEF include the Chromium header directly.
 #include "base/trace_event/trace_event.h"
 #else  // !USING_CHROMIUM_INCLUDES
 // The following is substantially similar to the Chromium implementation.
@@ -172,13 +155,11 @@

 #include "include/internal/cef_trace_event_internal.h"

-///
-/// Records a pair of begin and end events called "name" for the current
-/// scope, with 0, 1 or 2 associated arguments. If the category is not
-/// enabled, then this does nothing.
-/// - category and name strings must have application lifetime (statics or
-///   literals). They may not include " chars.
-///
+// Records a pair of begin and end events called "name" for the current
+// scope, with 0, 1 or 2 associated arguments. If the category is not
+// enabled, then this does nothing.
+// - category and name strings must have application lifetime (statics or
+//   literals). They may not include " chars.
 #define TRACE_EVENT0(category, name)                              \
  cef_trace_event_begin(category, name, NULL, 0, NULL, 0, false); \
  CEF_INTERNAL_TRACE_END_ON_SCOPE_CLOSE(category, name)
@@ -203,13 +184,11 @@
  cef_trace_event::CefTraceEndOnScopeClose CEF_INTERNAL_TRACE_EVENT_UID( \
      profileScope)(category, name)

-///
-/// Records a single event called "name" immediately, with 0, 1 or 2
-/// associated arguments. If the category is not enabled, then this
-/// does nothing.
-/// - category and name strings must have application lifetime (statics or
-///   literals). They may not include " chars.
-///
+// Records a single event called "name" immediately, with 0, 1 or 2
+// associated arguments. If the category is not enabled, then this
+// does nothing.
+// - category and name strings must have application lifetime (statics or
+//   literals). They may not include " chars.
 #define TRACE_EVENT_INSTANT0(category, name) \
  cef_trace_event_instant(category, name, NULL, 0, NULL, 0, false)
 #define TRACE_EVENT_INSTANT1(category, name, arg1_name, arg1_val) \
@@ -227,13 +206,11 @@
  cef_trace_event_instant(category, name, arg1_name, arg1_val, arg2_name, \
                          arg2_val, true)

-///
-/// Records a single BEGIN event called "name" immediately, with 0, 1 or 2
-/// associated arguments. If the category is not enabled, then this
-/// does nothing.
-/// - category and name strings must have application lifetime (statics or
-///   literals). They may not include " chars.
-///
+// Records a single BEGIN event called "name" immediately, with 0, 1 or 2
+// associated arguments. If the category is not enabled, then this
+// does nothing.
+// - category and name strings must have application lifetime (statics or
+//   literals). They may not include " chars.
 #define TRACE_EVENT_BEGIN0(category, name) \
  cef_trace_event_begin(category, name, NULL, 0, NULL, 0, false)
 #define TRACE_EVENT_BEGIN1(category, name, arg1_name, arg1_val) \
@@ -251,12 +228,10 @@
  cef_trace_event_begin(category, name, arg1_name, arg1_val, arg2_name, \
                        arg2_val, true)

-///
-/// Records a single END event for "name" immediately. If the category
-/// is not enabled, then this does nothing.
-/// - category and name strings must have application lifetime (statics or
-///   literals). They may not include " chars.
-///
+// Records a single END event for "name" immediately. If the category
+// is not enabled, then this does nothing.
+// - category and name strings must have application lifetime (statics or
+//   literals). They may not include " chars.
 #define TRACE_EVENT_END0(category, name) \
  cef_trace_event_end(category, name, NULL, 0, NULL, 0, false)
 #define TRACE_EVENT_END1(category, name, arg1_name, arg1_val) \
@@ -274,24 +249,20 @@
  cef_trace_event_end(category, name, arg1_name, arg1_val, arg2_name,         \
                      arg2_val, true)

-///
-/// Records the value of a counter called "name" immediately. Value
-/// must be representable as a 32 bit integer.
-/// - category and name strings must have application lifetime (statics or
-///   literals). They may not include " chars.
-///
+// Records the value of a counter called "name" immediately. Value
+// must be representable as a 32 bit integer.
+// - category and name strings must have application lifetime (statics or
+//   literals). They may not include " chars.
 #define TRACE_COUNTER1(category, name, value) \
  cef_trace_counter(category, name, NULL, value, NULL, 0, false)
 #define TRACE_COPY_COUNTER1(category, name, value) \
  cef_trace_counter(category, name, NULL, value, NULL, 0, true)

-///
-/// Records the values of a multi-parted counter called "name" immediately.
-/// The UI will treat value1 and value2 as parts of a whole, displaying their
-/// values as a stacked-bar chart.
-/// - category and name strings must have application lifetime (statics or
-///   literals). They may not include " chars.
-///
+// Records the values of a multi-parted counter called "name" immediately.
+// The UI will treat value1 and value2 as parts of a whole, displaying their
+// values as a stacked-bar chart.
+// - category and name strings must have application lifetime (statics or
+//   literals). They may not include " chars.
 #define TRACE_COUNTER2(category, name, value1_name, value1_val, value2_name, \
                       value2_val)                                           \
  cef_trace_counter(category, name, value1_name, value1_val, value2_name,    \
@@ -301,32 +272,28 @@
  cef_trace_counter(category, name, value1_name, value1_val, value2_name, \
                    value2_val, true)

-///
-/// Records the value of a counter called "name" immediately. Value
-/// must be representable as a 32 bit integer.
-/// - category and name strings must have application lifetime (statics or
-///   literals). They may not include " chars.
-/// - |id| is used to disambiguate counters with the same name. It must either
-///   be a pointer or an integer value up to 64 bits. If it's a pointer, the
-///   bits will be xored with a hash of the process ID so that the same pointer
-///   on two different processes will not collide.
-///
+// Records the value of a counter called "name" immediately. Value
+// must be representable as a 32 bit integer.
+// - category and name strings must have application lifetime (statics or
+//   literals). They may not include " chars.
+// - |id| is used to disambiguate counters with the same name. It must either
+//   be a pointer or an integer value up to 64 bits. If it's a pointer, the
+//   bits will be xored with a hash of the process ID so that the same pointer
+//   on two different processes will not collide.
 #define TRACE_COUNTER_ID1(category, name, id, value) \
  cef_trace_counter_id(category, name, id, NULL, value, NULL, 0, false)
 #define TRACE_COPY_COUNTER_ID1(category, name, id, value) \
  cef_trace_counter_id(category, name, id, NULL, value, NULL, 0, true)

-///
-/// Records the values of a multi-parted counter called "name" immediately.
-/// The UI will treat value1 and value2 as parts of a whole, displaying their
-/// values as a stacked-bar chart.
-/// - category and name strings must have application lifetime (statics or
-///   literals). They may not include " chars.
-/// - |id| is used to disambiguate counters with the same name. It must either
-///   be a pointer or an integer value up to 64 bits. If it's a pointer, the
-///   bits will be xored with a hash of the process ID so that the same pointer
-///   on two different processes will not collide.
-///
+// Records the values of a multi-parted counter called "name" immediately.
+// The UI will treat value1 and value2 as parts of a whole, displaying their
+// values as a stacked-bar chart.
+// - category and name strings must have application lifetime (statics or
+//   literals). They may not include " chars.
+// - |id| is used to disambiguate counters with the same name. It must either
+//   be a pointer or an integer value up to 64 bits. If it's a pointer, the
+//   bits will be xored with a hash of the process ID so that the same pointer
+//   on two different processes will not collide.
 #define TRACE_COUNTER_ID2(category, name, id, value1_name, value1_val, \
                          value2_name, value2_val)                     \
  cef_trace_counter_id(category, name, id, value1_name, value1_val,    \
@@ -336,24 +303,22 @@
  cef_trace_counter_id(category, name, id, value1_name, value1_val,         \
                       value2_name, value2_val, true)

-///
-/// Records a single ASYNC_BEGIN event called "name" immediately, with 0, 1 or 2
-/// associated arguments. If the category is not enabled, then this
-/// does nothing.
-/// - category and name strings must have application lifetime (statics or
-///   literals). They may not include " chars.
-/// - |id| is used to match the ASYNC_BEGIN event with the ASYNC_END event.
-///   ASYNC events are considered to match if their category, name and id values
-///   all match. |id| must either be a pointer or an integer value up to 64
-///   bits. If it's a pointer, the bits will be xored with a hash of the process
-///   ID sothat the same pointer on two different processes will not collide.
-/// An asynchronous operation can consist of multiple phases. The first phase is
-/// defined by the ASYNC_BEGIN calls. Additional phases can be defined using the
-/// ASYNC_STEP_BEGIN macros. When the operation completes, call ASYNC_END.
-/// An async operation can span threads and processes, but all events in that
-/// operation must use the same |name| and |id|. Each event can have its own
-/// args.
-///
+// Records a single ASYNC_BEGIN event called "name" immediately, with 0, 1 or 2
+// associated arguments. If the category is not enabled, then this
+// does nothing.
+// - category and name strings must have application lifetime (statics or
+//   literals). They may not include " chars.
+// - |id| is used to match the ASYNC_BEGIN event with the ASYNC_END event.
+//   ASYNC events are considered to match if their category, name and id values
+//   all match. |id| must either be a pointer or an integer value up to 64
+//   bits. If it's a pointer, the bits will be xored with a hash of the process
+//   ID sothat the same pointer on two different processes will not collide.
+// An asynchronous operation can consist of multiple phases. The first phase is
+// defined by the ASYNC_BEGIN calls. Additional phases can be defined using the
+// ASYNC_STEP_BEGIN macros. When the operation completes, call ASYNC_END.
+// An async operation can span threads and processes, but all events in that
+// operation must use the same |name| and |id|. Each event can have its own
+// args.
 #define TRACE_EVENT_ASYNC_BEGIN0(category, name, id) \
  cef_trace_event_async_begin(category, name, id, NULL, 0, NULL, 0, false)
 #define TRACE_EVENT_ASYNC_BEGIN1(category, name, id, arg1_name, arg1_val)    \
@@ -373,14 +338,12 @@
  cef_trace_event_async_begin(category, name, id, arg1_name, arg1_val,         \
                              arg2_name, arg2_val, true)

-///
-/// Records a single ASYNC_STEP_INTO event for |step| immediately. If the
-/// category is not enabled, then this does nothing. The |name| and |id| must
-/// match the ASYNC_BEGIN event above. The |step| param identifies this step
-/// within the async event. This should be called at the beginning of the next
-/// phase of an asynchronous operation. The ASYNC_BEGIN event must not have any
-/// ASYNC_STEP_PAST events.
-///
+// Records a single ASYNC_STEP_INTO event for |step| immediately. If the
+// category is not enabled, then this does nothing. The |name| and |id| must
+// match the ASYNC_BEGIN event above. The |step| param identifies this step
+// within the async event. This should be called at the beginning of the next
+// phase of an asynchronous operation. The ASYNC_BEGIN event must not have any
+// ASYNC_STEP_PAST events.
 #define TRACE_EVENT_ASYNC_STEP_INTO0(category, name, id, step) \
  cef_trace_event_async_step_into(category, name, id, step, NULL, 0, false)
 #define TRACE_EVENT_ASYNC_STEP_INTO1(category, name, id, step, arg1_name, \
@@ -394,14 +357,12 @@
  cef_trace_event_async_step_into(category, name, id, step, arg1_name,         \
                                  arg1_val, true)

-///
-/// Records a single ASYNC_STEP_PAST event for |step| immediately. If the
-/// category is not enabled, then this does nothing. The |name| and |id| must
-/// match the ASYNC_BEGIN event above. The |step| param identifies this step
-/// within the async event. This should be called at the beginning of the next
-/// phase of an asynchronous operation. The ASYNC_BEGIN event must not have any
-/// ASYNC_STEP_INTO events.
-///
+// Records a single ASYNC_STEP_PAST event for |step| immediately. If the
+// category is not enabled, then this does nothing. The |name| and |id| must
+// match the ASYNC_BEGIN event above. The |step| param identifies this step
+// within the async event. This should be called at the beginning of the next
+// phase of an asynchronous operation. The ASYNC_BEGIN event must not have any
+// ASYNC_STEP_INTO events.
 #define TRACE_EVENT_ASYNC_STEP_PAST0(category, name, id, step) \
  cef_trace_event_async_step_past(category, name, id, step, NULL, 0, false)
 #define TRACE_EVENT_ASYNC_STEP_PAST1(category, name, id, step, arg1_name, \
@@ -415,10 +376,8 @@
  cef_trace_event_async_step_past(category, name, id, step, arg1_name,         \
                                  arg1_val, true)

-///
-/// Records a single ASYNC_END event for "name" immediately. If the category
-/// is not enabled, then this does nothing.
-///
+// Records a single ASYNC_END event for "name" immediately. If the category
+// is not enabled, then this does nothing.
 #define TRACE_EVENT_ASYNC_END0(category, name, id) \
  cef_trace_event_async_end(category, name, id, NULL, 0, NULL, 0, false)
 #define TRACE_EVENT_ASYNC_END1(category, name, id, arg1_name, arg1_val)       \
@@ -440,9 +399,7 @@

 namespace cef_trace_event {

-///
-/// Used by TRACE_EVENTx macro. Do not use directly.
-///
+// Used by TRACE_EVENTx macro. Do not use directly.
 class CefTraceEndOnScopeClose {
 public:
  CefTraceEndOnScopeClose(const char* category, const char* name)
@@ -456,7 +413,7 @@ class CefTraceEndOnScopeClose {
  const char* name_;
 };

-}  // namespace cef_trace_event
+}  // cef_trace_event

 #endif  // !USING_CHROMIUM_INCLUDES

--- a/include/base/cef_tuple.h
+++ b/include/base/cef_tuple.h
--- a/include/base/cef_weak_ptr.h
+++ b/include/base/cef_weak_ptr.h
@@ -28,79 +28,80 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-///
-/// \file
-/// Weak pointers are pointers to an object that do not affect its lifetime.
-/// They may be invalidated (i.e. reset to nullptr) by the object, or its
-/// owner, at any time, most commonly when the object is about to be deleted.
-///
-/// Weak pointers are useful when an object needs to be accessed safely by one
-/// or more objects other than its owner, and those callers can cope with the
-/// object vanishing and e.g. tasks posted to it being silently dropped.
-/// Reference-counting such an object would complicate the ownership graph and
-/// make it harder to reason about the object's lifetime.
-///
-/// EXAMPLE:
-///
-/// <pre>
-///  class Controller {
-///   public:
-///    void SpawnWorker() { Worker::StartNew(weak_factory_.GetWeakPtr()); }
-///    void WorkComplete(const Result& result) { ... }
-///   private:
-///    // Member variables should appear before the WeakPtrFactory, to ensure
-///    // that any WeakPtrs to Controller are invalidated before its members
-///    // variable's destructors are executed, rendering them invalid.
-///    WeakPtrFactory<Controller> weak_factory_{this};
-///  };
-///
-///  class Worker {
-///   public:
-///    static void StartNew(WeakPtr<Controller> controller) {
-///      Worker* worker = new Worker(std::move(controller));
-///      // Kick off asynchronous processing...
-///    }
-///   private:
-///    Worker(WeakPtr<Controller> controller)
-///        : controller_(std::move(controller)) {}
-///    void DidCompleteAsynchronousProcessing(const Result& result) {
-///      if (controller_)
-///        controller_->WorkComplete(result);
-///    }
-///    WeakPtr<Controller> controller_;
-///  };
-/// </pre>
-///
-/// With this implementation a caller may use SpawnWorker() to dispatch multiple
-/// Workers and subsequently delete the Controller, without waiting for all
-/// Workers to have completed.
-///
-/// <b>IMPORTANT: Thread-safety</b>
-///
-/// Weak pointers may be passed safely between threads, but must always be
-/// dereferenced and invalidated on the same ThreaddTaskRunner otherwise
-/// checking the pointer would be racey.
-///
-/// To ensure correct use, the first time a WeakPtr issued by a WeakPtrFactory
-/// is dereferenced, the factory and its WeakPtrs become bound to the calling
-/// thread or current ThreaddWorkerPool token, and cannot be dereferenced or
-/// invalidated on any other task runner. Bound WeakPtrs can still be handed
-/// off to other task runners, e.g. to use to post tasks back to object on the
-/// bound thread.
-///
-/// If all WeakPtr objects are destroyed or invalidated then the factory is
-/// unbound from the ThreadedTaskRunner/Thread. The WeakPtrFactory may then be
-/// destroyed, or new WeakPtr objects may be used, from a different thread.
-///
-/// Thus, at least one WeakPtr object must exist and have been dereferenced on
-/// the correct thread to enforce that other WeakPtr objects will enforce they
-/// are used on the desired thread.
+// Weak pointers are pointers to an object that do not affect its lifetime,
+// and which may be invalidated (i.e. reset to NULL) by the object, or its
+// owner, at any time, most commonly when the object is about to be deleted.
+
+// Weak pointers are useful when an object needs to be accessed safely by one
+// or more objects other than its owner, and those callers can cope with the
+// object vanishing and e.g. tasks posted to it being silently dropped.
+// Reference-counting such an object would complicate the ownership graph and
+// make it harder to reason about the object's lifetime.
+
+// EXAMPLE:
+//
+//  class Controller {
+//   public:
+//    Controller() : weak_factory_(this) {}
+//    void SpawnWorker() { Worker::StartNew(weak_factory_.GetWeakPtr()); }
+//    void WorkComplete(const Result& result) { ... }
+//   private:
+//    // Member variables should appear before the WeakPtrFactory, to ensure
+//    // that any WeakPtrs to Controller are invalidated before its members
+//    // variable's destructors are executed, rendering them invalid.
+//    WeakPtrFactory<Controller> weak_factory_;
+//  };
+//
+//  class Worker {
+//   public:
+//    static void StartNew(const WeakPtr<Controller>& controller) {
+//      Worker* worker = new Worker(controller);
+//      // Kick off asynchronous processing...
+//    }
+//   private:
+//    Worker(const WeakPtr<Controller>& controller)
+//        : controller_(controller) {}
+//    void DidCompleteAsynchronousProcessing(const Result& result) {
+//      if (controller_)
+//        controller_->WorkComplete(result);
+//    }
+//    WeakPtr<Controller> controller_;
+//  };
+//
+// With this implementation a caller may use SpawnWorker() to dispatch multiple
+// Workers and subsequently delete the Controller, without waiting for all
+// Workers to have completed.
+
+// ------------------------- IMPORTANT: Thread-safety -------------------------
+
+// Weak pointers may be passed safely between threads, but must always be
+// dereferenced and invalidated on the same thread otherwise checking the
+// pointer would be racey.
+//
+// To ensure correct use, the first time a WeakPtr issued by a WeakPtrFactory
+// is dereferenced, the factory and its WeakPtrs become bound to the calling
+// thread, and cannot be dereferenced or invalidated on any other thread. Bound
+// WeakPtrs can still be handed off to other threads, e.g. to use to post tasks
+// back to object on the bound thread.
+//
+// If all WeakPtr objects are destroyed or invalidated then the factory is
+// unbound from the SequencedTaskRunner/Thread. The WeakPtrFactory may then be
+// destroyed, or new WeakPtr objects may be used, from a different sequence.
+//
+// Thus, at least one WeakPtr object must exist and have been dereferenced on
+// the correct thread to enforce that other WeakPtr objects will enforce they
+// are used on the desired thread.

 #ifndef CEF_INCLUDE_BASE_CEF_WEAK_PTR_H_
 #define CEF_INCLUDE_BASE_CEF_WEAK_PTR_H_
 #pragma once

-#if defined(USING_CHROMIUM_INCLUDES)
+#if defined(BASE_MEMORY_WEAK_PTR_H_)
+// Do nothing if the Chromium header has already been included.
+// This can happen in cases where Chromium code is used directly by the
+// client application. When using Chromium code directly always include
+// the Chromium header first to avoid type conflicts.
+#elif defined(USING_CHROMIUM_INCLUDES)
 // When building CEF include the Chromium header directly.
 #include "base/memory/weak_ptr.h"
 #else  // !USING_CHROMIUM_INCLUDES
@@ -108,12 +109,10 @@
 // If the Chromium implementation diverges the below implementation should be
 // updated to match.

-#include <cstddef>
-#include <type_traits>
-
-#include "include/base/cef_atomic_flag.h"
+#include "include/base/cef_basictypes.h"
 #include "include/base/cef_logging.h"
 #include "include/base/cef_ref_counted.h"
+#include "include/base/cef_template_util.h"
 #include "include/base/cef_thread_checker.h"

 namespace base {
@@ -123,14 +122,14 @@ class SupportsWeakPtr;
 template <typename T>
 class WeakPtr;

-namespace internal {
+namespace cef_internal {
 // These classes are part of the WeakPtr implementation.
 // DO NOT USE THESE CLASSES DIRECTLY YOURSELF.

 class WeakReference {
 public:
-  // Although Flag is bound to a specific ThreaddTaskRunner, it may be
-  // deleted from another via base::WeakPtr::~WeakPtr().
+  // Although Flag is bound to a specific thread, it may be deleted from another
+  // via base::WeakPtr::~WeakPtr().
  class Flag : public RefCountedThreadSafe<Flag> {
   public:
    Flag();
@@ -138,30 +137,23 @@ class WeakReference {
    void Invalidate();
    bool IsValid() const;

-    bool MaybeValid() const;
-
-    void DetachFromThread();
-
   private:
    friend class base::RefCountedThreadSafe<Flag>;

    ~Flag();

-    base::ThreadChecker thread_checker_;
-    AtomicFlag invalidated_;
+    // The current Chromium implementation uses SequenceChecker instead of
+    // ThreadChecker to support SequencedWorkerPools. CEF does not yet expose
+    // the concept of SequencedWorkerPools.
+    ThreadChecker thread_checker_;
+    bool is_valid_;
  };

  WeakReference();
-  explicit WeakReference(const scoped_refptr<Flag>& flag);
+  explicit WeakReference(const Flag* flag);
  ~WeakReference();

-  WeakReference(WeakReference&& other) noexcept;
-  WeakReference(const WeakReference& other);
-  WeakReference& operator=(WeakReference&& other) noexcept = default;
-  WeakReference& operator=(const WeakReference& other) = default;
-
-  bool IsValid() const;
-  bool MaybeValid() const;
+  bool is_valid() const;

 private:
  scoped_refptr<const Flag> flag_;
@@ -174,12 +166,12 @@ class WeakReferenceOwner {

  WeakReference GetRef() const;

-  bool HasRefs() const { return !flag_->HasOneRef(); }
+  bool HasRefs() const { return flag_.get() && !flag_->HasOneRef(); }

  void Invalidate();

 private:
-  scoped_refptr<WeakReference::Flag> flag_;
+  mutable scoped_refptr<WeakReference::Flag> flag_;
 };

 // This class simplifies the implementation of WeakPtr's type conversion
@@ -191,24 +183,10 @@ class WeakPtrBase {
  WeakPtrBase();
  ~WeakPtrBase();

-  WeakPtrBase(const WeakPtrBase& other) = default;
-  WeakPtrBase(WeakPtrBase&& other) noexcept = default;
-  WeakPtrBase& operator=(const WeakPtrBase& other) = default;
-  WeakPtrBase& operator=(WeakPtrBase&& other) noexcept = default;
-
-  void reset() {
-    ref_ = internal::WeakReference();
-    ptr_ = 0;
-  }
-
 protected:
-  WeakPtrBase(const WeakReference& ref, uintptr_t ptr);
+  explicit WeakPtrBase(const WeakReference& ref);

  WeakReference ref_;
-
-  // This pointer is only valid when ref_.is_valid() is true.  Otherwise, its
-  // value is undefined (as opposed to nullptr).
-  uintptr_t ptr_;
 };

 // This class provides a common implementation of common functions that would
@@ -220,14 +198,13 @@ class SupportsWeakPtrBase {
  // conversion will only compile if there is exists a Base which inherits
  // from SupportsWeakPtr<Base>. See base::AsWeakPtr() below for a helper
  // function that makes calling this easier.
-  //
-  // Precondition: t != nullptr
  template <typename Derived>
  static WeakPtr<Derived> StaticAsWeakPtr(Derived* t) {
-    static_assert(
-        std::is_base_of<internal::SupportsWeakPtrBase, Derived>::value,
-        "AsWeakPtr argument must inherit from SupportsWeakPtr");
-    return AsWeakPtrImpl<Derived>(t);
+    typedef is_convertible<Derived, cef_internal::SupportsWeakPtrBase&>
+        convertible;
+    COMPILE_ASSERT(convertible::value,
+                   AsWeakPtr_argument_inherits_from_SupportsWeakPtr);
+    return AsWeakPtrImpl<Derived>(t, *t);
  }

 private:
@@ -235,231 +212,170 @@ class SupportsWeakPtrBase {
  // which is an instance of SupportsWeakPtr<Base>. We can then safely
  // static_cast the Base* to a Derived*.
  template <typename Derived, typename Base>
-  static WeakPtr<Derived> AsWeakPtrImpl(SupportsWeakPtr<Base>* t) {
-    WeakPtr<Base> ptr = t->AsWeakPtr();
-    return WeakPtr<Derived>(
-        ptr.ref_, static_cast<Derived*>(reinterpret_cast<Base*>(ptr.ptr_)));
+  static WeakPtr<Derived> AsWeakPtrImpl(Derived* t,
+                                        const SupportsWeakPtr<Base>&) {
+    WeakPtr<Base> ptr = t->Base::AsWeakPtr();
+    return WeakPtr<Derived>(ptr.ref_, static_cast<Derived*>(ptr.ptr_));
  }
 };

-}  // namespace internal
+}  // namespace cef_internal

 template <typename T>
 class WeakPtrFactory;

-///
-/// The WeakPtr class holds a weak reference to |T*|.
-///
-/// This class is designed to be used like a normal pointer.  You should always
-/// null-test an object of this class before using it or invoking a method that
-/// may result in the underlying object being destroyed.
-///
-/// EXAMPLE:
-///
-/// <pre>
-///   class Foo { ... };
-///   WeakPtr<Foo> foo;
-///   if (foo)
-///     foo->method();
-/// </pre>
-///
+// The WeakPtr class holds a weak reference to |T*|.
+//
+// This class is designed to be used like a normal pointer.  You should always
+// null-test an object of this class before using it or invoking a method that
+// may result in the underlying object being destroyed.
+//
+// EXAMPLE:
+//
+//   class Foo { ... };
+//   WeakPtr<Foo> foo;
+//   if (foo)
+//     foo->method();
+//
 template <typename T>
-class WeakPtr : public internal::WeakPtrBase {
+class WeakPtr : public cef_internal::WeakPtrBase {
 public:
-  WeakPtr() = default;
-  WeakPtr(std::nullptr_t) {}
+  WeakPtr() : ptr_(NULL) {}

-  ///
-  /// Allow conversion from U to T provided U "is a" T. Note that this
-  /// is separate from the (implicit) copy and move constructors.
-  ///
+  // Allow conversion from U to T provided U "is a" T. Note that this
+  // is separate from the (implicit) copy constructor.
  template <typename U>
-  WeakPtr(const WeakPtr<U>& other) : WeakPtrBase(other) {
-    // Need to cast from U* to T* to do pointer adjustment in case of multiple
-    // inheritance. This also enforces the "U is a T" rule.
-    T* t = reinterpret_cast<U*>(other.ptr_);
-    ptr_ = reinterpret_cast<uintptr_t>(t);
-  }
-  template <typename U>
-  WeakPtr(WeakPtr<U>&& other) noexcept : WeakPtrBase(std::move(other)) {
-    // Need to cast from U* to T* to do pointer adjustment in case of multiple
-    // inheritance. This also enforces the "U is a T" rule.
-    T* t = reinterpret_cast<U*>(other.ptr_);
-    ptr_ = reinterpret_cast<uintptr_t>(t);
-  }
+  WeakPtr(const WeakPtr<U>& other) : WeakPtrBase(other), ptr_(other.ptr_) {}

-  T* get() const {
-    return ref_.IsValid() ? reinterpret_cast<T*>(ptr_) : nullptr;
-  }
+  T* get() const { return ref_.is_valid() ? ptr_ : NULL; }

  T& operator*() const {
-    CHECK(ref_.IsValid());
+    CHECK(ref_.is_valid());
    return *get();
  }
  T* operator->() const {
-    CHECK(ref_.IsValid());
+    CHECK(ref_.is_valid());
    return get();
  }

-  ///
-  /// Allow conditionals to test validity, e.g. `if (weak_ptr) {...}`;
-  ///
-  explicit operator bool() const { return get() != nullptr; }
+  // Allow WeakPtr<element_type> to be used in boolean expressions, but not
+  // implicitly convertible to a real bool (which is dangerous).
+  //
+  // Note that this trick is only safe when the == and != operators
+  // are declared explicitly, as otherwise "weak_ptr1 == weak_ptr2"
+  // will compile but do the wrong thing (i.e., convert to Testable
+  // and then do the comparison).
+ private:
+  typedef T* WeakPtr::*Testable;

-  ///
-  /// Returns false if the WeakPtr is confirmed to be invalid. This call is safe
-  /// to make from any thread, e.g. to optimize away unnecessary work, but
-  /// operator bool() must always be called, on the correct thread, before
-  /// actually using the pointer.
-  ///
-  /// Warning: as with any object, this call is only thread-safe if the WeakPtr
-  /// instance isn't being re-assigned or reset() racily with this call.
-  ///
-  bool MaybeValid() const { return ref_.MaybeValid(); }
+ public:
+  operator Testable() const { return get() ? &WeakPtr::ptr_ : NULL; }

-  ///
-  /// Returns whether the object |this| points to has been invalidated. This can
-  /// be used to distinguish a WeakPtr to a destroyed object from one that has
-  /// been explicitly set to null.
-  ///
-  bool WasInvalidated() const { return ptr_ && !ref_.IsValid(); }
+  void reset() {
+    ref_ = cef_internal::WeakReference();
+    ptr_ = NULL;
+  }

 private:
-  friend class internal::SupportsWeakPtrBase;
+  // Explicitly declare comparison operators as required by the bool
+  // trick, but keep them private.
+  template <class U>
+  bool operator==(WeakPtr<U> const&) const;
+  template <class U>
+  bool operator!=(WeakPtr<U> const&) const;
+
+  friend class cef_internal::SupportsWeakPtrBase;
  template <typename U>
  friend class WeakPtr;
  friend class SupportsWeakPtr<T>;
  friend class WeakPtrFactory<T>;

-  WeakPtr(const internal::WeakReference& ref, T* ptr)
-      : WeakPtrBase(ref, reinterpret_cast<uintptr_t>(ptr)) {}
+  WeakPtr(const cef_internal::WeakReference& ref, T* ptr)
+      : WeakPtrBase(ref), ptr_(ptr) {}
+
+  // This pointer is only valid when ref_.is_valid() is true.  Otherwise, its
+  // value is undefined (as opposed to NULL).
+  T* ptr_;
 };

-///
-/// Allow callers to compare WeakPtrs against nullptr to test validity.
-///
+// A class may be composed of a WeakPtrFactory and thereby
+// control how it exposes weak pointers to itself.  This is helpful if you only
+// need weak pointers within the implementation of a class.  This class is also
+// useful when working with primitive types.  For example, you could have a
+// WeakPtrFactory<bool> that is used to pass around a weak reference to a bool.
 template <class T>
-bool operator!=(const WeakPtr<T>& weak_ptr, std::nullptr_t) {
-  return !(weak_ptr == nullptr);
-}
-template <class T>
-bool operator!=(std::nullptr_t, const WeakPtr<T>& weak_ptr) {
-  return weak_ptr != nullptr;
-}
-template <class T>
-bool operator==(const WeakPtr<T>& weak_ptr, std::nullptr_t) {
-  return weak_ptr.get() == nullptr;
-}
-template <class T>
-bool operator==(std::nullptr_t, const WeakPtr<T>& weak_ptr) {
-  return weak_ptr == nullptr;
-}
-
-namespace internal {
-class WeakPtrFactoryBase {
- protected:
-  WeakPtrFactoryBase(uintptr_t ptr);
-  ~WeakPtrFactoryBase();
-  internal::WeakReferenceOwner weak_reference_owner_;
-  uintptr_t ptr_;
-};
-}  // namespace internal
-
-///
-/// A class may be composed of a WeakPtrFactory and thereby control how it
-/// exposes weak pointers to itself.  This is helpful if you only need weak
-/// pointers within the implementation of a class.  This class is also useful
-/// when working with primitive types.  For example, you could have a
-/// WeakPtrFactory<bool> that is used to pass around a weak reference to a
-/// bool.
-///
-template <class T>
-class WeakPtrFactory : public internal::WeakPtrFactoryBase {
+class WeakPtrFactory {
 public:
-  WeakPtrFactory() = delete;
+  explicit WeakPtrFactory(T* ptr) : ptr_(ptr) {}

-  explicit WeakPtrFactory(T* ptr)
-      : WeakPtrFactoryBase(reinterpret_cast<uintptr_t>(ptr)) {}
+  ~WeakPtrFactory() { ptr_ = NULL; }

-  WeakPtrFactory(const WeakPtrFactory&) = delete;
-  WeakPtrFactory& operator=(const WeakPtrFactory&) = delete;
-
-  ~WeakPtrFactory() = default;
-
-  WeakPtr<T> GetWeakPtr() const {
-    return WeakPtr<T>(weak_reference_owner_.GetRef(),
-                      reinterpret_cast<T*>(ptr_));
+  WeakPtr<T> GetWeakPtr() {
+    DCHECK(ptr_);
+    return WeakPtr<T>(weak_reference_owner_.GetRef(), ptr_);
  }

-  ///
-  /// Call this method to invalidate all existing weak pointers.
-  ///
+  // Call this method to invalidate all existing weak pointers.
  void InvalidateWeakPtrs() {
    DCHECK(ptr_);
    weak_reference_owner_.Invalidate();
  }

-  ///
-  /// Call this method to determine if any weak pointers exist.
-  ///
+  // Call this method to determine if any weak pointers exist.
  bool HasWeakPtrs() const {
    DCHECK(ptr_);
    return weak_reference_owner_.HasRefs();
  }
+
+ private:
+  cef_internal::WeakReferenceOwner weak_reference_owner_;
+  T* ptr_;
+  DISALLOW_IMPLICIT_CONSTRUCTORS(WeakPtrFactory);
 };

-///
-/// A class may extend from SupportsWeakPtr to let others take weak pointers to
-/// it. This avoids the class itself implementing boilerplate to dispense weak
-/// pointers.  However, since SupportsWeakPtr's destructor won't invalidate
-/// weak pointers to the class until after the derived class' members have been
-/// destroyed, its use can lead to subtle use-after-destroy issues.
-///
+// A class may extend from SupportsWeakPtr to let others take weak pointers to
+// it. This avoids the class itself implementing boilerplate to dispense weak
+// pointers.  However, since SupportsWeakPtr's destructor won't invalidate
+// weak pointers to the class until after the derived class' members have been
+// destroyed, its use can lead to subtle use-after-destroy issues.
 template <class T>
-class SupportsWeakPtr : public internal::SupportsWeakPtrBase {
+class SupportsWeakPtr : public cef_internal::SupportsWeakPtrBase {
 public:
-  SupportsWeakPtr() = default;
-
-  SupportsWeakPtr(const SupportsWeakPtr&) = delete;
-  SupportsWeakPtr& operator=(const SupportsWeakPtr&) = delete;
+  SupportsWeakPtr() {}

  WeakPtr<T> AsWeakPtr() {
    return WeakPtr<T>(weak_reference_owner_.GetRef(), static_cast<T*>(this));
  }

 protected:
-  ~SupportsWeakPtr() = default;
+  ~SupportsWeakPtr() {}

 private:
-  internal::WeakReferenceOwner weak_reference_owner_;
+  cef_internal::WeakReferenceOwner weak_reference_owner_;
+  DISALLOW_COPY_AND_ASSIGN(SupportsWeakPtr);
 };

-///
-/// Helper function that uses type deduction to safely return a WeakPtr<Derived>
-/// when Derived doesn't directly extend SupportsWeakPtr<Derived>, instead it
-/// extends a Base that extends SupportsWeakPtr<Base>.
-///
-/// EXAMPLE:
-/// <pre>
-///   class Base : public base::SupportsWeakPtr<Producer> {};
-///   class Derived : public Base {};
-///
-///   Derived derived;
-///   base::WeakPtr<Derived> ptr = base::AsWeakPtr(&derived);
-/// </pre>
-///
-/// Note that the following doesn't work (invalid type conversion) since
-/// Derived::AsWeakPtr() is WeakPtr<Base> SupportsWeakPtr<Base>::AsWeakPtr(),
-/// and there's no way to safely cast WeakPtr<Base> to WeakPtr<Derived> at
-/// the caller.
-///
-/// <pre>
-///   base::WeakPtr<Derived> ptr = derived.AsWeakPtr();  // Fails.
-/// </pre>
-///
+// Helper function that uses type deduction to safely return a WeakPtr<Derived>
+// when Derived doesn't directly extend SupportsWeakPtr<Derived>, instead it
+// extends a Base that extends SupportsWeakPtr<Base>.
+//
+// EXAMPLE:
+//   class Base : public base::SupportsWeakPtr<Producer> {};
+//   class Derived : public Base {};
+//
+//   Derived derived;
+//   base::WeakPtr<Derived> ptr = base::AsWeakPtr(&derived);
+//
+// Note that the following doesn't work (invalid type conversion) since
+// Derived::AsWeakPtr() is WeakPtr<Base> SupportsWeakPtr<Base>::AsWeakPtr(),
+// and there's no way to safely cast WeakPtr<Base> to WeakPtr<Derived> at
+// the caller.
+//
+//   base::WeakPtr<Derived> ptr = derived.AsWeakPtr();  // Fails.
+
 template <typename Derived>
 WeakPtr<Derived> AsWeakPtr(Derived* t) {
-  return internal::SupportsWeakPtrBase::StaticAsWeakPtr<Derived>(t);
+  return cef_internal::SupportsWeakPtrBase::StaticAsWeakPtr<Derived>(t);
 }

 }  // namespace base
--- a/include/base/internal/cef_atomicops_arm64_gcc.h
+++ b/include/base/internal/cef_atomicops_arm64_gcc.h
@@ -0,0 +1,335 @@
+// Copyright (c) 2012 Google Inc. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//    * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//    * Neither the name of Google Inc. nor the name Chromium Embedded
+// Framework nor the names of its contributors may be used to endorse
+// or promote products derived from this software without specific prior
+// written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Do not include this header file directly. Use base/cef_atomicops.h
+// instead.
+
+#ifndef CEF_INCLUDE_BASE_INTERNAL_CEF_ATOMICOPS_ARM64_GCC_H_
+#define CEF_INCLUDE_BASE_INTERNAL_CEF_ATOMICOPS_ARM64_GCC_H_
+
+namespace base {
+namespace subtle {
+
+inline void MemoryBarrier() {
+  __asm__ __volatile__ ("dmb ish" ::: "memory");  // NOLINT
+}
+
+// NoBarrier versions of the operation include "memory" in the clobber list.
+// This is not required for direct usage of the NoBarrier versions of the
+// operations. However this is required for correctness when they are used as
+// part of the Acquire or Release versions, to ensure that nothing from outside
+// the call is reordered between the operation and the memory barrier. This does
+// not change the code generated, so has no or minimal impact on the
+// NoBarrier operations.
+
+inline Atomic32 NoBarrier_CompareAndSwap(volatile Atomic32* ptr,
+                                         Atomic32 old_value,
+                                         Atomic32 new_value) {
+  Atomic32 prev;
+  int32_t temp;
+
+  __asm__ __volatile__ (  // NOLINT
+    "0:                                    \n\t"
+    "ldxr %w[prev], %[ptr]                 \n\t"  // Load the previous value.
+    "cmp %w[prev], %w[old_value]           \n\t"
+    "bne 1f                                \n\t"
+    "stxr %w[temp], %w[new_value], %[ptr]  \n\t"  // Try to store the new value.
+    "cbnz %w[temp], 0b                     \n\t"  // Retry if it did not work.
+    "1:                                    \n\t"
+    : [prev]"=&r" (prev),
+      [temp]"=&r" (temp),
+      [ptr]"+Q" (*ptr)
+    : [old_value]"IJr" (old_value),
+      [new_value]"r" (new_value)
+    : "cc", "memory"
+  );  // NOLINT
+
+  return prev;
+}
+
+inline Atomic32 NoBarrier_AtomicExchange(volatile Atomic32* ptr,
+                                         Atomic32 new_value) {
+  Atomic32 result;
+  int32_t temp;
+
+  __asm__ __volatile__ (  // NOLINT
+    "0:                                    \n\t"
+    "ldxr %w[result], %[ptr]               \n\t"  // Load the previous value.
+    "stxr %w[temp], %w[new_value], %[ptr]  \n\t"  // Try to store the new value.
+    "cbnz %w[temp], 0b                     \n\t"  // Retry if it did not work.
+    : [result]"=&r" (result),
+      [temp]"=&r" (temp),
+      [ptr]"+Q" (*ptr)
+    : [new_value]"r" (new_value)
+    : "memory"
+  );  // NOLINT
+
+  return result;
+}
+
+inline Atomic32 NoBarrier_AtomicIncrement(volatile Atomic32* ptr,
+                                          Atomic32 increment) {
+  Atomic32 result;
+  int32_t temp;
+
+  __asm__ __volatile__ (  // NOLINT
+    "0:                                       \n\t"
+    "ldxr %w[result], %[ptr]                  \n\t"  // Load the previous value.
+    "add %w[result], %w[result], %w[increment]\n\t"
+    "stxr %w[temp], %w[result], %[ptr]        \n\t"  // Try to store the result.
+    "cbnz %w[temp], 0b                        \n\t"  // Retry on failure.
+    : [result]"=&r" (result),
+      [temp]"=&r" (temp),
+      [ptr]"+Q" (*ptr)
+    : [increment]"IJr" (increment)
+    : "memory"
+  );  // NOLINT
+
+  return result;
+}
+
+inline Atomic32 Barrier_AtomicIncrement(volatile Atomic32* ptr,
+                                        Atomic32 increment) {
+  Atomic32 result;
+
+  MemoryBarrier();
+  result = NoBarrier_AtomicIncrement(ptr, increment);
+  MemoryBarrier();
+
+  return result;
+}
+
+inline Atomic32 Acquire_CompareAndSwap(volatile Atomic32* ptr,
+                                       Atomic32 old_value,
+                                       Atomic32 new_value) {
+  Atomic32 prev;
+
+  prev = NoBarrier_CompareAndSwap(ptr, old_value, new_value);
+  MemoryBarrier();
+
+  return prev;
+}
+
+inline Atomic32 Release_CompareAndSwap(volatile Atomic32* ptr,
+                                       Atomic32 old_value,
+                                       Atomic32 new_value) {
+  Atomic32 prev;
+
+  MemoryBarrier();
+  prev = NoBarrier_CompareAndSwap(ptr, old_value, new_value);
+
+  return prev;
+}
+
+inline void NoBarrier_Store(volatile Atomic32* ptr, Atomic32 value) {
+  *ptr = value;
+}
+
+inline void Acquire_Store(volatile Atomic32* ptr, Atomic32 value) {
+  *ptr = value;
+  MemoryBarrier();
+}
+
+inline void Release_Store(volatile Atomic32* ptr, Atomic32 value) {
+  __asm__ __volatile__ (  // NOLINT
+    "stlr %w[value], %[ptr]  \n\t"
+    : [ptr]"=Q" (*ptr)
+    : [value]"r" (value)
+    : "memory"
+  );  // NOLINT
+}
+
+inline Atomic32 NoBarrier_Load(volatile const Atomic32* ptr) {
+  return *ptr;
+}
+
+inline Atomic32 Acquire_Load(volatile const Atomic32* ptr) {
+  Atomic32 value;
+
+  __asm__ __volatile__ (  // NOLINT
+    "ldar %w[value], %[ptr]  \n\t"
+    : [value]"=r" (value)
+    : [ptr]"Q" (*ptr)
+    : "memory"
+  );  // NOLINT
+
+  return value;
+}
+
+inline Atomic32 Release_Load(volatile const Atomic32* ptr) {
+  MemoryBarrier();
+  return *ptr;
+}
+
+// 64-bit versions of the operations.
+// See the 32-bit versions for comments.
+
+inline Atomic64 NoBarrier_CompareAndSwap(volatile Atomic64* ptr,
+                                         Atomic64 old_value,
+                                         Atomic64 new_value) {
+  Atomic64 prev;
+  int32_t temp;
+
+  __asm__ __volatile__ (  // NOLINT
+    "0:                                    \n\t"
+    "ldxr %[prev], %[ptr]                  \n\t"
+    "cmp %[prev], %[old_value]             \n\t"
+    "bne 1f                                \n\t"
+    "stxr %w[temp], %[new_value], %[ptr]   \n\t"
+    "cbnz %w[temp], 0b                     \n\t"
+    "1:                                    \n\t"
+    : [prev]"=&r" (prev),
+      [temp]"=&r" (temp),
+      [ptr]"+Q" (*ptr)
+    : [old_value]"IJr" (old_value),
+      [new_value]"r" (new_value)
+    : "cc", "memory"
+  );  // NOLINT
+
+  return prev;
+}
+
+inline Atomic64 NoBarrier_AtomicExchange(volatile Atomic64* ptr,
+                                         Atomic64 new_value) {
+  Atomic64 result;
+  int32_t temp;
+
+  __asm__ __volatile__ (  // NOLINT
+    "0:                                    \n\t"
+    "ldxr %[result], %[ptr]                \n\t"
+    "stxr %w[temp], %[new_value], %[ptr]   \n\t"
+    "cbnz %w[temp], 0b                     \n\t"
+    : [result]"=&r" (result),
+      [temp]"=&r" (temp),
+      [ptr]"+Q" (*ptr)
+    : [new_value]"r" (new_value)
+    : "memory"
+  );  // NOLINT
+
+  return result;
+}
+
+inline Atomic64 NoBarrier_AtomicIncrement(volatile Atomic64* ptr,
+                                          Atomic64 increment) {
+  Atomic64 result;
+  int32_t temp;
+
+  __asm__ __volatile__ (  // NOLINT
+    "0:                                     \n\t"
+    "ldxr %[result], %[ptr]                 \n\t"
+    "add %[result], %[result], %[increment] \n\t"
+    "stxr %w[temp], %[result], %[ptr]       \n\t"
+    "cbnz %w[temp], 0b                      \n\t"
+    : [result]"=&r" (result),
+      [temp]"=&r" (temp),
+      [ptr]"+Q" (*ptr)
+    : [increment]"IJr" (increment)
+    : "memory"
+  );  // NOLINT
+
+  return result;
+}
+
+inline Atomic64 Barrier_AtomicIncrement(volatile Atomic64* ptr,
+                                        Atomic64 increment) {
+  Atomic64 result;
+
+  MemoryBarrier();
+  result = NoBarrier_AtomicIncrement(ptr, increment);
+  MemoryBarrier();
+
+  return result;
+}
+
+inline Atomic64 Acquire_CompareAndSwap(volatile Atomic64* ptr,
+                                       Atomic64 old_value,
+                                       Atomic64 new_value) {
+  Atomic64 prev;
+
+  prev = NoBarrier_CompareAndSwap(ptr, old_value, new_value);
+  MemoryBarrier();
+
+  return prev;
+}
+
+inline Atomic64 Release_CompareAndSwap(volatile Atomic64* ptr,
+                                       Atomic64 old_value,
+                                       Atomic64 new_value) {
+  Atomic64 prev;
+
+  MemoryBarrier();
+  prev = NoBarrier_CompareAndSwap(ptr, old_value, new_value);
+
+  return prev;
+}
+
+inline void NoBarrier_Store(volatile Atomic64* ptr, Atomic64 value) {
+  *ptr = value;
+}
+
+inline void Acquire_Store(volatile Atomic64* ptr, Atomic64 value) {
+  *ptr = value;
+  MemoryBarrier();
+}
+
+inline void Release_Store(volatile Atomic64* ptr, Atomic64 value) {
+  __asm__ __volatile__ (  // NOLINT
+    "stlr %x[value], %[ptr]  \n\t"
+    : [ptr]"=Q" (*ptr)
+    : [value]"r" (value)
+    : "memory"
+  );  // NOLINT
+}
+
+inline Atomic64 NoBarrier_Load(volatile const Atomic64* ptr) {
+  return *ptr;
+}
+
+inline Atomic64 Acquire_Load(volatile const Atomic64* ptr) {
+  Atomic64 value;
+
+  __asm__ __volatile__ (  // NOLINT
+    "ldar %x[value], %[ptr]  \n\t"
+    : [value]"=r" (value)
+    : [ptr]"Q" (*ptr)
+    : "memory"
+  );  // NOLINT
+
+  return value;
+}
+
+inline Atomic64 Release_Load(volatile const Atomic64* ptr) {
+  MemoryBarrier();
+  return *ptr;
+}
+
+} }  // namespace base::subtle
+
+#endif  // CEF_INCLUDE_BASE_INTERNAL_CEF_ATOMICOPS_ARM64_GCC_H_
+
--- a/include/base/internal/cef_atomicops_arm64_msvc.h
+++ b/include/base/internal/cef_atomicops_arm64_msvc.h
@@ -0,0 +1,197 @@
+// Copyright (c) 2008 Google Inc. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//    * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//    * Neither the name of Google Inc. nor the name Chromium Embedded
+// Framework nor the names of its contributors may be used to endorse
+// or promote products derived from this software without specific prior
+// written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Do not include this header file directly. Use base/cef_atomicops.h
+// instead.
+
+#ifndef CEF_INCLUDE_BASE_INTERNAL_CEF_ATOMICOPS_ARM64_MSVC_H_
+#define CEF_INCLUDE_BASE_INTERNAL_CEF_ATOMICOPS_ARM64_MSVC_H_
+
+#include <windows.h>
+
+#include <intrin.h>
+
+#include "include/base/cef_macros.h"
+
+namespace base {
+namespace subtle {
+
+inline Atomic32 NoBarrier_CompareAndSwap(volatile Atomic32* ptr,
+                                         Atomic32 old_value,
+                                         Atomic32 new_value) {
+  LONG result = _InterlockedCompareExchange(
+      reinterpret_cast<volatile LONG*>(ptr), static_cast<LONG>(new_value),
+      static_cast<LONG>(old_value));
+  return static_cast<Atomic32>(result);
+}
+
+inline Atomic32 NoBarrier_AtomicExchange(volatile Atomic32* ptr,
+                                         Atomic32 new_value) {
+  LONG result = _InterlockedExchange(reinterpret_cast<volatile LONG*>(ptr),
+                                     static_cast<LONG>(new_value));
+  return static_cast<Atomic32>(result);
+}
+
+inline Atomic32 Barrier_AtomicIncrement(volatile Atomic32* ptr,
+                                        Atomic32 increment) {
+  return _InterlockedExchangeAdd(reinterpret_cast<volatile LONG*>(ptr),
+                                 static_cast<LONG>(increment)) +
+         increment;
+}
+
+inline Atomic32 NoBarrier_AtomicIncrement(volatile Atomic32* ptr,
+                                          Atomic32 increment) {
+  return Barrier_AtomicIncrement(ptr, increment);
+}
+
+#if !(defined(_MSC_VER) && _MSC_VER >= 1400)
+#error "We require at least vs2005 for MemoryBarrier"
+#endif
+
+inline Atomic32 Acquire_CompareAndSwap(volatile Atomic32* ptr,
+                                       Atomic32 old_value,
+                                       Atomic32 new_value) {
+  return NoBarrier_CompareAndSwap(ptr, old_value, new_value);
+}
+
+inline Atomic32 Release_CompareAndSwap(volatile Atomic32* ptr,
+                                       Atomic32 old_value,
+                                       Atomic32 new_value) {
+  return NoBarrier_CompareAndSwap(ptr, old_value, new_value);
+}
+
+inline void NoBarrier_Store(volatile Atomic32* ptr, Atomic32 value) {
+  *ptr = value;
+}
+
+inline void Acquire_Store(volatile Atomic32* ptr, Atomic32 value) {
+  NoBarrier_AtomicExchange(ptr, value);
+  // acts as a barrier in this implementation
+}
+
+inline void Release_Store(volatile Atomic32* ptr, Atomic32 value) {
+  *ptr = value;
+  // See comments in Atomic64 version of Release_Store() below.
+}
+
+inline Atomic32 NoBarrier_Load(volatile const Atomic32* ptr) {
+  return *ptr;
+}
+
+inline Atomic32 Acquire_Load(volatile const Atomic32* ptr) {
+  Atomic32 value = *ptr;
+  return value;
+}
+
+inline Atomic32 Release_Load(volatile const Atomic32* ptr) {
+  MemoryBarrier();
+  return *ptr;
+}
+
+#if defined(_WIN64)
+
+// 64-bit low-level operations on 64-bit platform.
+
+COMPILE_ASSERT(sizeof(Atomic64) == sizeof(PVOID), atomic_word_is_atomic);
+
+inline Atomic64 NoBarrier_CompareAndSwap(volatile Atomic64* ptr,
+                                         Atomic64 old_value,
+                                         Atomic64 new_value) {
+  PVOID result = InterlockedCompareExchangePointer(
+      reinterpret_cast<volatile PVOID*>(ptr),
+      reinterpret_cast<PVOID>(new_value), reinterpret_cast<PVOID>(old_value));
+  return reinterpret_cast<Atomic64>(result);
+}
+
+inline Atomic64 NoBarrier_AtomicExchange(volatile Atomic64* ptr,
+                                         Atomic64 new_value) {
+  PVOID result =
+      InterlockedExchangePointer(reinterpret_cast<volatile PVOID*>(ptr),
+                                 reinterpret_cast<PVOID>(new_value));
+  return reinterpret_cast<Atomic64>(result);
+}
+
+inline Atomic64 Barrier_AtomicIncrement(volatile Atomic64* ptr,
+                                        Atomic64 increment) {
+  return InterlockedExchangeAdd64(reinterpret_cast<volatile LONGLONG*>(ptr),
+                                  static_cast<LONGLONG>(increment)) +
+         increment;
+}
+
+inline Atomic64 NoBarrier_AtomicIncrement(volatile Atomic64* ptr,
+                                          Atomic64 increment) {
+  return Barrier_AtomicIncrement(ptr, increment);
+}
+
+inline void NoBarrier_Store(volatile Atomic64* ptr, Atomic64 value) {
+  *ptr = value;
+}
+
+inline void Acquire_Store(volatile Atomic64* ptr, Atomic64 value) {
+  NoBarrier_AtomicExchange(ptr, value);
+  // acts as a barrier in this implementation
+}
+
+inline void Release_Store(volatile Atomic64* ptr, Atomic64 value) {
+  *ptr = value;
+}
+
+inline Atomic64 NoBarrier_Load(volatile const Atomic64* ptr) {
+  return *ptr;
+}
+
+inline Atomic64 Acquire_Load(volatile const Atomic64* ptr) {
+  Atomic64 value = *ptr;
+  return value;
+}
+
+inline Atomic64 Release_Load(volatile const Atomic64* ptr) {
+  MemoryBarrier();
+  return *ptr;
+}
+
+inline Atomic64 Acquire_CompareAndSwap(volatile Atomic64* ptr,
+                                       Atomic64 old_value,
+                                       Atomic64 new_value) {
+  return NoBarrier_CompareAndSwap(ptr, old_value, new_value);
+}
+
+inline Atomic64 Release_CompareAndSwap(volatile Atomic64* ptr,
+                                       Atomic64 old_value,
+                                       Atomic64 new_value) {
+  return NoBarrier_CompareAndSwap(ptr, old_value, new_value);
+}
+
+#endif  // defined(_WIN64)
+
+}  // namespace base::subtle
+}  // namespace base
+
+#endif  // CEF_INCLUDE_BASE_INTERNAL_CEF_ATOMICOPS_ARM64_MSVC_H_
+
--- a/include/base/internal/cef_atomicops_arm_gcc.h
+++ b/include/base/internal/cef_atomicops_arm_gcc.h
@@ -0,0 +1,325 @@
+// Copyright (c) 2013 Google Inc. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//    * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//    * Neither the name of Google Inc. nor the name Chromium Embedded
+// Framework nor the names of its contributors may be used to endorse
+// or promote products derived from this software without specific prior
+// written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Do not include this header file directly. Use base/cef_atomicops.h
+// instead.
+//
+// LinuxKernelCmpxchg and Barrier_AtomicIncrement are from Google Gears.
+
+#ifndef CEF_INCLUDE_BASE_INTERNAL_CEF_ATOMICOPS_ARM_GCC_H_
+#define CEF_INCLUDE_BASE_INTERNAL_CEF_ATOMICOPS_ARM_GCC_H_
+
+#if defined(OS_QNX)
+#include <sys/cpuinline.h>
+#endif
+
+namespace base {
+namespace subtle {
+
+// Memory barriers on ARM are funky, but the kernel is here to help:
+//
+// * ARMv5 didn't support SMP, there is no memory barrier instruction at
+//   all on this architecture, or when targeting its machine code.
+//
+// * Some ARMv6 CPUs support SMP. A full memory barrier can be produced by
+//   writing a random value to a very specific coprocessor register.
+//
+// * On ARMv7, the "dmb" instruction is used to perform a full memory
+//   barrier (though writing to the co-processor will still work).
+//   However, on single core devices (e.g. Nexus One, or Nexus S),
+//   this instruction will take up to 200 ns, which is huge, even though
+//   it's completely un-needed on these devices.
+//
+// * There is no easy way to determine at runtime if the device is
+//   single or multi-core. However, the kernel provides a useful helper
+//   function at a fixed memory address (0xffff0fa0), which will always
+//   perform a memory barrier in the most efficient way. I.e. on single
+//   core devices, this is an empty function that exits immediately.
+//   On multi-core devices, it implements a full memory barrier.
+//
+// * This source could be compiled to ARMv5 machine code that runs on a
+//   multi-core ARMv6 or ARMv7 device. In this case, memory barriers
+//   are needed for correct execution. Always call the kernel helper, even
+//   when targeting ARMv5TE.
+//
+
+inline void MemoryBarrier() {
+#if defined(OS_LINUX) || defined(OS_ANDROID)
+  // Note: This is a function call, which is also an implicit compiler barrier.
+  typedef void (*KernelMemoryBarrierFunc)();
+  ((KernelMemoryBarrierFunc)0xffff0fa0)();
+#elif defined(OS_QNX)
+  __cpu_membarrier();
+#else
+#error MemoryBarrier() is not implemented on this platform.
+#endif
+}
+
+// An ARM toolchain would only define one of these depending on which
+// variant of the target architecture is being used. This tests against
+// any known ARMv6 or ARMv7 variant, where it is possible to directly
+// use ldrex/strex instructions to implement fast atomic operations.
+#if defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) ||  \
+    defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) || \
+    defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) ||  \
+    defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6Z__) || \
+    defined(__ARM_ARCH_6ZK__) || defined(__ARM_ARCH_6T2__)
+
+inline Atomic32 NoBarrier_CompareAndSwap(volatile Atomic32* ptr,
+                                         Atomic32 old_value,
+                                         Atomic32 new_value) {
+  Atomic32 prev_value;
+  int reloop;
+  do {
+    // The following is equivalent to:
+    //
+    //   prev_value = LDREX(ptr)
+    //   reloop = 0
+    //   if (prev_value != old_value)
+    //      reloop = STREX(ptr, new_value)
+    __asm__ __volatile__(
+        "    ldrex %0, [%3]\n"
+        "    mov %1, #0\n"
+        "    cmp %0, %4\n"
+#ifdef __thumb2__
+        "    it eq\n"
+#endif
+        "    strexeq %1, %5, [%3]\n"
+        : "=&r"(prev_value), "=&r"(reloop), "+m"(*ptr)
+        : "r"(ptr), "r"(old_value), "r"(new_value)
+        : "cc", "memory");
+  } while (reloop != 0);
+  return prev_value;
+}
+
+inline Atomic32 Acquire_CompareAndSwap(volatile Atomic32* ptr,
+                                       Atomic32 old_value,
+                                       Atomic32 new_value) {
+  Atomic32 result = NoBarrier_CompareAndSwap(ptr, old_value, new_value);
+  MemoryBarrier();
+  return result;
+}
+
+inline Atomic32 Release_CompareAndSwap(volatile Atomic32* ptr,
+                                       Atomic32 old_value,
+                                       Atomic32 new_value) {
+  MemoryBarrier();
+  return NoBarrier_CompareAndSwap(ptr, old_value, new_value);
+}
+
+inline Atomic32 NoBarrier_AtomicIncrement(volatile Atomic32* ptr,
+                                          Atomic32 increment) {
+  Atomic32 value;
+  int reloop;
+  do {
+    // Equivalent to:
+    //
+    //  value = LDREX(ptr)
+    //  value += increment
+    //  reloop = STREX(ptr, value)
+    //
+    __asm__ __volatile__(
+        "    ldrex %0, [%3]\n"
+        "    add %0, %0, %4\n"
+        "    strex %1, %0, [%3]\n"
+        : "=&r"(value), "=&r"(reloop), "+m"(*ptr)
+        : "r"(ptr), "r"(increment)
+        : "cc", "memory");
+  } while (reloop);
+  return value;
+}
+
+inline Atomic32 Barrier_AtomicIncrement(volatile Atomic32* ptr,
+                                        Atomic32 increment) {
+  // TODO(digit): Investigate if it's possible to implement this with
+  // a single MemoryBarrier() operation between the LDREX and STREX.
+  // See http://crbug.com/246514
+  MemoryBarrier();
+  Atomic32 result = NoBarrier_AtomicIncrement(ptr, increment);
+  MemoryBarrier();
+  return result;
+}
+
+inline Atomic32 NoBarrier_AtomicExchange(volatile Atomic32* ptr,
+                                         Atomic32 new_value) {
+  Atomic32 old_value;
+  int reloop;
+  do {
+    // old_value = LDREX(ptr)
+    // reloop = STREX(ptr, new_value)
+    __asm__ __volatile__(
+        "   ldrex %0, [%3]\n"
+        "   strex %1, %4, [%3]\n"
+        : "=&r"(old_value), "=&r"(reloop), "+m"(*ptr)
+        : "r"(ptr), "r"(new_value)
+        : "cc", "memory");
+  } while (reloop != 0);
+  return old_value;
+}
+
+// This tests against any known ARMv5 variant.
+#elif defined(__ARM_ARCH_5__) || defined(__ARM_ARCH_5T__) || \
+    defined(__ARM_ARCH_5TE__) || defined(__ARM_ARCH_5TEJ__)
+
+// The kernel also provides a helper function to perform an atomic
+// compare-and-swap operation at the hard-wired address 0xffff0fc0.
+// On ARMv5, this is implemented by a special code path that the kernel
+// detects and treats specially when thread pre-emption happens.
+// On ARMv6 and higher, it uses LDREX/STREX instructions instead.
+//
+// Note that this always perform a full memory barrier, there is no
+// need to add calls MemoryBarrier() before or after it. It also
+// returns 0 on success, and 1 on exit.
+//
+// Available and reliable since Linux 2.6.24. Both Android and ChromeOS
+// use newer kernel revisions, so this should not be a concern.
+namespace {
+
+inline int LinuxKernelCmpxchg(Atomic32 old_value,
+                              Atomic32 new_value,
+                              volatile Atomic32* ptr) {
+  typedef int (*KernelCmpxchgFunc)(Atomic32, Atomic32, volatile Atomic32*);
+  return ((KernelCmpxchgFunc)0xffff0fc0)(old_value, new_value, ptr);
+}
+
+}  // namespace
+
+inline Atomic32 NoBarrier_CompareAndSwap(volatile Atomic32* ptr,
+                                         Atomic32 old_value,
+                                         Atomic32 new_value) {
+  Atomic32 prev_value;
+  for (;;) {
+    prev_value = *ptr;
+    if (prev_value != old_value)
+      return prev_value;
+    if (!LinuxKernelCmpxchg(old_value, new_value, ptr))
+      return old_value;
+  }
+}
+
+inline Atomic32 NoBarrier_AtomicExchange(volatile Atomic32* ptr,
+                                         Atomic32 new_value) {
+  Atomic32 old_value;
+  do {
+    old_value = *ptr;
+  } while (LinuxKernelCmpxchg(old_value, new_value, ptr));
+  return old_value;
+}
+
+inline Atomic32 NoBarrier_AtomicIncrement(volatile Atomic32* ptr,
+                                          Atomic32 increment) {
+  return Barrier_AtomicIncrement(ptr, increment);
+}
+
+inline Atomic32 Barrier_AtomicIncrement(volatile Atomic32* ptr,
+                                        Atomic32 increment) {
+  for (;;) {
+    // Atomic exchange the old value with an incremented one.
+    Atomic32 old_value = *ptr;
+    Atomic32 new_value = old_value + increment;
+    if (!LinuxKernelCmpxchg(old_value, new_value, ptr)) {
+      // The exchange took place as expected.
+      return new_value;
+    }
+    // Otherwise, *ptr changed mid-loop and we need to retry.
+  }
+}
+
+inline Atomic32 Acquire_CompareAndSwap(volatile Atomic32* ptr,
+                                       Atomic32 old_value,
+                                       Atomic32 new_value) {
+  Atomic32 prev_value;
+  for (;;) {
+    prev_value = *ptr;
+    if (prev_value != old_value) {
+      // Always ensure acquire semantics.
+      MemoryBarrier();
+      return prev_value;
+    }
+    if (!LinuxKernelCmpxchg(old_value, new_value, ptr))
+      return old_value;
+  }
+}
+
+inline Atomic32 Release_CompareAndSwap(volatile Atomic32* ptr,
+                                       Atomic32 old_value,
+                                       Atomic32 new_value) {
+  // This could be implemented as:
+  //    MemoryBarrier();
+  //    return NoBarrier_CompareAndSwap();
+  //
+  // But would use 3 barriers per succesful CAS. To save performance,
+  // use Acquire_CompareAndSwap(). Its implementation guarantees that:
+  // - A succesful swap uses only 2 barriers (in the kernel helper).
+  // - An early return due to (prev_value != old_value) performs
+  //   a memory barrier with no store, which is equivalent to the
+  //   generic implementation above.
+  return Acquire_CompareAndSwap(ptr, old_value, new_value);
+}
+
+#else
+#error "Your CPU's ARM architecture is not supported yet"
+#endif
+
+// NOTE: Atomicity of the following load and store operations is only
+// guaranteed in case of 32-bit alignement of |ptr| values.
+
+inline void NoBarrier_Store(volatile Atomic32* ptr, Atomic32 value) {
+  *ptr = value;
+}
+
+inline void Acquire_Store(volatile Atomic32* ptr, Atomic32 value) {
+  *ptr = value;
+  MemoryBarrier();
+}
+
+inline void Release_Store(volatile Atomic32* ptr, Atomic32 value) {
+  MemoryBarrier();
+  *ptr = value;
+}
+
+inline Atomic32 NoBarrier_Load(volatile const Atomic32* ptr) {
+  return *ptr;
+}
+
+inline Atomic32 Acquire_Load(volatile const Atomic32* ptr) {
+  Atomic32 value = *ptr;
+  MemoryBarrier();
+  return value;
+}
+
+inline Atomic32 Release_Load(volatile const Atomic32* ptr) {
+  MemoryBarrier();
+  return *ptr;
+}
+
+}  // namespace base::subtle
+}  // namespace base
+
+#endif  // CEF_INCLUDE_BASE_INTERNAL_CEF_ATOMICOPS_ARM_GCC_H_
--- a/include/base/internal/cef_atomicops_atomicword_compat.h
+++ b/include/base/internal/cef_atomicops_atomicword_compat.h
@@ -0,0 +1,124 @@
+// Copyright (c) 2011 Google Inc. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//    * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//    * Neither the name of Google Inc. nor the name Chromium Embedded
+// Framework nor the names of its contributors may be used to endorse
+// or promote products derived from this software without specific prior
+// written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Do not include this header file directly. Use base/cef_atomicops.h
+// instead.
+
+#ifndef CEF_INCLUDE_BASE_INTERNAL_CEF_ATOMICOPS_ATOMICWORD_COMPAT_H_
+#define CEF_INCLUDE_BASE_INTERNAL_CEF_ATOMICOPS_ATOMICWORD_COMPAT_H_
+
+// AtomicWord is a synonym for intptr_t, and Atomic32 is a synonym for int32,
+// which in turn means int. On some LP32 platforms, intptr_t is an int, but
+// on others, it's a long. When AtomicWord and Atomic32 are based on different
+// fundamental types, their pointers are incompatible.
+//
+// This file defines function overloads to allow both AtomicWord and Atomic32
+// data to be used with this interface.
+//
+// On LP64 platforms, AtomicWord and Atomic64 are both always long,
+// so this problem doesn't occur.
+
+#if !defined(ARCH_CPU_64_BITS)
+
+namespace base {
+namespace subtle {
+
+inline AtomicWord NoBarrier_CompareAndSwap(volatile AtomicWord* ptr,
+                                           AtomicWord old_value,
+                                           AtomicWord new_value) {
+  return NoBarrier_CompareAndSwap(reinterpret_cast<volatile Atomic32*>(ptr),
+                                  old_value, new_value);
+}
+
+inline AtomicWord NoBarrier_AtomicExchange(volatile AtomicWord* ptr,
+                                           AtomicWord new_value) {
+  return NoBarrier_AtomicExchange(reinterpret_cast<volatile Atomic32*>(ptr),
+                                  new_value);
+}
+
+inline AtomicWord NoBarrier_AtomicIncrement(volatile AtomicWord* ptr,
+                                            AtomicWord increment) {
+  return NoBarrier_AtomicIncrement(reinterpret_cast<volatile Atomic32*>(ptr),
+                                   increment);
+}
+
+inline AtomicWord Barrier_AtomicIncrement(volatile AtomicWord* ptr,
+                                          AtomicWord increment) {
+  return Barrier_AtomicIncrement(reinterpret_cast<volatile Atomic32*>(ptr),
+                                 increment);
+}
+
+inline AtomicWord Acquire_CompareAndSwap(volatile AtomicWord* ptr,
+                                         AtomicWord old_value,
+                                         AtomicWord new_value) {
+  return base::subtle::Acquire_CompareAndSwap(
+      reinterpret_cast<volatile Atomic32*>(ptr), old_value, new_value);
+}
+
+inline AtomicWord Release_CompareAndSwap(volatile AtomicWord* ptr,
+                                         AtomicWord old_value,
+                                         AtomicWord new_value) {
+  return base::subtle::Release_CompareAndSwap(
+      reinterpret_cast<volatile Atomic32*>(ptr), old_value, new_value);
+}
+
+inline void NoBarrier_Store(volatile AtomicWord* ptr, AtomicWord value) {
+  NoBarrier_Store(reinterpret_cast<volatile Atomic32*>(ptr), value);
+}
+
+inline void Acquire_Store(volatile AtomicWord* ptr, AtomicWord value) {
+  return base::subtle::Acquire_Store(reinterpret_cast<volatile Atomic32*>(ptr),
+                                     value);
+}
+
+inline void Release_Store(volatile AtomicWord* ptr, AtomicWord value) {
+  return base::subtle::Release_Store(reinterpret_cast<volatile Atomic32*>(ptr),
+                                     value);
+}
+
+inline AtomicWord NoBarrier_Load(volatile const AtomicWord* ptr) {
+  return NoBarrier_Load(reinterpret_cast<volatile const Atomic32*>(ptr));
+}
+
+inline AtomicWord Acquire_Load(volatile const AtomicWord* ptr) {
+  return base::subtle::Acquire_Load(
+      reinterpret_cast<volatile const Atomic32*>(ptr));
+}
+
+inline AtomicWord Release_Load(volatile const AtomicWord* ptr) {
+  return base::subtle::Release_Load(
+      reinterpret_cast<volatile const Atomic32*>(ptr));
+}
+
+}  // namespace base::subtle
+}  // namespace base
+
+#endif  // !defined(ARCH_CPU_64_BITS)
+
+#endif  // CEF_INCLUDE_BASE_INTERNAL_CEF_ATOMICOPS_ATOMICWORD_COMPAT_H_
--- a/include/base/internal/cef_atomicops_mac.h
+++ b/include/base/internal/cef_atomicops_mac.h
@@ -0,0 +1,223 @@
+// Copyright (c) 2012 Google Inc. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//    * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//    * Neither the name of Google Inc. nor the name Chromium Embedded
+// Framework nor the names of its contributors may be used to endorse
+// or promote products derived from this software without specific prior
+// written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Do not include this header file directly. Use base/cef_atomicops.h
+// instead.
+
+#ifndef CEF_INCLUDE_BASE_INTERNAL_CEF_ATOMICOPS_MAC_H_
+#define CEF_INCLUDE_BASE_INTERNAL_CEF_ATOMICOPS_MAC_H_
+
+#include <libkern/OSAtomic.h>
+
+namespace base {
+namespace subtle {
+
+inline Atomic32 NoBarrier_CompareAndSwap(volatile Atomic32* ptr,
+                                         Atomic32 old_value,
+                                         Atomic32 new_value) {
+  Atomic32 prev_value;
+  do {
+    if (OSAtomicCompareAndSwap32(old_value, new_value,
+                                 const_cast<Atomic32*>(ptr))) {
+      return old_value;
+    }
+    prev_value = *ptr;
+  } while (prev_value == old_value);
+  return prev_value;
+}
+
+inline Atomic32 NoBarrier_AtomicExchange(volatile Atomic32* ptr,
+                                         Atomic32 new_value) {
+  Atomic32 old_value;
+  do {
+    old_value = *ptr;
+  } while (!OSAtomicCompareAndSwap32(old_value, new_value,
+                                     const_cast<Atomic32*>(ptr)));
+  return old_value;
+}
+
+inline Atomic32 NoBarrier_AtomicIncrement(volatile Atomic32* ptr,
+                                          Atomic32 increment) {
+  return OSAtomicAdd32(increment, const_cast<Atomic32*>(ptr));
+}
+
+inline Atomic32 Barrier_AtomicIncrement(volatile Atomic32* ptr,
+                                        Atomic32 increment) {
+  return OSAtomicAdd32Barrier(increment, const_cast<Atomic32*>(ptr));
+}
+
+inline void MemoryBarrier() {
+  OSMemoryBarrier();
+}
+
+inline Atomic32 Acquire_CompareAndSwap(volatile Atomic32* ptr,
+                                       Atomic32 old_value,
+                                       Atomic32 new_value) {
+  Atomic32 prev_value;
+  do {
+    if (OSAtomicCompareAndSwap32Barrier(old_value, new_value,
+                                        const_cast<Atomic32*>(ptr))) {
+      return old_value;
+    }
+    prev_value = *ptr;
+  } while (prev_value == old_value);
+  return prev_value;
+}
+
+inline Atomic32 Release_CompareAndSwap(volatile Atomic32* ptr,
+                                       Atomic32 old_value,
+                                       Atomic32 new_value) {
+  return Acquire_CompareAndSwap(ptr, old_value, new_value);
+}
+
+inline void NoBarrier_Store(volatile Atomic32* ptr, Atomic32 value) {
+  *ptr = value;
+}
+
+inline void Acquire_Store(volatile Atomic32* ptr, Atomic32 value) {
+  *ptr = value;
+  MemoryBarrier();
+}
+
+inline void Release_Store(volatile Atomic32* ptr, Atomic32 value) {
+  MemoryBarrier();
+  *ptr = value;
+}
+
+inline Atomic32 NoBarrier_Load(volatile const Atomic32* ptr) {
+  return *ptr;
+}
+
+inline Atomic32 Acquire_Load(volatile const Atomic32* ptr) {
+  Atomic32 value = *ptr;
+  MemoryBarrier();
+  return value;
+}
+
+inline Atomic32 Release_Load(volatile const Atomic32* ptr) {
+  MemoryBarrier();
+  return *ptr;
+}
+
+#ifdef __LP64__
+
+// 64-bit implementation on 64-bit platform
+
+inline Atomic64 NoBarrier_CompareAndSwap(volatile Atomic64* ptr,
+                                         Atomic64 old_value,
+                                         Atomic64 new_value) {
+  Atomic64 prev_value;
+  do {
+    if (OSAtomicCompareAndSwap64(old_value, new_value,
+                                 reinterpret_cast<volatile int64_t*>(ptr))) {
+      return old_value;
+    }
+    prev_value = *ptr;
+  } while (prev_value == old_value);
+  return prev_value;
+}
+
+inline Atomic64 NoBarrier_AtomicExchange(volatile Atomic64* ptr,
+                                         Atomic64 new_value) {
+  Atomic64 old_value;
+  do {
+    old_value = *ptr;
+  } while (!OSAtomicCompareAndSwap64(old_value, new_value,
+                                     reinterpret_cast<volatile int64_t*>(ptr)));
+  return old_value;
+}
+
+inline Atomic64 NoBarrier_AtomicIncrement(volatile Atomic64* ptr,
+                                          Atomic64 increment) {
+  return OSAtomicAdd64(increment, reinterpret_cast<volatile int64_t*>(ptr));
+}
+
+inline Atomic64 Barrier_AtomicIncrement(volatile Atomic64* ptr,
+                                        Atomic64 increment) {
+  return OSAtomicAdd64Barrier(increment,
+                              reinterpret_cast<volatile int64_t*>(ptr));
+}
+
+inline Atomic64 Acquire_CompareAndSwap(volatile Atomic64* ptr,
+                                       Atomic64 old_value,
+                                       Atomic64 new_value) {
+  Atomic64 prev_value;
+  do {
+    if (OSAtomicCompareAndSwap64Barrier(
+            old_value, new_value, reinterpret_cast<volatile int64_t*>(ptr))) {
+      return old_value;
+    }
+    prev_value = *ptr;
+  } while (prev_value == old_value);
+  return prev_value;
+}
+
+inline Atomic64 Release_CompareAndSwap(volatile Atomic64* ptr,
+                                       Atomic64 old_value,
+                                       Atomic64 new_value) {
+  // The lib kern interface does not distinguish between
+  // Acquire and Release memory barriers; they are equivalent.
+  return Acquire_CompareAndSwap(ptr, old_value, new_value);
+}
+
+inline void NoBarrier_Store(volatile Atomic64* ptr, Atomic64 value) {
+  *ptr = value;
+}
+
+inline void Acquire_Store(volatile Atomic64* ptr, Atomic64 value) {
+  *ptr = value;
+  MemoryBarrier();
+}
+
+inline void Release_Store(volatile Atomic64* ptr, Atomic64 value) {
+  MemoryBarrier();
+  *ptr = value;
+}
+
+inline Atomic64 NoBarrier_Load(volatile const Atomic64* ptr) {
+  return *ptr;
+}
+
+inline Atomic64 Acquire_Load(volatile const Atomic64* ptr) {
+  Atomic64 value = *ptr;
+  MemoryBarrier();
+  return value;
+}
+
+inline Atomic64 Release_Load(volatile const Atomic64* ptr) {
+  MemoryBarrier();
+  return *ptr;
+}
+
+#endif  // defined(__LP64__)
+
+}  // namespace base::subtle
+}  // namespace base
+
+#endif  // CEF_INCLUDE_BASE_INTERNAL_CEF_ATOMICOPS_MAC_H_
--- a/include/base/internal/cef_atomicops_x86_gcc.h
+++ b/include/base/internal/cef_atomicops_x86_gcc.h
@@ -0,0 +1,268 @@
+// Copyright (c) 2011 Google Inc. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//    * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//    * Neither the name of Google Inc. nor the name Chromium Embedded
+// Framework nor the names of its contributors may be used to endorse
+// or promote products derived from this software without specific prior
+// written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Do not include this header file directly. Use base/cef_atomicops.h
+// instead.
+
+#ifndef CEF_INCLUDE_BASE_INTERNAL_CEF_ATOMICOPS_X86_GCC_H_
+#define CEF_INCLUDE_BASE_INTERNAL_CEF_ATOMICOPS_X86_GCC_H_
+
+// This struct is not part of the public API of this module; clients may not
+// use it.
+// Features of this x86.  Values may not be correct before main() is run,
+// but are set conservatively.
+struct AtomicOps_x86CPUFeatureStruct {
+  bool has_amd_lock_mb_bug;  // Processor has AMD memory-barrier bug; do lfence
+                             // after acquire compare-and-swap.
+};
+extern struct AtomicOps_x86CPUFeatureStruct AtomicOps_Internalx86CPUFeatures;
+
+#define ATOMICOPS_COMPILER_BARRIER() __asm__ __volatile__("" : : : "memory")
+
+namespace base {
+namespace subtle {
+
+// 32-bit low-level operations on any platform.
+
+inline Atomic32 NoBarrier_CompareAndSwap(volatile Atomic32* ptr,
+                                         Atomic32 old_value,
+                                         Atomic32 new_value) {
+  Atomic32 prev;
+  __asm__ __volatile__("lock; cmpxchgl %1,%2"
+                       : "=a"(prev)
+                       : "q"(new_value), "m"(*ptr), "0"(old_value)
+                       : "memory");
+  return prev;
+}
+
+inline Atomic32 NoBarrier_AtomicExchange(volatile Atomic32* ptr,
+                                         Atomic32 new_value) {
+  __asm__ __volatile__("xchgl %1,%0"  // The lock prefix is implicit for xchg.
+                       : "=r"(new_value)
+                       : "m"(*ptr), "0"(new_value)
+                       : "memory");
+  return new_value;  // Now it's the previous value.
+}
+
+inline Atomic32 NoBarrier_AtomicIncrement(volatile Atomic32* ptr,
+                                          Atomic32 increment) {
+  Atomic32 temp = increment;
+  __asm__ __volatile__("lock; xaddl %0,%1"
+                       : "+r"(temp), "+m"(*ptr)
+                       :
+                       : "memory");
+  // temp now holds the old value of *ptr
+  return temp + increment;
+}
+
+inline Atomic32 Barrier_AtomicIncrement(volatile Atomic32* ptr,
+                                        Atomic32 increment) {
+  Atomic32 temp = increment;
+  __asm__ __volatile__("lock; xaddl %0,%1"
+                       : "+r"(temp), "+m"(*ptr)
+                       :
+                       : "memory");
+  // temp now holds the old value of *ptr
+  if (AtomicOps_Internalx86CPUFeatures.has_amd_lock_mb_bug) {
+    __asm__ __volatile__("lfence" : : : "memory");
+  }
+  return temp + increment;
+}
+
+inline Atomic32 Acquire_CompareAndSwap(volatile Atomic32* ptr,
+                                       Atomic32 old_value,
+                                       Atomic32 new_value) {
+  Atomic32 x = NoBarrier_CompareAndSwap(ptr, old_value, new_value);
+  if (AtomicOps_Internalx86CPUFeatures.has_amd_lock_mb_bug) {
+    __asm__ __volatile__("lfence" : : : "memory");
+  }
+  return x;
+}
+
+inline Atomic32 Release_CompareAndSwap(volatile Atomic32* ptr,
+                                       Atomic32 old_value,
+                                       Atomic32 new_value) {
+  return NoBarrier_CompareAndSwap(ptr, old_value, new_value);
+}
+
+inline void NoBarrier_Store(volatile Atomic32* ptr, Atomic32 value) {
+  *ptr = value;
+}
+
+inline void MemoryBarrier() {
+  __asm__ __volatile__("mfence" : : : "memory");
+}
+
+inline void Acquire_Store(volatile Atomic32* ptr, Atomic32 value) {
+  *ptr = value;
+  MemoryBarrier();
+}
+
+inline void Release_Store(volatile Atomic32* ptr, Atomic32 value) {
+  ATOMICOPS_COMPILER_BARRIER();
+  *ptr = value;  // An x86 store acts as a release barrier.
+  // See comments in Atomic64 version of Release_Store(), below.
+}
+
+inline Atomic32 NoBarrier_Load(volatile const Atomic32* ptr) {
+  return *ptr;
+}
+
+inline Atomic32 Acquire_Load(volatile const Atomic32* ptr) {
+  Atomic32 value = *ptr;  // An x86 load acts as a acquire barrier.
+  // See comments in Atomic64 version of Release_Store(), below.
+  ATOMICOPS_COMPILER_BARRIER();
+  return value;
+}
+
+inline Atomic32 Release_Load(volatile const Atomic32* ptr) {
+  MemoryBarrier();
+  return *ptr;
+}
+
+#if defined(__x86_64__)
+
+// 64-bit low-level operations on 64-bit platform.
+
+inline Atomic64 NoBarrier_CompareAndSwap(volatile Atomic64* ptr,
+                                         Atomic64 old_value,
+                                         Atomic64 new_value) {
+  Atomic64 prev;
+  __asm__ __volatile__("lock; cmpxchgq %1,%2"
+                       : "=a"(prev)
+                       : "q"(new_value), "m"(*ptr), "0"(old_value)
+                       : "memory");
+  return prev;
+}
+
+inline Atomic64 NoBarrier_AtomicExchange(volatile Atomic64* ptr,
+                                         Atomic64 new_value) {
+  __asm__ __volatile__("xchgq %1,%0"  // The lock prefix is implicit for xchg.
+                       : "=r"(new_value)
+                       : "m"(*ptr), "0"(new_value)
+                       : "memory");
+  return new_value;  // Now it's the previous value.
+}
+
+inline Atomic64 NoBarrier_AtomicIncrement(volatile Atomic64* ptr,
+                                          Atomic64 increment) {
+  Atomic64 temp = increment;
+  __asm__ __volatile__("lock; xaddq %0,%1"
+                       : "+r"(temp), "+m"(*ptr)
+                       :
+                       : "memory");
+  // temp now contains the previous value of *ptr
+  return temp + increment;
+}
+
+inline Atomic64 Barrier_AtomicIncrement(volatile Atomic64* ptr,
+                                        Atomic64 increment) {
+  Atomic64 temp = increment;
+  __asm__ __volatile__("lock; xaddq %0,%1"
+                       : "+r"(temp), "+m"(*ptr)
+                       :
+                       : "memory");
+  // temp now contains the previous value of *ptr
+  if (AtomicOps_Internalx86CPUFeatures.has_amd_lock_mb_bug) {
+    __asm__ __volatile__("lfence" : : : "memory");
+  }
+  return temp + increment;
+}
+
+inline void NoBarrier_Store(volatile Atomic64* ptr, Atomic64 value) {
+  *ptr = value;
+}
+
+inline void Acquire_Store(volatile Atomic64* ptr, Atomic64 value) {
+  *ptr = value;
+  MemoryBarrier();
+}
+
+inline void Release_Store(volatile Atomic64* ptr, Atomic64 value) {
+  ATOMICOPS_COMPILER_BARRIER();
+
+  *ptr = value;  // An x86 store acts as a release barrier
+                 // for current AMD/Intel chips as of Jan 2008.
+                 // See also Acquire_Load(), below.
+
+  // When new chips come out, check:
+  //  IA-32 Intel Architecture Software Developer's Manual, Volume 3:
+  //  System Programming Guide, Chatper 7: Multiple-processor management,
+  //  Section 7.2, Memory Ordering.
+  // Last seen at:
+  //   http://developer.intel.com/design/pentium4/manuals/index_new.htm
+  //
+  // x86 stores/loads fail to act as barriers for a few instructions (clflush
+  // maskmovdqu maskmovq movntdq movnti movntpd movntps movntq) but these are
+  // not generated by the compiler, and are rare.  Users of these instructions
+  // need to know about cache behaviour in any case since all of these involve
+  // either flushing cache lines or non-temporal cache hints.
+}
+
+inline Atomic64 NoBarrier_Load(volatile const Atomic64* ptr) {
+  return *ptr;
+}
+
+inline Atomic64 Acquire_Load(volatile const Atomic64* ptr) {
+  Atomic64 value = *ptr;  // An x86 load acts as a acquire barrier,
+                          // for current AMD/Intel chips as of Jan 2008.
+                          // See also Release_Store(), above.
+  ATOMICOPS_COMPILER_BARRIER();
+  return value;
+}
+
+inline Atomic64 Release_Load(volatile const Atomic64* ptr) {
+  MemoryBarrier();
+  return *ptr;
+}
+
+inline Atomic64 Acquire_CompareAndSwap(volatile Atomic64* ptr,
+                                       Atomic64 old_value,
+                                       Atomic64 new_value) {
+  Atomic64 x = NoBarrier_CompareAndSwap(ptr, old_value, new_value);
+  if (AtomicOps_Internalx86CPUFeatures.has_amd_lock_mb_bug) {
+    __asm__ __volatile__("lfence" : : : "memory");
+  }
+  return x;
+}
+
+inline Atomic64 Release_CompareAndSwap(volatile Atomic64* ptr,
+                                       Atomic64 old_value,
+                                       Atomic64 new_value) {
+  return NoBarrier_CompareAndSwap(ptr, old_value, new_value);
+}
+
+#endif  // defined(__x86_64__)
+
+}  // namespace base::subtle
+}  // namespace base
+
+#undef ATOMICOPS_COMPILER_BARRIER
+
+#endif  // CEF_INCLUDE_BASE_INTERNAL_CEF_ATOMICOPS_X86_GCC_H_
--- a/include/base/internal/cef_atomicops_x86_msvc.h
+++ b/include/base/internal/cef_atomicops_x86_msvc.h
@@ -0,0 +1,221 @@
+// Copyright (c) 2008 Google Inc. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//    * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//    * Neither the name of Google Inc. nor the name Chromium Embedded
+// Framework nor the names of its contributors may be used to endorse
+// or promote products derived from this software without specific prior
+// written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Do not include this header file directly. Use base/cef_atomicops.h
+// instead.
+
+#ifndef CEF_INCLUDE_BASE_INTERNAL_CEF_ATOMICOPS_X86_MSVC_H_
+#define CEF_INCLUDE_BASE_INTERNAL_CEF_ATOMICOPS_X86_MSVC_H_
+
+#include <windows.h>
+
+#include <intrin.h>
+
+#include "include/base/cef_macros.h"
+
+#if defined(ARCH_CPU_64_BITS)
+// windows.h #defines this (only on x64). This causes problems because the
+// public API also uses MemoryBarrier at the public name for this fence. So, on
+// X64, undef it, and call its documented
+// (http://msdn.microsoft.com/en-us/library/windows/desktop/ms684208.aspx)
+// implementation directly.
+#undef MemoryBarrier
+#endif
+
+namespace base {
+namespace subtle {
+
+inline Atomic32 NoBarrier_CompareAndSwap(volatile Atomic32* ptr,
+                                         Atomic32 old_value,
+                                         Atomic32 new_value) {
+  LONG result = _InterlockedCompareExchange(
+      reinterpret_cast<volatile LONG*>(ptr), static_cast<LONG>(new_value),
+      static_cast<LONG>(old_value));
+  return static_cast<Atomic32>(result);
+}
+
+inline Atomic32 NoBarrier_AtomicExchange(volatile Atomic32* ptr,
+                                         Atomic32 new_value) {
+  LONG result = _InterlockedExchange(reinterpret_cast<volatile LONG*>(ptr),
+                                     static_cast<LONG>(new_value));
+  return static_cast<Atomic32>(result);
+}
+
+inline Atomic32 Barrier_AtomicIncrement(volatile Atomic32* ptr,
+                                        Atomic32 increment) {
+  return _InterlockedExchangeAdd(reinterpret_cast<volatile LONG*>(ptr),
+                                 static_cast<LONG>(increment)) +
+         increment;
+}
+
+inline Atomic32 NoBarrier_AtomicIncrement(volatile Atomic32* ptr,
+                                          Atomic32 increment) {
+  return Barrier_AtomicIncrement(ptr, increment);
+}
+
+#if !(defined(_MSC_VER) && _MSC_VER >= 1400)
+#error "We require at least vs2005 for MemoryBarrier"
+#endif
+inline void MemoryBarrier() {
+#if defined(ARCH_CPU_64_BITS)
+  // See #undef and note at the top of this file.
+  __faststorefence();
+#else
+  // We use MemoryBarrier from WinNT.h
+  ::MemoryBarrier();
+#endif
+}
+
+inline Atomic32 Acquire_CompareAndSwap(volatile Atomic32* ptr,
+                                       Atomic32 old_value,
+                                       Atomic32 new_value) {
+  return NoBarrier_CompareAndSwap(ptr, old_value, new_value);
+}
+
+inline Atomic32 Release_CompareAndSwap(volatile Atomic32* ptr,
+                                       Atomic32 old_value,
+                                       Atomic32 new_value) {
+  return NoBarrier_CompareAndSwap(ptr, old_value, new_value);
+}
+
+inline void NoBarrier_Store(volatile Atomic32* ptr, Atomic32 value) {
+  *ptr = value;
+}
+
+inline void Acquire_Store(volatile Atomic32* ptr, Atomic32 value) {
+  NoBarrier_AtomicExchange(ptr, value);
+  // acts as a barrier in this implementation
+}
+
+inline void Release_Store(volatile Atomic32* ptr, Atomic32 value) {
+  *ptr = value;  // works w/o barrier for current Intel chips as of June 2005
+  // See comments in Atomic64 version of Release_Store() below.
+}
+
+inline Atomic32 NoBarrier_Load(volatile const Atomic32* ptr) {
+  return *ptr;
+}
+
+inline Atomic32 Acquire_Load(volatile const Atomic32* ptr) {
+  Atomic32 value = *ptr;
+  return value;
+}
+
+inline Atomic32 Release_Load(volatile const Atomic32* ptr) {
+  MemoryBarrier();
+  return *ptr;
+}
+
+#if defined(_WIN64)
+
+// 64-bit low-level operations on 64-bit platform.
+
+COMPILE_ASSERT(sizeof(Atomic64) == sizeof(PVOID), atomic_word_is_atomic);
+
+inline Atomic64 NoBarrier_CompareAndSwap(volatile Atomic64* ptr,
+                                         Atomic64 old_value,
+                                         Atomic64 new_value) {
+  PVOID result = InterlockedCompareExchangePointer(
+      reinterpret_cast<volatile PVOID*>(ptr),
+      reinterpret_cast<PVOID>(new_value), reinterpret_cast<PVOID>(old_value));
+  return reinterpret_cast<Atomic64>(result);
+}
+
+inline Atomic64 NoBarrier_AtomicExchange(volatile Atomic64* ptr,
+                                         Atomic64 new_value) {
+  PVOID result =
+      InterlockedExchangePointer(reinterpret_cast<volatile PVOID*>(ptr),
+                                 reinterpret_cast<PVOID>(new_value));
+  return reinterpret_cast<Atomic64>(result);
+}
+
+inline Atomic64 Barrier_AtomicIncrement(volatile Atomic64* ptr,
+                                        Atomic64 increment) {
+  return InterlockedExchangeAdd64(reinterpret_cast<volatile LONGLONG*>(ptr),
+                                  static_cast<LONGLONG>(increment)) +
+         increment;
+}
+
+inline Atomic64 NoBarrier_AtomicIncrement(volatile Atomic64* ptr,
+                                          Atomic64 increment) {
+  return Barrier_AtomicIncrement(ptr, increment);
+}
+
+inline void NoBarrier_Store(volatile Atomic64* ptr, Atomic64 value) {
+  *ptr = value;
+}
+
+inline void Acquire_Store(volatile Atomic64* ptr, Atomic64 value) {
+  NoBarrier_AtomicExchange(ptr, value);
+  // acts as a barrier in this implementation
+}
+
+inline void Release_Store(volatile Atomic64* ptr, Atomic64 value) {
+  *ptr = value;  // works w/o barrier for current Intel chips as of June 2005
+
+  // When new chips come out, check:
+  //  IA-32 Intel Architecture Software Developer's Manual, Volume 3:
+  //  System Programming Guide, Chatper 7: Multiple-processor management,
+  //  Section 7.2, Memory Ordering.
+  // Last seen at:
+  //   http://developer.intel.com/design/pentium4/manuals/index_new.htm
+}
+
+inline Atomic64 NoBarrier_Load(volatile const Atomic64* ptr) {
+  return *ptr;
+}
+
+inline Atomic64 Acquire_Load(volatile const Atomic64* ptr) {
+  Atomic64 value = *ptr;
+  return value;
+}
+
+inline Atomic64 Release_Load(volatile const Atomic64* ptr) {
+  MemoryBarrier();
+  return *ptr;
+}
+
+inline Atomic64 Acquire_CompareAndSwap(volatile Atomic64* ptr,
+                                       Atomic64 old_value,
+                                       Atomic64 new_value) {
+  return NoBarrier_CompareAndSwap(ptr, old_value, new_value);
+}
+
+inline Atomic64 Release_CompareAndSwap(volatile Atomic64* ptr,
+                                       Atomic64 old_value,
+                                       Atomic64 new_value) {
+  return NoBarrier_CompareAndSwap(ptr, old_value, new_value);
+}
+
+#endif  // defined(_WIN64)
+
+}  // namespace base::subtle
+}  // namespace base
+
+#endif  // CEF_INCLUDE_BASE_INTERNAL_CEF_ATOMICOPS_X86_MSVC_H_
--- a/include/base/internal/cef_bind_internal.h
+++ b/include/base/internal/cef_bind_internal.h
--- a/include/base/internal/cef_bind_internal_win.h
+++ b/include/base/internal/cef_bind_internal_win.h
@@ -0,0 +1,398 @@
+// Copyright (c) 2011 Google Inc. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//    * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//    * Neither the name of Google Inc. nor the name Chromium Embedded
+// Framework nor the names of its contributors may be used to endorse
+// or promote products derived from this software without specific prior
+// written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Do not include this header file directly. Use base/cef_bind.h instead.
+
+// Specializations of RunnableAdapter<> for Windows specific calling
+// conventions.  Please see base/bind_internal.h for more info.
+
+#ifndef CEF_INCLUDE_BASE_INTERNAL_CEF_BIND_INTERNAL_WIN_H_
+#define CEF_INCLUDE_BASE_INTERNAL_CEF_BIND_INTERNAL_WIN_H_
+
+// In the x64 architecture in Windows, __fastcall, __stdcall, etc, are all
+// the same as __cdecl which would turn the following specializations into
+// multiple definitions.
+#if defined(ARCH_CPU_X86_FAMILY)
+#if defined(ARCH_CPU_32_BITS)
+
+namespace base {
+namespace cef_internal {
+
+template <typename Functor>
+class RunnableAdapter;
+
+// __stdcall Function: Arity 0.
+template <typename R>
+class RunnableAdapter<R(__stdcall*)()> {
+ public:
+  typedef R(RunType)();
+
+  explicit RunnableAdapter(R(__stdcall* function)()) : function_(function) {}
+
+  R Run() { return function_(); }
+
+ private:
+  R(__stdcall* function_)();
+};
+
+// __fastcall Function: Arity 0.
+template <typename R>
+class RunnableAdapter<R(__fastcall*)()> {
+ public:
+  typedef R(RunType)();
+
+  explicit RunnableAdapter(R(__fastcall* function)()) : function_(function) {}
+
+  R Run() { return function_(); }
+
+ private:
+  R(__fastcall* function_)();
+};
+
+// __stdcall Function: Arity 1.
+template <typename R, typename A1>
+class RunnableAdapter<R(__stdcall*)(A1)> {
+ public:
+  typedef R(RunType)(A1);
+
+  explicit RunnableAdapter(R(__stdcall* function)(A1)) : function_(function) {}
+
+  R Run(typename CallbackParamTraits<A1>::ForwardType a1) {
+    return function_(a1);
+  }
+
+ private:
+  R(__stdcall* function_)(A1);
+};
+
+// __fastcall Function: Arity 1.
+template <typename R, typename A1>
+class RunnableAdapter<R(__fastcall*)(A1)> {
+ public:
+  typedef R(RunType)(A1);
+
+  explicit RunnableAdapter(R(__fastcall* function)(A1)) : function_(function) {}
+
+  R Run(typename CallbackParamTraits<A1>::ForwardType a1) {
+    return function_(a1);
+  }
+
+ private:
+  R(__fastcall* function_)(A1);
+};
+
+// __stdcall Function: Arity 2.
+template <typename R, typename A1, typename A2>
+class RunnableAdapter<R(__stdcall*)(A1, A2)> {
+ public:
+  typedef R(RunType)(A1, A2);
+
+  explicit RunnableAdapter(R(__stdcall* function)(A1, A2))
+      : function_(function) {}
+
+  R Run(typename CallbackParamTraits<A1>::ForwardType a1,
+        typename CallbackParamTraits<A2>::ForwardType a2) {
+    return function_(a1, a2);
+  }
+
+ private:
+  R(__stdcall* function_)(A1, A2);
+};
+
+// __fastcall Function: Arity 2.
+template <typename R, typename A1, typename A2>
+class RunnableAdapter<R(__fastcall*)(A1, A2)> {
+ public:
+  typedef R(RunType)(A1, A2);
+
+  explicit RunnableAdapter(R(__fastcall* function)(A1, A2))
+      : function_(function) {}
+
+  R Run(typename CallbackParamTraits<A1>::ForwardType a1,
+        typename CallbackParamTraits<A2>::ForwardType a2) {
+    return function_(a1, a2);
+  }
+
+ private:
+  R(__fastcall* function_)(A1, A2);
+};
+
+// __stdcall Function: Arity 3.
+template <typename R, typename A1, typename A2, typename A3>
+class RunnableAdapter<R(__stdcall*)(A1, A2, A3)> {
+ public:
+  typedef R(RunType)(A1, A2, A3);
+
+  explicit RunnableAdapter(R(__stdcall* function)(A1, A2, A3))
+      : function_(function) {}
+
+  R Run(typename CallbackParamTraits<A1>::ForwardType a1,
+        typename CallbackParamTraits<A2>::ForwardType a2,
+        typename CallbackParamTraits<A3>::ForwardType a3) {
+    return function_(a1, a2, a3);
+  }
+
+ private:
+  R(__stdcall* function_)(A1, A2, A3);
+};
+
+// __fastcall Function: Arity 3.
+template <typename R, typename A1, typename A2, typename A3>
+class RunnableAdapter<R(__fastcall*)(A1, A2, A3)> {
+ public:
+  typedef R(RunType)(A1, A2, A3);
+
+  explicit RunnableAdapter(R(__fastcall* function)(A1, A2, A3))
+      : function_(function) {}
+
+  R Run(typename CallbackParamTraits<A1>::ForwardType a1,
+        typename CallbackParamTraits<A2>::ForwardType a2,
+        typename CallbackParamTraits<A3>::ForwardType a3) {
+    return function_(a1, a2, a3);
+  }
+
+ private:
+  R(__fastcall* function_)(A1, A2, A3);
+};
+
+// __stdcall Function: Arity 4.
+template <typename R, typename A1, typename A2, typename A3, typename A4>
+class RunnableAdapter<R(__stdcall*)(A1, A2, A3, A4)> {
+ public:
+  typedef R(RunType)(A1, A2, A3, A4);
+
+  explicit RunnableAdapter(R(__stdcall* function)(A1, A2, A3, A4))
+      : function_(function) {}
+
+  R Run(typename CallbackParamTraits<A1>::ForwardType a1,
+        typename CallbackParamTraits<A2>::ForwardType a2,
+        typename CallbackParamTraits<A3>::ForwardType a3,
+        typename CallbackParamTraits<A4>::ForwardType a4) {
+    return function_(a1, a2, a3, a4);
+  }
+
+ private:
+  R(__stdcall* function_)(A1, A2, A3, A4);
+};
+
+// __fastcall Function: Arity 4.
+template <typename R, typename A1, typename A2, typename A3, typename A4>
+class RunnableAdapter<R(__fastcall*)(A1, A2, A3, A4)> {
+ public:
+  typedef R(RunType)(A1, A2, A3, A4);
+
+  explicit RunnableAdapter(R(__fastcall* function)(A1, A2, A3, A4))
+      : function_(function) {}
+
+  R Run(typename CallbackParamTraits<A1>::ForwardType a1,
+        typename CallbackParamTraits<A2>::ForwardType a2,
+        typename CallbackParamTraits<A3>::ForwardType a3,
+        typename CallbackParamTraits<A4>::ForwardType a4) {
+    return function_(a1, a2, a3, a4);
+  }
+
+ private:
+  R(__fastcall* function_)(A1, A2, A3, A4);
+};
+
+// __stdcall Function: Arity 5.
+template <typename R,
+          typename A1,
+          typename A2,
+          typename A3,
+          typename A4,
+          typename A5>
+class RunnableAdapter<R(__stdcall*)(A1, A2, A3, A4, A5)> {
+ public:
+  typedef R(RunType)(A1, A2, A3, A4, A5);
+
+  explicit RunnableAdapter(R(__stdcall* function)(A1, A2, A3, A4, A5))
+      : function_(function) {}
+
+  R Run(typename CallbackParamTraits<A1>::ForwardType a1,
+        typename CallbackParamTraits<A2>::ForwardType a2,
+        typename CallbackParamTraits<A3>::ForwardType a3,
+        typename CallbackParamTraits<A4>::ForwardType a4,
+        typename CallbackParamTraits<A5>::ForwardType a5) {
+    return function_(a1, a2, a3, a4, a5);
+  }
+
+ private:
+  R(__stdcall* function_)(A1, A2, A3, A4, A5);
+};
+
+// __fastcall Function: Arity 5.
+template <typename R,
+          typename A1,
+          typename A2,
+          typename A3,
+          typename A4,
+          typename A5>
+class RunnableAdapter<R(__fastcall*)(A1, A2, A3, A4, A5)> {
+ public:
+  typedef R(RunType)(A1, A2, A3, A4, A5);
+
+  explicit RunnableAdapter(R(__fastcall* function)(A1, A2, A3, A4, A5))
+      : function_(function) {}
+
+  R Run(typename CallbackParamTraits<A1>::ForwardType a1,
+        typename CallbackParamTraits<A2>::ForwardType a2,
+        typename CallbackParamTraits<A3>::ForwardType a3,
+        typename CallbackParamTraits<A4>::ForwardType a4,
+        typename CallbackParamTraits<A5>::ForwardType a5) {
+    return function_(a1, a2, a3, a4, a5);
+  }
+
+ private:
+  R(__fastcall* function_)(A1, A2, A3, A4, A5);
+};
+
+// __stdcall Function: Arity 6.
+template <typename R,
+          typename A1,
+          typename A2,
+          typename A3,
+          typename A4,
+          typename A5,
+          typename A6>
+class RunnableAdapter<R(__stdcall*)(A1, A2, A3, A4, A5, A6)> {
+ public:
+  typedef R(RunType)(A1, A2, A3, A4, A5, A6);
+
+  explicit RunnableAdapter(R(__stdcall* function)(A1, A2, A3, A4, A5, A6))
+      : function_(function) {}
+
+  R Run(typename CallbackParamTraits<A1>::ForwardType a1,
+        typename CallbackParamTraits<A2>::ForwardType a2,
+        typename CallbackParamTraits<A3>::ForwardType a3,
+        typename CallbackParamTraits<A4>::ForwardType a4,
+        typename CallbackParamTraits<A5>::ForwardType a5,
+        typename CallbackParamTraits<A6>::ForwardType a6) {
+    return function_(a1, a2, a3, a4, a5, a6);
+  }
+
+ private:
+  R(__stdcall* function_)(A1, A2, A3, A4, A5, A6);
+};
+
+// __fastcall Function: Arity 6.
+template <typename R,
+          typename A1,
+          typename A2,
+          typename A3,
+          typename A4,
+          typename A5,
+          typename A6>
+class RunnableAdapter<R(__fastcall*)(A1, A2, A3, A4, A5, A6)> {
+ public:
+  typedef R(RunType)(A1, A2, A3, A4, A5, A6);
+
+  explicit RunnableAdapter(R(__fastcall* function)(A1, A2, A3, A4, A5, A6))
+      : function_(function) {}
+
+  R Run(typename CallbackParamTraits<A1>::ForwardType a1,
+        typename CallbackParamTraits<A2>::ForwardType a2,
+        typename CallbackParamTraits<A3>::ForwardType a3,
+        typename CallbackParamTraits<A4>::ForwardType a4,
+        typename CallbackParamTraits<A5>::ForwardType a5,
+        typename CallbackParamTraits<A6>::ForwardType a6) {
+    return function_(a1, a2, a3, a4, a5, a6);
+  }
+
+ private:
+  R(__fastcall* function_)(A1, A2, A3, A4, A5, A6);
+};
+
+// __stdcall Function: Arity 7.
+template <typename R,
+          typename A1,
+          typename A2,
+          typename A3,
+          typename A4,
+          typename A5,
+          typename A6,
+          typename A7>
+class RunnableAdapter<R(__stdcall*)(A1, A2, A3, A4, A5, A6, A7)> {
+ public:
+  typedef R(RunType)(A1, A2, A3, A4, A5, A6, A7);
+
+  explicit RunnableAdapter(R(__stdcall* function)(A1, A2, A3, A4, A5, A6, A7))
+      : function_(function) {}
+
+  R Run(typename CallbackParamTraits<A1>::ForwardType a1,
+        typename CallbackParamTraits<A2>::ForwardType a2,
+        typename CallbackParamTraits<A3>::ForwardType a3,
+        typename CallbackParamTraits<A4>::ForwardType a4,
+        typename CallbackParamTraits<A5>::ForwardType a5,
+        typename CallbackParamTraits<A6>::ForwardType a6,
+        typename CallbackParamTraits<A7>::ForwardType a7) {
+    return function_(a1, a2, a3, a4, a5, a6, a7);
+  }
+
+ private:
+  R(__stdcall* function_)(A1, A2, A3, A4, A5, A6, A7);
+};
+
+// __fastcall Function: Arity 7.
+template <typename R,
+          typename A1,
+          typename A2,
+          typename A3,
+          typename A4,
+          typename A5,
+          typename A6,
+          typename A7>
+class RunnableAdapter<R(__fastcall*)(A1, A2, A3, A4, A5, A6, A7)> {
+ public:
+  typedef R(RunType)(A1, A2, A3, A4, A5, A6, A7);
+
+  explicit RunnableAdapter(R(__fastcall* function)(A1, A2, A3, A4, A5, A6, A7))
+      : function_(function) {}
+
+  R Run(typename CallbackParamTraits<A1>::ForwardType a1,
+        typename CallbackParamTraits<A2>::ForwardType a2,
+        typename CallbackParamTraits<A3>::ForwardType a3,
+        typename CallbackParamTraits<A4>::ForwardType a4,
+        typename CallbackParamTraits<A5>::ForwardType a5,
+        typename CallbackParamTraits<A6>::ForwardType a6,
+        typename CallbackParamTraits<A7>::ForwardType a7) {
+    return function_(a1, a2, a3, a4, a5, a6, a7);
+  }
+
+ private:
+  R(__fastcall* function_)(A1, A2, A3, A4, A5, A6, A7);
+};
+
+}  // namespace cef_internal
+}  // namespace base
+
+#endif  // defined(ARCH_CPU_32_BITS)
+#endif  // defined(ARCH_CPU_X86_FAMILY)
+
+#endif  // CEF_INCLUDE_BASE_INTERNAL_CEF_BIND_INTERNAL_WIN_H_
--- a/include/base/internal/cef_callback_internal.h
+++ b/include/base/internal/cef_callback_internal.h
@@ -36,156 +36,72 @@
 #ifndef CEF_INCLUDE_BASE_INTERNAL_CEF_CALLBACK_INTERNAL_H_
 #define CEF_INCLUDE_BASE_INTERNAL_CEF_CALLBACK_INTERNAL_H_

-#include "include/base/cef_callback_forward.h"
+#include <stddef.h>
+
+#include "include/base/cef_atomic_ref_count.h"
+#include "include/base/cef_macros.h"
 #include "include/base/cef_ref_counted.h"
-
-namespace base {
-
-struct FakeBindState;
-
-namespace internal {
-
-class BindStateBase;
-class FinallyExecutorCommon;
-class ThenAndCatchExecutorCommon;
-
-template <typename ReturnType>
-class PostTaskExecutor;
-
-template <typename Functor, typename... BoundArgs>
-struct BindState;
-
-class CallbackBase;
-class CallbackBaseCopyable;
-
-struct BindStateBaseRefCountTraits {
-  static void Destruct(const BindStateBase*);
-};
+#include "include/base/cef_scoped_ptr.h"
+#include "include/base/cef_template_util.h"

 template <typename T>
-using PassingType = std::conditional_t<std::is_scalar<T>::value, T, T&&>;
+class ScopedVector;

-// BindStateBase is used to provide an opaque handle that the Callback
-// class can use to represent a function object with bound arguments.  It
-// behaves as an existential type that is used by a corresponding
-// DoInvoke function to perform the function execution.  This allows
-// us to shield the Callback class from the types of the bound argument via
-// "type erasure."
-// At the base level, the only task is to add reference counting data. Avoid
-// using or inheriting any virtual functions. Creating a vtable for every
-// BindState template instantiation results in a lot of bloat. Its only task is
-// to call the destructor which can be done with a function pointer.
-class BindStateBase
-    : public RefCountedThreadSafe<BindStateBase, BindStateBaseRefCountTraits> {
- public:
-  REQUIRE_ADOPTION_FOR_REFCOUNTED_TYPE();
+namespace base {
+namespace cef_internal {
+class CallbackBase;

-  enum CancellationQueryMode {
-    IS_CANCELLED,
-    MAYBE_VALID,
-  };
-
-  using InvokeFuncStorage = void (*)();
-
-  BindStateBase(const BindStateBase&) = delete;
-  BindStateBase& operator=(const BindStateBase&) = delete;
+// At the base level, the only task is to add reference counting data. Don't use
+// RefCountedThreadSafe since it requires the destructor to be a virtual method.
+// Creating a vtable for every BindState template instantiation results in a lot
+// of bloat. Its only task is to call the destructor which can be done with a
+// function pointer.
+class BindStateBase {
+ protected:
+  explicit BindStateBase(void (*destructor)(BindStateBase*))
+      : ref_count_(0), destructor_(destructor) {}
+  ~BindStateBase() {}

 private:
-  BindStateBase(InvokeFuncStorage polymorphic_invoke,
-                void (*destructor)(const BindStateBase*));
-  BindStateBase(InvokeFuncStorage polymorphic_invoke,
-                void (*destructor)(const BindStateBase*),
-                bool (*query_cancellation_traits)(const BindStateBase*,
-                                                  CancellationQueryMode mode));
-
-  ~BindStateBase() = default;
-
-  friend struct BindStateBaseRefCountTraits;
-  friend class RefCountedThreadSafe<BindStateBase, BindStateBaseRefCountTraits>;
-
+  friend class scoped_refptr<BindStateBase>;
  friend class CallbackBase;
-  friend class CallbackBaseCopyable;

-  // Allowlist subclasses that access the destructor of BindStateBase.
-  template <typename Functor, typename... BoundArgs>
-  friend struct BindState;
-  friend struct ::base::FakeBindState;
+  void AddRef();
+  void Release();

-  bool IsCancelled() const {
-    return query_cancellation_traits_(this, IS_CANCELLED);
-  }
-
-  bool MaybeValid() const {
-    return query_cancellation_traits_(this, MAYBE_VALID);
-  }
-
-  // In C++, it is safe to cast function pointers to function pointers of
-  // another type. It is not okay to use void*. We create a InvokeFuncStorage
-  // that that can store our function pointer, and then cast it back to
-  // the original type on usage.
-  InvokeFuncStorage polymorphic_invoke_;
+  AtomicRefCount ref_count_;

  // Pointer to a function that will properly destroy |this|.
-  void (*destructor_)(const BindStateBase*);
-  bool (*query_cancellation_traits_)(const BindStateBase*,
-                                     CancellationQueryMode mode);
+  void (*destructor_)(BindStateBase*);
+
+  DISALLOW_COPY_AND_ASSIGN(BindStateBase);
 };

 // Holds the Callback methods that don't require specialization to reduce
 // template bloat.
-// CallbackBase<MoveOnly> is a direct base class of MoveOnly callbacks, and
-// CallbackBase<Copyable> uses CallbackBase<MoveOnly> for its implementation.
 class CallbackBase {
 public:
-  inline CallbackBase(CallbackBase&& c) noexcept;
-  CallbackBase& operator=(CallbackBase&& c) noexcept;
-
-  explicit CallbackBase(const CallbackBaseCopyable& c);
-  CallbackBase& operator=(const CallbackBaseCopyable& c);
-
-  explicit CallbackBase(CallbackBaseCopyable&& c) noexcept;
-  CallbackBase& operator=(CallbackBaseCopyable&& c) noexcept;
-
  // Returns true if Callback is null (doesn't refer to anything).
-  bool is_null() const { return !bind_state_; }
-  explicit operator bool() const { return !is_null(); }
-
-  // Returns true if the callback invocation will be nop due to an cancellation.
-  // It's invalid to call this on uninitialized callback.
-  //
-  // Must be called on the Callback's destination sequence.
-  bool IsCancelled() const;
-
-  // If this returns false, the callback invocation will be a nop due to a
-  // cancellation. This may(!) still return true, even on a cancelled callback.
-  //
-  // This function is thread-safe.
-  bool MaybeValid() const;
+  bool is_null() const { return bind_state_.get() == NULL; }

  // Returns the Callback into an uninitialized state.
  void Reset();

 protected:
-  friend class FinallyExecutorCommon;
-  friend class ThenAndCatchExecutorCommon;
-
-  template <typename ReturnType>
-  friend class PostTaskExecutor;
-
-  using InvokeFuncStorage = BindStateBase::InvokeFuncStorage;
+  // In C++, it is safe to cast function pointers to function pointers of
+  // another type. It is not okay to use void*. We create a InvokeFuncStorage
+  // that that can store our function pointer, and then cast it back to
+  // the original type on usage.
+  typedef void (*InvokeFuncStorage)(void);

  // Returns true if this callback equals |other|. |other| may be null.
-  bool EqualsInternal(const CallbackBase& other) const;
-
-  constexpr inline CallbackBase();
+  bool Equals(const CallbackBase& other) const;

  // Allow initializing of |bind_state_| via the constructor to avoid default
-  // initialization of the scoped_refptr.
-  explicit inline CallbackBase(BindStateBase* bind_state);
-
-  InvokeFuncStorage polymorphic_invoke() const {
-    return bind_state_->polymorphic_invoke_;
-  }
+  // initialization of the scoped_refptr.  We do not also initialize
+  // |polymorphic_invoke_| here because doing a normal assignment in the
+  // derived Callback templates makes for much nicer compiler errors.
+  explicit CallbackBase(BindStateBase* bind_state);

  // Force the destructor to be instantiated inside this translation unit so
  // that our subclasses will not get inlined versions.  Avoids more template
@@ -193,83 +109,116 @@ class CallbackBase {
  ~CallbackBase();

  scoped_refptr<BindStateBase> bind_state_;
+  InvokeFuncStorage polymorphic_invoke_;
 };

-constexpr CallbackBase::CallbackBase() = default;
-CallbackBase::CallbackBase(CallbackBase&&) noexcept = default;
-CallbackBase::CallbackBase(BindStateBase* bind_state)
-    : bind_state_(AdoptRef(bind_state)) {}
+// A helper template to determine if given type is non-const move-only-type,
+// i.e. if a value of the given type should be passed via .Pass() in a
+// destructive way.
+template <typename T>
+struct IsMoveOnlyType {
+  template <typename U>
+  static YesType Test(const typename U::MoveOnlyTypeForCPP03*);

-// CallbackBase<Copyable> is a direct base class of Copyable Callbacks.
-class CallbackBaseCopyable : public CallbackBase {
- public:
-  CallbackBaseCopyable(const CallbackBaseCopyable& c);
-  CallbackBaseCopyable(CallbackBaseCopyable&& c) noexcept = default;
-  CallbackBaseCopyable& operator=(const CallbackBaseCopyable& c);
-  CallbackBaseCopyable& operator=(CallbackBaseCopyable&& c) noexcept;
+  template <typename U>
+  static NoType Test(...);

- protected:
-  constexpr CallbackBaseCopyable() = default;
-  explicit CallbackBaseCopyable(BindStateBase* bind_state)
-      : CallbackBase(bind_state) {}
-  ~CallbackBaseCopyable() = default;
+  static const bool value =
+      sizeof(Test<T>(0)) == sizeof(YesType) && !is_const<T>::value;
 };

-// Helpers for the `Then()` implementation.
-template <typename OriginalCallback, typename ThenCallback>
-struct ThenHelper;
-
-// Specialization when original callback returns `void`.
-template <template <typename> class OriginalCallback,
-          template <typename>
-          class ThenCallback,
-          typename... OriginalArgs,
-          typename ThenR,
-          typename... ThenArgs>
-struct ThenHelper<OriginalCallback<void(OriginalArgs...)>,
-                  ThenCallback<ThenR(ThenArgs...)>> {
-  static_assert(sizeof...(ThenArgs) == 0,
-                "|then| callback cannot accept parameters if |this| has a "
-                "void return type.");
-
-  static auto CreateTrampoline() {
-    return [](OriginalCallback<void(OriginalArgs...)> c1,
-              ThenCallback<ThenR(ThenArgs...)> c2, OriginalArgs... c1_args) {
-      std::move(c1).Run(std::forward<OriginalArgs>(c1_args)...);
-      return std::move(c2).Run();
-    };
-  }
+// This is a typetraits object that's used to take an argument type, and
+// extract a suitable type for storing and forwarding arguments.
+//
+// In particular, it strips off references, and converts arrays to
+// pointers for storage; and it avoids accidentally trying to create a
+// "reference of a reference" if the argument is a reference type.
+//
+// This array type becomes an issue for storage because we are passing bound
+// parameters by const reference. In this case, we end up passing an actual
+// array type in the initializer list which C++ does not allow.  This will
+// break passing of C-string literals.
+template <typename T, bool is_move_only = IsMoveOnlyType<T>::value>
+struct CallbackParamTraits {
+  typedef const T& ForwardType;
+  typedef T StorageType;
 };

-// Specialization when original callback returns a non-void type.
-template <template <typename> class OriginalCallback,
-          template <typename>
-          class ThenCallback,
-          typename OriginalR,
-          typename... OriginalArgs,
-          typename ThenR,
-          typename... ThenArgs>
-struct ThenHelper<OriginalCallback<OriginalR(OriginalArgs...)>,
-                  ThenCallback<ThenR(ThenArgs...)>> {
-  static_assert(sizeof...(ThenArgs) == 1,
-                "|then| callback must accept exactly one parameter if |this| "
-                "has a non-void return type.");
-  // TODO(dcheng): This should probably check is_convertible as well (same with
-  // `AssertBindArgsValidity`).
-  static_assert(std::is_constructible<ThenArgs..., OriginalR&&>::value,
-                "|then| callback's parameter must be constructible from "
-                "return type of |this|.");
-
-  static auto CreateTrampoline() {
-    return [](OriginalCallback<OriginalR(OriginalArgs...)> c1,
-              ThenCallback<ThenR(ThenArgs...)> c2, OriginalArgs... c1_args) {
-      return std::move(c2).Run(
-          std::move(c1).Run(std::forward<OriginalArgs>(c1_args)...));
-    };
-  }
+// The Storage should almost be impossible to trigger unless someone manually
+// specifies type of the bind parameters.  However, in case they do,
+// this will guard against us accidentally storing a reference parameter.
+//
+// The ForwardType should only be used for unbound arguments.
+template <typename T>
+struct CallbackParamTraits<T&, false> {
+  typedef T& ForwardType;
+  typedef T StorageType;
 };

-}  // namespace internal
+// Note that for array types, we implicitly add a const in the conversion. This
+// means that it is not possible to bind array arguments to functions that take
+// a non-const pointer. Trying to specialize the template based on a "const
+// T[n]" does not seem to match correctly, so we are stuck with this
+// restriction.
+template <typename T, size_t n>
+struct CallbackParamTraits<T[n], false> {
+  typedef const T* ForwardType;
+  typedef const T* StorageType;
+};
+
+// See comment for CallbackParamTraits<T[n]>.
+template <typename T>
+struct CallbackParamTraits<T[], false> {
+  typedef const T* ForwardType;
+  typedef const T* StorageType;
+};
+
+// Parameter traits for movable-but-not-copyable scopers.
+//
+// Callback<>/Bind() understands movable-but-not-copyable semantics where
+// the type cannot be copied but can still have its state destructively
+// transferred (aka. moved) to another instance of the same type by calling a
+// helper function.  When used with Bind(), this signifies transferal of the
+// object's state to the target function.
+//
+// For these types, the ForwardType must not be a const reference, or a
+// reference.  A const reference is inappropriate, and would break const
+// correctness, because we are implementing a destructive move.  A non-const
+// reference cannot be used with temporaries which means the result of a
+// function or a cast would not be usable with Callback<> or Bind().
+template <typename T>
+struct CallbackParamTraits<T, true> {
+  typedef T ForwardType;
+  typedef T StorageType;
+};
+
+// CallbackForward() is a very limited simulation of C++11's std::forward()
+// used by the Callback/Bind system for a set of movable-but-not-copyable
+// types.  It is needed because forwarding a movable-but-not-copyable
+// argument to another function requires us to invoke the proper move
+// operator to create a rvalue version of the type.  The supported types are
+// whitelisted below as overloads of the CallbackForward() function. The
+// default template compiles out to be a no-op.
+//
+// In C++11, std::forward would replace all uses of this function.  However, it
+// is impossible to implement a general std::forward with C++11 due to a lack
+// of rvalue references.
+//
+// In addition to Callback/Bind, this is used by PostTaskAndReplyWithResult to
+// simulate std::forward() and forward the result of one Callback as a
+// parameter to another callback. This is to support Callbacks that return
+// the movable-but-not-copyable types whitelisted above.
+template <typename T>
+typename enable_if<!IsMoveOnlyType<T>::value, T>::type& CallbackForward(T& t) {
+  return t;
+}
+
+template <typename T>
+typename enable_if<IsMoveOnlyType<T>::value, T>::type CallbackForward(T& t) {
+  return t.Pass();
+}
+
+}  // namespace cef_internal
 }  // namespace base

 #endif  // CEF_INCLUDE_BASE_INTERNAL_CEF_CALLBACK_INTERNAL_H_
--- a/include/base/internal/cef_lock_impl.h
+++ b/include/base/internal/cef_lock_impl.h
@@ -40,6 +40,8 @@
 #include <pthread.h>
 #endif

+#include "include/base/cef_macros.h"
+
 namespace base {
 namespace cef_internal {

@@ -55,10 +57,6 @@ class LockImpl {
 #endif

  LockImpl();
-
-  LockImpl(const LockImpl&) = delete;
-  LockImpl& operator=(const LockImpl&) = delete;
-
  ~LockImpl();

  // If the lock is not held, take it and return true.  If the lock is already
@@ -79,6 +77,8 @@ class LockImpl {

 private:
  NativeHandle native_handle_;
+
+  DISALLOW_COPY_AND_ASSIGN(LockImpl);
 };

 }  // namespace cef_internal
--- a/include/base/internal/cef_raw_scoped_refptr_mismatch_checker.h
+++ b/include/base/internal/cef_raw_scoped_refptr_mismatch_checker.h
@@ -32,9 +32,10 @@
 #ifndef CEF_INCLUDE_BASE_INTERNAL_CEF_RAW_SCOPED_REFPTR_MISMATCH_CHECKER_H_
 #define CEF_INCLUDE_BASE_INTERNAL_CEF_RAW_SCOPED_REFPTR_MISMATCH_CHECKER_H_

-#include <type_traits>
-
+#include "include/base/cef_build.h"
+#include "include/base/cef_ref_counted.h"
 #include "include/base/cef_template_util.h"
+#include "include/base/cef_tuple.h"

 // It is dangerous to post a task with a T* argument where T is a subtype of
 // RefCounted(Base|ThreadSafeBase), since by the time the parameter is used, the
@@ -45,30 +46,135 @@

 namespace base {

-// This is a base internal implementation file used by task.h and callback.h.
-// Not for public consumption, so we wrap it in namespace internal.
-namespace internal {
-
-template <typename T, typename = void>
-struct IsRefCountedType : std::false_type {};
+namespace cef_internal {

 template <typename T>
-struct IsRefCountedType<T,
-                        void_t<decltype(std::declval<T*>()->AddRef()),
-                               decltype(std::declval<T*>()->Release())>>
-    : std::true_type {};
-
-// Human readable translation: you needed to be a scoped_refptr if you are a raw
-// pointer type and are convertible to a RefCounted(Base|ThreadSafeBase) type.
-template <typename T>
-struct NeedsScopedRefptrButGetsRawPtr
-    : conjunction<std::is_pointer<T>,
-                  IsRefCountedType<std::remove_pointer_t<T>>> {
-  static_assert(!std::is_reference<T>::value,
-                "NeedsScopedRefptrButGetsRawPtr requires non-reference type.");
+struct NeedsScopedRefptrButGetsRawPtr {
+#if defined(OS_WIN)
+  enum { value = base::false_type::value };
+#else
+  enum {
+    // Human readable translation: you needed to be a scoped_refptr if you are a
+    // raw pointer type and are convertible to a RefCounted(Base|ThreadSafeBase)
+    // type.
+    value = (is_pointer<T>::value &&
+             (is_convertible<T, subtle::RefCountedBase*>::value ||
+              is_convertible<T, subtle::RefCountedThreadSafeBase*>::value))
+  };
+#endif
 };

-}  // namespace internal
+template <typename Params>
+struct ParamsUseScopedRefptrCorrectly {
+  enum { value = 0 };
+};
+
+template <>
+struct ParamsUseScopedRefptrCorrectly<Tuple0> {
+  enum { value = 1 };
+};
+
+template <typename A>
+struct ParamsUseScopedRefptrCorrectly<Tuple1<A>> {
+  enum { value = !NeedsScopedRefptrButGetsRawPtr<A>::value };
+};
+
+template <typename A, typename B>
+struct ParamsUseScopedRefptrCorrectly<Tuple2<A, B>> {
+  enum {
+    value = !(NeedsScopedRefptrButGetsRawPtr<A>::value ||
+              NeedsScopedRefptrButGetsRawPtr<B>::value)
+  };
+};
+
+template <typename A, typename B, typename C>
+struct ParamsUseScopedRefptrCorrectly<Tuple3<A, B, C>> {
+  enum {
+    value = !(NeedsScopedRefptrButGetsRawPtr<A>::value ||
+              NeedsScopedRefptrButGetsRawPtr<B>::value ||
+              NeedsScopedRefptrButGetsRawPtr<C>::value)
+  };
+};
+
+template <typename A, typename B, typename C, typename D>
+struct ParamsUseScopedRefptrCorrectly<Tuple4<A, B, C, D>> {
+  enum {
+    value = !(NeedsScopedRefptrButGetsRawPtr<A>::value ||
+              NeedsScopedRefptrButGetsRawPtr<B>::value ||
+              NeedsScopedRefptrButGetsRawPtr<C>::value ||
+              NeedsScopedRefptrButGetsRawPtr<D>::value)
+  };
+};
+
+template <typename A, typename B, typename C, typename D, typename E>
+struct ParamsUseScopedRefptrCorrectly<Tuple5<A, B, C, D, E>> {
+  enum {
+    value = !(NeedsScopedRefptrButGetsRawPtr<A>::value ||
+              NeedsScopedRefptrButGetsRawPtr<B>::value ||
+              NeedsScopedRefptrButGetsRawPtr<C>::value ||
+              NeedsScopedRefptrButGetsRawPtr<D>::value ||
+              NeedsScopedRefptrButGetsRawPtr<E>::value)
+  };
+};
+
+template <typename A,
+          typename B,
+          typename C,
+          typename D,
+          typename E,
+          typename F>
+struct ParamsUseScopedRefptrCorrectly<Tuple6<A, B, C, D, E, F>> {
+  enum {
+    value = !(NeedsScopedRefptrButGetsRawPtr<A>::value ||
+              NeedsScopedRefptrButGetsRawPtr<B>::value ||
+              NeedsScopedRefptrButGetsRawPtr<C>::value ||
+              NeedsScopedRefptrButGetsRawPtr<D>::value ||
+              NeedsScopedRefptrButGetsRawPtr<E>::value ||
+              NeedsScopedRefptrButGetsRawPtr<F>::value)
+  };
+};
+
+template <typename A,
+          typename B,
+          typename C,
+          typename D,
+          typename E,
+          typename F,
+          typename G>
+struct ParamsUseScopedRefptrCorrectly<Tuple7<A, B, C, D, E, F, G>> {
+  enum {
+    value = !(NeedsScopedRefptrButGetsRawPtr<A>::value ||
+              NeedsScopedRefptrButGetsRawPtr<B>::value ||
+              NeedsScopedRefptrButGetsRawPtr<C>::value ||
+              NeedsScopedRefptrButGetsRawPtr<D>::value ||
+              NeedsScopedRefptrButGetsRawPtr<E>::value ||
+              NeedsScopedRefptrButGetsRawPtr<F>::value ||
+              NeedsScopedRefptrButGetsRawPtr<G>::value)
+  };
+};
+
+template <typename A,
+          typename B,
+          typename C,
+          typename D,
+          typename E,
+          typename F,
+          typename G,
+          typename H>
+struct ParamsUseScopedRefptrCorrectly<Tuple8<A, B, C, D, E, F, G, H>> {
+  enum {
+    value = !(NeedsScopedRefptrButGetsRawPtr<A>::value ||
+              NeedsScopedRefptrButGetsRawPtr<B>::value ||
+              NeedsScopedRefptrButGetsRawPtr<C>::value ||
+              NeedsScopedRefptrButGetsRawPtr<D>::value ||
+              NeedsScopedRefptrButGetsRawPtr<E>::value ||
+              NeedsScopedRefptrButGetsRawPtr<F>::value ||
+              NeedsScopedRefptrButGetsRawPtr<G>::value ||
+              NeedsScopedRefptrButGetsRawPtr<H>::value)
+  };
+};
+
+}  // namespace cef_internal

 }  // namespace base

--- a/include/base/internal/cef_scoped_block_mac.h
+++ b/include/base/internal/cef_scoped_block_mac.h
@@ -1,66 +0,0 @@
-// Copyright (c) 2013 Google Inc. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//    * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//    * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//    * Neither the name of Google Inc. nor the name Chromium Embedded
-// Framework nor the names of its contributors may be used to endorse
-// or promote products derived from this software without specific prior
-// written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Do not include this header file directly. Use base/mac/scoped_block.h
-// instead.
-
-#ifndef CEF_INCLUDE_BASE_INTERNAL_CEF_SCOPED_BLOCK_MAC_H_
-#define CEF_INCLUDE_BASE_INTERNAL_CEF_SCOPED_BLOCK_MAC_H_
-
-#include <Block.h>
-
-#include "include/base/cef_scoped_typeref_mac.h"
-
-#if defined(__has_feature) && __has_feature(objc_arc)
-#error "Cannot include include/base/internal/cef_scoped_block_mac.h in file built with ARC."
-#endif
-
-namespace base {
-namespace mac {
-
-namespace internal {
-
-template <typename B>
-struct ScopedBlockTraits {
-  static B InvalidValue() { return nullptr; }
-  static B Retain(B block) { return Block_copy(block); }
-  static void Release(B block) { Block_release(block); }
-};
-
-}  // namespace internal
-
-// ScopedBlock<> is patterned after ScopedCFTypeRef<>, but uses Block_copy() and
-// Block_release() instead of CFRetain() and CFRelease().
-template <typename B>
-using ScopedBlock = ScopedTypeRef<B, internal::ScopedBlockTraits<B>>;
-
-}  // namespace mac
-}  // namespace base
-
-#endif  // CEF_INCLUDE_BASE_INTERNAL_CEF_SCOPED_BLOCK_MAC_H_
--- a/include/base/internal/cef_scoped_policy.h
+++ b/include/base/internal/cef_scoped_policy.h
@@ -1,53 +0,0 @@
-// Copyright (c) 2012 Google Inc. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//    * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//    * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//    * Neither the name of Google Inc. nor the name Chromium Embedded
-// Framework nor the names of its contributors may be used to endorse
-// or promote products derived from this software without specific prior
-// written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Do not include this header file directly. Use base/memory/scoped_policy.h
-// instead.
-
-#ifndef CEF_INCLUDE_BASE_INTERNAL_CEF_SCOPED_POLICY_H_
-#define CEF_INCLUDE_BASE_INTERNAL_CEF_SCOPED_POLICY_H_
-
-namespace base {
-namespace scoped_policy {
-
-// Defines the ownership policy for a scoped object.
-enum OwnershipPolicy {
-  // The scoped object takes ownership of an object by taking over an existing
-  // ownership claim.
-  ASSUME,
-
-  // The scoped object will retain the object and any initial ownership is
-  // not changed.
-  RETAIN
-};
-
-}  // namespace scoped_policy
-}  // namespace base
-
-#endif  // CEF_INCLUDE_BASE_INTERNAL_CEF_SCOPED_POLICY_H_
--- a/include/capi/cef_accessibility_handler_capi.h
+++ b/include/capi/cef_accessibility_handler_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=6bdc0ce413420b45510fcc7f415c6a6fb05f0112$
+// $hash=c487e5fd787b1be8224a8981839e0cfdd0ed74f3$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_ACCESSIBILITY_HANDLER_CAPI_H_
@@ -47,27 +47,27 @@ extern "C" {
 #endif

 ///
-/// Implement this structure to receive accessibility notification when
-/// accessibility events have been registered. The functions of this structure
-/// will be called on the UI thread.
+// Implement this structure to receive accessibility notification when
+// accessibility events have been registered. The functions of this structure
+// will be called on the UI thread.
 ///
 typedef struct _cef_accessibility_handler_t {
  ///
-  /// Base structure.
+  // Base structure.
  ///
  cef_base_ref_counted_t base;

  ///
-  /// Called after renderer process sends accessibility tree changes to the
-  /// browser process.
+  // Called after renderer process sends accessibility tree changes to the
+  // browser process.
  ///
  void(CEF_CALLBACK* on_accessibility_tree_change)(
      struct _cef_accessibility_handler_t* self,
      struct _cef_value_t* value);

  ///
-  /// Called after renderer process sends accessibility location changes to the
-  /// browser process.
+  // Called after renderer process sends accessibility location changes to the
+  // browser process.
  ///
  void(CEF_CALLBACK* on_accessibility_location_change)(
      struct _cef_accessibility_handler_t* self,
--- a/include/capi/cef_app_capi.h
+++ b/include/capi/cef_app_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=7c6894aae3e508aaa42a376532328316d9bd509c$
+// $hash=a4b63e6e7942e3a3961b4f7141a963980178ae6f$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_APP_CAPI_H_
@@ -54,26 +54,25 @@ extern "C" {
 struct _cef_app_t;

 ///
-/// Implement this structure to provide handler implementations. Methods will be
-/// called by the process and/or thread indicated.
+// Implement this structure to provide handler implementations. Methods will be
+// called by the process and/or thread indicated.
 ///
 typedef struct _cef_app_t {
  ///
-  /// Base structure.
+  // Base structure.
  ///
  cef_base_ref_counted_t base;

  ///
-  /// Provides an opportunity to view and/or modify command-line arguments
-  /// before processing by CEF and Chromium. The |process_type| value will be
-  /// NULL for the browser process. Do not keep a reference to the
-  /// cef_command_line_t object passed to this function. The
-  /// cef_settings_t.command_line_args_disabled value can be used to start with
-  /// an NULL command-line object. Any values specified in CefSettings that
-  /// equate to command-line arguments will be set before this function is
-  /// called. Be cautious when using this function to modify command-line
-  /// arguments for non-browser processes as this may result in undefined
-  /// behavior including crashes.
+  // Provides an opportunity to view and/or modify command-line arguments before
+  // processing by CEF and Chromium. The |process_type| value will be NULL for
+  // the browser process. Do not keep a reference to the cef_command_line_t
+  // object passed to this function. The CefSettings.command_line_args_disabled
+  // value can be used to start with an NULL command-line object. Any values
+  // specified in CefSettings that equate to command-line arguments will be set
+  // before this function is called. Be cautious when using this function to
+  // modify command-line arguments for non-browser processes as this may result
+  // in undefined behavior including crashes.
  ///
  void(CEF_CALLBACK* on_before_command_line_processing)(
      struct _cef_app_t* self,
@@ -81,120 +80,119 @@ typedef struct _cef_app_t {
      struct _cef_command_line_t* command_line);

  ///
-  /// Provides an opportunity to register custom schemes. Do not keep a
-  /// reference to the |registrar| object. This function is called on the main
-  /// thread for each process and the registered schemes should be the same
-  /// across all processes.
+  // Provides an opportunity to register custom schemes. Do not keep a reference
+  // to the |registrar| object. This function is called on the main thread for
+  // each process and the registered schemes should be the same across all
+  // processes.
  ///
  void(CEF_CALLBACK* on_register_custom_schemes)(
      struct _cef_app_t* self,
      struct _cef_scheme_registrar_t* registrar);

  ///
-  /// Return the handler for resource bundle events. If
-  /// cef_settings_t.pack_loading_disabled is true (1) a handler must be
-  /// returned. If no handler is returned resources will be loaded from pack
-  /// files. This function is called by the browser and render processes on
-  /// multiple threads.
+  // Return the handler for resource bundle events. If
+  // CefSettings.pack_loading_disabled is true (1) a handler must be returned.
+  // If no handler is returned resources will be loaded from pack files. This
+  // function is called by the browser and render processes on multiple threads.
  ///
  struct _cef_resource_bundle_handler_t*(
      CEF_CALLBACK* get_resource_bundle_handler)(struct _cef_app_t* self);

  ///
-  /// Return the handler for functionality specific to the browser process. This
-  /// function is called on multiple threads in the browser process.
+  // Return the handler for functionality specific to the browser process. This
+  // function is called on multiple threads in the browser process.
  ///
  struct _cef_browser_process_handler_t*(
      CEF_CALLBACK* get_browser_process_handler)(struct _cef_app_t* self);

  ///
-  /// Return the handler for functionality specific to the render process. This
-  /// function is called on the render process main thread.
+  // Return the handler for functionality specific to the render process. This
+  // function is called on the render process main thread.
  ///
  struct _cef_render_process_handler_t*(
      CEF_CALLBACK* get_render_process_handler)(struct _cef_app_t* self);
 } cef_app_t;

 ///
-/// This function should be called from the application entry point function to
-/// execute a secondary process. It can be used to run secondary processes from
-/// the browser client executable (default behavior) or from a separate
-/// executable specified by the cef_settings_t.browser_subprocess_path value. If
-/// called for the browser process (identified by no "type" command-line value)
-/// it will return immediately with a value of -1. If called for a recognized
-/// secondary process it will block until the process should exit and then
-/// return the process exit code. The |application| parameter may be NULL. The
-/// |windows_sandbox_info| parameter is only used on Windows and may be NULL
-/// (see cef_sandbox_win.h for details).
+// This function should be called from the application entry point function to
+// execute a secondary process. It can be used to run secondary processes from
+// the browser client executable (default behavior) or from a separate
+// executable specified by the CefSettings.browser_subprocess_path value. If
+// called for the browser process (identified by no "type" command-line value)
+// it will return immediately with a value of -1. If called for a recognized
+// secondary process it will block until the process should exit and then return
+// the process exit code. The |application| parameter may be NULL. The
+// |windows_sandbox_info| parameter is only used on Windows and may be NULL (see
+// cef_sandbox_win.h for details).
 ///
-CEF_EXPORT int cef_execute_process(const cef_main_args_t* args,
+CEF_EXPORT int cef_execute_process(const struct _cef_main_args_t* args,
                                   cef_app_t* application,
                                   void* windows_sandbox_info);

 ///
-/// This function should be called on the main application thread to initialize
-/// the CEF browser process. The |application| parameter may be NULL. A return
-/// value of true (1) indicates that it succeeded and false (0) indicates that
-/// it failed. The |windows_sandbox_info| parameter is only used on Windows and
-/// may be NULL (see cef_sandbox_win.h for details).
+// This function should be called on the main application thread to initialize
+// the CEF browser process. The |application| parameter may be NULL. A return
+// value of true (1) indicates that it succeeded and false (0) indicates that it
+// failed. The |windows_sandbox_info| parameter is only used on Windows and may
+// be NULL (see cef_sandbox_win.h for details).
 ///
-CEF_EXPORT int cef_initialize(const cef_main_args_t* args,
+CEF_EXPORT int cef_initialize(const struct _cef_main_args_t* args,
                              const struct _cef_settings_t* settings,
                              cef_app_t* application,
                              void* windows_sandbox_info);

 ///
-/// This function should be called on the main application thread to shut down
-/// the CEF browser process before the application exits.
+// This function should be called on the main application thread to shut down
+// the CEF browser process before the application exits.
 ///
-CEF_EXPORT void cef_shutdown(void);
+CEF_EXPORT void cef_shutdown();

 ///
-/// Perform a single iteration of CEF message loop processing. This function is
-/// provided for cases where the CEF message loop must be integrated into an
-/// existing application message loop. Use of this function is not recommended
-/// for most users; use either the cef_run_message_loop() function or
-/// cef_settings_t.multi_threaded_message_loop if possible. When using this
-/// function care must be taken to balance performance against excessive CPU
-/// usage. It is recommended to enable the cef_settings_t.external_message_pump
-/// option when using this function so that
-/// cef_browser_process_handler_t::on_schedule_message_pump_work() callbacks can
-/// facilitate the scheduling process. This function should only be called on
-/// the main application thread and only if cef_initialize() is called with a
-/// cef_settings_t.multi_threaded_message_loop value of false (0). This function
-/// will not block.
+// Perform a single iteration of CEF message loop processing. This function is
+// provided for cases where the CEF message loop must be integrated into an
+// existing application message loop. Use of this function is not recommended
+// for most users; use either the cef_run_message_loop() function or
+// CefSettings.multi_threaded_message_loop if possible. When using this function
+// care must be taken to balance performance against excessive CPU usage. It is
+// recommended to enable the CefSettings.external_message_pump option when using
+// this function so that
+// cef_browser_process_handler_t::on_schedule_message_pump_work() callbacks can
+// facilitate the scheduling process. This function should only be called on the
+// main application thread and only if cef_initialize() is called with a
+// CefSettings.multi_threaded_message_loop value of false (0). This function
+// will not block.
 ///
-CEF_EXPORT void cef_do_message_loop_work(void);
+CEF_EXPORT void cef_do_message_loop_work();

 ///
-/// Run the CEF message loop. Use this function instead of an application-
-/// provided message loop to get the best balance between performance and CPU
-/// usage. This function should only be called on the main application thread
-/// and only if cef_initialize() is called with a
-/// cef_settings_t.multi_threaded_message_loop value of false (0). This function
-/// will block until a quit message is received by the system.
+// Run the CEF message loop. Use this function instead of an application-
+// provided message loop to get the best balance between performance and CPU
+// usage. This function should only be called on the main application thread and
+// only if cef_initialize() is called with a
+// CefSettings.multi_threaded_message_loop value of false (0). This function
+// will block until a quit message is received by the system.
 ///
-CEF_EXPORT void cef_run_message_loop(void);
+CEF_EXPORT void cef_run_message_loop();

 ///
-/// Quit the CEF message loop that was started by calling
-/// cef_run_message_loop(). This function should only be called on the main
-/// application thread and only if cef_run_message_loop() was used.
+// Quit the CEF message loop that was started by calling cef_run_message_loop().
+// This function should only be called on the main application thread and only
+// if cef_run_message_loop() was used.
 ///
-CEF_EXPORT void cef_quit_message_loop(void);
+CEF_EXPORT void cef_quit_message_loop();

 ///
-/// Set to true (1) before calling Windows APIs like TrackPopupMenu that enter a
-/// modal message loop. Set to false (0) after exiting the modal message loop.
+// Set to true (1) before calling Windows APIs like TrackPopupMenu that enter a
+// modal message loop. Set to false (0) after exiting the modal message loop.
 ///
 CEF_EXPORT void cef_set_osmodal_loop(int osModalLoop);

 ///
-/// Call during process startup to enable High-DPI support on Windows 7 or
-/// newer. Older versions of Windows should be left DPI-unaware because they do
-/// not support DirectWrite and GDI fonts are kerned very badly.
+// Call during process startup to enable High-DPI support on Windows 7 or newer.
+// Older versions of Windows should be left DPI-unaware because they do not
+// support DirectWrite and GDI fonts are kerned very badly.
 ///
-CEF_EXPORT void cef_enable_highdpi_support(void);
+CEF_EXPORT void cef_enable_highdpi_support();

 #ifdef __cplusplus
 }
--- a/include/capi/cef_audio_handler_capi.h
+++ b/include/capi/cef_audio_handler_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=4e243df31e29bc6e473d56e371ed6328d948959c$
+// $hash=7a483ed552ecca4f1aaa03800d366beca1ea2dee$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_AUDIO_HANDLER_CAPI_H_
@@ -48,30 +48,30 @@ extern "C" {
 #endif

 ///
-/// Implement this structure to handle audio events.
+// Implement this structure to handle audio events.
 ///
 typedef struct _cef_audio_handler_t {
  ///
-  /// Base structure.
+  // Base structure.
  ///
  cef_base_ref_counted_t base;

  ///
-  /// Called on the UI thread to allow configuration of audio stream parameters.
-  /// Return true (1) to proceed with audio stream capture, or false (0) to
-  /// cancel it. All members of |params| can optionally be configured here, but
-  /// they are also pre-filled with some sensible defaults.
+  // Called on the UI thread to allow configuration of audio stream parameters.
+  // Return true (1) to proceed with audio stream capture, or false (0) to
+  // cancel it. All members of |params| can optionally be configured here, but
+  // they are also pre-filled with some sensible defaults.
  ///
  int(CEF_CALLBACK* get_audio_parameters)(struct _cef_audio_handler_t* self,
                                          struct _cef_browser_t* browser,
                                          cef_audio_parameters_t* params);

  ///
-  /// Called on a browser audio capture thread when the browser starts streaming
-  /// audio. OnAudioStreamStopped will always be called after
-  /// OnAudioStreamStarted; both functions may be called multiple times for the
-  /// same browser. |params| contains the audio parameters like sample rate and
-  /// channel layout. |channels| is the number of channels.
+  // Called on a browser audio capture thread when the browser starts streaming
+  // audio. OnAudioSteamStopped will always be called after
+  // OnAudioStreamStarted; both functions may be called multiple times for the
+  // same browser. |params| contains the audio parameters like sample rate and
+  // channel layout. |channels| is the number of channels.
  ///
  void(CEF_CALLBACK* on_audio_stream_started)(
      struct _cef_audio_handler_t* self,
@@ -80,14 +80,14 @@ typedef struct _cef_audio_handler_t {
      int channels);

  ///
-  /// Called on the audio stream thread when a PCM packet is received for the
-  /// stream. |data| is an array representing the raw PCM data as a floating
-  /// point type, i.e. 4-byte value(s). |frames| is the number of frames in the
-  /// PCM packet. |pts| is the presentation timestamp (in milliseconds since the
-  /// Unix Epoch) and represents the time at which the decompressed packet
-  /// should be presented to the user. Based on |frames| and the
-  /// |channel_layout| value passed to OnAudioStreamStarted you can calculate
-  /// the size of the |data| array in bytes.
+  // Called on the audio stream thread when a PCM packet is received for the
+  // stream. |data| is an array representing the raw PCM data as a floating
+  // point type, i.e. 4-byte value(s). |frames| is the number of frames in the
+  // PCM packet. |pts| is the presentation timestamp (in milliseconds since the
+  // Unix Epoch) and represents the time at which the decompressed packet should
+  // be presented to the user. Based on |frames| and the |channel_layout| value
+  // passed to OnAudioStreamStarted you can calculate the size of the |data|
+  // array in bytes.
  ///
  void(CEF_CALLBACK* on_audio_stream_packet)(struct _cef_audio_handler_t* self,
                                             struct _cef_browser_t* browser,
@@ -96,18 +96,18 @@ typedef struct _cef_audio_handler_t {
                                             int64 pts);

  ///
-  /// Called on the UI thread when the stream has stopped. OnAudioSteamStopped
-  /// will always be called after OnAudioStreamStarted; both functions may be
-  /// called multiple times for the same stream.
+  // Called on the UI thread when the stream has stopped. OnAudioSteamStopped
+  // will always be called after OnAudioStreamStarted; both functions may be
+  // called multiple times for the same stream.
  ///
  void(CEF_CALLBACK* on_audio_stream_stopped)(struct _cef_audio_handler_t* self,
                                              struct _cef_browser_t* browser);

  ///
-  /// Called on the UI or audio stream thread when an error occurred. During the
-  /// stream creation phase this callback will be called on the UI thread while
-  /// in the capturing phase it will be called on the audio stream thread. The
-  /// stream will be stopped immediately.
+  // Called on the UI or audio stream thread when an error occurred. During the
+  // stream creation phase this callback will be called on the UI thread while
+  // in the capturing phase it will be called on the audio stream thread. The
+  // stream will be stopped immediately.
  ///
  void(CEF_CALLBACK* on_audio_stream_error)(struct _cef_audio_handler_t* self,
                                            struct _cef_browser_t* browser,
--- a/include/capi/cef_auth_callback_capi.h
+++ b/include/capi/cef_auth_callback_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=c0704c0a87e8b57b20887be75700a30e887fee4f$
+// $hash=2b9508a328ed0218e2c576af455f8d76e5978545$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_AUTH_CALLBACK_CAPI_H_
@@ -47,24 +47,24 @@ extern "C" {
 #endif

 ///
-/// Callback structure used for asynchronous continuation of authentication
-/// requests.
+// Callback structure used for asynchronous continuation of authentication
+// requests.
 ///
 typedef struct _cef_auth_callback_t {
  ///
-  /// Base structure.
+  // Base structure.
  ///
  cef_base_ref_counted_t base;

  ///
-  /// Continue the authentication request.
+  // Continue the authentication request.
  ///
  void(CEF_CALLBACK* cont)(struct _cef_auth_callback_t* self,
                           const cef_string_t* username,
                           const cef_string_t* password);

  ///
-  /// Cancel the authentication request.
+  // Cancel the authentication request.
  ///
  void(CEF_CALLBACK* cancel)(struct _cef_auth_callback_t* self);
 } cef_auth_callback_t;
--- a/include/capi/cef_browser_capi.h
+++ b/include/capi/cef_browser_capi.h
--- a/include/capi/cef_browser_process_handler_capi.h
+++ b/include/capi/cef_browser_process_handler_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=c4ed4278e513daa2a1ccf42e50e242d61dfbb86f$
+// $hash=ade537f836add7fe0b5fd94ceba26d678abb3e43$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_BROWSER_PROCESS_HANDLER_CAPI_H_
@@ -50,57 +50,57 @@ extern "C" {
 #endif

 ///
-/// Structure used to implement browser process callbacks. The functions of this
-/// structure will be called on the browser process main thread unless otherwise
-/// indicated.
+// Structure used to implement browser process callbacks. The functions of this
+// structure will be called on the browser process main thread unless otherwise
+// indicated.
 ///
 typedef struct _cef_browser_process_handler_t {
  ///
-  /// Base structure.
+  // Base structure.
  ///
  cef_base_ref_counted_t base;

  ///
-  /// Called on the browser process UI thread immediately after the CEF context
-  /// has been initialized.
+  // Called on the browser process UI thread immediately after the CEF context
+  // has been initialized.
  ///
  void(CEF_CALLBACK* on_context_initialized)(
      struct _cef_browser_process_handler_t* self);

  ///
-  /// Called before a child process is launched. Will be called on the browser
-  /// process UI thread when launching a render process and on the browser
-  /// process IO thread when launching a GPU process. Provides an opportunity to
-  /// modify the child process command line. Do not keep a reference to
-  /// |command_line| outside of this function.
+  // Called before a child process is launched. Will be called on the browser
+  // process UI thread when launching a render process and on the browser
+  // process IO thread when launching a GPU or plugin process. Provides an
+  // opportunity to modify the child process command line. Do not keep a
+  // reference to |command_line| outside of this function.
  ///
  void(CEF_CALLBACK* on_before_child_process_launch)(
      struct _cef_browser_process_handler_t* self,
      struct _cef_command_line_t* command_line);

  ///
-  /// Called from any thread when work has been scheduled for the browser
-  /// process main (UI) thread. This callback is used in combination with
-  /// cef_settings_t.external_message_pump and cef_do_message_loop_work() in
-  /// cases where the CEF message loop must be integrated into an existing
-  /// application message loop (see additional comments and warnings on
-  /// CefDoMessageLoopWork). This callback should schedule a
-  /// cef_do_message_loop_work() call to happen on the main (UI) thread.
-  /// |delay_ms| is the requested delay in milliseconds. If |delay_ms| is <= 0
-  /// then the call should happen reasonably soon. If |delay_ms| is > 0 then the
-  /// call should be scheduled to happen after the specified delay and any
-  /// currently pending scheduled call should be cancelled.
+  // Called from any thread when work has been scheduled for the browser process
+  // main (UI) thread. This callback is used in combination with CefSettings.
+  // external_message_pump and cef_do_message_loop_work() in cases where the CEF
+  // message loop must be integrated into an existing application message loop
+  // (see additional comments and warnings on CefDoMessageLoopWork). This
+  // callback should schedule a cef_do_message_loop_work() call to happen on the
+  // main (UI) thread. |delay_ms| is the requested delay in milliseconds. If
+  // |delay_ms| is <= 0 then the call should happen reasonably soon. If
+  // |delay_ms| is > 0 then the call should be scheduled to happen after the
+  // specified delay and any currently pending scheduled call should be
+  // cancelled.
  ///
  void(CEF_CALLBACK* on_schedule_message_pump_work)(
      struct _cef_browser_process_handler_t* self,
      int64 delay_ms);

  ///
-  /// Return the default client for use with a newly created browser window. If
-  /// null is returned the browser will be unmanaged (no callbacks will be
-  /// executed for that browser) and application shutdown will be blocked until
-  /// the browser window is closed manually. This function is currently only
-  /// used with the chrome runtime.
+  // Return the default client for use with a newly created browser window. If
+  // null is returned the browser will be unmanaged (no callbacks will be
+  // executed for that browser) and application shutdown will be blocked until
+  // the browser window is closed manually. This function is currently only used
+  // with the chrome runtime.
  ///
  struct _cef_client_t*(CEF_CALLBACK* get_default_client)(
      struct _cef_browser_process_handler_t* self);
--- a/include/capi/cef_callback_capi.h
+++ b/include/capi/cef_callback_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=1bb026d01d1d4bb38ceb4c54f6bcf70300bf5201$
+// $hash=cd8c183355a6808abd763ecc0396b5da6c15b3f9$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_CALLBACK_CAPI_H_
@@ -47,36 +47,36 @@ extern "C" {
 #endif

 ///
-/// Generic callback structure used for asynchronous continuation.
+// Generic callback structure used for asynchronous continuation.
 ///
 typedef struct _cef_callback_t {
  ///
-  /// Base structure.
+  // Base structure.
  ///
  cef_base_ref_counted_t base;

  ///
-  /// Continue processing.
+  // Continue processing.
  ///
  void(CEF_CALLBACK* cont)(struct _cef_callback_t* self);

  ///
-  /// Cancel processing.
+  // Cancel processing.
  ///
  void(CEF_CALLBACK* cancel)(struct _cef_callback_t* self);
 } cef_callback_t;

 ///
-/// Generic callback structure used for asynchronous completion.
+// Generic callback structure used for asynchronous completion.
 ///
 typedef struct _cef_completion_callback_t {
  ///
-  /// Base structure.
+  // Base structure.
  ///
  cef_base_ref_counted_t base;

  ///
-  /// Method that will be called once the task is complete.
+  // Method that will be called once the task is complete.
  ///
  void(CEF_CALLBACK* on_complete)(struct _cef_completion_callback_t* self);
 } cef_completion_callback_t;
--- a/include/capi/cef_client_capi.h
+++ b/include/capi/cef_client_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=93f1c39c102dc97d6ad8d236a90a2e0e88f10fb7$
+// $hash=845a1d1dda63a06f4ae33ed39acfd2599b46a885$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_CLIENT_CAPI_H_
@@ -42,7 +42,6 @@

 #include "include/capi/cef_audio_handler_capi.h"
 #include "include/capi/cef_base_capi.h"
-#include "include/capi/cef_command_handler_capi.h"
 #include "include/capi/cef_context_menu_handler_capi.h"
 #include "include/capi/cef_dialog_handler_capi.h"
 #include "include/capi/cef_display_handler_capi.h"
@@ -55,7 +54,6 @@
 #include "include/capi/cef_keyboard_handler_capi.h"
 #include "include/capi/cef_life_span_handler_capi.h"
 #include "include/capi/cef_load_handler_capi.h"
-#include "include/capi/cef_permission_handler_capi.h"
 #include "include/capi/cef_print_handler_capi.h"
 #include "include/capi/cef_process_message_capi.h"
 #include "include/capi/cef_render_handler_capi.h"
@@ -66,134 +64,121 @@ extern "C" {
 #endif

 ///
-/// Implement this structure to provide handler implementations.
+// Implement this structure to provide handler implementations.
 ///
 typedef struct _cef_client_t {
  ///
-  /// Base structure.
+  // Base structure.
  ///
  cef_base_ref_counted_t base;

  ///
-  /// Return the handler for audio rendering events.
+  // Return the handler for audio rendering events.
  ///
  struct _cef_audio_handler_t*(CEF_CALLBACK* get_audio_handler)(
      struct _cef_client_t* self);

  ///
-  /// Return the handler for commands. If no handler is provided the default
-  /// implementation will be used.
-  ///
-  struct _cef_command_handler_t*(CEF_CALLBACK* get_command_handler)(
-      struct _cef_client_t* self);
-
-  ///
-  /// Return the handler for context menus. If no handler is provided the
-  /// default implementation will be used.
+  // Return the handler for context menus. If no handler is provided the default
+  // implementation will be used.
  ///
  struct _cef_context_menu_handler_t*(CEF_CALLBACK* get_context_menu_handler)(
      struct _cef_client_t* self);

  ///
-  /// Return the handler for dialogs. If no handler is provided the default
-  /// implementation will be used.
+  // Return the handler for dialogs. If no handler is provided the default
+  // implementation will be used.
  ///
  struct _cef_dialog_handler_t*(CEF_CALLBACK* get_dialog_handler)(
      struct _cef_client_t* self);

  ///
-  /// Return the handler for browser display state events.
+  // Return the handler for browser display state events.
  ///
  struct _cef_display_handler_t*(CEF_CALLBACK* get_display_handler)(
      struct _cef_client_t* self);

  ///
-  /// Return the handler for download events. If no handler is returned
-  /// downloads will not be allowed.
+  // Return the handler for download events. If no handler is returned downloads
+  // will not be allowed.
  ///
  struct _cef_download_handler_t*(CEF_CALLBACK* get_download_handler)(
      struct _cef_client_t* self);

  ///
-  /// Return the handler for drag events.
+  // Return the handler for drag events.
  ///
  struct _cef_drag_handler_t*(CEF_CALLBACK* get_drag_handler)(
      struct _cef_client_t* self);

  ///
-  /// Return the handler for find result events.
+  // Return the handler for find result events.
  ///
  struct _cef_find_handler_t*(CEF_CALLBACK* get_find_handler)(
      struct _cef_client_t* self);

  ///
-  /// Return the handler for focus events.
+  // Return the handler for focus events.
  ///
  struct _cef_focus_handler_t*(CEF_CALLBACK* get_focus_handler)(
      struct _cef_client_t* self);

  ///
-  /// Return the handler for events related to cef_frame_t lifespan. This
-  /// function will be called once during cef_browser_t creation and the result
-  /// will be cached for performance reasons.
+  // Return the handler for events related to cef_frame_t lifespan. This
+  // function will be called once during cef_browser_t creation and the result
+  // will be cached for performance reasons.
  ///
  struct _cef_frame_handler_t*(CEF_CALLBACK* get_frame_handler)(
      struct _cef_client_t* self);

  ///
-  /// Return the handler for permission requests.
-  ///
-  struct _cef_permission_handler_t*(CEF_CALLBACK* get_permission_handler)(
-      struct _cef_client_t* self);
-
-  ///
-  /// Return the handler for JavaScript dialogs. If no handler is provided the
-  /// default implementation will be used.
+  // Return the handler for JavaScript dialogs. If no handler is provided the
+  // default implementation will be used.
  ///
  struct _cef_jsdialog_handler_t*(CEF_CALLBACK* get_jsdialog_handler)(
      struct _cef_client_t* self);

  ///
-  /// Return the handler for keyboard events.
+  // Return the handler for keyboard events.
  ///
  struct _cef_keyboard_handler_t*(CEF_CALLBACK* get_keyboard_handler)(
      struct _cef_client_t* self);

  ///
-  /// Return the handler for browser life span events.
+  // Return the handler for browser life span events.
  ///
  struct _cef_life_span_handler_t*(CEF_CALLBACK* get_life_span_handler)(
      struct _cef_client_t* self);

  ///
-  /// Return the handler for browser load status events.
+  // Return the handler for browser load status events.
  ///
  struct _cef_load_handler_t*(CEF_CALLBACK* get_load_handler)(
      struct _cef_client_t* self);

  ///
-  /// Return the handler for printing on Linux. If a print handler is not
-  /// provided then printing will not be supported on the Linux platform.
+  // Return the handler for printing on Linux. If a print handler is not
+  // provided then printing will not be supported on the Linux platform.
  ///
  struct _cef_print_handler_t*(CEF_CALLBACK* get_print_handler)(
      struct _cef_client_t* self);

  ///
-  /// Return the handler for off-screen rendering events.
+  // Return the handler for off-screen rendering events.
  ///
  struct _cef_render_handler_t*(CEF_CALLBACK* get_render_handler)(
      struct _cef_client_t* self);

  ///
-  /// Return the handler for browser request events.
+  // Return the handler for browser request events.
  ///
  struct _cef_request_handler_t*(CEF_CALLBACK* get_request_handler)(
      struct _cef_client_t* self);

  ///
-  /// Called when a new message is received from a different process. Return
-  /// true (1) if the message was handled or false (0) otherwise.  It is safe to
-  /// keep a reference to |message| outside of this callback.
+  // Called when a new message is received from a different process. Return true
+  // (1) if the message was handled or false (0) otherwise.  It is safe to keep
+  // a reference to |message| outside of this callback.
  ///
  int(CEF_CALLBACK* on_process_message_received)(
      struct _cef_client_t* self,
--- a/include/capi/cef_command_handler_capi.h
+++ b/include/capi/cef_command_handler_capi.h
@@ -1,80 +0,0 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//    * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//    * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//    * Neither the name of Google Inc. nor the name Chromium Embedded
-// Framework nor the names of its contributors may be used to endorse
-// or promote products derived from this software without specific prior
-// written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// ---------------------------------------------------------------------------
-//
-// This file was generated by the CEF translator tool and should not edited
-// by hand. See the translator.README.txt file in the tools directory for
-// more information.
-//
-// $hash=ec05ae57537091e3543c4b31d72d2d84d44df876$
-//
-
-#ifndef CEF_INCLUDE_CAPI_CEF_COMMAND_HANDLER_CAPI_H_
-#define CEF_INCLUDE_CAPI_CEF_COMMAND_HANDLER_CAPI_H_
-#pragma once
-
-#include "include/capi/cef_base_capi.h"
-#include "include/capi/cef_browser_capi.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-///
-/// Implement this structure to handle events related to commands. The functions
-/// of this structure will be called on the UI thread.
-///
-typedef struct _cef_command_handler_t {
-  ///
-  /// Base structure.
-  ///
-  cef_base_ref_counted_t base;
-
-  ///
-  /// Called to execute a Chrome command triggered via menu selection or
-  /// keyboard shortcut. Values for |command_id| can be found in the
-  /// cef_command_ids.h file. |disposition| provides information about the
-  /// intended command target. Return true (1) if the command was handled or
-  /// false (0) for the default implementation. For context menu commands this
-  /// will be called after cef_context_menu_handler_t::OnContextMenuCommand.
-  /// Only used with the Chrome runtime.
-  ///
-  int(CEF_CALLBACK* on_chrome_command)(
-      struct _cef_command_handler_t* self,
-      struct _cef_browser_t* browser,
-      int command_id,
-      cef_window_open_disposition_t disposition);
-} cef_command_handler_t;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // CEF_INCLUDE_CAPI_CEF_COMMAND_HANDLER_CAPI_H_
--- a/include/capi/cef_command_line_capi.h
+++ b/include/capi/cef_command_line_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=f535e9560b9fde9b53fc4d8383905105ed029ea4$
+// $hash=5af5bf1e877dd53f21f751d332a9e2166817324c$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_COMMAND_LINE_CAPI_H_
@@ -47,104 +47,103 @@ extern "C" {
 #endif

 ///
-/// Structure used to create and/or parse command line arguments. Arguments with
-/// "--", "-" and, on Windows, "/" prefixes are considered switches. Switches
-/// will always precede any arguments without switch prefixes. Switches can
-/// optionally have a value specified using the "=" delimiter (e.g.
-/// "-switch=value"). An argument of "--" will terminate switch parsing with all
-/// subsequent tokens, regardless of prefix, being interpreted as non-switch
-/// arguments. Switch names should be lowercase ASCII and will be converted to
-/// such if necessary. Switch values will retain the original case and UTF8
-/// encoding. This structure can be used before cef_initialize() is called.
+// Structure used to create and/or parse command line arguments. Arguments with
+// '--', '-' and, on Windows, '/' prefixes are considered switches. Switches
+// will always precede any arguments without switch prefixes. Switches can
+// optionally have a value specified using the '=' delimiter (e.g.
+// "-switch=value"). An argument of "--" will terminate switch parsing with all
+// subsequent tokens, regardless of prefix, being interpreted as non-switch
+// arguments. Switch names are considered case-insensitive. This structure can
+// be used before cef_initialize() is called.
 ///
 typedef struct _cef_command_line_t {
  ///
-  /// Base structure.
+  // Base structure.
  ///
  cef_base_ref_counted_t base;

  ///
-  /// Returns true (1) if this object is valid. Do not call any other functions
-  /// if this function returns false (0).
+  // Returns true (1) if this object is valid. Do not call any other functions
+  // if this function returns false (0).
  ///
  int(CEF_CALLBACK* is_valid)(struct _cef_command_line_t* self);

  ///
-  /// Returns true (1) if the values of this object are read-only. Some APIs may
-  /// expose read-only objects.
+  // Returns true (1) if the values of this object are read-only. Some APIs may
+  // expose read-only objects.
  ///
  int(CEF_CALLBACK* is_read_only)(struct _cef_command_line_t* self);

  ///
-  /// Returns a writable copy of this object.
+  // Returns a writable copy of this object.
  ///
  struct _cef_command_line_t*(CEF_CALLBACK* copy)(
      struct _cef_command_line_t* self);

  ///
-  /// Initialize the command line with the specified |argc| and |argv| values.
-  /// The first argument must be the name of the program. This function is only
-  /// supported on non-Windows platforms.
+  // Initialize the command line with the specified |argc| and |argv| values.
+  // The first argument must be the name of the program. This function is only
+  // supported on non-Windows platforms.
  ///
  void(CEF_CALLBACK* init_from_argv)(struct _cef_command_line_t* self,
                                     int argc,
                                     const char* const* argv);

  ///
-  /// Initialize the command line with the string returned by calling
-  /// GetCommandLineW(). This function is only supported on Windows.
+  // Initialize the command line with the string returned by calling
+  // GetCommandLineW(). This function is only supported on Windows.
  ///
  void(CEF_CALLBACK* init_from_string)(struct _cef_command_line_t* self,
                                       const cef_string_t* command_line);

  ///
-  /// Reset the command-line switches and arguments but leave the program
-  /// component unchanged.
+  // Reset the command-line switches and arguments but leave the program
+  // component unchanged.
  ///
  void(CEF_CALLBACK* reset)(struct _cef_command_line_t* self);

  ///
-  /// Retrieve the original command line string as a vector of strings. The argv
-  /// array: `{ program, [(--|-|/)switch[=value]]*, [--], [argument]* }`
+  // Retrieve the original command line string as a vector of strings. The argv
+  // array: { program, [(--|-|/)switch[=value]]*, [--], [argument]* }
  ///
  void(CEF_CALLBACK* get_argv)(struct _cef_command_line_t* self,
                               cef_string_list_t argv);

  ///
-  /// Constructs and returns the represented command line string. Use this
-  /// function cautiously because quoting behavior is unclear.
+  // Constructs and returns the represented command line string. Use this
+  // function cautiously because quoting behavior is unclear.
  ///
  // The resulting string must be freed by calling cef_string_userfree_free().
  cef_string_userfree_t(CEF_CALLBACK* get_command_line_string)(
      struct _cef_command_line_t* self);

  ///
-  /// Get the program part of the command line string (the first item).
+  // Get the program part of the command line string (the first item).
  ///
  // The resulting string must be freed by calling cef_string_userfree_free().
  cef_string_userfree_t(CEF_CALLBACK* get_program)(
      struct _cef_command_line_t* self);

  ///
-  /// Set the program part of the command line string (the first item).
+  // Set the program part of the command line string (the first item).
  ///
  void(CEF_CALLBACK* set_program)(struct _cef_command_line_t* self,
                                  const cef_string_t* program);

  ///
-  /// Returns true (1) if the command line has switches.
+  // Returns true (1) if the command line has switches.
  ///
  int(CEF_CALLBACK* has_switches)(struct _cef_command_line_t* self);

  ///
-  /// Returns true (1) if the command line contains the given switch.
+  // Returns true (1) if the command line contains the given switch.
  ///
  int(CEF_CALLBACK* has_switch)(struct _cef_command_line_t* self,
                                const cef_string_t* name);

  ///
-  /// Returns the value associated with the given switch. If the switch has no
-  /// value or isn't present this function returns the NULL string.
+  // Returns the value associated with the given switch. If the switch has no
+  // value or isn't present this function returns the NULL string.
  ///
  // The resulting string must be freed by calling cef_string_userfree_free().
  cef_string_userfree_t(CEF_CALLBACK* get_switch_value)(
@@ -152,61 +151,61 @@ typedef struct _cef_command_line_t {
      const cef_string_t* name);

  ///
-  /// Returns the map of switch names and values. If a switch has no value an
-  /// NULL string is returned.
+  // Returns the map of switch names and values. If a switch has no value an
+  // NULL string is returned.
  ///
  void(CEF_CALLBACK* get_switches)(struct _cef_command_line_t* self,
                                   cef_string_map_t switches);

  ///
-  /// Add a switch to the end of the command line. If the switch has no value
-  /// pass an NULL value string.
+  // Add a switch to the end of the command line. If the switch has no value
+  // pass an NULL value string.
  ///
  void(CEF_CALLBACK* append_switch)(struct _cef_command_line_t* self,
                                    const cef_string_t* name);

  ///
-  /// Add a switch with the specified value to the end of the command line.
+  // Add a switch with the specified value to the end of the command line.
  ///
  void(CEF_CALLBACK* append_switch_with_value)(struct _cef_command_line_t* self,
                                               const cef_string_t* name,
                                               const cef_string_t* value);

  ///
-  /// True if there are remaining command line arguments.
+  // True if there are remaining command line arguments.
  ///
  int(CEF_CALLBACK* has_arguments)(struct _cef_command_line_t* self);

  ///
-  /// Get the remaining command line arguments.
+  // Get the remaining command line arguments.
  ///
  void(CEF_CALLBACK* get_arguments)(struct _cef_command_line_t* self,
                                    cef_string_list_t arguments);

  ///
-  /// Add an argument to the end of the command line.
+  // Add an argument to the end of the command line.
  ///
  void(CEF_CALLBACK* append_argument)(struct _cef_command_line_t* self,
                                      const cef_string_t* argument);

  ///
-  /// Insert a command before the current command. Common for debuggers, like
-  /// "valgrind" or "gdb --args".
+  // Insert a command before the current command. Common for debuggers, like
+  // "valgrind" or "gdb --args".
  ///
  void(CEF_CALLBACK* prepend_wrapper)(struct _cef_command_line_t* self,
                                      const cef_string_t* wrapper);
 } cef_command_line_t;

 ///
-/// Create a new cef_command_line_t instance.
+// Create a new cef_command_line_t instance.
 ///
-CEF_EXPORT cef_command_line_t* cef_command_line_create(void);
+CEF_EXPORT cef_command_line_t* cef_command_line_create();

 ///
-/// Returns the singleton global cef_command_line_t object. The returned object
-/// will be read-only.
+// Returns the singleton global cef_command_line_t object. The returned object
+// will be read-only.
 ///
-CEF_EXPORT cef_command_line_t* cef_command_line_get_global(void);
+CEF_EXPORT cef_command_line_t* cef_command_line_get_global();

 #ifdef __cplusplus
 }
--- a/include/capi/cef_context_menu_handler_capi.h
+++ b/include/capi/cef_context_menu_handler_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=0ae549ed35e30afcbb01961fe55455beaadcd7f9$
+// $hash=175779df75a1405fcc5c337a09e6322c556698ba$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_CONTEXT_MENU_HANDLER_CAPI_H_
@@ -52,67 +52,44 @@ extern "C" {
 struct _cef_context_menu_params_t;

 ///
-/// Callback structure used for continuation of custom context menu display.
+// Callback structure used for continuation of custom context menu display.
 ///
 typedef struct _cef_run_context_menu_callback_t {
  ///
-  /// Base structure.
+  // Base structure.
  ///
  cef_base_ref_counted_t base;

  ///
-  /// Complete context menu display by selecting the specified |command_id| and
-  /// |event_flags|.
+  // Complete context menu display by selecting the specified |command_id| and
+  // |event_flags|.
  ///
  void(CEF_CALLBACK* cont)(struct _cef_run_context_menu_callback_t* self,
                           int command_id,
                           cef_event_flags_t event_flags);

  ///
-  /// Cancel context menu display.
+  // Cancel context menu display.
  ///
  void(CEF_CALLBACK* cancel)(struct _cef_run_context_menu_callback_t* self);
 } cef_run_context_menu_callback_t;

 ///
-/// Callback structure used for continuation of custom quick menu display.
-///
-typedef struct _cef_run_quick_menu_callback_t {
-  ///
-  /// Base structure.
-  ///
-  cef_base_ref_counted_t base;
-
-  ///
-  /// Complete quick menu display by selecting the specified |command_id| and
-  /// |event_flags|.
-  ///
-  void(CEF_CALLBACK* cont)(struct _cef_run_quick_menu_callback_t* self,
-                           int command_id,
-                           cef_event_flags_t event_flags);
-
-  ///
-  /// Cancel quick menu display.
-  ///
-  void(CEF_CALLBACK* cancel)(struct _cef_run_quick_menu_callback_t* self);
-} cef_run_quick_menu_callback_t;
-
-///
-/// Implement this structure to handle context menu events. The functions of
-/// this structure will be called on the UI thread.
+// Implement this structure to handle context menu events. The functions of this
+// structure will be called on the UI thread.
 ///
 typedef struct _cef_context_menu_handler_t {
  ///
-  /// Base structure.
+  // Base structure.
  ///
  cef_base_ref_counted_t base;

  ///
-  /// Called before a context menu is displayed. |params| provides information
-  /// about the context menu state. |model| initially contains the default
-  /// context menu. The |model| can be cleared to show no context menu or
-  /// modified to show a custom menu. Do not keep references to |params| or
-  /// |model| outside of this callback.
+  // Called before a context menu is displayed. |params| provides information
+  // about the context menu state. |model| initially contains the default
+  // context menu. The |model| can be cleared to show no context menu or
+  // modified to show a custom menu. Do not keep references to |params| or
+  // |model| outside of this callback.
  ///
  void(CEF_CALLBACK* on_before_context_menu)(
      struct _cef_context_menu_handler_t* self,
@@ -122,12 +99,12 @@ typedef struct _cef_context_menu_handler_t {
      struct _cef_menu_model_t* model);

  ///
-  /// Called to allow custom display of the context menu. |params| provides
-  /// information about the context menu state. |model| contains the context
-  /// menu model resulting from OnBeforeContextMenu. For custom display return
-  /// true (1) and execute |callback| either synchronously or asynchronously
-  /// with the selected command ID. For default display return false (0). Do not
-  /// keep references to |params| or |model| outside of this callback.
+  // Called to allow custom display of the context menu. |params| provides
+  // information about the context menu state. |model| contains the context menu
+  // model resulting from OnBeforeContextMenu. For custom display return true
+  // (1) and execute |callback| either synchronously or asynchronously with the
+  // selected command ID. For default display return false (0). Do not keep
+  // references to |params| or |model| outside of this callback.
  ///
  int(CEF_CALLBACK* run_context_menu)(
      struct _cef_context_menu_handler_t* self,
@@ -138,13 +115,13 @@ typedef struct _cef_context_menu_handler_t {
      struct _cef_run_context_menu_callback_t* callback);

  ///
-  /// Called to execute a command selected from the context menu. Return true
-  /// (1) if the command was handled or false (0) for the default
-  /// implementation. See cef_menu_id_t for the command ids that have default
-  /// implementations. All user-defined command ids should be between
-  /// MENU_ID_USER_FIRST and MENU_ID_USER_LAST. |params| will have the same
-  /// values as what was passed to on_before_context_menu(). Do not keep a
-  /// reference to |params| outside of this callback.
+  // Called to execute a command selected from the context menu. Return true (1)
+  // if the command was handled or false (0) for the default implementation. See
+  // cef_menu_id_t for the command ids that have default implementations. All
+  // user-defined command ids should be between MENU_ID_USER_FIRST and
+  // MENU_ID_USER_LAST. |params| will have the same values as what was passed to
+  // on_before_context_menu(). Do not keep a reference to |params| outside of
+  // this callback.
  ///
  int(CEF_CALLBACK* on_context_menu_command)(
      struct _cef_context_menu_handler_t* self,
@@ -155,207 +132,166 @@ typedef struct _cef_context_menu_handler_t {
      cef_event_flags_t event_flags);

  ///
-  /// Called when the context menu is dismissed irregardless of whether the menu
-  /// was canceled or a command was selected.
+  // Called when the context menu is dismissed irregardless of whether the menu
+  // was NULL or a command was selected.
  ///
  void(CEF_CALLBACK* on_context_menu_dismissed)(
      struct _cef_context_menu_handler_t* self,
      struct _cef_browser_t* browser,
      struct _cef_frame_t* frame);
-
-  ///
-  /// Called to allow custom display of the quick menu for a windowless browser.
-  /// |location| is the top left corner of the selected region. |size| is the
-  /// size of the selected region. |edit_state_flags| is a combination of flags
-  /// that represent the state of the quick menu. Return true (1) if the menu
-  /// will be handled and execute |callback| either synchronously or
-  /// asynchronously with the selected command ID. Return false (0) to cancel
-  /// the menu.
-  ///
-  int(CEF_CALLBACK* run_quick_menu)(
-      struct _cef_context_menu_handler_t* self,
-      struct _cef_browser_t* browser,
-      struct _cef_frame_t* frame,
-      const cef_point_t* location,
-      const cef_size_t* size,
-      cef_quick_menu_edit_state_flags_t edit_state_flags,
-      struct _cef_run_quick_menu_callback_t* callback);
-
-  ///
-  /// Called to execute a command selected from the quick menu for a windowless
-  /// browser. Return true (1) if the command was handled or false (0) for the
-  /// default implementation. See cef_menu_id_t for command IDs that have
-  /// default implementations.
-  ///
-  int(CEF_CALLBACK* on_quick_menu_command)(
-      struct _cef_context_menu_handler_t* self,
-      struct _cef_browser_t* browser,
-      struct _cef_frame_t* frame,
-      int command_id,
-      cef_event_flags_t event_flags);
-
-  ///
-  /// Called when the quick menu for a windowless browser is dismissed
-  /// irregardless of whether the menu was canceled or a command was selected.
-  ///
-  void(CEF_CALLBACK* on_quick_menu_dismissed)(
-      struct _cef_context_menu_handler_t* self,
-      struct _cef_browser_t* browser,
-      struct _cef_frame_t* frame);
 } cef_context_menu_handler_t;

 ///
-/// Provides information about the context menu state. The functions of this
-/// structure can only be accessed on browser process the UI thread.
+// Provides information about the context menu state. The ethods of this
+// structure can only be accessed on browser process the UI thread.
 ///
 typedef struct _cef_context_menu_params_t {
  ///
-  /// Base structure.
+  // Base structure.
  ///
  cef_base_ref_counted_t base;

  ///
-  /// Returns the X coordinate of the mouse where the context menu was invoked.
-  /// Coords are relative to the associated RenderView's origin.
+  // Returns the X coordinate of the mouse where the context menu was invoked.
+  // Coords are relative to the associated RenderView's origin.
  ///
  int(CEF_CALLBACK* get_xcoord)(struct _cef_context_menu_params_t* self);

  ///
-  /// Returns the Y coordinate of the mouse where the context menu was invoked.
-  /// Coords are relative to the associated RenderView's origin.
+  // Returns the Y coordinate of the mouse where the context menu was invoked.
+  // Coords are relative to the associated RenderView's origin.
  ///
  int(CEF_CALLBACK* get_ycoord)(struct _cef_context_menu_params_t* self);

  ///
-  /// Returns flags representing the type of node that the context menu was
-  /// invoked on.
+  // Returns flags representing the type of node that the context menu was
+  // invoked on.
  ///
  cef_context_menu_type_flags_t(CEF_CALLBACK* get_type_flags)(
      struct _cef_context_menu_params_t* self);

  ///
-  /// Returns the URL of the link, if any, that encloses the node that the
-  /// context menu was invoked on.
+  // Returns the URL of the link, if any, that encloses the node that the
+  // context menu was invoked on.
  ///
  // The resulting string must be freed by calling cef_string_userfree_free().
  cef_string_userfree_t(CEF_CALLBACK* get_link_url)(
      struct _cef_context_menu_params_t* self);

  ///
-  /// Returns the link URL, if any, to be used ONLY for "copy link address". We
-  /// don't validate this field in the frontend process.
+  // Returns the link URL, if any, to be used ONLY for "copy link address". We
+  // don't validate this field in the frontend process.
  ///
  // The resulting string must be freed by calling cef_string_userfree_free().
  cef_string_userfree_t(CEF_CALLBACK* get_unfiltered_link_url)(
      struct _cef_context_menu_params_t* self);

  ///
-  /// Returns the source URL, if any, for the element that the context menu was
-  /// invoked on. Example of elements with source URLs are img, audio, and
-  /// video.
+  // Returns the source URL, if any, for the element that the context menu was
+  // invoked on. Example of elements with source URLs are img, audio, and video.
  ///
  // The resulting string must be freed by calling cef_string_userfree_free().
  cef_string_userfree_t(CEF_CALLBACK* get_source_url)(
      struct _cef_context_menu_params_t* self);

  ///
-  /// Returns true (1) if the context menu was invoked on an image which has
-  /// non-NULL contents.
+  // Returns true (1) if the context menu was invoked on an image which has non-
+  // NULL contents.
  ///
  int(CEF_CALLBACK* has_image_contents)(
      struct _cef_context_menu_params_t* self);

  ///
-  /// Returns the title text or the alt text if the context menu was invoked on
-  /// an image.
+  // Returns the title text or the alt text if the context menu was invoked on
+  // an image.
  ///
  // The resulting string must be freed by calling cef_string_userfree_free().
  cef_string_userfree_t(CEF_CALLBACK* get_title_text)(
      struct _cef_context_menu_params_t* self);

  ///
-  /// Returns the URL of the top level page that the context menu was invoked
-  /// on.
+  // Returns the URL of the top level page that the context menu was invoked on.
  ///
  // The resulting string must be freed by calling cef_string_userfree_free().
  cef_string_userfree_t(CEF_CALLBACK* get_page_url)(
      struct _cef_context_menu_params_t* self);

  ///
-  /// Returns the URL of the subframe that the context menu was invoked on.
+  // Returns the URL of the subframe that the context menu was invoked on.
  ///
  // The resulting string must be freed by calling cef_string_userfree_free().
  cef_string_userfree_t(CEF_CALLBACK* get_frame_url)(
      struct _cef_context_menu_params_t* self);

  ///
-  /// Returns the character encoding of the subframe that the context menu was
-  /// invoked on.
+  // Returns the character encoding of the subframe that the context menu was
+  // invoked on.
  ///
  // The resulting string must be freed by calling cef_string_userfree_free().
  cef_string_userfree_t(CEF_CALLBACK* get_frame_charset)(
      struct _cef_context_menu_params_t* self);

  ///
-  /// Returns the type of context node that the context menu was invoked on.
+  // Returns the type of context node that the context menu was invoked on.
  ///
  cef_context_menu_media_type_t(CEF_CALLBACK* get_media_type)(
      struct _cef_context_menu_params_t* self);

  ///
-  /// Returns flags representing the actions supported by the media element, if
-  /// any, that the context menu was invoked on.
+  // Returns flags representing the actions supported by the media element, if
+  // any, that the context menu was invoked on.
  ///
  cef_context_menu_media_state_flags_t(CEF_CALLBACK* get_media_state_flags)(
      struct _cef_context_menu_params_t* self);

  ///
-  /// Returns the text of the selection, if any, that the context menu was
-  /// invoked on.
+  // Returns the text of the selection, if any, that the context menu was
+  // invoked on.
  ///
  // The resulting string must be freed by calling cef_string_userfree_free().
  cef_string_userfree_t(CEF_CALLBACK* get_selection_text)(
      struct _cef_context_menu_params_t* self);

  ///
-  /// Returns the text of the misspelled word, if any, that the context menu was
-  /// invoked on.
+  // Returns the text of the misspelled word, if any, that the context menu was
+  // invoked on.
  ///
  // The resulting string must be freed by calling cef_string_userfree_free().
  cef_string_userfree_t(CEF_CALLBACK* get_misspelled_word)(
      struct _cef_context_menu_params_t* self);

  ///
-  /// Returns true (1) if suggestions exist, false (0) otherwise. Fills in
-  /// |suggestions| from the spell check service for the misspelled word if
-  /// there is one.
+  // Returns true (1) if suggestions exist, false (0) otherwise. Fills in
+  // |suggestions| from the spell check service for the misspelled word if there
+  // is one.
  ///
  int(CEF_CALLBACK* get_dictionary_suggestions)(
      struct _cef_context_menu_params_t* self,
      cef_string_list_t suggestions);

  ///
-  /// Returns true (1) if the context menu was invoked on an editable node.
+  // Returns true (1) if the context menu was invoked on an editable node.
  ///
  int(CEF_CALLBACK* is_editable)(struct _cef_context_menu_params_t* self);

  ///
-  /// Returns true (1) if the context menu was invoked on an editable node where
-  /// spell-check is enabled.
+  // Returns true (1) if the context menu was invoked on an editable node where
+  // spell-check is enabled.
  ///
  int(CEF_CALLBACK* is_spell_check_enabled)(
      struct _cef_context_menu_params_t* self);

  ///
-  /// Returns flags representing the actions supported by the editable node, if
-  /// any, that the context menu was invoked on.
+  // Returns flags representing the actions supported by the editable node, if
+  // any, that the context menu was invoked on.
  ///
  cef_context_menu_edit_state_flags_t(CEF_CALLBACK* get_edit_state_flags)(
      struct _cef_context_menu_params_t* self);

  ///
-  /// Returns true (1) if the context menu contains items specified by the
-  /// renderer process.
+  // Returns true (1) if the context menu contains items specified by the
+  // renderer process (for example, plugin placeholder or pepper plugin menu
+  // items).
  ///
  int(CEF_CALLBACK* is_custom_menu)(struct _cef_context_menu_params_t* self);
 } cef_context_menu_params_t;
--- a/include/capi/cef_cookie_capi.h
+++ b/include/capi/cef_cookie_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=37b5e115ff7abd1df1b9913404b69505fb9fef29$
+// $hash=b19ef1c8a781f8d59276357609fe64370bb8a107$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_COOKIE_CAPI_H_
@@ -52,29 +52,29 @@ struct _cef_delete_cookies_callback_t;
 struct _cef_set_cookie_callback_t;

 ///
-/// Structure used for managing cookies. The functions of this structure may be
-/// called on any thread unless otherwise indicated.
+// Structure used for managing cookies. The functions of this structure may be
+// called on any thread unless otherwise indicated.
 ///
 typedef struct _cef_cookie_manager_t {
  ///
-  /// Base structure.
+  // Base structure.
  ///
  cef_base_ref_counted_t base;

  ///
-  /// Visit all cookies on the UI thread. The returned cookies are ordered by
-  /// longest path, then by earliest creation date. Returns false (0) if cookies
-  /// cannot be accessed.
+  // Visit all cookies on the UI thread. The returned cookies are ordered by
+  // longest path, then by earliest creation date. Returns false (0) if cookies
+  // cannot be accessed.
  ///
  int(CEF_CALLBACK* visit_all_cookies)(struct _cef_cookie_manager_t* self,
                                       struct _cef_cookie_visitor_t* visitor);

  ///
-  /// Visit a subset of cookies on the UI thread. The results are filtered by
-  /// the given url scheme, host, domain and path. If |includeHttpOnly| is true
-  /// (1) HTTP-only cookies will also be included in the results. The returned
-  /// cookies are ordered by longest path, then by earliest creation date.
-  /// Returns false (0) if cookies cannot be accessed.
+  // Visit a subset of cookies on the UI thread. The results are filtered by the
+  // given url scheme, host, domain and path. If |includeHttpOnly| is true (1)
+  // HTTP-only cookies will also be included in the results. The returned
+  // cookies are ordered by longest path, then by earliest creation date.
+  // Returns false (0) if cookies cannot be accessed.
  ///
  int(CEF_CALLBACK* visit_url_cookies)(struct _cef_cookie_manager_t* self,
                                       const cef_string_t* url,
@@ -82,13 +82,13 @@ typedef struct _cef_cookie_manager_t {
                                       struct _cef_cookie_visitor_t* visitor);

  ///
-  /// Sets a cookie given a valid URL and explicit user-provided cookie
-  /// attributes. This function expects each attribute to be well-formed. It
-  /// will check for disallowed characters (e.g. the ';' character is disallowed
-  /// within the cookie value attribute) and fail without setting the cookie if
-  /// such characters are found. If |callback| is non-NULL it will be executed
-  /// asnychronously on the UI thread after the cookie has been set. Returns
-  /// false (0) if an invalid URL is specified or if cookies cannot be accessed.
+  // Sets a cookie given a valid URL and explicit user-provided cookie
+  // attributes. This function expects each attribute to be well-formed. It will
+  // check for disallowed characters (e.g. the ';' character is disallowed
+  // within the cookie value attribute) and fail without setting the cookie if
+  // such characters are found. If |callback| is non-NULL it will be executed
+  // asnychronously on the UI thread after the cookie has been set. Returns
+  // false (0) if an invalid URL is specified or if cookies cannot be accessed.
  ///
  int(CEF_CALLBACK* set_cookie)(struct _cef_cookie_manager_t* self,
                                const cef_string_t* url,
@@ -96,15 +96,15 @@ typedef struct _cef_cookie_manager_t {
                                struct _cef_set_cookie_callback_t* callback);

  ///
-  /// Delete all cookies that match the specified parameters. If both |url| and
-  /// |cookie_name| values are specified all host and domain cookies matching
-  /// both will be deleted. If only |url| is specified all host cookies (but not
-  /// domain cookies) irrespective of path will be deleted. If |url| is NULL all
-  /// cookies for all hosts and domains will be deleted. If |callback| is non-
-  /// NULL it will be executed asnychronously on the UI thread after the cookies
-  /// have been deleted. Returns false (0) if a non-NULL invalid URL is
-  /// specified or if cookies cannot be accessed. Cookies can alternately be
-  /// deleted using the Visit*Cookies() functions.
+  // Delete all cookies that match the specified parameters. If both |url| and
+  // |cookie_name| values are specified all host and domain cookies matching
+  // both will be deleted. If only |url| is specified all host cookies (but not
+  // domain cookies) irrespective of path will be deleted. If |url| is NULL all
+  // cookies for all hosts and domains will be deleted. If |callback| is non-
+  // NULL it will be executed asnychronously on the UI thread after the cookies
+  // have been deleted. Returns false (0) if a non-NULL invalid URL is specified
+  // or if cookies cannot be accessed. Cookies can alternately be deleted using
+  // the Visit*Cookies() functions.
  ///
  int(CEF_CALLBACK* delete_cookies)(
      struct _cef_cookie_manager_t* self,
@@ -113,41 +113,41 @@ typedef struct _cef_cookie_manager_t {
      struct _cef_delete_cookies_callback_t* callback);

  ///
-  /// Flush the backing store (if any) to disk. If |callback| is non-NULL it
-  /// will be executed asnychronously on the UI thread after the flush is
-  /// complete. Returns false (0) if cookies cannot be accessed.
+  // Flush the backing store (if any) to disk. If |callback| is non-NULL it will
+  // be executed asnychronously on the UI thread after the flush is complete.
+  // Returns false (0) if cookies cannot be accessed.
  ///
  int(CEF_CALLBACK* flush_store)(struct _cef_cookie_manager_t* self,
                                 struct _cef_completion_callback_t* callback);
 } cef_cookie_manager_t;

 ///
-/// Returns the global cookie manager. By default data will be stored at
-/// cef_settings_t.cache_path if specified or in memory otherwise. If |callback|
-/// is non-NULL it will be executed asnychronously on the UI thread after the
-/// manager's storage has been initialized. Using this function is equivalent to
-/// calling cef_request_context_t::cef_request_context_get_global_context()->Get
-/// DefaultCookieManager().
+// Returns the global cookie manager. By default data will be stored at
+// CefSettings.cache_path if specified or in memory otherwise. If |callback| is
+// non-NULL it will be executed asnychronously on the UI thread after the
+// manager's storage has been initialized. Using this function is equivalent to
+// calling cef_request_context_t::cef_request_context_get_global_context()->GetD
+// efaultCookieManager().
 ///
 CEF_EXPORT cef_cookie_manager_t* cef_cookie_manager_get_global_manager(
    struct _cef_completion_callback_t* callback);

 ///
-/// Structure to implement for visiting cookie values. The functions of this
-/// structure will always be called on the UI thread.
+// Structure to implement for visiting cookie values. The functions of this
+// structure will always be called on the UI thread.
 ///
 typedef struct _cef_cookie_visitor_t {
  ///
-  /// Base structure.
+  // Base structure.
  ///
  cef_base_ref_counted_t base;

  ///
-  /// Method that will be called once for each cookie. |count| is the 0-based
-  /// index for the current cookie. |total| is the total number of cookies. Set
-  /// |deleteCookie| to true (1) to delete the cookie currently being visited.
-  /// Return false (0) to stop visiting cookies. This function may never be
-  /// called if no cookies are found.
+  // Method that will be called once for each cookie. |count| is the 0-based
+  // index for the current cookie. |total| is the total number of cookies. Set
+  // |deleteCookie| to true (1) to delete the cookie currently being visited.
+  // Return false (0) to stop visiting cookies. This function may never be
+  // called if no cookies are found.
  ///
  int(CEF_CALLBACK* visit)(struct _cef_cookie_visitor_t* self,
                           const struct _cef_cookie_t* cookie,
@@ -157,36 +157,36 @@ typedef struct _cef_cookie_visitor_t {
 } cef_cookie_visitor_t;

 ///
-/// Structure to implement to be notified of asynchronous completion via
-/// cef_cookie_manager_t::set_cookie().
+// Structure to implement to be notified of asynchronous completion via
+// cef_cookie_manager_t::set_cookie().
 ///
 typedef struct _cef_set_cookie_callback_t {
  ///
-  /// Base structure.
+  // Base structure.
  ///
  cef_base_ref_counted_t base;

  ///
-  /// Method that will be called upon completion. |success| will be true (1) if
-  /// the cookie was set successfully.
+  // Method that will be called upon completion. |success| will be true (1) if
+  // the cookie was set successfully.
  ///
  void(CEF_CALLBACK* on_complete)(struct _cef_set_cookie_callback_t* self,
                                  int success);
 } cef_set_cookie_callback_t;

 ///
-/// Structure to implement to be notified of asynchronous completion via
-/// cef_cookie_manager_t::delete_cookies().
+// Structure to implement to be notified of asynchronous completion via
+// cef_cookie_manager_t::delete_cookies().
 ///
 typedef struct _cef_delete_cookies_callback_t {
  ///
-  /// Base structure.
+  // Base structure.
  ///
  cef_base_ref_counted_t base;

  ///
-  /// Method that will be called upon completion. |num_deleted| will be the
-  /// number of cookies that were deleted.
+  // Method that will be called upon completion. |num_deleted| will be the
+  // number of cookies that were deleted.
  ///
  void(CEF_CALLBACK* on_complete)(struct _cef_delete_cookies_callback_t* self,
                                  int num_deleted);
--- a/include/capi/cef_crash_util_capi.h
+++ b/include/capi/cef_crash_util_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=1ce19c3213f033ca9059da738102b9b4292d4a06$
+// $hash=5e19231e3476eef376c2742e8d375bee7bd4ea2d$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_CRASH_UTIL_CAPI_H_
@@ -47,102 +47,99 @@ extern "C" {
 #endif

 ///
-/// Crash reporting is configured using an INI-style config file named
-/// "crash_reporter.cfg". On Windows and Linux this file must be placed next to
-/// the main application executable. On macOS this file must be placed in the
-/// top-level app bundle Resources directory (e.g.
-/// "<appname>.app/Contents/Resources"). File contents are as follows:
+// Crash reporting is configured using an INI-style config file named
+// "crash_reporter.cfg". On Windows and Linux this file must be placed next to
+// the main application executable. On macOS this file must be placed in the
+// top-level app bundle Resources directory (e.g.
+// "<appname>.app/Contents/Resources"). File contents are as follows:
+//
+//  # Comments start with a hash character and must be on their own line.
+//
+//  [Config]
+//  ProductName=<Value of the "prod" crash key; defaults to "cef">
+//  ProductVersion=<Value of the "ver" crash key; defaults to the CEF version>
+//  AppName=<Windows only; App-specific folder name component for storing crash
+//           information; default to "CEF">
+//  ExternalHandler=<Windows only; Name of the external handler exe to use
+//                   instead of re-launching the main exe; default to empty>
+//  BrowserCrashForwardingEnabled=<macOS only; True if browser process crashes
+//                                 should be forwarded to the system crash
+//                                 reporter; default to false>
+//  ServerURL=<crash server URL; default to empty>
+//  RateLimitEnabled=<True if uploads should be rate limited; default to true>
+//  MaxUploadsPerDay=<Max uploads per 24 hours, used if rate limit is enabled;
+//                    default to 5>
+//  MaxDatabaseSizeInMb=<Total crash report disk usage greater than this value
+//                       will cause older reports to be deleted; default to 20>
+//  MaxDatabaseAgeInDays=<Crash reports older than this value will be deleted;
+//                        default to 5>
+//
+//  [CrashKeys]
+//  my_key1=<small|medium|large>
+//  my_key2=<small|medium|large>
+//
+// Config section:
+//
+// If "ProductName" and/or "ProductVersion" are set then the specified values
+// will be included in the crash dump metadata. On macOS if these values are set
+// to NULL then they will be retrieved from the Info.plist file using the
+// "CFBundleName" and "CFBundleShortVersionString" keys respectively.
+//
+// If "AppName" is set on Windows then crash report information (metrics,
+// database and dumps) will be stored locally on disk under the
+// "C:\Users\[CurrentUser]\AppData\Local\[AppName]\User Data" folder. On other
+// platforms the CefSettings.user_data_path value will be used.
+//
+// If "ExternalHandler" is set on Windows then the specified exe will be
+// launched as the crashpad-handler instead of re-launching the main process
+// exe. The value can be an absolute path or a path relative to the main exe
+// directory. On Linux the CefSettings.browser_subprocess_path value will be
+// used. On macOS the existing subprocess app bundle will be used.
+//
+// If "BrowserCrashForwardingEnabled" is set to true (1) on macOS then browser
+// process crashes will be forwarded to the system crash reporter. This results
+// in the crash UI dialog being displayed to the user and crash reports being
+// logged under "~/Library/Logs/DiagnosticReports". Forwarding of crash reports
+// from non-browser processes and Debug builds is always disabled.
+//
+// If "ServerURL" is set then crashes will be uploaded as a multi-part POST
+// request to the specified URL. Otherwise, reports will only be stored locally
+// on disk.
+//
+// If "RateLimitEnabled" is set to true (1) then crash report uploads will be
+// rate limited as follows:
+//  1. If "MaxUploadsPerDay" is set to a positive value then at most the
+//     specified number of crashes will be uploaded in each 24 hour period.
+//  2. If crash upload fails due to a network or server error then an
+//     incremental backoff delay up to a maximum of 24 hours will be applied for
+//     retries.
+//  3. If a backoff delay is applied and "MaxUploadsPerDay" is > 1 then the
+//     "MaxUploadsPerDay" value will be reduced to 1 until the client is
+//     restarted. This helps to avoid an upload flood when the network or
+//     server error is resolved.
+// Rate limiting is not supported on Linux.
+//
+// If "MaxDatabaseSizeInMb" is set to a positive value then crash report storage
+// on disk will be limited to that size in megabytes. For example, on Windows
+// each dump is about 600KB so a "MaxDatabaseSizeInMb" value of 20 equates to
+// about 34 crash reports stored on disk. Not supported on Linux.
+//
+// If "MaxDatabaseAgeInDays" is set to a positive value then crash reports older
+// than the specified age in days will be deleted. Not supported on Linux.
+//
+// CrashKeys section:
+//
+// A maximum of 26 crash keys of each size can be specified for use by the
+// application. Crash key values will be truncated based on the specified size
+// (small = 64 bytes, medium = 256 bytes, large = 1024 bytes). The value of
+// crash keys can be set from any thread or process using the
+// CefSetCrashKeyValue function. These key/value pairs will be sent to the crash
+// server along with the crash dump file.
 ///
-/// <pre>
-///  # Comments start with a hash character and must be on their own line.
-///
-///  [Config]
-///  ProductName=<Value of the "prod" crash key; defaults to "cef">
-///  ProductVersion=<Value of the "ver" crash key; defaults to the CEF version>
-///  AppName=<Windows only; App-specific folder name component for storing crash
-///           information; default to "CEF">
-///  ExternalHandler=<Windows only; Name of the external handler exe to use
-///                   instead of re-launching the main exe; default to empty>
-///  BrowserCrashForwardingEnabled=<macOS only; True if browser process crashes
-///                                 should be forwarded to the system crash
-///                                 reporter; default to false>
-///  ServerURL=<crash server URL; default to empty>
-///  RateLimitEnabled=<True if uploads should be rate limited; default to true>
-///  MaxUploadsPerDay=<Max uploads per 24 hours, used if rate limit is enabled;
-///                    default to 5>
-///  MaxDatabaseSizeInMb=<Total crash report disk usage greater than this value
-///                       will cause older reports to be deleted; default to 20>
-///  MaxDatabaseAgeInDays=<Crash reports older than this value will be deleted;
-///                        default to 5>
-///
-///  [CrashKeys]
-///  my_key1=<small|medium|large>
-///  my_key2=<small|medium|large>
-/// </pre>
-///
-/// <b>Config section:</b>
-///
-/// If "ProductName" and/or "ProductVersion" are set then the specified values
-/// will be included in the crash dump metadata. On macOS if these values are
-/// set to NULL then they will be retrieved from the Info.plist file using the
-/// "CFBundleName" and "CFBundleShortVersionString" keys respectively.
-///
-/// If "AppName" is set on Windows then crash report information (metrics,
-/// database and dumps) will be stored locally on disk under the
-/// "C:\Users\[CurrentUser]\AppData\Local\[AppName]\User Data" folder. On other
-/// platforms the cef_settings_t.user_data_path value will be used.
-///
-/// If "ExternalHandler" is set on Windows then the specified exe will be
-/// launched as the crashpad-handler instead of re-launching the main process
-/// exe. The value can be an absolute path or a path relative to the main exe
-/// directory. On Linux the cef_settings_t.browser_subprocess_path value will be
-/// used. On macOS the existing subprocess app bundle will be used.
-///
-/// If "BrowserCrashForwardingEnabled" is set to true (1) on macOS then browser
-/// process crashes will be forwarded to the system crash reporter. This results
-/// in the crash UI dialog being displayed to the user and crash reports being
-/// logged under "~/Library/Logs/DiagnosticReports". Forwarding of crash reports
-/// from non-browser processes and Debug builds is always disabled.
-///
-/// If "ServerURL" is set then crashes will be uploaded as a multi-part POST
-/// request to the specified URL. Otherwise, reports will only be stored locally
-/// on disk.
-///
-/// If "RateLimitEnabled" is set to true (1) then crash report uploads will be
-/// rate limited as follows:
-///  1. If "MaxUploadsPerDay" is set to a positive value then at most the
-///     specified number of crashes will be uploaded in each 24 hour period.
-///  2. If crash upload fails due to a network or server error then an
-///     incremental backoff delay up to a maximum of 24 hours will be applied
-///     for retries.
-///  3. If a backoff delay is applied and "MaxUploadsPerDay" is > 1 then the
-///     "MaxUploadsPerDay" value will be reduced to 1 until the client is
-///     restarted. This helps to avoid an upload flood when the network or
-///     server error is resolved.
-/// Rate limiting is not supported on Linux.
-///
-/// If "MaxDatabaseSizeInMb" is set to a positive value then crash report
-/// storage on disk will be limited to that size in megabytes. For example, on
-/// Windows each dump is about 600KB so a "MaxDatabaseSizeInMb" value of 20
-/// equates to about 34 crash reports stored on disk. Not supported on Linux.
-///
-/// If "MaxDatabaseAgeInDays" is set to a positive value then crash reports
-/// older than the specified age in days will be deleted. Not supported on
-/// Linux.
-///
-/// <b>CrashKeys section:</b>
-///
-/// A maximum of 26 crash keys of each size can be specified for use by the
-/// application. Crash key values will be truncated based on the specified size
-/// (small = 64 bytes, medium = 256 bytes, large = 1024 bytes). The value of
-/// crash keys can be set from any thread or process using the
-/// CefSetCrashKeyValue function. These key/value pairs will be sent to the
-/// crash server along with the crash dump file.
-///
-CEF_EXPORT int cef_crash_reporting_enabled(void);
+CEF_EXPORT int cef_crash_reporting_enabled();

 ///
-/// Sets or clears a specific key-value pair from the crash metadata.
+// Sets or clears a specific key-value pair from the crash metadata.
 ///
 CEF_EXPORT void cef_set_crash_key_value(const cef_string_t* key,
                                        const cef_string_t* value);
--- a/include/capi/cef_devtools_message_observer_capi.h
+++ b/include/capi/cef_devtools_message_observer_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=076a01db2fc4241efeb46c5f247a9737fd828f9b$
+// $hash=1a256c04042ebd4867f39e1c31def558871b2bab$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_DEVTOOLS_MESSAGE_OBSERVER_CAPI_H_
@@ -49,36 +49,35 @@ extern "C" {
 struct _cef_browser_t;

 ///
-/// Callback structure for cef_browser_host_t::AddDevToolsMessageObserver. The
-/// functions of this structure will be called on the browser process UI thread.
+// Callback structure for cef_browser_host_t::AddDevToolsMessageObserver. The
+// functions of this structure will be called on the browser process UI thread.
 ///
 typedef struct _cef_dev_tools_message_observer_t {
  ///
-  /// Base structure.
+  // Base structure.
  ///
  cef_base_ref_counted_t base;

  ///
-  /// Method that will be called on receipt of a DevTools protocol message.
-  /// |browser| is the originating browser instance. |message| is a UTF8-encoded
-  /// JSON dictionary representing either a function result or an event.
-  /// |message| is only valid for the scope of this callback and should be
-  /// copied if necessary. Return true (1) if the message was handled or false
-  /// (0) if the message should be further processed and passed to the
-  /// OnDevToolsMethodResult or OnDevToolsEvent functions as appropriate.
-  ///
-  /// Method result dictionaries include an "id" (int) value that identifies the
-  /// orginating function call sent from
-  /// cef_browser_host_t::SendDevToolsMessage, and optionally either a "result"
-  /// (dictionary) or "error" (dictionary) value. The "error" dictionary will
-  /// contain "code" (int) and "message" (string) values. Event dictionaries
-  /// include a "function" (string) value and optionally a "params" (dictionary)
-  /// value. See the DevTools protocol documentation at
-  /// https://chromedevtools.github.io/devtools-protocol/ for details of
-  /// supported function calls and the expected "result" or "params" dictionary
-  /// contents. JSON dictionaries can be parsed using the CefParseJSON function
-  /// if desired, however be aware of performance considerations when parsing
-  /// large messages (some of which may exceed 1MB in size).
+  // Method that will be called on receipt of a DevTools protocol message.
+  // |browser| is the originating browser instance. |message| is a UTF8-encoded
+  // JSON dictionary representing either a function result or an event.
+  // |message| is only valid for the scope of this callback and should be copied
+  // if necessary. Return true (1) if the message was handled or false (0) if
+  // the message should be further processed and passed to the
+  // OnDevToolsMethodResult or OnDevToolsEvent functions as appropriate.
+  //
+  // Method result dictionaries include an "id" (int) value that identifies the
+  // orginating function call sent from cef_browser_host_t::SendDevToolsMessage,
+  // and optionally either a "result" (dictionary) or "error" (dictionary)
+  // value. The "error" dictionary will contain "code" (int) and "message"
+  // (string) values. Event dictionaries include a "function" (string) value and
+  // optionally a "params" (dictionary) value. See the DevTools protocol
+  // documentation at https://chromedevtools.github.io/devtools-protocol/ for
+  // details of supported function calls and the expected "result" or "params"
+  // dictionary contents. JSON dictionaries can be parsed using the CefParseJSON
+  // function if desired, however be aware of performance considerations when
+  // parsing large messages (some of which may exceed 1MB in size).
  ///
  int(CEF_CALLBACK* on_dev_tools_message)(
      struct _cef_dev_tools_message_observer_t* self,
@@ -87,16 +86,16 @@ typedef struct _cef_dev_tools_message_observer_t {
      size_t message_size);

  ///
-  /// Method that will be called after attempted execution of a DevTools
-  /// protocol function. |browser| is the originating browser instance.
-  /// |message_id| is the "id" value that identifies the originating function
-  /// call message. If the function succeeded |success| will be true (1) and
-  /// |result| will be the UTF8-encoded JSON "result" dictionary value (which
-  /// may be NULL). If the function failed |success| will be false (0) and
-  /// |result| will be the UTF8-encoded JSON "error" dictionary value. |result|
-  /// is only valid for the scope of this callback and should be copied if
-  /// necessary. See the OnDevToolsMessage documentation for additional details
-  /// on |result| contents.
+  // Method that will be called after attempted execution of a DevTools protocol
+  // function. |browser| is the originating browser instance. |message_id| is
+  // the "id" value that identifies the originating function call message. If
+  // the function succeeded |success| will be true (1) and |result| will be the
+  // UTF8-encoded JSON "result" dictionary value (which may be NULL). If the
+  // function failed |success| will be false (0) and |result| will be the
+  // UTF8-encoded JSON "error" dictionary value. |result| is only valid for the
+  // scope of this callback and should be copied if necessary. See the
+  // OnDevToolsMessage documentation for additional details on |result|
+  // contents.
  ///
  void(CEF_CALLBACK* on_dev_tools_method_result)(
      struct _cef_dev_tools_message_observer_t* self,
@@ -107,12 +106,12 @@ typedef struct _cef_dev_tools_message_observer_t {
      size_t result_size);

  ///
-  /// Method that will be called on receipt of a DevTools protocol event.
-  /// |browser| is the originating browser instance. |function| is the
-  /// "function" value. |params| is the UTF8-encoded JSON "params" dictionary
-  /// value (which may be NULL). |params| is only valid for the scope of this
-  /// callback and should be copied if necessary. See the OnDevToolsMessage
-  /// documentation for additional details on |params| contents.
+  // Method that will be called on receipt of a DevTools protocol event.
+  // |browser| is the originating browser instance. |function| is the "function"
+  // value. |params| is the UTF8-encoded JSON "params" dictionary value (which
+  // may be NULL). |params| is only valid for the scope of this callback and
+  // should be copied if necessary. See the OnDevToolsMessage documentation for
+  // additional details on |params| contents.
  ///
  void(CEF_CALLBACK* on_dev_tools_event)(
      struct _cef_dev_tools_message_observer_t* self,
@@ -122,19 +121,19 @@ typedef struct _cef_dev_tools_message_observer_t {
      size_t params_size);

  ///
-  /// Method that will be called when the DevTools agent has attached. |browser|
-  /// is the originating browser instance. This will generally occur in response
-  /// to the first message sent while the agent is detached.
+  // Method that will be called when the DevTools agent has attached. |browser|
+  // is the originating browser instance. This will generally occur in response
+  // to the first message sent while the agent is detached.
  ///
  void(CEF_CALLBACK* on_dev_tools_agent_attached)(
      struct _cef_dev_tools_message_observer_t* self,
      struct _cef_browser_t* browser);

  ///
-  /// Method that will be called when the DevTools agent has detached. |browser|
-  /// is the originating browser instance. Any function results that were
-  /// pending before the agent became detached will not be delivered, and any
-  /// active event subscriptions will be canceled.
+  // Method that will be called when the DevTools agent has detached. |browser|
+  // is the originating browser instance. Any function results that were pending
+  // before the agent became detached will not be delivered, and any active
+  // event subscriptions will be canceled.
  ///
  void(CEF_CALLBACK* on_dev_tools_agent_detached)(
      struct _cef_dev_tools_message_observer_t* self,
--- a/include/capi/cef_dialog_handler_capi.h
+++ b/include/capi/cef_dialog_handler_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=3a1a3ac84690c6090d356ddec3ddb49b934fe28c$
+// $hash=5ae5556e4085faf8cf17ee757f5eeac9197f75c0$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_DIALOG_HANDLER_CAPI_H_
@@ -48,51 +48,55 @@ extern "C" {
 #endif

 ///
-/// Callback structure for asynchronous continuation of file dialog requests.
+// Callback structure for asynchronous continuation of file dialog requests.
 ///
 typedef struct _cef_file_dialog_callback_t {
  ///
-  /// Base structure.
+  // Base structure.
  ///
  cef_base_ref_counted_t base;

  ///
-  /// Continue the file selection. |file_paths| should be a single value or a
-  /// list of values depending on the dialog mode. An NULL |file_paths| value is
-  /// treated the same as calling cancel().
+  // Continue the file selection. |selected_accept_filter| should be the 0-based
+  // index of the value selected from the accept filters array passed to
+  // cef_dialog_handler_t::OnFileDialog. |file_paths| should be a single value
+  // or a list of values depending on the dialog mode. An NULL |file_paths|
+  // value is treated the same as calling cancel().
  ///
  void(CEF_CALLBACK* cont)(struct _cef_file_dialog_callback_t* self,
+                           int selected_accept_filter,
                           cef_string_list_t file_paths);

  ///
-  /// Cancel the file selection.
+  // Cancel the file selection.
  ///
  void(CEF_CALLBACK* cancel)(struct _cef_file_dialog_callback_t* self);
 } cef_file_dialog_callback_t;

 ///
-/// Implement this structure to handle dialog events. The functions of this
-/// structure will be called on the browser process UI thread.
+// Implement this structure to handle dialog events. The functions of this
+// structure will be called on the browser process UI thread.
 ///
 typedef struct _cef_dialog_handler_t {
  ///
-  /// Base structure.
+  // Base structure.
  ///
  cef_base_ref_counted_t base;

  ///
-  /// Called to run a file chooser dialog. |mode| represents the type of dialog
-  /// to display. |title| to the title to be used for the dialog and may be NULL
-  /// to show the default title ("Open" or "Save" depending on the mode).
-  /// |default_file_path| is the path with optional directory and/or file name
-  /// component that should be initially selected in the dialog.
-  /// |accept_filters| are used to restrict the selectable file types and may
-  /// any combination of (a) valid lower-cased MIME types (e.g. "text/*" or
-  /// "image/*"), (b) individual file extensions (e.g. ".txt" or ".png"), or (c)
-  /// combined description and file extension delimited using "|" and ";" (e.g.
-  /// "Image Types|.png;.gif;.jpg"). To display a custom dialog return true (1)
-  /// and execute |callback| either inline or at a later time. To display the
-  /// default dialog return false (0).
+  // Called to run a file chooser dialog. |mode| represents the type of dialog
+  // to display. |title| to the title to be used for the dialog and may be NULL
+  // to show the default title ("Open" or "Save" depending on the mode).
+  // |default_file_path| is the path with optional directory and/or file name
+  // component that should be initially selected in the dialog. |accept_filters|
+  // are used to restrict the selectable file types and may any combination of
+  // (a) valid lower-cased MIME types (e.g. "text/*" or "image/*"), (b)
+  // individual file extensions (e.g. ".txt" or ".png"), or (c) combined
+  // description and file extension delimited using "|" and ";" (e.g. "Image
+  // Types|.png;.gif;.jpg"). |selected_accept_filter| is the 0-based index of
+  // the filter that should be selected by default. To display a custom dialog
+  // return true (1) and execute |callback| either inline or at a later time. To
+  // display the default dialog return false (0).
  ///
  int(CEF_CALLBACK* on_file_dialog)(
      struct _cef_dialog_handler_t* self,
@@ -101,6 +105,7 @@ typedef struct _cef_dialog_handler_t {
      const cef_string_t* title,
      const cef_string_t* default_file_path,
      cef_string_list_t accept_filters,
+      int selected_accept_filter,
      struct _cef_file_dialog_callback_t* callback);
 } cef_dialog_handler_t;

--- a/include/capi/cef_display_handler_capi.h
+++ b/include/capi/cef_display_handler_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=976a61df924efbcb0c53afeb75265e5e9e80c2de$
+// $hash=067fd169a30bec1ad8eeacc5ab1ac750cf59640e$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_DISPLAY_HANDLER_CAPI_H_
@@ -49,17 +49,17 @@ extern "C" {
 #endif

 ///
-/// Implement this structure to handle events related to browser display state.
-/// The functions of this structure will be called on the UI thread.
+// Implement this structure to handle events related to browser display state.
+// The functions of this structure will be called on the UI thread.
 ///
 typedef struct _cef_display_handler_t {
  ///
-  /// Base structure.
+  // Base structure.
  ///
  cef_base_ref_counted_t base;

  ///
-  /// Called when a frame's address has changed.
+  // Called when a frame's address has changed.
  ///
  void(CEF_CALLBACK* on_address_change)(struct _cef_display_handler_t* self,
                                        struct _cef_browser_t* browser,
@@ -67,25 +67,25 @@ typedef struct _cef_display_handler_t {
                                        const cef_string_t* url);

  ///
-  /// Called when the page title changes.
+  // Called when the page title changes.
  ///
  void(CEF_CALLBACK* on_title_change)(struct _cef_display_handler_t* self,
                                      struct _cef_browser_t* browser,
                                      const cef_string_t* title);

  ///
-  /// Called when the page icon changes.
+  // Called when the page icon changes.
  ///
  void(CEF_CALLBACK* on_favicon_urlchange)(struct _cef_display_handler_t* self,
                                           struct _cef_browser_t* browser,
                                           cef_string_list_t icon_urls);

  ///
-  /// Called when web content in the page has toggled fullscreen mode. If
-  /// |fullscreen| is true (1) the content will automatically be sized to fill
-  /// the browser content area. If |fullscreen| is false (0) the content will
-  /// automatically return to its original size and position. The client is
-  /// responsible for resizing the browser if desired.
+  // Called when web content in the page has toggled fullscreen mode. If
+  // |fullscreen| is true (1) the content will automatically be sized to fill
+  // the browser content area. If |fullscreen| is false (0) the content will
+  // automatically return to its original size and position. The client is
+  // responsible for resizing the browser if desired.
  ///
  void(CEF_CALLBACK* on_fullscreen_mode_change)(
      struct _cef_display_handler_t* self,
@@ -93,28 +93,28 @@ typedef struct _cef_display_handler_t {
      int fullscreen);

  ///
-  /// Called when the browser is about to display a tooltip. |text| contains the
-  /// text that will be displayed in the tooltip. To handle the display of the
-  /// tooltip yourself return true (1). Otherwise, you can optionally modify
-  /// |text| and then return false (0) to allow the browser to display the
-  /// tooltip. When window rendering is disabled the application is responsible
-  /// for drawing tooltips and the return value is ignored.
+  // Called when the browser is about to display a tooltip. |text| contains the
+  // text that will be displayed in the tooltip. To handle the display of the
+  // tooltip yourself return true (1). Otherwise, you can optionally modify
+  // |text| and then return false (0) to allow the browser to display the
+  // tooltip. When window rendering is disabled the application is responsible
+  // for drawing tooltips and the return value is ignored.
  ///
  int(CEF_CALLBACK* on_tooltip)(struct _cef_display_handler_t* self,
                                struct _cef_browser_t* browser,
                                cef_string_t* text);

  ///
-  /// Called when the browser receives a status message. |value| contains the
-  /// text that will be displayed in the status message.
+  // Called when the browser receives a status message. |value| contains the
+  // text that will be displayed in the status message.
  ///
  void(CEF_CALLBACK* on_status_message)(struct _cef_display_handler_t* self,
                                        struct _cef_browser_t* browser,
                                        const cef_string_t* value);

  ///
-  /// Called to display a console message. Return true (1) to stop the message
-  /// from being output to the console.
+  // Called to display a console message. Return true (1) to stop the message
+  // from being output to the console.
  ///
  int(CEF_CALLBACK* on_console_message)(struct _cef_display_handler_t* self,
                                        struct _cef_browser_t* browser,
@@ -124,18 +124,18 @@ typedef struct _cef_display_handler_t {
                                        int line);

  ///
-  /// Called when auto-resize is enabled via
-  /// cef_browser_host_t::SetAutoResizeEnabled and the contents have auto-
-  /// resized. |new_size| will be the desired size in view coordinates. Return
-  /// true (1) if the resize was handled or false (0) for default handling.
+  // Called when auto-resize is enabled via
+  // cef_browser_host_t::SetAutoResizeEnabled and the contents have auto-
+  // resized. |new_size| will be the desired size in view coordinates. Return
+  // true (1) if the resize was handled or false (0) for default handling.
  ///
  int(CEF_CALLBACK* on_auto_resize)(struct _cef_display_handler_t* self,
                                    struct _cef_browser_t* browser,
                                    const cef_size_t* new_size);

  ///
-  /// Called when the overall page loading progress has changed. |progress|
-  /// ranges from 0.0 to 1.0.
+  // Called when the overall page loading progress has changed. |progress|
+  // ranges from 0.0 to 1.0.
  ///
  void(CEF_CALLBACK* on_loading_progress_change)(
      struct _cef_display_handler_t* self,
@@ -143,27 +143,17 @@ typedef struct _cef_display_handler_t {
      double progress);

  ///
-  /// Called when the browser's cursor has changed. If |type| is CT_CUSTOM then
-  /// |custom_cursor_info| will be populated with the custom cursor information.
-  /// Return true (1) if the cursor change was handled or false (0) for default
-  /// handling.
+  // Called when the browser's cursor has changed. If |type| is CT_CUSTOM then
+  // |custom_cursor_info| will be populated with the custom cursor information.
+  // Return true (1) if the cursor change was handled or false (0) for default
+  // handling.
  ///
  int(CEF_CALLBACK* on_cursor_change)(
      struct _cef_display_handler_t* self,
      struct _cef_browser_t* browser,
      cef_cursor_handle_t cursor,
      cef_cursor_type_t type,
-      const cef_cursor_info_t* custom_cursor_info);
-
-  ///
-  /// Called when the browser's access to an audio and/or video source has
-  /// changed.
-  ///
-  void(CEF_CALLBACK* on_media_access_change)(
-      struct _cef_display_handler_t* self,
-      struct _cef_browser_t* browser,
-      int has_video_access,
-      int has_audio_access);
+      const struct _cef_cursor_info_t* custom_cursor_info);
 } cef_display_handler_t;

 #ifdef __cplusplus
--- a/include/capi/cef_dom_capi.h
+++ b/include/capi/cef_dom_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=47d8c186f687b65c8e7f394b97d72530e67593cd$
+// $hash=0517dc6c42fdde9fecfc4549fab1ea12b614e143$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_DOM_CAPI_H_
@@ -50,120 +50,120 @@ struct _cef_domdocument_t;
 struct _cef_domnode_t;

 ///
-/// Structure to implement for visiting the DOM. The functions of this structure
-/// will be called on the render process main thread.
+// Structure to implement for visiting the DOM. The functions of this structure
+// will be called on the render process main thread.
 ///
 typedef struct _cef_domvisitor_t {
  ///
-  /// Base structure.
+  // Base structure.
  ///
  cef_base_ref_counted_t base;

  ///
-  /// Method executed for visiting the DOM. The document object passed to this
-  /// function represents a snapshot of the DOM at the time this function is
-  /// executed. DOM objects are only valid for the scope of this function. Do
-  /// not keep references to or attempt to access any DOM objects outside the
-  /// scope of this function.
+  // Method executed for visiting the DOM. The document object passed to this
+  // function represents a snapshot of the DOM at the time this function is
+  // executed. DOM objects are only valid for the scope of this function. Do not
+  // keep references to or attempt to access any DOM objects outside the scope
+  // of this function.
  ///
  void(CEF_CALLBACK* visit)(struct _cef_domvisitor_t* self,
                            struct _cef_domdocument_t* document);
 } cef_domvisitor_t;

 ///
-/// Structure used to represent a DOM document. The functions of this structure
-/// should only be called on the render process main thread thread.
+// Structure used to represent a DOM document. The functions of this structure
+// should only be called on the render process main thread thread.
 ///
 typedef struct _cef_domdocument_t {
  ///
-  /// Base structure.
+  // Base structure.
  ///
  cef_base_ref_counted_t base;

  ///
-  /// Returns the document type.
+  // Returns the document type.
  ///
  cef_dom_document_type_t(CEF_CALLBACK* get_type)(
      struct _cef_domdocument_t* self);

  ///
-  /// Returns the root document node.
+  // Returns the root document node.
  ///
  struct _cef_domnode_t*(CEF_CALLBACK* get_document)(
      struct _cef_domdocument_t* self);

  ///
-  /// Returns the BODY node of an HTML document.
+  // Returns the BODY node of an HTML document.
  ///
  struct _cef_domnode_t*(CEF_CALLBACK* get_body)(
      struct _cef_domdocument_t* self);

  ///
-  /// Returns the HEAD node of an HTML document.
+  // Returns the HEAD node of an HTML document.
  ///
  struct _cef_domnode_t*(CEF_CALLBACK* get_head)(
      struct _cef_domdocument_t* self);

  ///
-  /// Returns the title of an HTML document.
+  // Returns the title of an HTML document.
  ///
  // The resulting string must be freed by calling cef_string_userfree_free().
  cef_string_userfree_t(CEF_CALLBACK* get_title)(
      struct _cef_domdocument_t* self);

  ///
-  /// Returns the document element with the specified ID value.
+  // Returns the document element with the specified ID value.
  ///
  struct _cef_domnode_t*(CEF_CALLBACK* get_element_by_id)(
      struct _cef_domdocument_t* self,
      const cef_string_t* id);

  ///
-  /// Returns the node that currently has keyboard focus.
+  // Returns the node that currently has keyboard focus.
  ///
  struct _cef_domnode_t*(CEF_CALLBACK* get_focused_node)(
      struct _cef_domdocument_t* self);

  ///
-  /// Returns true (1) if a portion of the document is selected.
+  // Returns true (1) if a portion of the document is selected.
  ///
  int(CEF_CALLBACK* has_selection)(struct _cef_domdocument_t* self);

  ///
-  /// Returns the selection offset within the start node.
+  // Returns the selection offset within the start node.
  ///
  int(CEF_CALLBACK* get_selection_start_offset)(
      struct _cef_domdocument_t* self);

  ///
-  /// Returns the selection offset within the end node.
+  // Returns the selection offset within the end node.
  ///
  int(CEF_CALLBACK* get_selection_end_offset)(struct _cef_domdocument_t* self);

  ///
-  /// Returns the contents of this selection as markup.
+  // Returns the contents of this selection as markup.
  ///
  // The resulting string must be freed by calling cef_string_userfree_free().
  cef_string_userfree_t(CEF_CALLBACK* get_selection_as_markup)(
      struct _cef_domdocument_t* self);

  ///
-  /// Returns the contents of this selection as text.
+  // Returns the contents of this selection as text.
  ///
  // The resulting string must be freed by calling cef_string_userfree_free().
  cef_string_userfree_t(CEF_CALLBACK* get_selection_as_text)(
      struct _cef_domdocument_t* self);

  ///
-  /// Returns the base URL for the document.
+  // Returns the base URL for the document.
  ///
  // The resulting string must be freed by calling cef_string_userfree_free().
  cef_string_userfree_t(CEF_CALLBACK* get_base_url)(
      struct _cef_domdocument_t* self);

  ///
-  /// Returns a complete URL based on the document base URL and the specified
-  /// partial URL.
+  // Returns a complete URL based on the document base URL and the specified
+  // partial URL.
  ///
  // The resulting string must be freed by calling cef_string_userfree_free().
  cef_string_userfree_t(CEF_CALLBACK* get_complete_url)(
@@ -172,139 +172,141 @@ typedef struct _cef_domdocument_t {
 } cef_domdocument_t;

 ///
-/// Structure used to represent a DOM node. The functions of this structure
-/// should only be called on the render process main thread.
+// Structure used to represent a DOM node. The functions of this structure
+// should only be called on the render process main thread.
 ///
 typedef struct _cef_domnode_t {
  ///
-  /// Base structure.
+  // Base structure.
  ///
  cef_base_ref_counted_t base;

  ///
-  /// Returns the type for this node.
+  // Returns the type for this node.
  ///
  cef_dom_node_type_t(CEF_CALLBACK* get_type)(struct _cef_domnode_t* self);

  ///
-  /// Returns true (1) if this is a text node.
+  // Returns true (1) if this is a text node.
  ///
  int(CEF_CALLBACK* is_text)(struct _cef_domnode_t* self);

  ///
-  /// Returns true (1) if this is an element node.
+  // Returns true (1) if this is an element node.
  ///
  int(CEF_CALLBACK* is_element)(struct _cef_domnode_t* self);

  ///
-  /// Returns true (1) if this is an editable node.
+  // Returns true (1) if this is an editable node.
  ///
  int(CEF_CALLBACK* is_editable)(struct _cef_domnode_t* self);

  ///
-  /// Returns true (1) if this is a form control element node.
+  // Returns true (1) if this is a form control element node.
  ///
  int(CEF_CALLBACK* is_form_control_element)(struct _cef_domnode_t* self);

  ///
-  /// Returns the type of this form control element node.
+  // Returns the type of this form control element node.
  ///
  // The resulting string must be freed by calling cef_string_userfree_free().
  cef_string_userfree_t(CEF_CALLBACK* get_form_control_element_type)(
      struct _cef_domnode_t* self);

  ///
-  /// Returns true (1) if this object is pointing to the same handle as |that|
-  /// object.
+  // Returns true (1) if this object is pointing to the same handle as |that|
+  // object.
  ///
  int(CEF_CALLBACK* is_same)(struct _cef_domnode_t* self,
                             struct _cef_domnode_t* that);

  ///
-  /// Returns the name of this node.
+  // Returns the name of this node.
  ///
  // The resulting string must be freed by calling cef_string_userfree_free().
  cef_string_userfree_t(CEF_CALLBACK* get_name)(struct _cef_domnode_t* self);

  ///
-  /// Returns the value of this node.
+  // Returns the value of this node.
  ///
  // The resulting string must be freed by calling cef_string_userfree_free().
  cef_string_userfree_t(CEF_CALLBACK* get_value)(struct _cef_domnode_t* self);

  ///
-  /// Set the value of this node. Returns true (1) on success.
+  // Set the value of this node. Returns true (1) on success.
  ///
  int(CEF_CALLBACK* set_value)(struct _cef_domnode_t* self,
                               const cef_string_t* value);

  ///
-  /// Returns the contents of this node as markup.
+  // Returns the contents of this node as markup.
  ///
  // The resulting string must be freed by calling cef_string_userfree_free().
  cef_string_userfree_t(CEF_CALLBACK* get_as_markup)(
      struct _cef_domnode_t* self);

  ///
-  /// Returns the document associated with this node.
+  // Returns the document associated with this node.
  ///
  struct _cef_domdocument_t*(CEF_CALLBACK* get_document)(
      struct _cef_domnode_t* self);

  ///
-  /// Returns the parent node.
+  // Returns the parent node.
  ///
  struct _cef_domnode_t*(CEF_CALLBACK* get_parent)(struct _cef_domnode_t* self);

  ///
-  /// Returns the previous sibling node.
+  // Returns the previous sibling node.
  ///
  struct _cef_domnode_t*(CEF_CALLBACK* get_previous_sibling)(
      struct _cef_domnode_t* self);

  ///
-  /// Returns the next sibling node.
+  // Returns the next sibling node.
  ///
  struct _cef_domnode_t*(CEF_CALLBACK* get_next_sibling)(
      struct _cef_domnode_t* self);

  ///
-  /// Returns true (1) if this node has child nodes.
+  // Returns true (1) if this node has child nodes.
  ///
  int(CEF_CALLBACK* has_children)(struct _cef_domnode_t* self);

  ///
-  /// Return the first child node.
+  // Return the first child node.
  ///
  struct _cef_domnode_t*(CEF_CALLBACK* get_first_child)(
      struct _cef_domnode_t* self);

  ///
-  /// Returns the last child node.
+  // Returns the last child node.
  ///
  struct _cef_domnode_t*(CEF_CALLBACK* get_last_child)(
      struct _cef_domnode_t* self);

+  // The following functions are valid only for element nodes.
+
  ///
-  /// Returns the tag name of this element.
+  // Returns the tag name of this element.
  ///
  // The resulting string must be freed by calling cef_string_userfree_free().
  cef_string_userfree_t(CEF_CALLBACK* get_element_tag_name)(
      struct _cef_domnode_t* self);

  ///
-  /// Returns true (1) if this element has attributes.
+  // Returns true (1) if this element has attributes.
  ///
  int(CEF_CALLBACK* has_element_attributes)(struct _cef_domnode_t* self);

  ///
-  /// Returns true (1) if this element has an attribute named |attrName|.
+  // Returns true (1) if this element has an attribute named |attrName|.
  ///
  int(CEF_CALLBACK* has_element_attribute)(struct _cef_domnode_t* self,
                                           const cef_string_t* attrName);

  ///
-  /// Returns the element attribute named |attrName|.
+  // Returns the element attribute named |attrName|.
  ///
  // The resulting string must be freed by calling cef_string_userfree_free().
  cef_string_userfree_t(CEF_CALLBACK* get_element_attribute)(
@@ -312,29 +314,28 @@ typedef struct _cef_domnode_t {
      const cef_string_t* attrName);

  ///
-  /// Returns a map of all element attributes.
+  // Returns a map of all element attributes.
  ///
  void(CEF_CALLBACK* get_element_attributes)(struct _cef_domnode_t* self,
                                             cef_string_map_t attrMap);

  ///
-  /// Set the value for the element attribute named |attrName|. Returns true (1)
-  /// on success.
+  // Set the value for the element attribute named |attrName|. Returns true (1)
+  // on success.
  ///
  int(CEF_CALLBACK* set_element_attribute)(struct _cef_domnode_t* self,
                                           const cef_string_t* attrName,
                                           const cef_string_t* value);

  ///
-  /// Returns the inner text of the element.
+  // Returns the inner text of the element.
  ///
  // The resulting string must be freed by calling cef_string_userfree_free().
  cef_string_userfree_t(CEF_CALLBACK* get_element_inner_text)(
      struct _cef_domnode_t* self);

  ///
-  /// Returns the bounds of the element in device pixels. Use
-  /// "window.devicePixelRatio" to convert to/from CSS pixels.
+  // Returns the bounds of the element.
  ///
  cef_rect_t(CEF_CALLBACK* get_element_bounds)(struct _cef_domnode_t* self);
 } cef_domnode_t;
--- a/include/capi/cef_download_handler_capi.h
+++ b/include/capi/cef_download_handler_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=aff139899b4b8b769fd0e506d8a46e434f924eee$
+// $hash=f0ceb73b289072a01c45c6e7abf339a4ec924d29$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_DOWNLOAD_HANDLER_CAPI_H_
@@ -49,19 +49,19 @@ extern "C" {
 #endif

 ///
-/// Callback structure used to asynchronously continue a download.
+// Callback structure used to asynchronously continue a download.
 ///
 typedef struct _cef_before_download_callback_t {
  ///
-  /// Base structure.
+  // Base structure.
  ///
  cef_base_ref_counted_t base;

  ///
-  /// Call to continue the download. Set |download_path| to the full file path
-  /// for the download including the file name or leave blank to use the
-  /// suggested name and the default temp directory. Set |show_dialog| to true
-  /// (1) if you do wish to show the default "Save As" dialog.
+  // Call to continue the download. Set |download_path| to the full file path
+  // for the download including the file name or leave blank to use the
+  // suggested name and the default temp directory. Set |show_dialog| to true
+  // (1) if you do wish to show the default "Save As" dialog.
  ///
  void(CEF_CALLBACK* cont)(struct _cef_before_download_callback_t* self,
                           const cef_string_t* download_path,
@@ -69,58 +69,46 @@ typedef struct _cef_before_download_callback_t {
 } cef_before_download_callback_t;

 ///
-/// Callback structure used to asynchronously cancel a download.
+// Callback structure used to asynchronously cancel a download.
 ///
 typedef struct _cef_download_item_callback_t {
  ///
-  /// Base structure.
+  // Base structure.
  ///
  cef_base_ref_counted_t base;

  ///
-  /// Call to cancel the download.
+  // Call to cancel the download.
  ///
  void(CEF_CALLBACK* cancel)(struct _cef_download_item_callback_t* self);

  ///
-  /// Call to pause the download.
+  // Call to pause the download.
  ///
  void(CEF_CALLBACK* pause)(struct _cef_download_item_callback_t* self);

  ///
-  /// Call to resume the download.
+  // Call to resume the download.
  ///
  void(CEF_CALLBACK* resume)(struct _cef_download_item_callback_t* self);
 } cef_download_item_callback_t;

 ///
-/// Structure used to handle file downloads. The functions of this structure
-/// will called on the browser process UI thread.
+// Structure used to handle file downloads. The functions of this structure will
+// called on the browser process UI thread.
 ///
 typedef struct _cef_download_handler_t {
  ///
-  /// Base structure.
+  // Base structure.
  ///
  cef_base_ref_counted_t base;

  ///
-  /// Called before a download begins in response to a user-initiated action
-  /// (e.g. alt + link click or link click that returns a `Content-Disposition:
-  /// attachment` response from the server). |url| is the target download URL
-  /// and |request_function| is the target function (GET, POST, etc). Return
-  /// true (1) to proceed with the download or false (0) to cancel the download.
-  ///
-  int(CEF_CALLBACK* can_download)(struct _cef_download_handler_t* self,
-                                  struct _cef_browser_t* browser,
-                                  const cef_string_t* url,
-                                  const cef_string_t* request_method);
-
-  ///
-  /// Called before a download begins. |suggested_name| is the suggested name
-  /// for the download file. By default the download will be canceled. Execute
-  /// |callback| either asynchronously or in this function to continue the
-  /// download if desired. Do not keep a reference to |download_item| outside of
-  /// this function.
+  // Called before a download begins. |suggested_name| is the suggested name for
+  // the download file. By default the download will be canceled. Execute
+  // |callback| either asynchronously or in this function to continue the
+  // download if desired. Do not keep a reference to |download_item| outside of
+  // this function.
  ///
  void(CEF_CALLBACK* on_before_download)(
      struct _cef_download_handler_t* self,
@@ -130,11 +118,11 @@ typedef struct _cef_download_handler_t {
      struct _cef_before_download_callback_t* callback);

  ///
-  /// Called when a download's status or progress information has been updated.
-  /// This may be called multiple times before and after on_before_download().
-  /// Execute |callback| either asynchronously or in this function to cancel the
-  /// download if desired. Do not keep a reference to |download_item| outside of
-  /// this function.
+  // Called when a download's status or progress information has been updated.
+  // This may be called multiple times before and after on_before_download().
+  // Execute |callback| either asynchronously or in this function to cancel the
+  // download if desired. Do not keep a reference to |download_item| outside of
+  // this function.
  ///
  void(CEF_CALLBACK* on_download_updated)(
      struct _cef_download_handler_t* self,
--- a/include/capi/cef_download_item_capi.h
+++ b/include/capi/cef_download_item_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=a218058d7ceb842c9ea0cf0c252f9787de6562e7$
+// $hash=d84044bb582b029af5fa46c75f35b3da948dffd2$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_DOWNLOAD_ITEM_CAPI_H_
@@ -47,109 +47,108 @@ extern "C" {
 #endif

 ///
-/// Structure used to represent a download item.
+// Structure used to represent a download item.
 ///
 typedef struct _cef_download_item_t {
  ///
-  /// Base structure.
+  // Base structure.
  ///
  cef_base_ref_counted_t base;

  ///
-  /// Returns true (1) if this object is valid. Do not call any other functions
-  /// if this function returns false (0).
+  // Returns true (1) if this object is valid. Do not call any other functions
+  // if this function returns false (0).
  ///
  int(CEF_CALLBACK* is_valid)(struct _cef_download_item_t* self);

  ///
-  /// Returns true (1) if the download is in progress.
+  // Returns true (1) if the download is in progress.
  ///
  int(CEF_CALLBACK* is_in_progress)(struct _cef_download_item_t* self);

  ///
-  /// Returns true (1) if the download is complete.
+  // Returns true (1) if the download is complete.
  ///
  int(CEF_CALLBACK* is_complete)(struct _cef_download_item_t* self);

  ///
-  /// Returns true (1) if the download has been canceled or interrupted.
+  // Returns true (1) if the download has been canceled or interrupted.
  ///
  int(CEF_CALLBACK* is_canceled)(struct _cef_download_item_t* self);

  ///
-  /// Returns a simple speed estimate in bytes/s.
+  // Returns a simple speed estimate in bytes/s.
  ///
  int64(CEF_CALLBACK* get_current_speed)(struct _cef_download_item_t* self);

  ///
-  /// Returns the rough percent complete or -1 if the receive total size is
-  /// unknown.
+  // Returns the rough percent complete or -1 if the receive total size is
+  // unknown.
  ///
  int(CEF_CALLBACK* get_percent_complete)(struct _cef_download_item_t* self);

  ///
-  /// Returns the total number of bytes.
+  // Returns the total number of bytes.
  ///
  int64(CEF_CALLBACK* get_total_bytes)(struct _cef_download_item_t* self);

  ///
-  /// Returns the number of received bytes.
+  // Returns the number of received bytes.
  ///
  int64(CEF_CALLBACK* get_received_bytes)(struct _cef_download_item_t* self);

  ///
-  /// Returns the time that the download started.
+  // Returns the time that the download started.
  ///
-  cef_basetime_t(CEF_CALLBACK* get_start_time)(
-      struct _cef_download_item_t* self);
+  cef_time_t(CEF_CALLBACK* get_start_time)(struct _cef_download_item_t* self);

  ///
-  /// Returns the time that the download ended.
+  // Returns the time that the download ended.
  ///
-  cef_basetime_t(CEF_CALLBACK* get_end_time)(struct _cef_download_item_t* self);
+  cef_time_t(CEF_CALLBACK* get_end_time)(struct _cef_download_item_t* self);

  ///
-  /// Returns the full path to the downloaded or downloading file.
+  // Returns the full path to the downloaded or downloading file.
  ///
  // The resulting string must be freed by calling cef_string_userfree_free().
  cef_string_userfree_t(CEF_CALLBACK* get_full_path)(
      struct _cef_download_item_t* self);

  ///
-  /// Returns the unique identifier for this download.
+  // Returns the unique identifier for this download.
  ///
  uint32(CEF_CALLBACK* get_id)(struct _cef_download_item_t* self);

  ///
-  /// Returns the URL.
+  // Returns the URL.
  ///
  // The resulting string must be freed by calling cef_string_userfree_free().
  cef_string_userfree_t(CEF_CALLBACK* get_url)(
      struct _cef_download_item_t* self);

  ///
-  /// Returns the original URL before any redirections.
+  // Returns the original URL before any redirections.
  ///
  // The resulting string must be freed by calling cef_string_userfree_free().
  cef_string_userfree_t(CEF_CALLBACK* get_original_url)(
      struct _cef_download_item_t* self);

  ///
-  /// Returns the suggested file name.
+  // Returns the suggested file name.
  ///
  // The resulting string must be freed by calling cef_string_userfree_free().
  cef_string_userfree_t(CEF_CALLBACK* get_suggested_file_name)(
      struct _cef_download_item_t* self);

  ///
-  /// Returns the content disposition.
+  // Returns the content disposition.
  ///
  // The resulting string must be freed by calling cef_string_userfree_free().
  cef_string_userfree_t(CEF_CALLBACK* get_content_disposition)(
      struct _cef_download_item_t* self);

  ///
-  /// Returns the mime type.
+  // Returns the mime type.
  ///
  // The resulting string must be freed by calling cef_string_userfree_free().
  cef_string_userfree_t(CEF_CALLBACK* get_mime_type)(
--- a/include/capi/cef_drag_data_capi.h
+++ b/include/capi/cef_drag_data_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=9e8375de3d30eb7e4f67488da3568d19848eb038$
+// $hash=9663321e2be1d000ac54e195c81f210ae40773d1$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_DRAG_DATA_CAPI_H_
@@ -49,182 +49,177 @@ extern "C" {
 #endif

 ///
-/// Structure used to represent drag data. The functions of this structure may
-/// be called on any thread.
+// Structure used to represent drag data. The functions of this structure may be
+// called on any thread.
 ///
 typedef struct _cef_drag_data_t {
  ///
-  /// Base structure.
+  // Base structure.
  ///
  cef_base_ref_counted_t base;

  ///
-  /// Returns a copy of the current object.
+  // Returns a copy of the current object.
  ///
  struct _cef_drag_data_t*(CEF_CALLBACK* clone)(struct _cef_drag_data_t* self);

  ///
-  /// Returns true (1) if this object is read-only.
+  // Returns true (1) if this object is read-only.
  ///
  int(CEF_CALLBACK* is_read_only)(struct _cef_drag_data_t* self);

  ///
-  /// Returns true (1) if the drag data is a link.
+  // Returns true (1) if the drag data is a link.
  ///
  int(CEF_CALLBACK* is_link)(struct _cef_drag_data_t* self);

  ///
-  /// Returns true (1) if the drag data is a text or html fragment.
+  // Returns true (1) if the drag data is a text or html fragment.
  ///
  int(CEF_CALLBACK* is_fragment)(struct _cef_drag_data_t* self);

  ///
-  /// Returns true (1) if the drag data is a file.
+  // Returns true (1) if the drag data is a file.
  ///
  int(CEF_CALLBACK* is_file)(struct _cef_drag_data_t* self);

  ///
-  /// Return the link URL that is being dragged.
+  // Return the link URL that is being dragged.
  ///
  // The resulting string must be freed by calling cef_string_userfree_free().
  cef_string_userfree_t(CEF_CALLBACK* get_link_url)(
      struct _cef_drag_data_t* self);

  ///
-  /// Return the title associated with the link being dragged.
+  // Return the title associated with the link being dragged.
  ///
  // The resulting string must be freed by calling cef_string_userfree_free().
  cef_string_userfree_t(CEF_CALLBACK* get_link_title)(
      struct _cef_drag_data_t* self);

  ///
-  /// Return the metadata, if any, associated with the link being dragged.
+  // Return the metadata, if any, associated with the link being dragged.
  ///
  // The resulting string must be freed by calling cef_string_userfree_free().
  cef_string_userfree_t(CEF_CALLBACK* get_link_metadata)(
      struct _cef_drag_data_t* self);

  ///
-  /// Return the plain text fragment that is being dragged.
+  // Return the plain text fragment that is being dragged.
  ///
  // The resulting string must be freed by calling cef_string_userfree_free().
  cef_string_userfree_t(CEF_CALLBACK* get_fragment_text)(
      struct _cef_drag_data_t* self);

  ///
-  /// Return the text/html fragment that is being dragged.
+  // Return the text/html fragment that is being dragged.
  ///
  // The resulting string must be freed by calling cef_string_userfree_free().
  cef_string_userfree_t(CEF_CALLBACK* get_fragment_html)(
      struct _cef_drag_data_t* self);

  ///
-  /// Return the base URL that the fragment came from. This value is used for
-  /// resolving relative URLs and may be NULL.
+  // Return the base URL that the fragment came from. This value is used for
+  // resolving relative URLs and may be NULL.
  ///
  // The resulting string must be freed by calling cef_string_userfree_free().
  cef_string_userfree_t(CEF_CALLBACK* get_fragment_base_url)(
      struct _cef_drag_data_t* self);

  ///
-  /// Return the name of the file being dragged out of the browser window.
+  // Return the name of the file being dragged out of the browser window.
  ///
  // The resulting string must be freed by calling cef_string_userfree_free().
  cef_string_userfree_t(CEF_CALLBACK* get_file_name)(
      struct _cef_drag_data_t* self);

  ///
-  /// Write the contents of the file being dragged out of the web view into
-  /// |writer|. Returns the number of bytes sent to |writer|. If |writer| is
-  /// NULL this function will return the size of the file contents in bytes.
-  /// Call get_file_name() to get a suggested name for the file.
+  // Write the contents of the file being dragged out of the web view into
+  // |writer|. Returns the number of bytes sent to |writer|. If |writer| is NULL
+  // this function will return the size of the file contents in bytes. Call
+  // get_file_name() to get a suggested name for the file.
  ///
  size_t(CEF_CALLBACK* get_file_contents)(struct _cef_drag_data_t* self,
                                          struct _cef_stream_writer_t* writer);

  ///
-  /// Retrieve the list of file names that are being dragged into the browser
-  /// window.
+  // Retrieve the list of file names that are being dragged into the browser
+  // window.
  ///
  int(CEF_CALLBACK* get_file_names)(struct _cef_drag_data_t* self,
                                    cef_string_list_t names);

  ///
-  /// Set the link URL that is being dragged.
+  // Set the link URL that is being dragged.
  ///
  void(CEF_CALLBACK* set_link_url)(struct _cef_drag_data_t* self,
                                   const cef_string_t* url);

  ///
-  /// Set the title associated with the link being dragged.
+  // Set the title associated with the link being dragged.
  ///
  void(CEF_CALLBACK* set_link_title)(struct _cef_drag_data_t* self,
                                     const cef_string_t* title);

  ///
-  /// Set the metadata associated with the link being dragged.
+  // Set the metadata associated with the link being dragged.
  ///
  void(CEF_CALLBACK* set_link_metadata)(struct _cef_drag_data_t* self,
                                        const cef_string_t* data);

  ///
-  /// Set the plain text fragment that is being dragged.
+  // Set the plain text fragment that is being dragged.
  ///
  void(CEF_CALLBACK* set_fragment_text)(struct _cef_drag_data_t* self,
                                        const cef_string_t* text);

  ///
-  /// Set the text/html fragment that is being dragged.
+  // Set the text/html fragment that is being dragged.
  ///
  void(CEF_CALLBACK* set_fragment_html)(struct _cef_drag_data_t* self,
                                        const cef_string_t* html);

  ///
-  /// Set the base URL that the fragment came from.
+  // Set the base URL that the fragment came from.
  ///
  void(CEF_CALLBACK* set_fragment_base_url)(struct _cef_drag_data_t* self,
                                            const cef_string_t* base_url);

  ///
-  /// Reset the file contents. You should do this before calling
-  /// cef_browser_host_t::DragTargetDragEnter as the web view does not allow us
-  /// to drag in this kind of data.
+  // Reset the file contents. You should do this before calling
+  // cef_browser_host_t::DragTargetDragEnter as the web view does not allow us
+  // to drag in this kind of data.
  ///
  void(CEF_CALLBACK* reset_file_contents)(struct _cef_drag_data_t* self);

  ///
-  /// Add a file that is being dragged into the webview.
+  // Add a file that is being dragged into the webview.
  ///
  void(CEF_CALLBACK* add_file)(struct _cef_drag_data_t* self,
                               const cef_string_t* path,
                               const cef_string_t* display_name);

  ///
-  /// Clear list of filenames.
-  ///
-  void(CEF_CALLBACK* clear_filenames)(struct _cef_drag_data_t* self);
-
-  ///
-  /// Get the image representation of drag data. May return NULL if no image
-  /// representation is available.
+  // Get the image representation of drag data. May return NULL if no image
+  // representation is available.
  ///
  struct _cef_image_t*(CEF_CALLBACK* get_image)(struct _cef_drag_data_t* self);

  ///
-  /// Get the image hotspot (drag start location relative to image dimensions).
+  // Get the image hotspot (drag start location relative to image dimensions).
  ///
  cef_point_t(CEF_CALLBACK* get_image_hotspot)(struct _cef_drag_data_t* self);

  ///
-  /// Returns true (1) if an image representation of drag data is available.
+  // Returns true (1) if an image representation of drag data is available.
  ///
  int(CEF_CALLBACK* has_image)(struct _cef_drag_data_t* self);
 } cef_drag_data_t;

 ///
-/// Create a new cef_drag_data_t object.
+// Create a new cef_drag_data_t object.
 ///
-CEF_EXPORT cef_drag_data_t* cef_drag_data_create(void);
+CEF_EXPORT cef_drag_data_t* cef_drag_data_create();

 #ifdef __cplusplus
 }
--- a/include/capi/cef_drag_handler_capi.h
+++ b/include/capi/cef_drag_handler_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=ec450acb2c3cc4d0e69b7da725387d5c1049773b$
+// $hash=1cc1f134e68406ae3b05f7e181e12f27262772f0$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_DRAG_HANDLER_CAPI_H_
@@ -50,20 +50,20 @@ extern "C" {
 #endif

 ///
-/// Implement this structure to handle events related to dragging. The functions
-/// of this structure will be called on the UI thread.
+// Implement this structure to handle events related to dragging. The functions
+// of this structure will be called on the UI thread.
 ///
 typedef struct _cef_drag_handler_t {
  ///
-  /// Base structure.
+  // Base structure.
  ///
  cef_base_ref_counted_t base;

  ///
-  /// Called when an external drag event enters the browser window. |dragData|
-  /// contains the drag event data and |mask| represents the type of drag
-  /// operation. Return false (0) for default drag handling behavior or true (1)
-  /// to cancel the drag event.
+  // Called when an external drag event enters the browser window. |dragData|
+  // contains the drag event data and |mask| represents the type of drag
+  // operation. Return false (0) for default drag handling behavior or true (1)
+  // to cancel the drag event.
  ///
  int(CEF_CALLBACK* on_drag_enter)(struct _cef_drag_handler_t* self,
                                   struct _cef_browser_t* browser,
@@ -71,11 +71,11 @@ typedef struct _cef_drag_handler_t {
                                   cef_drag_operations_mask_t mask);

  ///
-  /// Called whenever draggable regions for the browser window change. These can
-  /// be specified using the '-webkit-app-region: drag/no-drag' CSS-property. If
-  /// draggable regions are never defined in a document this function will also
-  /// never be called. If the last draggable region is removed from a document
-  /// this function will be called with an NULL vector.
+  // Called whenever draggable regions for the browser window change. These can
+  // be specified using the '-webkit-app-region: drag/no-drag' CSS-property. If
+  // draggable regions are never defined in a document this function will also
+  // never be called. If the last draggable region is removed from a document
+  // this function will be called with an NULL vector.
  ///
  void(CEF_CALLBACK* on_draggable_regions_changed)(
      struct _cef_drag_handler_t* self,
--- a/include/capi/cef_extension_capi.h
+++ b/include/capi/cef_extension_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=b16b1c47d26e911d360159e5535743622a411c31$
+// $hash=5d5251098be1477705de2a21502dec2d8338ce00$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_EXTENSION_CAPI_H_
@@ -51,74 +51,74 @@ struct _cef_extension_handler_t;
 struct _cef_request_context_t;

 ///
-/// Object representing an extension. Methods may be called on any thread unless
-/// otherwise indicated.
+// Object representing an extension. Methods may be called on any thread unless
+// otherwise indicated.
 ///
 typedef struct _cef_extension_t {
  ///
-  /// Base structure.
+  // Base structure.
  ///
  cef_base_ref_counted_t base;

  ///
-  /// Returns the unique extension identifier. This is calculated based on the
-  /// extension public key, if available, or on the extension path. See
-  /// https://developer.chrome.com/extensions/manifest/key for details.
+  // Returns the unique extension identifier. This is calculated based on the
+  // extension public key, if available, or on the extension path. See
+  // https://developer.chrome.com/extensions/manifest/key for details.
  ///
  // The resulting string must be freed by calling cef_string_userfree_free().
  cef_string_userfree_t(CEF_CALLBACK* get_identifier)(
      struct _cef_extension_t* self);

  ///
-  /// Returns the absolute path to the extension directory on disk. This value
-  /// will be prefixed with PK_DIR_RESOURCES if a relative path was passed to
-  /// cef_request_context_t::LoadExtension.
+  // Returns the absolute path to the extension directory on disk. This value
+  // will be prefixed with PK_DIR_RESOURCES if a relative path was passed to
+  // cef_request_context_t::LoadExtension.
  ///
  // The resulting string must be freed by calling cef_string_userfree_free().
  cef_string_userfree_t(CEF_CALLBACK* get_path)(struct _cef_extension_t* self);

  ///
-  /// Returns the extension manifest contents as a cef_dictionary_value_t
-  /// object. See https://developer.chrome.com/extensions/manifest for details.
+  // Returns the extension manifest contents as a cef_dictionary_value_t object.
+  // See https://developer.chrome.com/extensions/manifest for details.
  ///
  struct _cef_dictionary_value_t*(CEF_CALLBACK* get_manifest)(
      struct _cef_extension_t* self);

  ///
-  /// Returns true (1) if this object is the same extension as |that| object.
-  /// Extensions are considered the same if identifier, path and loader context
-  /// match.
+  // Returns true (1) if this object is the same extension as |that| object.
+  // Extensions are considered the same if identifier, path and loader context
+  // match.
  ///
  int(CEF_CALLBACK* is_same)(struct _cef_extension_t* self,
                             struct _cef_extension_t* that);

  ///
-  /// Returns the handler for this extension. Will return NULL for internal
-  /// extensions or if no handler was passed to
-  /// cef_request_context_t::LoadExtension.
+  // Returns the handler for this extension. Will return NULL for internal
+  // extensions or if no handler was passed to
+  // cef_request_context_t::LoadExtension.
  ///
  struct _cef_extension_handler_t*(CEF_CALLBACK* get_handler)(
      struct _cef_extension_t* self);

  ///
-  /// Returns the request context that loaded this extension. Will return NULL
-  /// for internal extensions or if the extension has been unloaded. See the
-  /// cef_request_context_t::LoadExtension documentation for more information
-  /// about loader contexts. Must be called on the browser process UI thread.
+  // Returns the request context that loaded this extension. Will return NULL
+  // for internal extensions or if the extension has been unloaded. See the
+  // cef_request_context_t::LoadExtension documentation for more information
+  // about loader contexts. Must be called on the browser process UI thread.
  ///
  struct _cef_request_context_t*(CEF_CALLBACK* get_loader_context)(
      struct _cef_extension_t* self);

  ///
-  /// Returns true (1) if this extension is currently loaded. Must be called on
-  /// the browser process UI thread.
+  // Returns true (1) if this extension is currently loaded. Must be called on
+  // the browser process UI thread.
  ///
  int(CEF_CALLBACK* is_loaded)(struct _cef_extension_t* self);

  ///
-  /// Unload this extension if it is not an internal extension and is currently
-  /// loaded. Will result in a call to
-  /// cef_extension_handler_t::OnExtensionUnloaded on success.
+  // Unload this extension if it is not an internal extension and is currently
+  // loaded. Will result in a call to
+  // cef_extension_handler_t::OnExtensionUnloaded on success.
  ///
  void(CEF_CALLBACK* unload)(struct _cef_extension_t* self);
 } cef_extension_t;
--- a/include/capi/cef_extension_handler_capi.h
+++ b/include/capi/cef_extension_handler_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=ba961ade334c82e53213e7e8ac848adc2a7b533a$
+// $hash=c952241dabb9d99109ebb64acba0124e43150628$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_EXTENSION_HANDLER_CAPI_H_
@@ -52,76 +52,75 @@ extern "C" {
 struct _cef_client_t;

 ///
-/// Callback structure used for asynchronous continuation of
-/// cef_extension_handler_t::GetExtensionResource.
+// Callback structure used for asynchronous continuation of
+// cef_extension_handler_t::GetExtensionResource.
 ///
 typedef struct _cef_get_extension_resource_callback_t {
  ///
-  /// Base structure.
+  // Base structure.
  ///
  cef_base_ref_counted_t base;

  ///
-  /// Continue the request. Read the resource contents from |stream|.
+  // Continue the request. Read the resource contents from |stream|.
  ///
  void(CEF_CALLBACK* cont)(struct _cef_get_extension_resource_callback_t* self,
                           struct _cef_stream_reader_t* stream);

  ///
-  /// Cancel the request.
+  // Cancel the request.
  ///
  void(CEF_CALLBACK* cancel)(
      struct _cef_get_extension_resource_callback_t* self);
 } cef_get_extension_resource_callback_t;

 ///
-/// Implement this structure to handle events related to browser extensions. The
-/// functions of this structure will be called on the UI thread. See
-/// cef_request_context_t::LoadExtension for information about extension
-/// loading.
+// Implement this structure to handle events related to browser extensions. The
+// functions of this structure will be called on the UI thread. See
+// cef_request_context_t::LoadExtension for information about extension loading.
 ///
 typedef struct _cef_extension_handler_t {
  ///
-  /// Base structure.
+  // Base structure.
  ///
  cef_base_ref_counted_t base;

  ///
-  /// Called if the cef_request_context_t::LoadExtension request fails. |result|
-  /// will be the error code.
+  // Called if the cef_request_context_t::LoadExtension request fails. |result|
+  // will be the error code.
  ///
  void(CEF_CALLBACK* on_extension_load_failed)(
      struct _cef_extension_handler_t* self,
      cef_errorcode_t result);

  ///
-  /// Called if the cef_request_context_t::LoadExtension request succeeds.
-  /// |extension| is the loaded extension.
+  // Called if the cef_request_context_t::LoadExtension request succeeds.
+  // |extension| is the loaded extension.
  ///
  void(CEF_CALLBACK* on_extension_loaded)(struct _cef_extension_handler_t* self,
                                          struct _cef_extension_t* extension);

  ///
-  /// Called after the cef_extension_t::Unload request has completed.
+  // Called after the cef_extension_t::Unload request has completed.
  ///
  void(CEF_CALLBACK* on_extension_unloaded)(
      struct _cef_extension_handler_t* self,
      struct _cef_extension_t* extension);

  ///
-  /// Called when an extension needs a browser to host a background script
-  /// specified via the "background" manifest key. The browser will have no
-  /// visible window and cannot be displayed. |extension| is the extension that
-  /// is loading the background script. |url| is an internally generated
-  /// reference to an HTML page that will be used to load the background script
-  /// via a "<script>" src attribute. To allow creation of the browser
-  /// optionally modify |client| and |settings| and return false (0). To cancel
-  /// creation of the browser (and consequently cancel load of the background
-  /// script) return true (1). Successful creation will be indicated by a call
-  /// to cef_life_span_handler_t::OnAfterCreated, and
-  /// cef_browser_host_t::IsBackgroundHost will return true (1) for the
-  /// resulting browser. See https://developer.chrome.com/extensions/event_pages
-  /// for more information about extension background script usage.
+  // Called when an extension needs a browser to host a background script
+  // specified via the "background" manifest key. The browser will have no
+  // visible window and cannot be displayed. |extension| is the extension that
+  // is loading the background script. |url| is an internally generated
+  // reference to an HTML page that will be used to load the background script
+  // via a <script> src attribute. To allow creation of the browser optionally
+  // modify |client| and |settings| and return false (0). To cancel creation of
+  // the browser (and consequently cancel load of the background script) return
+  // true (1). Successful creation will be indicated by a call to
+  // cef_life_span_handler_t::OnAfterCreated, and
+  // cef_browser_host_t::IsBackgroundHost will return true (1) for the resulting
+  // browser. See https://developer.chrome.com/extensions/event_pages for more
+  // information about extension background script usage.
  ///
  int(CEF_CALLBACK* on_before_background_browser)(
      struct _cef_extension_handler_t* self,
@@ -131,19 +130,19 @@ typedef struct _cef_extension_handler_t {
      struct _cef_browser_settings_t* settings);

  ///
-  /// Called when an extension API (e.g. chrome.tabs.create) requests creation
-  /// of a new browser. |extension| and |browser| are the source of the API
-  /// call. |active_browser| may optionally be specified via the windowId
-  /// property or returned via the get_active_browser() callback and provides
-  /// the default |client| and |settings| values for the new browser. |index| is
-  /// the position value optionally specified via the index property. |url| is
-  /// the URL that will be loaded in the browser. |active| is true (1) if the
-  /// new browser should be active when opened.  To allow creation of the
-  /// browser optionally modify |windowInfo|, |client| and |settings| and return
-  /// false (0). To cancel creation of the browser return true (1). Successful
-  /// creation will be indicated by a call to
-  /// cef_life_span_handler_t::OnAfterCreated. Any modifications to |windowInfo|
-  /// will be ignored if |active_browser| is wrapped in a cef_browser_view_t.
+  // Called when an extension API (e.g. chrome.tabs.create) requests creation of
+  // a new browser. |extension| and |browser| are the source of the API call.
+  // |active_browser| may optionally be specified via the windowId property or
+  // returned via the get_active_browser() callback and provides the default
+  // |client| and |settings| values for the new browser. |index| is the position
+  // value optionally specified via the index property. |url| is the URL that
+  // will be loaded in the browser. |active| is true (1) if the new browser
+  // should be active when opened.  To allow creation of the browser optionally
+  // modify |windowInfo|, |client| and |settings| and return false (0). To
+  // cancel creation of the browser return true (1). Successful creation will be
+  // indicated by a call to cef_life_span_handler_t::OnAfterCreated. Any
+  // modifications to |windowInfo| will be ignored if |active_browser| is
+  // wrapped in a cef_browser_view_t.
  ///
  int(CEF_CALLBACK* on_before_browser)(
      struct _cef_extension_handler_t* self,
@@ -158,13 +157,13 @@ typedef struct _cef_extension_handler_t {
      struct _cef_browser_settings_t* settings);

  ///
-  /// Called when no tabId is specified to an extension API call that accepts a
-  /// tabId parameter (e.g. chrome.tabs.*). |extension| and |browser| are the
-  /// source of the API call. Return the browser that will be acted on by the
-  /// API call or return NULL to act on |browser|. The returned browser must
-  /// share the same cef_request_context_t as |browser|. Incognito browsers
-  /// should not be considered unless the source extension has incognito access
-  /// enabled, in which case |include_incognito| will be true (1).
+  // Called when no tabId is specified to an extension API call that accepts a
+  // tabId parameter (e.g. chrome.tabs.*). |extension| and |browser| are the
+  // source of the API call. Return the browser that will be acted on by the API
+  // call or return NULL to act on |browser|. The returned browser must share
+  // the same cef_request_context_t as |browser|. Incognito browsers should not
+  // be considered unless the source extension has incognito access enabled, in
+  // which case |include_incognito| will be true (1).
  ///
  struct _cef_browser_t*(CEF_CALLBACK* get_active_browser)(
      struct _cef_extension_handler_t* self,
@@ -173,12 +172,12 @@ typedef struct _cef_extension_handler_t {
      int include_incognito);

  ///
-  /// Called when the tabId associated with |target_browser| is specified to an
-  /// extension API call that accepts a tabId parameter (e.g. chrome.tabs.*).
-  /// |extension| and |browser| are the source of the API call. Return true (1)
-  /// to allow access of false (0) to deny access. Access to incognito browsers
-  /// should not be allowed unless the source extension has incognito access
-  /// enabled, in which case |include_incognito| will be true (1).
+  // Called when the tabId associated with |target_browser| is specified to an
+  // extension API call that accepts a tabId parameter (e.g. chrome.tabs.*).
+  // |extension| and |browser| are the source of the API call. Return true (1)
+  // to allow access of false (0) to deny access. Access to incognito browsers
+  // should not be allowed unless the source extension has incognito access
+  // enabled, in which case |include_incognito| will be true (1).
  ///
  int(CEF_CALLBACK* can_access_browser)(struct _cef_extension_handler_t* self,
                                        struct _cef_extension_t* extension,
@@ -187,15 +186,14 @@ typedef struct _cef_extension_handler_t {
                                        struct _cef_browser_t* target_browser);

  ///
-  /// Called to retrieve an extension resource that would normally be loaded
-  /// from disk (e.g. if a file parameter is specified to
-  /// chrome.tabs.executeScript). |extension| and |browser| are the source of
-  /// the resource request. |file| is the requested relative file path. To
-  /// handle the resource request return true (1) and execute |callback| either
-  /// synchronously or asynchronously. For the default behavior which reads the
-  /// resource from the extension directory on disk return false (0).
-  /// Localization substitutions will not be applied to resources handled via
-  /// this function.
+  // Called to retrieve an extension resource that would normally be loaded from
+  // disk (e.g. if a file parameter is specified to chrome.tabs.executeScript).
+  // |extension| and |browser| are the source of the resource request. |file| is
+  // the requested relative file path. To handle the resource request return
+  // true (1) and execute |callback| either synchronously or asynchronously. For
+  // the default behavior which reads the resource from the extension directory
+  // on disk return false (0). Localization substitutions will not be applied to
+  // resources handled via this function.
  ///
  int(CEF_CALLBACK* get_extension_resource)(
      struct _cef_extension_handler_t* self,
--- a/include/capi/cef_file_util_capi.h
+++ b/include/capi/cef_file_util_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=3e2e068a2be0a3b12653eea65a4bbe1c9cdb8c7f$
+// $hash=00d75d4f1968686cec7db84a59df89d98d8fe146$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_FILE_UTIL_CAPI_H_
@@ -47,40 +47,40 @@ extern "C" {
 #endif

 ///
-/// Creates a directory and all parent directories if they don't already exist.
-/// Returns true (1) on successful creation or if the directory already exists.
-/// The directory is only readable by the current user. Calling this function on
-/// the browser process UI or IO threads is not allowed.
+// Creates a directory and all parent directories if they don't already exist.
+// Returns true (1) on successful creation or if the directory already exists.
+// The directory is only readable by the current user. Calling this function on
+// the browser process UI or IO threads is not allowed.
 ///
 CEF_EXPORT int cef_create_directory(const cef_string_t* full_path);

 ///
-/// Get the temporary directory provided by the system.
-///
-/// WARNING: In general, you should use the temp directory variants below
-/// instead of this function. Those variants will ensure that the proper
-/// permissions are set so that other users on the system can't edit them while
-/// they're open (which could lead to security issues).
+// Get the temporary directory provided by the system.
+//
+// WARNING: In general, you should use the temp directory variants below instead
+// of this function. Those variants will ensure that the proper permissions are
+// set so that other users on the system can't edit them while they're open
+// (which could lead to security issues).
 ///
 CEF_EXPORT int cef_get_temp_directory(cef_string_t* temp_dir);

 ///
-/// Creates a new directory. On Windows if |prefix| is provided the new
-/// directory name is in the format of "prefixyyyy". Returns true (1) on success
-/// and sets |new_temp_path| to the full path of the directory that was created.
-/// The directory is only readable by the current user. Calling this function on
-/// the browser process UI or IO threads is not allowed.
+// Creates a new directory. On Windows if |prefix| is provided the new directory
+// name is in the format of "prefixyyyy". Returns true (1) on success and sets
+// |new_temp_path| to the full path of the directory that was created. The
+// directory is only readable by the current user. Calling this function on the
+// browser process UI or IO threads is not allowed.
 ///
 CEF_EXPORT int cef_create_new_temp_directory(const cef_string_t* prefix,
                                             cef_string_t* new_temp_path);

 ///
-/// Creates a directory within another directory. Extra characters will be
-/// appended to |prefix| to ensure that the new directory does not have the same
-/// name as an existing directory. Returns true (1) on success and sets
-/// |new_dir| to the full path of the directory that was created. The directory
-/// is only readable by the current user. Calling this function on the browser
-/// process UI or IO threads is not allowed.
+// Creates a directory within another directory. Extra characters will be
+// appended to |prefix| to ensure that the new directory does not have the same
+// name as an existing directory. Returns true (1) on success and sets |new_dir|
+// to the full path of the directory that was created. The directory is only
+// readable by the current user. Calling this function on the browser process UI
+// or IO threads is not allowed.
 ///
 CEF_EXPORT int cef_create_temp_directory_in_directory(
    const cef_string_t* base_dir,
@@ -88,40 +88,39 @@ CEF_EXPORT int cef_create_temp_directory_in_directory(
    cef_string_t* new_dir);

 ///
-/// Returns true (1) if the given path exists and is a directory. Calling this
-/// function on the browser process UI or IO threads is not allowed.
+// Returns true (1) if the given path exists and is a directory. Calling this
+// function on the browser process UI or IO threads is not allowed.
 ///
 CEF_EXPORT int cef_directory_exists(const cef_string_t* path);

 ///
-/// Deletes the given path whether it's a file or a directory. If |path| is a
-/// directory all contents will be deleted.  If |recursive| is true (1) any sub-
-/// directories and their contents will also be deleted (equivalent to executing
-/// "rm -rf", so use with caution). On POSIX environments if |path| is a
-/// symbolic link then only the symlink will be deleted. Returns true (1) on
-/// successful deletion or if |path| does not exist. Calling this function on
-/// the browser process UI or IO threads is not allowed.
+// Deletes the given path whether it's a file or a directory. If |path| is a
+// directory all contents will be deleted.  If |recursive| is true (1) any sub-
+// directories and their contents will also be deleted (equivalent to executing
+// "rm -rf", so use with caution). On POSIX environments if |path| is a symbolic
+// link then only the symlink will be deleted. Returns true (1) on successful
+// deletion or if |path| does not exist. Calling this function on the browser
+// process UI or IO threads is not allowed.
 ///
 CEF_EXPORT int cef_delete_file(const cef_string_t* path, int recursive);

 ///
-/// Writes the contents of |src_dir| into a zip archive at |dest_file|. If
-/// |include_hidden_files| is true (1) files starting with "." will be included.
-/// Returns true (1) on success.  Calling this function on the browser process
-/// UI or IO threads is not allowed.
+// Writes the contents of |src_dir| into a zip archive at |dest_file|. If
+// |include_hidden_files| is true (1) files starting with "." will be included.
+// Returns true (1) on success.  Calling this function on the browser process UI
+// or IO threads is not allowed.
 ///
 CEF_EXPORT int cef_zip_directory(const cef_string_t* src_dir,
                                 const cef_string_t* dest_file,
                                 int include_hidden_files);

 ///
-/// Loads the existing "Certificate Revocation Lists" file that is managed by
-/// Google Chrome. This file can generally be found in Chrome's User Data
-/// directory (e.g. "C:\Users\[User]\AppData\Local\Google\Chrome\User Data\" on
-/// Windows) and is updated periodically by Chrome's component updater service.
-/// Must be called in the browser process after the context has been
-/// initialized. See https://dev.chromium.org/Home/chromium-security/crlsets for
-/// background.
+// Loads the existing "Certificate Revocation Lists" file that is managed by
+// Google Chrome. This file can generally be found in Chrome's User Data
+// directory (e.g. "C:\Users\[User]\AppData\Local\Google\Chrome\User Data\" on
+// Windows) and is updated periodically by Chrome's component updater service.
+// Must be called in the browser process after the context has been initialized.
+// See https://dev.chromium.org/Home/chromium-security/crlsets for background.
 ///
 CEF_EXPORT void cef_load_crlsets_file(const cef_string_t* path);

--- a/include/capi/cef_find_handler_capi.h
+++ b/include/capi/cef_find_handler_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=30e86c9dd440616305f94747b313eb526c4323c7$
+// $hash=03bb69a14868a95abf3bf7b1608dc351480e307f$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_FIND_HANDLER_CAPI_H_
@@ -48,23 +48,22 @@ extern "C" {
 #endif

 ///
-/// Implement this structure to handle events related to find results. The
-/// functions of this structure will be called on the UI thread.
+// Implement this structure to handle events related to find results. The
+// functions of this structure will be called on the UI thread.
 ///
 typedef struct _cef_find_handler_t {
  ///
-  /// Base structure.
+  // Base structure.
  ///
  cef_base_ref_counted_t base;

  ///
-  /// Called to report find results returned by cef_browser_host_t::find().
-  /// |identifer| is a unique incremental identifier for the currently active
-  /// search, |count| is the number of matches currently identified,
-  /// |selectionRect| is the location of where the match was found (in window
-  /// coordinates), |activeMatchOrdinal| is the current position in the search
-  /// results, and |finalUpdate| is true (1) if this is the last find
-  /// notification.
+  // Called to report find results returned by cef_browser_host_t::find().
+  // |identifer| is the identifier passed to find(), |count| is the number of
+  // matches currently identified, |selectionRect| is the location of where the
+  // match was found (in window coordinates), |activeMatchOrdinal| is the
+  // current position in the search results, and |finalUpdate| is true (1) if
+  // this is the last find notification.
  ///
  void(CEF_CALLBACK* on_find_result)(struct _cef_find_handler_t* self,
                                     struct _cef_browser_t* browser,
--- a/include/capi/cef_focus_handler_capi.h
+++ b/include/capi/cef_focus_handler_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=907b9628ac4b7ab4603dc6e20b7e8675a51987ba$
+// $hash=0fccb41381e922e9d9545ae45ba3e6cf1916c4b0$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_FOCUS_HANDLER_CAPI_H_
@@ -50,37 +50,36 @@ extern "C" {
 #endif

 ///
-/// Implement this structure to handle events related to focus. The functions of
-/// this structure will be called on the UI thread.
+// Implement this structure to handle events related to focus. The functions of
+// this structure will be called on the UI thread.
 ///
 typedef struct _cef_focus_handler_t {
  ///
-  /// Base structure.
+  // Base structure.
  ///
  cef_base_ref_counted_t base;

  ///
-  /// Called when the browser component is about to loose focus. For instance,
-  /// if focus was on the last HTML element and the user pressed the TAB key.
-  /// |next| will be true (1) if the browser is giving focus to the next
-  /// component and false (0) if the browser is giving focus to the previous
-  /// component.
+  // Called when the browser component is about to loose focus. For instance, if
+  // focus was on the last HTML element and the user pressed the TAB key. |next|
+  // will be true (1) if the browser is giving focus to the next component and
+  // false (0) if the browser is giving focus to the previous component.
  ///
  void(CEF_CALLBACK* on_take_focus)(struct _cef_focus_handler_t* self,
                                    struct _cef_browser_t* browser,
                                    int next);

  ///
-  /// Called when the browser component is requesting focus. |source| indicates
-  /// where the focus request is originating from. Return false (0) to allow the
-  /// focus to be set or true (1) to cancel setting the focus.
+  // Called when the browser component is requesting focus. |source| indicates
+  // where the focus request is originating from. Return false (0) to allow the
+  // focus to be set or true (1) to cancel setting the focus.
  ///
  int(CEF_CALLBACK* on_set_focus)(struct _cef_focus_handler_t* self,
                                  struct _cef_browser_t* browser,
                                  cef_focus_source_t source);

  ///
-  /// Called when the browser component has received focus.
+  // Called when the browser component has received focus.
  ///
  void(CEF_CALLBACK* on_got_focus)(struct _cef_focus_handler_t* self,
                                   struct _cef_browser_t* browser);
--- a/include/capi/cef_frame_capi.h
+++ b/include/capi/cef_frame_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=48bc345bb0971e3fcaaf839e9e4419b2aec0e33b$
+// $hash=872fd1e811d41f56f03da0da75a8f2e89cad40cd$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_FRAME_CAPI_H_
@@ -57,100 +57,100 @@ struct _cef_urlrequest_t;
 struct _cef_v8context_t;

 ///
-/// Structure used to represent a frame in the browser window. When used in the
-/// browser process the functions of this structure may be called on any thread
-/// unless otherwise indicated in the comments. When used in the render process
-/// the functions of this structure may only be called on the main thread.
+// Structure used to represent a frame in the browser window. When used in the
+// browser process the functions of this structure may be called on any thread
+// unless otherwise indicated in the comments. When used in the render process
+// the functions of this structure may only be called on the main thread.
 ///
 typedef struct _cef_frame_t {
  ///
-  /// Base structure.
+  // Base structure.
  ///
  cef_base_ref_counted_t base;

  ///
-  /// True if this object is currently attached to a valid frame.
+  // True if this object is currently attached to a valid frame.
  ///
  int(CEF_CALLBACK* is_valid)(struct _cef_frame_t* self);

  ///
-  /// Execute undo in this frame.
+  // Execute undo in this frame.
  ///
  void(CEF_CALLBACK* undo)(struct _cef_frame_t* self);

  ///
-  /// Execute redo in this frame.
+  // Execute redo in this frame.
  ///
  void(CEF_CALLBACK* redo)(struct _cef_frame_t* self);

  ///
-  /// Execute cut in this frame.
+  // Execute cut in this frame.
  ///
  void(CEF_CALLBACK* cut)(struct _cef_frame_t* self);

  ///
-  /// Execute copy in this frame.
+  // Execute copy in this frame.
  ///
  void(CEF_CALLBACK* copy)(struct _cef_frame_t* self);

  ///
-  /// Execute paste in this frame.
+  // Execute paste in this frame.
  ///
  void(CEF_CALLBACK* paste)(struct _cef_frame_t* self);

  ///
-  /// Execute delete in this frame.
+  // Execute delete in this frame.
  ///
  void(CEF_CALLBACK* del)(struct _cef_frame_t* self);

  ///
-  /// Execute select all in this frame.
+  // Execute select all in this frame.
  ///
  void(CEF_CALLBACK* select_all)(struct _cef_frame_t* self);

  ///
-  /// Save this frame's HTML source to a temporary file and open it in the
-  /// default text viewing application. This function can only be called from
-  /// the browser process.
+  // Save this frame's HTML source to a temporary file and open it in the
+  // default text viewing application. This function can only be called from the
+  // browser process.
  ///
  void(CEF_CALLBACK* view_source)(struct _cef_frame_t* self);

  ///
-  /// Retrieve this frame's HTML source as a string sent to the specified
-  /// visitor.
+  // Retrieve this frame's HTML source as a string sent to the specified
+  // visitor.
  ///
  void(CEF_CALLBACK* get_source)(struct _cef_frame_t* self,
                                 struct _cef_string_visitor_t* visitor);

  ///
-  /// Retrieve this frame's display text as a string sent to the specified
-  /// visitor.
+  // Retrieve this frame's display text as a string sent to the specified
+  // visitor.
  ///
  void(CEF_CALLBACK* get_text)(struct _cef_frame_t* self,
                               struct _cef_string_visitor_t* visitor);

  ///
-  /// Load the request represented by the |request| object.
-  ///
-  /// WARNING: This function will fail with "bad IPC message" reason
-  /// INVALID_INITIATOR_ORIGIN (213) unless you first navigate to the request
-  /// origin using some other mechanism (LoadURL, link click, etc).
+  // Load the request represented by the |request| object.
+  //
+  // WARNING: This function will fail with "bad IPC message" reason
+  // INVALID_INITIATOR_ORIGIN (213) unless you first navigate to the request
+  // origin using some other mechanism (LoadURL, link click, etc).
  ///
  void(CEF_CALLBACK* load_request)(struct _cef_frame_t* self,
                                   struct _cef_request_t* request);

  ///
-  /// Load the specified |url|.
+  // Load the specified |url|.
  ///
  void(CEF_CALLBACK* load_url)(struct _cef_frame_t* self,
                               const cef_string_t* url);

  ///
-  /// Execute a string of JavaScript code in this frame. The |script_url|
-  /// parameter is the URL where the script in question can be found, if any.
-  /// The renderer may request this URL to show the developer the source of the
-  /// error.  The |start_line| parameter is the base line number to use for
-  /// error reporting.
+  // Execute a string of JavaScript code in this frame. The |script_url|
+  // parameter is the URL where the script in question can be found, if any. The
+  // renderer may request this URL to show the developer the source of the
+  // error.  The |start_line| parameter is the base line number to use for error
+  // reporting.
  ///
  void(CEF_CALLBACK* execute_java_script)(struct _cef_frame_t* self,
                                          const cef_string_t* code,
@@ -158,84 +158,83 @@ typedef struct _cef_frame_t {
                                          int start_line);

  ///
-  /// Returns true (1) if this is the main (top-level) frame.
+  // Returns true (1) if this is the main (top-level) frame.
  ///
  int(CEF_CALLBACK* is_main)(struct _cef_frame_t* self);

  ///
-  /// Returns true (1) if this is the focused frame.
+  // Returns true (1) if this is the focused frame.
  ///
  int(CEF_CALLBACK* is_focused)(struct _cef_frame_t* self);

  ///
-  /// Returns the name for this frame. If the frame has an assigned name (for
-  /// example, set via the iframe "name" attribute) then that value will be
-  /// returned. Otherwise a unique name will be constructed based on the frame
-  /// parent hierarchy. The main (top-level) frame will always have an NULL name
-  /// value.
+  // Returns the name for this frame. If the frame has an assigned name (for
+  // example, set via the iframe "name" attribute) then that value will be
+  // returned. Otherwise a unique name will be constructed based on the frame
+  // parent hierarchy. The main (top-level) frame will always have an NULL name
+  // value.
  ///
  // The resulting string must be freed by calling cef_string_userfree_free().
  cef_string_userfree_t(CEF_CALLBACK* get_name)(struct _cef_frame_t* self);

  ///
-  /// Returns the globally unique identifier for this frame or < 0 if the
-  /// underlying frame does not yet exist.
+  // Returns the globally unique identifier for this frame or < 0 if the
+  // underlying frame does not yet exist.
  ///
  int64(CEF_CALLBACK* get_identifier)(struct _cef_frame_t* self);

  ///
-  /// Returns the parent of this frame or NULL if this is the main (top-level)
-  /// frame.
+  // Returns the parent of this frame or NULL if this is the main (top-level)
+  // frame.
  ///
  struct _cef_frame_t*(CEF_CALLBACK* get_parent)(struct _cef_frame_t* self);

  ///
-  /// Returns the URL currently loaded in this frame.
+  // Returns the URL currently loaded in this frame.
  ///
  // The resulting string must be freed by calling cef_string_userfree_free().
  cef_string_userfree_t(CEF_CALLBACK* get_url)(struct _cef_frame_t* self);

  ///
-  /// Returns the browser that this frame belongs to.
+  // Returns the browser that this frame belongs to.
  ///
  struct _cef_browser_t*(CEF_CALLBACK* get_browser)(struct _cef_frame_t* self);

  ///
-  /// Get the V8 context associated with the frame. This function can only be
-  /// called from the render process.
+  // Get the V8 context associated with the frame. This function can only be
+  // called from the render process.
  ///
  struct _cef_v8context_t*(CEF_CALLBACK* get_v8context)(
      struct _cef_frame_t* self);

  ///
-  /// Visit the DOM document. This function can only be called from the render
-  /// process.
+  // Visit the DOM document. This function can only be called from the render
+  // process.
  ///
  void(CEF_CALLBACK* visit_dom)(struct _cef_frame_t* self,
                                struct _cef_domvisitor_t* visitor);

  ///
-  /// Create a new URL request that will be treated as originating from this
-  /// frame and the associated browser. This request may be intercepted by the
-  /// client via cef_resource_request_handler_t or cef_scheme_handler_factory_t.
-  /// Use cef_urlrequest_t::Create instead if you do not want the request to
-  /// have this association, in which case it may be handled differently (see
-  /// documentation on that function). Requests may originate from both the
-  /// browser process and the render process.
-  ///
-  /// For requests originating from the browser process:
-  ///   - POST data may only contain a single element of type PDE_TYPE_FILE or
-  ///     PDE_TYPE_BYTES.
-  ///
-  /// For requests originating from the render process:
-  ///   - POST data may only contain a single element of type PDE_TYPE_BYTES.
-  ///   - If the response contains Content-Disposition or Mime-Type header
-  ///     values that would not normally be rendered then the response may
-  ///     receive special handling inside the browser (for example, via the
-  ///     file download code path instead of the URL request code path).
-  ///
-  /// The |request| object will be marked as read-only after calling this
-  /// function.
+  // Create a new URL request that will be treated as originating from this
+  // frame and the associated browser. This request may be intercepted by the
+  // client via cef_resource_request_handler_t or cef_scheme_handler_factory_t.
+  // Use cef_urlrequest_t::Create instead if you do not want the request to have
+  // this association, in which case it may be handled differently (see
+  // documentation on that function). Requests may originate from both the
+  // browser process and the render process.
+  //
+  // For requests originating from the browser process:
+  //   - POST data may only contain a single element of type PDE_TYPE_FILE or
+  //     PDE_TYPE_BYTES.
+  // For requests originating from the render process:
+  //   - POST data may only contain a single element of type PDE_TYPE_BYTES.
+  //   - If the response contains Content-Disposition or Mime-Type header values
+  //     that would not normally be rendered then the response may receive
+  //     special handling inside the browser (for example, via the file download
+  //     code path instead of the URL request code path).
+  //
+  // The |request| object will be marked as read-only after calling this
+  // function.
  ///
  struct _cef_urlrequest_t*(CEF_CALLBACK* create_urlrequest)(
      struct _cef_frame_t* self,
@@ -243,12 +242,12 @@ typedef struct _cef_frame_t {
      struct _cef_urlrequest_client_t* client);

  ///
-  /// Send a message to the specified |target_process|. Ownership of the message
-  /// contents will be transferred and the |message| reference will be
-  /// invalidated. Message delivery is not guaranteed in all cases (for example,
-  /// if the browser is closing, navigating, or if the target process crashes).
-  /// Send an ACK message back from the target process if confirmation is
-  /// required.
+  // Send a message to the specified |target_process|. Ownership of the message
+  // contents will be transferred and the |message| reference will be
+  // invalidated. Message delivery is not guaranteed in all cases (for example,
+  // if the browser is closing, navigating, or if the target process crashes).
+  // Send an ACK message back from the target process if confirmation is
+  // required.
  ///
  void(CEF_CALLBACK* send_process_message)(
      struct _cef_frame_t* self,
--- a/include/capi/cef_frame_handler_capi.h
+++ b/include/capi/cef_frame_handler_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=3d97135fef535cc94aca6cf1afa4a9461c388b4f$
+// $hash=503984bf98aa52ff67ce52f26a560bbb1d4439bc$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_FRAME_HANDLER_CAPI_H_
@@ -49,145 +49,134 @@ extern "C" {
 #endif

 ///
-/// Implement this structure to handle events related to cef_frame_t life span.
-/// The order of callbacks is:
-///
-/// (1) During initial cef_browser_host_t creation and navigation of the main
-/// frame: - cef_frame_handler_t::OnFrameCreated => The initial main frame
-/// object has been
-///   created. Any commands will be queued until the frame is attached.
-/// - cef_frame_handler_t::OnMainFrameChanged => The initial main frame object
-/// has
-///   been assigned to the browser.
-/// - cef_life_span_handler_t::OnAfterCreated => The browser is now valid and
-/// can be
-///   used.
-/// - cef_frame_handler_t::OnFrameAttached => The initial main frame object is
-/// now
-///   connected to its peer in the renderer process. Commands can be routed.
-///
-/// (2) During further cef_browser_host_t navigation/loading of the main frame
-///     and/or sub-frames:
-/// - cef_frame_handler_t::OnFrameCreated => A new main frame or sub-frame
-/// object
-///   has been created. Any commands will be queued until the frame is attached.
-/// - cef_frame_handler_t::OnFrameAttached => A new main frame or sub-frame
-/// object
-///   is now connected to its peer in the renderer process. Commands can be
-///   routed.
-/// - cef_frame_handler_t::OnFrameDetached => An existing main frame or sub-
-/// frame
-///   object has lost its connection to the renderer process. If multiple
-///   objects are detached at the same time then notifications will be sent for
-///   any sub-frame objects before the main frame object. Commands can no longer
-///   be routed and will be discarded.
-/// - cef_frame_handler_t::OnMainFrameChanged => A new main frame object has
-/// been
-///   assigned to the browser. This will only occur with cross-origin navigation
-///   or re-navigation after renderer process termination (due to crashes, etc).
-///
-/// (3) During final cef_browser_host_t destruction of the main frame: -
-/// cef_frame_handler_t::OnFrameDetached => Any sub-frame objects have lost
-/// their
-///   connection to the renderer process. Commands can no longer be routed and
-///   will be discarded.
-/// - cef_life_span_handler_t::OnBeforeClose => The browser has been destroyed.
-/// - cef_frame_handler_t::OnFrameDetached => The main frame object have lost
-/// its
-///   connection to the renderer process. Notifications will be sent for any
-///   sub-frame objects before the main frame object. Commands can no longer be
-///   routed and will be discarded.
-/// - cef_frame_handler_t::OnMainFrameChanged => The final main frame object has
-///   been removed from the browser.
-///
-/// Cross-origin navigation and/or loading receives special handling.
-///
-/// When the main frame navigates to a different origin the OnMainFrameChanged
-/// callback (2) will be executed with the old and new main frame objects.
-///
-/// When a new sub-frame is loaded in, or an existing sub-frame is navigated to,
-/// a different origin from the parent frame, a temporary sub-frame object will
-/// first be created in the parent's renderer process. That temporary sub-frame
-/// will then be discarded after the real cross-origin sub-frame is created in
-/// the new/target renderer process. The client will receive cross-origin
-/// navigation callbacks (2) for the transition from the temporary sub-frame to
-/// the real sub-frame. The temporary sub-frame will not recieve or execute
-/// commands during this transitional period (any sent commands will be
-/// discarded).
-///
-/// When a new popup browser is created in a different origin from the parent
-/// browser, a temporary main frame object for the popup will first be created
-/// in the parent's renderer process. That temporary main frame will then be
-/// discarded after the real cross-origin main frame is created in the
-/// new/target renderer process. The client will recieve creation and initial
-/// navigation callbacks (1) for the temporary main frame, followed by cross-
-/// origin navigation callbacks (2) for the transition from the temporary main
-/// frame to the real main frame. The temporary main frame may receive and
-/// execute commands during this transitional period (any sent commands may be
-/// executed, but the behavior is potentially undesirable since they execute in
-/// the parent browser's renderer process and not the new/target renderer
-/// process).
-///
-/// Callbacks will not be executed for placeholders that may be created during
-/// pre-commit navigation for sub-frames that do not yet exist in the renderer
-/// process. Placeholders will have cef_frame_t::get_identifier() == -4.
-///
-/// The functions of this structure will be called on the UI thread unless
-/// otherwise indicated.
+// Implement this structure to handle events related to cef_frame_t life span.
+// The order of callbacks is:
+//
+// (1) During initial cef_browser_host_t creation and navigation of the main
+// frame: - cef_frame_handler_t::OnFrameCreated => The initial main frame object
+// has been
+//   created. Any commands will be queued until the frame is attached.
+// - cef_frame_handler_t::OnMainFrameChanged => The initial main frame object
+// has
+//   been assigned to the browser.
+// - cef_life_span_handler_t::OnAfterCreated => The browser is now valid and can
+// be
+//   used.
+// - cef_frame_handler_t::OnFrameAttached => The initial main frame object is
+// now
+//   connected to its peer in the renderer process. Commands can be routed.
+//
+// (2) During further cef_browser_host_t navigation/loading of the main frame
+// and/or sub-frames: - cef_frame_handler_t::OnFrameCreated => A new main frame
+// or sub-frame object has
+//   been created. Any commands will be queued until the frame is attached.
+// - cef_frame_handler_t::OnFrameAttached => A new main frame or sub-frame
+// object is
+//   now connected to its peer in the renderer process. Commands can be routed.
+// - cef_frame_handler_t::OnFrameDetached => An existing main frame or sub-frame
+//   object has lost its connection to the renderer process. If multiple objects
+//   are detached at the same time then notifications will be sent for any
+//   sub-frame objects before the main frame object. Commands can no longer be
+//   routed and will be discarded.
+// - cef_frame_handler_t::OnMainFrameChanged => A new main frame object has been
+//   assigned to the browser. This will only occur with cross-origin navigation
+//   or re-navigation after renderer process termination (due to crashes, etc).
+//
+// (3) During final cef_browser_host_t destruction of the main frame: -
+// cef_frame_handler_t::OnFrameDetached => Any sub-frame objects have lost their
+//   connection to the renderer process. Commands can no longer be routed and
+//   will be discarded.
+// - cef_life_span_handler_t::OnBeforeClose => The browser has been destroyed. -
+// cef_frame_handler_t::OnFrameDetached => The main frame object have lost its
+//   connection to the renderer process. Notifications will be sent for any
+//   sub-frame objects before the main frame object. Commands can no longer be
+//   routed and will be discarded.
+// - cef_frame_handler_t::OnMainFrameChanged => The final main frame object has
+// been
+//   removed from the browser.
+//
+// Cross-origin navigation and/or loading receives special handling.
+//
+// When the main frame navigates to a different origin the OnMainFrameChanged
+// callback (2) will be executed with the old and new main frame objects.
+//
+// When a new sub-frame is loaded in, or an existing sub-frame is navigated to,
+// a different origin from the parent frame, a temporary sub-frame object will
+// first be created in the parent's renderer process. That temporary sub-frame
+// will then be discarded after the real cross-origin sub-frame is created in
+// the new/target renderer process. The client will receive cross-origin
+// navigation callbacks (2) for the transition from the temporary sub-frame to
+// the real sub-frame. The temporary sub-frame will not recieve or execute
+// commands during this transitional period (any sent commands will be
+// discarded).
+//
+// When a new popup browser is created in a different origin from the parent
+// browser, a temporary main frame object for the popup will first be created in
+// the parent's renderer process. That temporary main frame will then be
+// discarded after the real cross-origin main frame is created in the new/target
+// renderer process. The client will recieve creation and initial navigation
+// callbacks (1) for the temporary main frame, followed by cross-origin
+// navigation callbacks (2) for the transition from the temporary main frame to
+// the real main frame. The temporary main frame may receive and execute
+// commands during this transitional period (any sent commands may be executed,
+// but the behavior is potentially undesirable since they execute in the parent
+// browser's renderer process and not the new/target renderer process).
+//
+// Callbacks will not be executed for placeholders that may be created during
+// pre-commit navigation for sub-frames that do not yet exist in the renderer
+// process. Placeholders will have cef_frame_t::get_identifier() == -4.
+//
+// The functions of this structure will be called on the UI thread unless
+// otherwise indicated.
 ///
 typedef struct _cef_frame_handler_t {
  ///
-  /// Base structure.
+  // Base structure.
  ///
  cef_base_ref_counted_t base;

  ///
-  /// Called when a new frame is created. This will be the first notification
-  /// that references |frame|. Any commands that require transport to the
-  /// associated renderer process (LoadRequest, SendProcessMessage, GetSource,
-  /// etc.) will be queued until OnFrameAttached is called for |frame|.
+  // Called when a new frame is created. This will be the first notification
+  // that references |frame|. Any commands that require transport to the
+  // associated renderer process (LoadRequest, SendProcessMessage, GetSource,
+  // etc.) will be queued until OnFrameAttached is called for |frame|.
  ///
  void(CEF_CALLBACK* on_frame_created)(struct _cef_frame_handler_t* self,
                                       struct _cef_browser_t* browser,
                                       struct _cef_frame_t* frame);

  ///
-  /// Called when a frame can begin routing commands to/from the associated
-  /// renderer process. |reattached| will be true (1) if the frame was re-
-  /// attached after exiting the BackForwardCache. Any commands that were queued
-  /// have now been dispatched.
+  // Called when a frame can begin routing commands to/from the associated
+  // renderer process. Any commands that were queued have now been dispatched.
  ///
  void(CEF_CALLBACK* on_frame_attached)(struct _cef_frame_handler_t* self,
                                        struct _cef_browser_t* browser,
-                                        struct _cef_frame_t* frame,
-                                        int reattached);
+                                        struct _cef_frame_t* frame);

  ///
-  /// Called when a frame loses its connection to the renderer process and will
-  /// be destroyed. Any pending or future commands will be discarded and
-  /// cef_frame_t::is_valid() will now return false (0) for |frame|. If called
-  /// after cef_life_span_handler_t::on_before_close() during browser
-  /// destruction then cef_browser_t::is_valid() will return false (0) for
-  /// |browser|.
+  // Called when a frame loses its connection to the renderer process and will
+  // be destroyed. Any pending or future commands will be discarded and
+  // cef_frame_t::is_valid() will now return false (0) for |frame|. If called
+  // after cef_life_span_handler_t::on_before_close() during browser destruction
+  // then cef_browser_t::is_valid() will return false (0) for |browser|.
  ///
  void(CEF_CALLBACK* on_frame_detached)(struct _cef_frame_handler_t* self,
                                        struct _cef_browser_t* browser,
                                        struct _cef_frame_t* frame);

  ///
-  /// Called when the main frame changes due to (a) initial browser creation,
-  /// (b) final browser destruction, (c) cross-origin navigation or (d) re-
-  /// navigation after renderer process termination (due to crashes, etc).
-  /// |old_frame| will be NULL and |new_frame| will be non-NULL when a main
-  /// frame is assigned to |browser| for the first time. |old_frame| will be
-  /// non-NULL and |new_frame| will be NULL and  when a main frame is removed
-  /// from |browser| for the last time. Both |old_frame| and |new_frame| will be
-  /// non-NULL for cross-origin navigations or re-navigation after renderer
-  /// process termination. This function will be called after on_frame_created()
-  /// for |new_frame| and/or after on_frame_detached() for |old_frame|. If
-  /// called after cef_life_span_handler_t::on_before_close() during browser
-  /// destruction then cef_browser_t::is_valid() will return false (0) for
-  /// |browser|.
+  // Called when the main frame changes due to (a) initial browser creation, (b)
+  // final browser destruction, (c) cross-origin navigation or (d) re-navigation
+  // after renderer process termination (due to crashes, etc). |old_frame| will
+  // be NULL and |new_frame| will be non-NULL when a main frame is assigned to
+  // |browser| for the first time. |old_frame| will be non-NULL and |new_frame|
+  // will be NULL and  when a main frame is removed from |browser| for the last
+  // time. Both |old_frame| and |new_frame| will be non-NULL for cross-origin
+  // navigations or re-navigation after renderer process termination. This
+  // function will be called after on_frame_created() for |new_frame| and/or
+  // after on_frame_detached() for |old_frame|. If called after
+  // cef_life_span_handler_t::on_before_close() during browser destruction then
+  // cef_browser_t::is_valid() will return false (0) for |browser|.
  ///
  void(CEF_CALLBACK* on_main_frame_changed)(struct _cef_frame_handler_t* self,
                                            struct _cef_browser_t* browser,
--- a/include/capi/cef_image_capi.h
+++ b/include/capi/cef_image_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=f679dc1ec87e99bed6843d4f4dbbe04585a827bd$
+// $hash=d9da8862142742e780086714bbd4fb44ac95cf2c$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_IMAGE_CAPI_H_
@@ -48,37 +48,37 @@ extern "C" {
 #endif

 ///
-/// Container for a single image represented at different scale factors. All
-/// image representations should be the same size in density independent pixel
-/// (DIP) units. For example, if the image at scale factor 1.0 is 100x100 pixels
-/// then the image at scale factor 2.0 should be 200x200 pixels -- both images
-/// will display with a DIP size of 100x100 units. The functions of this
-/// structure can be called on any browser process thread.
+// Container for a single image represented at different scale factors. All
+// image representations should be the same size in density independent pixel
+// (DIP) units. For example, if the image at scale factor 1.0 is 100x100 pixels
+// then the image at scale factor 2.0 should be 200x200 pixels -- both images
+// will display with a DIP size of 100x100 units. The functions of this
+// structure can be called on any browser process thread.
 ///
 typedef struct _cef_image_t {
  ///
-  /// Base structure.
+  // Base structure.
  ///
  cef_base_ref_counted_t base;

  ///
-  /// Returns true (1) if this Image is NULL.
+  // Returns true (1) if this Image is NULL.
  ///
  int(CEF_CALLBACK* is_empty)(struct _cef_image_t* self);

  ///
-  /// Returns true (1) if this Image and |that| Image share the same underlying
-  /// storage. Will also return true (1) if both images are NULL.
+  // Returns true (1) if this Image and |that| Image share the same underlying
+  // storage. Will also return true (1) if both images are NULL.
  ///
  int(CEF_CALLBACK* is_same)(struct _cef_image_t* self,
                             struct _cef_image_t* that);

  ///
-  /// Add a bitmap image representation for |scale_factor|. Only 32-bit
-  /// RGBA/BGRA formats are supported. |pixel_width| and |pixel_height| are the
-  /// bitmap representation size in pixel coordinates. |pixel_data| is the array
-  /// of pixel data and should be |pixel_width| x |pixel_height| x 4 bytes in
-  /// size. |color_type| and |alpha_type| values specify the pixel format.
+  // Add a bitmap image representation for |scale_factor|. Only 32-bit RGBA/BGRA
+  // formats are supported. |pixel_width| and |pixel_height| are the bitmap
+  // representation size in pixel coordinates. |pixel_data| is the array of
+  // pixel data and should be |pixel_width| x |pixel_height| x 4 bytes in size.
+  // |color_type| and |alpha_type| values specify the pixel format.
  ///
  int(CEF_CALLBACK* add_bitmap)(struct _cef_image_t* self,
                                float scale_factor,
@@ -90,9 +90,9 @@ typedef struct _cef_image_t {
                                size_t pixel_data_size);

  ///
-  /// Add a PNG image representation for |scale_factor|. |png_data| is the image
-  /// data of size |png_data_size|. Any alpha transparency in the PNG data will
-  /// be maintained.
+  // Add a PNG image representation for |scale_factor|. |png_data| is the image
+  // data of size |png_data_size|. Any alpha transparency in the PNG data will
+  // be maintained.
  ///
  int(CEF_CALLBACK* add_png)(struct _cef_image_t* self,
                             float scale_factor,
@@ -100,9 +100,9 @@ typedef struct _cef_image_t {
                             size_t png_data_size);

  ///
-  /// Create a JPEG image representation for |scale_factor|. |jpeg_data| is the
-  /// image data of size |jpeg_data_size|. The JPEG format does not support
-  /// transparency so the alpha byte will be set to 0xFF for all pixels.
+  // Create a JPEG image representation for |scale_factor|. |jpeg_data| is the
+  // image data of size |jpeg_data_size|. The JPEG format does not support
+  // transparency so the alpha byte will be set to 0xFF for all pixels.
  ///
  int(CEF_CALLBACK* add_jpeg)(struct _cef_image_t* self,
                              float scale_factor,
@@ -110,34 +110,33 @@ typedef struct _cef_image_t {
                              size_t jpeg_data_size);

  ///
-  /// Returns the image width in density independent pixel (DIP) units.
+  // Returns the image width in density independent pixel (DIP) units.
  ///
  size_t(CEF_CALLBACK* get_width)(struct _cef_image_t* self);

  ///
-  /// Returns the image height in density independent pixel (DIP) units.
+  // Returns the image height in density independent pixel (DIP) units.
  ///
  size_t(CEF_CALLBACK* get_height)(struct _cef_image_t* self);

  ///
-  /// Returns true (1) if this image contains a representation for
-  /// |scale_factor|.
+  // Returns true (1) if this image contains a representation for
+  // |scale_factor|.
  ///
  int(CEF_CALLBACK* has_representation)(struct _cef_image_t* self,
                                        float scale_factor);

  ///
-  /// Removes the representation for |scale_factor|. Returns true (1) on
-  /// success.
+  // Removes the representation for |scale_factor|. Returns true (1) on success.
  ///
  int(CEF_CALLBACK* remove_representation)(struct _cef_image_t* self,
                                           float scale_factor);

  ///
-  /// Returns information for the representation that most closely matches
-  /// |scale_factor|. |actual_scale_factor| is the actual scale factor for the
-  /// representation. |pixel_width| and |pixel_height| are the representation
-  /// size in pixel coordinates. Returns true (1) on success.
+  // Returns information for the representation that most closely matches
+  // |scale_factor|. |actual_scale_factor| is the actual scale factor for the
+  // representation. |pixel_width| and |pixel_height| are the representation
+  // size in pixel coordinates. Returns true (1) on success.
  ///
  int(CEF_CALLBACK* get_representation_info)(struct _cef_image_t* self,
                                             float scale_factor,
@@ -146,12 +145,12 @@ typedef struct _cef_image_t {
                                             int* pixel_height);

  ///
-  /// Returns the bitmap representation that most closely matches
-  /// |scale_factor|. Only 32-bit RGBA/BGRA formats are supported. |color_type|
-  /// and |alpha_type| values specify the desired output pixel format.
-  /// |pixel_width| and |pixel_height| are the output representation size in
-  /// pixel coordinates. Returns a cef_binary_value_t containing the pixel data
-  /// on success or NULL on failure.
+  // Returns the bitmap representation that most closely matches |scale_factor|.
+  // Only 32-bit RGBA/BGRA formats are supported. |color_type| and |alpha_type|
+  // values specify the desired output pixel format. |pixel_width| and
+  // |pixel_height| are the output representation size in pixel coordinates.
+  // Returns a cef_binary_value_t containing the pixel data on success or NULL
+  // on failure.
  ///
  struct _cef_binary_value_t*(CEF_CALLBACK* get_as_bitmap)(
      struct _cef_image_t* self,
@@ -162,12 +161,12 @@ typedef struct _cef_image_t {
      int* pixel_height);

  ///
-  /// Returns the PNG representation that most closely matches |scale_factor|.
-  /// If |with_transparency| is true (1) any alpha transparency in the image
-  /// will be represented in the resulting PNG data. |pixel_width| and
-  /// |pixel_height| are the output representation size in pixel coordinates.
-  /// Returns a cef_binary_value_t containing the PNG image data on success or
-  /// NULL on failure.
+  // Returns the PNG representation that most closely matches |scale_factor|. If
+  // |with_transparency| is true (1) any alpha transparency in the image will be
+  // represented in the resulting PNG data. |pixel_width| and |pixel_height| are
+  // the output representation size in pixel coordinates. Returns a
+  // cef_binary_value_t containing the PNG image data on success or NULL on
+  // failure.
  ///
  struct _cef_binary_value_t*(CEF_CALLBACK* get_as_png)(
      struct _cef_image_t* self,
@@ -177,13 +176,13 @@ typedef struct _cef_image_t {
      int* pixel_height);

  ///
-  /// Returns the JPEG representation that most closely matches |scale_factor|.
-  /// |quality| determines the compression level with 0 == lowest and 100 ==
-  /// highest. The JPEG format does not support alpha transparency and the alpha
-  /// channel, if any, will be discarded. |pixel_width| and |pixel_height| are
-  /// the output representation size in pixel coordinates. Returns a
-  /// cef_binary_value_t containing the JPEG image data on success or NULL on
-  /// failure.
+  // Returns the JPEG representation that most closely matches |scale_factor|.
+  // |quality| determines the compression level with 0 == lowest and 100 ==
+  // highest. The JPEG format does not support alpha transparency and the alpha
+  // channel, if any, will be discarded. |pixel_width| and |pixel_height| are
+  // the output representation size in pixel coordinates. Returns a
+  // cef_binary_value_t containing the JPEG image data on success or NULL on
+  // failure.
  ///
  struct _cef_binary_value_t*(CEF_CALLBACK* get_as_jpeg)(
      struct _cef_image_t* self,
@@ -194,10 +193,10 @@ typedef struct _cef_image_t {
 } cef_image_t;

 ///
-/// Create a new cef_image_t. It will initially be NULL. Use the Add*()
-/// functions to add representations at different scale factors.
+// Create a new cef_image_t. It will initially be NULL. Use the Add*() functions
+// to add representations at different scale factors.
 ///
-CEF_EXPORT cef_image_t* cef_image_create(void);
+CEF_EXPORT cef_image_t* cef_image_create();

 #ifdef __cplusplus
 }
--- a/include/capi/cef_jsdialog_handler_capi.h
+++ b/include/capi/cef_jsdialog_handler_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=523a692475e912e4ecad89842596c3d6eac6f4aa$
+// $hash=d991e2a7d1a58a013e4d3a963361fed6918f4ec3$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_JSDIALOG_HANDLER_CAPI_H_
@@ -48,19 +48,18 @@ extern "C" {
 #endif

 ///
-/// Callback structure used for asynchronous continuation of JavaScript dialog
-/// requests.
+// Callback structure used for asynchronous continuation of JavaScript dialog
+// requests.
 ///
 typedef struct _cef_jsdialog_callback_t {
  ///
-  /// Base structure.
+  // Base structure.
  ///
  cef_base_ref_counted_t base;

  ///
-  /// Continue the JS dialog request. Set |success| to true (1) if the OK button
-  /// was pressed. The |user_input| value should be specified for prompt
-  /// dialogs.
+  // Continue the JS dialog request. Set |success| to true (1) if the OK button
+  // was pressed. The |user_input| value should be specified for prompt dialogs.
  ///
  void(CEF_CALLBACK* cont)(struct _cef_jsdialog_callback_t* self,
                           int success,
@@ -68,31 +67,31 @@ typedef struct _cef_jsdialog_callback_t {
 } cef_jsdialog_callback_t;

 ///
-/// Implement this structure to handle events related to JavaScript dialogs. The
-/// functions of this structure will be called on the UI thread.
+// Implement this structure to handle events related to JavaScript dialogs. The
+// functions of this structure will be called on the UI thread.
 ///
 typedef struct _cef_jsdialog_handler_t {
  ///
-  /// Base structure.
+  // Base structure.
  ///
  cef_base_ref_counted_t base;

  ///
-  /// Called to run a JavaScript dialog. If |origin_url| is non-NULL it can be
-  /// passed to the CefFormatUrlForSecurityDisplay function to retrieve a secure
-  /// and user-friendly display string. The |default_prompt_text| value will be
-  /// specified for prompt dialogs only. Set |suppress_message| to true (1) and
-  /// return false (0) to suppress the message (suppressing messages is
-  /// preferable to immediately executing the callback as this is used to detect
-  /// presumably malicious behavior like spamming alert messages in
-  /// onbeforeunload). Set |suppress_message| to false (0) and return false (0)
-  /// to use the default implementation (the default implementation will show
-  /// one modal dialog at a time and suppress any additional dialog requests
-  /// until the displayed dialog is dismissed). Return true (1) if the
-  /// application will use a custom dialog or if the callback has been executed
-  /// immediately. Custom dialogs may be either modal or modeless. If a custom
-  /// dialog is used the application must execute |callback| once the custom
-  /// dialog is dismissed.
+  // Called to run a JavaScript dialog. If |origin_url| is non-NULL it can be
+  // passed to the CefFormatUrlForSecurityDisplay function to retrieve a secure
+  // and user-friendly display string. The |default_prompt_text| value will be
+  // specified for prompt dialogs only. Set |suppress_message| to true (1) and
+  // return false (0) to suppress the message (suppressing messages is
+  // preferable to immediately executing the callback as this is used to detect
+  // presumably malicious behavior like spamming alert messages in
+  // onbeforeunload). Set |suppress_message| to false (0) and return false (0)
+  // to use the default implementation (the default implementation will show one
+  // modal dialog at a time and suppress any additional dialog requests until
+  // the displayed dialog is dismissed). Return true (1) if the application will
+  // use a custom dialog or if the callback has been executed immediately.
+  // Custom dialogs may be either modal or modeless. If a custom dialog is used
+  // the application must execute |callback| once the custom dialog is
+  // dismissed.
  ///
  int(CEF_CALLBACK* on_jsdialog)(struct _cef_jsdialog_handler_t* self,
                                 struct _cef_browser_t* browser,
@@ -104,12 +103,12 @@ typedef struct _cef_jsdialog_handler_t {
                                 int* suppress_message);

  ///
-  /// Called to run a dialog asking the user if they want to leave a page.
-  /// Return false (0) to use the default dialog implementation. Return true (1)
-  /// if the application will use a custom dialog or if the callback has been
-  /// executed immediately. Custom dialogs may be either modal or modeless. If a
-  /// custom dialog is used the application must execute |callback| once the
-  /// custom dialog is dismissed.
+  // Called to run a dialog asking the user if they want to leave a page. Return
+  // false (0) to use the default dialog implementation. Return true (1) if the
+  // application will use a custom dialog or if the callback has been executed
+  // immediately. Custom dialogs may be either modal or modeless. If a custom
+  // dialog is used the application must execute |callback| once the custom
+  // dialog is dismissed.
  ///
  int(CEF_CALLBACK* on_before_unload_dialog)(
      struct _cef_jsdialog_handler_t* self,
@@ -119,16 +118,16 @@ typedef struct _cef_jsdialog_handler_t {
      struct _cef_jsdialog_callback_t* callback);

  ///
-  /// Called to cancel any pending dialogs and reset any saved dialog state.
-  /// Will be called due to events like page navigation irregardless of whether
-  /// any dialogs are currently pending.
+  // Called to cancel any pending dialogs and reset any saved dialog state. Will
+  // be called due to events like page navigation irregardless of whether any
+  // dialogs are currently pending.
  ///
  void(CEF_CALLBACK* on_reset_dialog_state)(
      struct _cef_jsdialog_handler_t* self,
      struct _cef_browser_t* browser);

  ///
-  /// Called when the dialog is closed.
+  // Called when the default implementation dialog is closed.
  ///
  void(CEF_CALLBACK* on_dialog_closed)(struct _cef_jsdialog_handler_t* self,
                                       struct _cef_browser_t* browser);
--- a/include/capi/cef_keyboard_handler_capi.h
+++ b/include/capi/cef_keyboard_handler_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=01d7f86c1304efe8dc8758624b74bafccf159e96$
+// $hash=d804a2db0f9ac13afd249407c85cb8d5852508ac$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_KEYBOARD_HANDLER_CAPI_H_
@@ -48,38 +48,37 @@ extern "C" {
 #endif

 ///
-/// Implement this structure to handle events related to keyboard input. The
-/// functions of this structure will be called on the UI thread.
+// Implement this structure to handle events related to keyboard input. The
+// functions of this structure will be called on the UI thread.
 ///
 typedef struct _cef_keyboard_handler_t {
  ///
-  /// Base structure.
+  // Base structure.
  ///
  cef_base_ref_counted_t base;

  ///
-  /// Called before a keyboard event is sent to the renderer. |event| contains
-  /// information about the keyboard event. |os_event| is the operating system
-  /// event message, if any. Return true (1) if the event was handled or false
-  /// (0) otherwise. If the event will be handled in on_key_event() as a
-  /// keyboard shortcut set |is_keyboard_shortcut| to true (1) and return false
-  /// (0).
+  // Called before a keyboard event is sent to the renderer. |event| contains
+  // information about the keyboard event. |os_event| is the operating system
+  // event message, if any. Return true (1) if the event was handled or false
+  // (0) otherwise. If the event will be handled in on_key_event() as a keyboard
+  // shortcut set |is_keyboard_shortcut| to true (1) and return false (0).
  ///
  int(CEF_CALLBACK* on_pre_key_event)(struct _cef_keyboard_handler_t* self,
                                      struct _cef_browser_t* browser,
-                                      const cef_key_event_t* event,
+                                      const struct _cef_key_event_t* event,
                                      cef_event_handle_t os_event,
                                      int* is_keyboard_shortcut);

  ///
-  /// Called after the renderer and JavaScript in the page has had a chance to
-  /// handle the event. |event| contains information about the keyboard event.
-  /// |os_event| is the operating system event message, if any. Return true (1)
-  /// if the keyboard event was handled or false (0) otherwise.
+  // Called after the renderer and JavaScript in the page has had a chance to
+  // handle the event. |event| contains information about the keyboard event.
+  // |os_event| is the operating system event message, if any. Return true (1)
+  // if the keyboard event was handled or false (0) otherwise.
  ///
  int(CEF_CALLBACK* on_key_event)(struct _cef_keyboard_handler_t* self,
                                  struct _cef_browser_t* browser,
-                                  const cef_key_event_t* event,
+                                  const struct _cef_key_event_t* event,
                                  cef_event_handle_t os_event);
 } cef_keyboard_handler_t;

--- a/include/capi/cef_life_span_handler_capi.h
+++ b/include/capi/cef_life_span_handler_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=44555ceece9989dabfa57a520168fa874dcfe2df$
+// $hash=e44bb89a337942c82bfa246275b4b033821b2782$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_LIFE_SPAN_HANDLER_CAPI_H_
@@ -50,40 +50,40 @@ extern "C" {
 struct _cef_client_t;

 ///
-/// Implement this structure to handle events related to browser life span. The
-/// functions of this structure will be called on the UI thread unless otherwise
-/// indicated.
+// Implement this structure to handle events related to browser life span. The
+// functions of this structure will be called on the UI thread unless otherwise
+// indicated.
 ///
 typedef struct _cef_life_span_handler_t {
  ///
-  /// Base structure.
+  // Base structure.
  ///
  cef_base_ref_counted_t base;

  ///
-  /// Called on the UI thread before a new popup browser is created. The
-  /// |browser| and |frame| values represent the source of the popup request.
-  /// The |target_url| and |target_frame_name| values indicate where the popup
-  /// browser should navigate and may be NULL if not specified with the request.
-  /// The |target_disposition| value indicates where the user intended to open
-  /// the popup (e.g. current tab, new tab, etc). The |user_gesture| value will
-  /// be true (1) if the popup was opened via explicit user gesture (e.g.
-  /// clicking a link) or false (0) if the popup opened automatically (e.g. via
-  /// the DomContentLoaded event). The |popupFeatures| structure contains
-  /// additional information about the requested popup window. To allow creation
-  /// of the popup browser optionally modify |windowInfo|, |client|, |settings|
-  /// and |no_javascript_access| and return false (0). To cancel creation of the
-  /// popup browser return true (1). The |client| and |settings| values will
-  /// default to the source browser's values. If the |no_javascript_access|
-  /// value is set to false (0) the new browser will not be scriptable and may
-  /// not be hosted in the same renderer process as the source browser. Any
-  /// modifications to |windowInfo| will be ignored if the parent browser is
-  /// wrapped in a cef_browser_view_t. Popup browser creation will be canceled
-  /// if the parent browser is destroyed before the popup browser creation
-  /// completes (indicated by a call to OnAfterCreated for the popup browser).
-  /// The |extra_info| parameter provides an opportunity to specify extra
-  /// information specific to the created popup browser that will be passed to
-  /// cef_render_process_handler_t::on_browser_created() in the render process.
+  // Called on the UI thread before a new popup browser is created. The
+  // |browser| and |frame| values represent the source of the popup request. The
+  // |target_url| and |target_frame_name| values indicate where the popup
+  // browser should navigate and may be NULL if not specified with the request.
+  // The |target_disposition| value indicates where the user intended to open
+  // the popup (e.g. current tab, new tab, etc). The |user_gesture| value will
+  // be true (1) if the popup was opened via explicit user gesture (e.g.
+  // clicking a link) or false (0) if the popup opened automatically (e.g. via
+  // the DomContentLoaded event). The |popupFeatures| structure contains
+  // additional information about the requested popup window. To allow creation
+  // of the popup browser optionally modify |windowInfo|, |client|, |settings|
+  // and |no_javascript_access| and return false (0). To cancel creation of the
+  // popup browser return true (1). The |client| and |settings| values will
+  // default to the source browser's values. If the |no_javascript_access| value
+  // is set to false (0) the new browser will not be scriptable and may not be
+  // hosted in the same renderer process as the source browser. Any
+  // modifications to |windowInfo| will be ignored if the parent browser is
+  // wrapped in a cef_browser_view_t. Popup browser creation will be canceled if
+  // the parent browser is destroyed before the popup browser creation completes
+  // (indicated by a call to OnAfterCreated for the popup browser). The
+  // |extra_info| parameter provides an opportunity to specify extra information
+  // specific to the created popup browser that will be passed to
+  // cef_render_process_handler_t::on_browser_created() in the render process.
  ///
  int(CEF_CALLBACK* on_before_popup)(
      struct _cef_life_span_handler_t* self,
@@ -93,7 +93,7 @@ typedef struct _cef_life_span_handler_t {
      const cef_string_t* target_frame_name,
      cef_window_open_disposition_t target_disposition,
      int user_gesture,
-      const cef_popup_features_t* popupFeatures,
+      const struct _cef_popup_features_t* popupFeatures,
      struct _cef_window_info_t* windowInfo,
      struct _cef_client_t** client,
      struct _cef_browser_settings_t* settings,
@@ -101,118 +101,117 @@ typedef struct _cef_life_span_handler_t {
      int* no_javascript_access);

  ///
-  /// Called after a new browser is created. It is now safe to begin performing
-  /// actions with |browser|. cef_frame_handler_t callbacks related to initial
-  /// main frame creation will arrive before this callback. See
-  /// cef_frame_handler_t documentation for additional usage information.
+  // Called after a new browser is created. It is now safe to begin performing
+  // actions with |browser|. cef_frame_handler_t callbacks related to initial
+  // main frame creation will arrive before this callback. See
+  // cef_frame_handler_t documentation for additional usage information.
  ///
  void(CEF_CALLBACK* on_after_created)(struct _cef_life_span_handler_t* self,
                                       struct _cef_browser_t* browser);

  ///
-  /// Called when a browser has recieved a request to close. This may result
-  /// directly from a call to cef_browser_host_t::*close_browser() or indirectly
-  /// if the browser is parented to a top-level window created by CEF and the
-  /// user attempts to close that window (by clicking the 'X', for example). The
-  /// do_close() function will be called after the JavaScript 'onunload' event
-  /// has been fired.
-  ///
-  /// An application should handle top-level owner window close notifications by
-  /// calling cef_browser_host_t::try_close_browser() or
-  /// cef_browser_host_t::CloseBrowser(false (0)) instead of allowing the window
-  /// to close immediately (see the examples below). This gives CEF an
-  /// opportunity to process the 'onbeforeunload' event and optionally cancel
-  /// the close before do_close() is called.
-  ///
-  /// When windowed rendering is enabled CEF will internally create a window or
-  /// view to host the browser. In that case returning false (0) from do_close()
-  /// will send the standard close notification to the browser's top-level owner
-  /// window (e.g. WM_CLOSE on Windows, performClose: on OS X, "delete_event" on
-  /// Linux or cef_window_delegate_t::can_close() callback from Views). If the
-  /// browser's host window/view has already been destroyed (via view hierarchy
-  /// tear-down, for example) then do_close() will not be called for that
-  /// browser since is no longer possible to cancel the close.
-  ///
-  /// When windowed rendering is disabled returning false (0) from do_close()
-  /// will cause the browser object to be destroyed immediately.
-  ///
-  /// If the browser's top-level owner window requires a non-standard close
-  /// notification then send that notification from do_close() and return true
-  /// (1).
-  ///
-  /// The cef_life_span_handler_t::on_before_close() function will be called
-  /// after do_close() (if do_close() is called) and immediately before the
-  /// browser object is destroyed. The application should only exit after
-  /// on_before_close() has been called for all existing browsers.
-  ///
-  /// The below examples describe what should happen during window close when
-  /// the browser is parented to an application-provided top-level window.
-  ///
-  /// Example 1: Using cef_browser_host_t::try_close_browser(). This is
-  /// recommended for clients using standard close handling and windows created
-  /// on the browser process UI thread. 1.  User clicks the window close button
-  /// which sends a close notification
-  ///     to the application's top-level window.
-  /// 2.  Application's top-level window receives the close notification and
-  ///     calls TryCloseBrowser() (which internally calls CloseBrowser(false)).
-  ///     TryCloseBrowser() returns false so the client cancels the window
-  ///     close.
-  /// 3.  JavaScript 'onbeforeunload' handler executes and shows the close
-  ///     confirmation dialog (which can be overridden via
-  ///     CefJSDialogHandler::OnBeforeUnloadDialog()).
-  /// 4.  User approves the close. 5.  JavaScript 'onunload' handler executes.
-  /// 6.  CEF sends a close notification to the application's top-level window
-  ///     (because DoClose() returned false by default).
-  /// 7.  Application's top-level window receives the close notification and
-  ///     calls TryCloseBrowser(). TryCloseBrowser() returns true so the client
-  ///     allows the window close.
-  /// 8.  Application's top-level window is destroyed. 9.  Application's
-  /// on_before_close() handler is called and the browser object
-  ///     is destroyed.
-  /// 10. Application exits by calling cef_quit_message_loop() if no other
-  /// browsers
-  ///     exist.
-  ///
-  /// Example 2: Using cef_browser_host_t::CloseBrowser(false (0)) and
-  /// implementing the do_close() callback. This is recommended for clients
-  /// using non-standard close handling or windows that were not created on the
-  /// browser process UI thread. 1.  User clicks the window close button which
-  /// sends a close notification
-  ///     to the application's top-level window.
-  /// 2.  Application's top-level window receives the close notification and:
-  ///     A. Calls CefBrowserHost::CloseBrowser(false).
-  ///     B. Cancels the window close.
-  /// 3.  JavaScript 'onbeforeunload' handler executes and shows the close
-  ///     confirmation dialog (which can be overridden via
-  ///     CefJSDialogHandler::OnBeforeUnloadDialog()).
-  /// 4.  User approves the close. 5.  JavaScript 'onunload' handler executes.
-  /// 6.  Application's do_close() handler is called. Application will:
-  ///     A. Set a flag to indicate that the next close attempt will be allowed.
-  ///     B. Return false.
-  /// 7.  CEF sends an close notification to the application's top-level window.
-  /// 8.  Application's top-level window receives the close notification and
-  ///     allows the window to close based on the flag from #6B.
-  /// 9.  Application's top-level window is destroyed. 10. Application's
-  /// on_before_close() handler is called and the browser object
-  ///     is destroyed.
-  /// 11. Application exits by calling cef_quit_message_loop() if no other
-  /// browsers
-  ///     exist.
+  // Called when a browser has recieved a request to close. This may result
+  // directly from a call to cef_browser_host_t::*close_browser() or indirectly
+  // if the browser is parented to a top-level window created by CEF and the
+  // user attempts to close that window (by clicking the 'X', for example). The
+  // do_close() function will be called after the JavaScript 'onunload' event
+  // has been fired.
+  //
+  // An application should handle top-level owner window close notifications by
+  // calling cef_browser_host_t::try_close_browser() or
+  // cef_browser_host_t::CloseBrowser(false (0)) instead of allowing the window
+  // to close immediately (see the examples below). This gives CEF an
+  // opportunity to process the 'onbeforeunload' event and optionally cancel the
+  // close before do_close() is called.
+  //
+  // When windowed rendering is enabled CEF will internally create a window or
+  // view to host the browser. In that case returning false (0) from do_close()
+  // will send the standard close notification to the browser's top-level owner
+  // window (e.g. WM_CLOSE on Windows, performClose: on OS X, "delete_event" on
+  // Linux or cef_window_delegate_t::can_close() callback from Views). If the
+  // browser's host window/view has already been destroyed (via view hierarchy
+  // tear-down, for example) then do_close() will not be called for that browser
+  // since is no longer possible to cancel the close.
+  //
+  // When windowed rendering is disabled returning false (0) from do_close()
+  // will cause the browser object to be destroyed immediately.
+  //
+  // If the browser's top-level owner window requires a non-standard close
+  // notification then send that notification from do_close() and return true
+  // (1).
+  //
+  // The cef_life_span_handler_t::on_before_close() function will be called
+  // after do_close() (if do_close() is called) and immediately before the
+  // browser object is destroyed. The application should only exit after
+  // on_before_close() has been called for all existing browsers.
+  //
+  // The below examples describe what should happen during window close when the
+  // browser is parented to an application-provided top-level window.
+  //
+  // Example 1: Using cef_browser_host_t::try_close_browser(). This is
+  // recommended for clients using standard close handling and windows created
+  // on the browser process UI thread. 1.  User clicks the window close button
+  // which sends a close notification to
+  //     the application's top-level window.
+  // 2.  Application's top-level window receives the close notification and
+  //     calls TryCloseBrowser() (which internally calls CloseBrowser(false)).
+  //     TryCloseBrowser() returns false so the client cancels the window close.
+  // 3.  JavaScript 'onbeforeunload' handler executes and shows the close
+  //     confirmation dialog (which can be overridden via
+  //     CefJSDialogHandler::OnBeforeUnloadDialog()).
+  // 4.  User approves the close. 5.  JavaScript 'onunload' handler executes. 6.
+  // CEF sends a close notification to the application's top-level window
+  //     (because DoClose() returned false by default).
+  // 7.  Application's top-level window receives the close notification and
+  //     calls TryCloseBrowser(). TryCloseBrowser() returns true so the client
+  //     allows the window close.
+  // 8.  Application's top-level window is destroyed. 9.  Application's
+  // on_before_close() handler is called and the browser object
+  //     is destroyed.
+  // 10. Application exits by calling cef_quit_message_loop() if no other
+  // browsers
+  //     exist.
+  //
+  // Example 2: Using cef_browser_host_t::CloseBrowser(false (0)) and
+  // implementing the do_close() callback. This is recommended for clients using
+  // non-standard close handling or windows that were not created on the browser
+  // process UI thread. 1.  User clicks the window close button which sends a
+  // close notification to
+  //     the application's top-level window.
+  // 2.  Application's top-level window receives the close notification and:
+  //     A. Calls CefBrowserHost::CloseBrowser(false).
+  //     B. Cancels the window close.
+  // 3.  JavaScript 'onbeforeunload' handler executes and shows the close
+  //     confirmation dialog (which can be overridden via
+  //     CefJSDialogHandler::OnBeforeUnloadDialog()).
+  // 4.  User approves the close. 5.  JavaScript 'onunload' handler executes. 6.
+  // Application's do_close() handler is called. Application will:
+  //     A. Set a flag to indicate that the next close attempt will be allowed.
+  //     B. Return false.
+  // 7.  CEF sends an close notification to the application's top-level window.
+  // 8.  Application's top-level window receives the close notification and
+  //     allows the window to close based on the flag from #6B.
+  // 9.  Application's top-level window is destroyed. 10. Application's
+  // on_before_close() handler is called and the browser object
+  //     is destroyed.
+  // 11. Application exits by calling cef_quit_message_loop() if no other
+  // browsers
+  //     exist.
  ///
  int(CEF_CALLBACK* do_close)(struct _cef_life_span_handler_t* self,
                              struct _cef_browser_t* browser);

  ///
-  /// Called just before a browser is destroyed. Release all references to the
-  /// browser object and do not attempt to execute any functions on the browser
-  /// object (other than IsValid, GetIdentifier or IsSame) after this callback
-  /// returns. cef_frame_handler_t callbacks related to final main frame
-  /// destruction will arrive after this callback and cef_browser_t::IsValid
-  /// will return false (0) at that time. Any in-progress network requests
-  /// associated with |browser| will be aborted when the browser is destroyed,
-  /// and cef_resource_request_handler_t callbacks related to those requests may
-  /// still arrive on the IO thread after this callback. See cef_frame_handler_t
-  /// and do_close() documentation for additional usage information.
+  // Called just before a browser is destroyed. Release all references to the
+  // browser object and do not attempt to execute any functions on the browser
+  // object (other than IsValid, GetIdentifier or IsSame) after this callback
+  // returns. cef_frame_handler_t callbacks related to final main frame
+  // destruction will arrive after this callback and cef_browser_t::IsValid will
+  // return false (0) at that time. Any in-progress network requests associated
+  // with |browser| will be aborted when the browser is destroyed, and
+  // cef_resource_request_handler_t callbacks related to those requests may
+  // still arrive on the IO thread after this callback. See cef_frame_handler_t
+  // and do_close() documentation for additional usage information.
  ///
  void(CEF_CALLBACK* on_before_close)(struct _cef_life_span_handler_t* self,
                                      struct _cef_browser_t* browser);
--- a/include/capi/cef_load_handler_capi.h
+++ b/include/capi/cef_load_handler_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=2713381c9969d7039e6c1a1ed2527e5aeb5425ce$
+// $hash=6c6a719d7cbbc01adfdc9bbe0dff6da10e06e3f3$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_LOAD_HANDLER_CAPI_H_
@@ -49,22 +49,22 @@ extern "C" {
 #endif

 ///
-/// Implement this structure to handle events related to browser load status.
-/// The functions of this structure will be called on the browser process UI
-/// thread or render process main thread (TID_RENDERER).
+// Implement this structure to handle events related to browser load status. The
+// functions of this structure will be called on the browser process UI thread
+// or render process main thread (TID_RENDERER).
 ///
 typedef struct _cef_load_handler_t {
  ///
-  /// Base structure.
+  // Base structure.
  ///
  cef_base_ref_counted_t base;

  ///
-  /// Called when the loading state has changed. This callback will be executed
-  /// twice -- once when loading is initiated either programmatically or by user
-  /// action, and once when loading is terminated due to completion,
-  /// cancellation of failure. It will be called before any calls to OnLoadStart
-  /// and after all calls to OnLoadError and/or OnLoadEnd.
+  // Called when the loading state has changed. This callback will be executed
+  // twice -- once when loading is initiated either programmatically or by user
+  // action, and once when loading is terminated due to completion, cancellation
+  // of failure. It will be called before any calls to OnLoadStart and after all
+  // calls to OnLoadError and/or OnLoadEnd.
  ///
  void(CEF_CALLBACK* on_loading_state_change)(struct _cef_load_handler_t* self,
                                              struct _cef_browser_t* browser,
@@ -73,16 +73,16 @@ typedef struct _cef_load_handler_t {
                                              int canGoForward);

  ///
-  /// Called after a navigation has been committed and before the browser begins
-  /// loading contents in the frame. The |frame| value will never be NULL --
-  /// call the is_main() function to check if this frame is the main frame.
-  /// |transition_type| provides information about the source of the navigation
-  /// and an accurate value is only available in the browser process. Multiple
-  /// frames may be loading at the same time. Sub-frames may start or continue
-  /// loading after the main frame load has ended. This function will not be
-  /// called for same page navigations (fragments, history state, etc.) or for
-  /// navigations that fail or are canceled before commit. For notification of
-  /// overall browser load status use OnLoadingStateChange instead.
+  // Called after a navigation has been committed and before the browser begins
+  // loading contents in the frame. The |frame| value will never be NULL -- call
+  // the is_main() function to check if this frame is the main frame.
+  // |transition_type| provides information about the source of the navigation
+  // and an accurate value is only available in the browser process. Multiple
+  // frames may be loading at the same time. Sub-frames may start or continue
+  // loading after the main frame load has ended. This function will not be
+  // called for same page navigations (fragments, history state, etc.) or for
+  // navigations that fail or are canceled before commit. For notification of
+  // overall browser load status use OnLoadingStateChange instead.
  ///
  void(CEF_CALLBACK* on_load_start)(struct _cef_load_handler_t* self,
                                    struct _cef_browser_t* browser,
@@ -90,14 +90,14 @@ typedef struct _cef_load_handler_t {
                                    cef_transition_type_t transition_type);

  ///
-  /// Called when the browser is done loading a frame. The |frame| value will
-  /// never be NULL -- call the is_main() function to check if this frame is the
-  /// main frame. Multiple frames may be loading at the same time. Sub-frames
-  /// may start or continue loading after the main frame load has ended. This
-  /// function will not be called for same page navigations (fragments, history
-  /// state, etc.) or for navigations that fail or are canceled before commit.
-  /// For notification of overall browser load status use OnLoadingStateChange
-  /// instead.
+  // Called when the browser is done loading a frame. The |frame| value will
+  // never be NULL -- call the is_main() function to check if this frame is the
+  // main frame. Multiple frames may be loading at the same time. Sub-frames may
+  // start or continue loading after the main frame load has ended. This
+  // function will not be called for same page navigations (fragments, history
+  // state, etc.) or for navigations that fail or are canceled before commit.
+  // For notification of overall browser load status use OnLoadingStateChange
+  // instead.
  ///
  void(CEF_CALLBACK* on_load_end)(struct _cef_load_handler_t* self,
                                  struct _cef_browser_t* browser,
@@ -105,11 +105,11 @@ typedef struct _cef_load_handler_t {
                                  int httpStatusCode);

  ///
-  /// Called when a navigation fails or is canceled. This function may be called
-  /// by itself if before commit or in combination with OnLoadStart/OnLoadEnd if
-  /// after commit. |errorCode| is the error code number, |errorText| is the
-  /// error text and |failedUrl| is the URL that failed to load. See
-  /// net\base\net_error_list.h for complete descriptions of the error codes.
+  // Called when a navigation fails or is canceled. This function may be called
+  // by itself if before commit or in combination with OnLoadStart/OnLoadEnd if
+  // after commit. |errorCode| is the error code number, |errorText| is the
+  // error text and |failedUrl| is the URL that failed to load. See
+  // net\base\net_error_list.h for complete descriptions of the error codes.
  ///
  void(CEF_CALLBACK* on_load_error)(struct _cef_load_handler_t* self,
                                    struct _cef_browser_t* browser,
--- a/include/capi/cef_media_access_handler_capi.h
+++ b/include/capi/cef_media_access_handler_capi.h
@@ -1,108 +0,0 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//    * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//    * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//    * Neither the name of Google Inc. nor the name Chromium Embedded
-// Framework nor the names of its contributors may be used to endorse
-// or promote products derived from this software without specific prior
-// written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// ---------------------------------------------------------------------------
-//
-// This file was generated by the CEF translator tool and should not edited
-// by hand. See the translator.README.txt file in the tools directory for
-// more information.
-//
-// $hash=91101808168ec0faf1f39b1924579e31478a6616$
-//
-
-#ifndef CEF_INCLUDE_CAPI_CEF_MEDIA_ACCESS_HANDLER_CAPI_H_
-#define CEF_INCLUDE_CAPI_CEF_MEDIA_ACCESS_HANDLER_CAPI_H_
-#pragma once
-
-#include "include/capi/cef_base_capi.h"
-#include "include/capi/cef_browser_capi.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-///
-// Callback structure used for asynchronous continuation of media access
-// permission requests.
-///
-typedef struct _cef_media_access_callback_t {
-  ///
-  // Base structure.
-  ///
-  cef_base_ref_counted_t base;
-
-  ///
-  // Call to allow or deny media access. If this callback was initiated in
-  // response to a getUserMedia (indicated by
-  // CEF_MEDIA_PERMISSION_DEVICE_AUDIO_CAPTURE and/or
-  // CEF_MEDIA_PERMISSION_DEVICE_VIDEO_CAPTURE being set) the
-  // |allowed_permissions| are required to match those given in
-  // |required_permissions| in the OnRequestMediaAccessPermission.
-  ///
-  void(CEF_CALLBACK* cont)(struct _cef_media_access_callback_t* self,
-                           int allowed_permissions);
-
-  ///
-  // Cancel the media access request.
-  ///
-  void(CEF_CALLBACK* cancel)(struct _cef_media_access_callback_t* self);
-} cef_media_access_callback_t;
-
-///
-// Implement this structure to handle events related to media access permission
-// requests. The functions of this structure will be called on the browser
-// process UI thread.
-///
-typedef struct _cef_media_access_handler_t {
-  ///
-  // Base structure.
-  ///
-  cef_base_ref_counted_t base;
-
-  ///
-  // Called when a page requests permission to access media. |requesting_url| is
-  // the URL requesting permission. Return true (1) and call
-  // cef_media_access_callback_t::cont() either in this function or at a later
-  // time to continue or cancel the request. Return false (0) to cancel the
-  // request immediately.
-  ///
-  int(CEF_CALLBACK* on_request_media_access_permission)(
-      struct _cef_media_access_handler_t* self,
-      struct _cef_browser_t* browser,
-      struct _cef_frame_t* frame,
-      const cef_string_t* requesting_url,
-      int32_t requested_permissions,
-      struct _cef_media_access_callback_t* callback);
-} cef_media_access_handler_t;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // CEF_INCLUDE_CAPI_CEF_MEDIA_ACCESS_HANDLER_CAPI_H_
--- a/include/capi/cef_media_router_capi.h
+++ b/include/capi/cef_media_router_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=77920892e7d9e8b98106e0bc8dfcf4b4c52a24e6$
+// $hash=79e4e38c732c0cfeef495c8a9726e105054012bb$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_MEDIA_ROUTER_CAPI_H_
@@ -56,46 +56,46 @@ struct _cef_media_sink_t;
 struct _cef_media_source_t;

 ///
-/// Supports discovery of and communication with media devices on the local
-/// network via the Cast and DIAL protocols. The functions of this structure may
-/// be called on any browser process thread unless otherwise indicated.
+// Supports discovery of and communication with media devices on the local
+// network via the Cast and DIAL protocols. The functions of this structure may
+// be called on any browser process thread unless otherwise indicated.
 ///
 typedef struct _cef_media_router_t {
  ///
-  /// Base structure.
+  // Base structure.
  ///
  cef_base_ref_counted_t base;

  ///
-  /// Add an observer for MediaRouter events. The observer will remain
-  /// registered until the returned Registration object is destroyed.
+  // Add an observer for MediaRouter events. The observer will remain registered
+  // until the returned Registration object is destroyed.
  ///
  struct _cef_registration_t*(CEF_CALLBACK* add_observer)(
      struct _cef_media_router_t* self,
      struct _cef_media_observer_t* observer);

  ///
-  /// Returns a MediaSource object for the specified media source URN. Supported
-  /// URN schemes include "cast:" and "dial:", and will be already known by the
-  /// client application (e.g. "cast:<appId>?clientId=<clientId>").
+  // Returns a MediaSource object for the specified media source URN. Supported
+  // URN schemes include "cast:" and "dial:", and will be already known by the
+  // client application (e.g. "cast:<appId>?clientId=<clientId>").
  ///
  struct _cef_media_source_t*(CEF_CALLBACK* get_source)(
      struct _cef_media_router_t* self,
      const cef_string_t* urn);

  ///
-  /// Trigger an asynchronous call to cef_media_observer_t::OnSinks on all
-  /// registered observers.
+  // Trigger an asynchronous call to cef_media_observer_t::OnSinks on all
+  // registered observers.
  ///
  void(CEF_CALLBACK* notify_current_sinks)(struct _cef_media_router_t* self);

  ///
-  /// Create a new route between |source| and |sink|. Source and sink must be
-  /// valid, compatible (as reported by cef_media_sink_t::IsCompatibleWith), and
-  /// a route between them must not already exist. |callback| will be executed
-  /// on success or failure. If route creation succeeds it will also trigger an
-  /// asynchronous call to cef_media_observer_t::OnRoutes on all registered
-  /// observers.
+  // Create a new route between |source| and |sink|. Source and sink must be
+  // valid, compatible (as reported by cef_media_sink_t::IsCompatibleWith), and
+  // a route between them must not already exist. |callback| will be executed on
+  // success or failure. If route creation succeeds it will also trigger an
+  // asynchronous call to cef_media_observer_t::OnRoutes on all registered
+  // observers.
  ///
  void(CEF_CALLBACK* create_route)(
      struct _cef_media_router_t* self,
@@ -104,51 +104,51 @@ typedef struct _cef_media_router_t {
      struct _cef_media_route_create_callback_t* callback);

  ///
-  /// Trigger an asynchronous call to cef_media_observer_t::OnRoutes on all
-  /// registered observers.
+  // Trigger an asynchronous call to cef_media_observer_t::OnRoutes on all
+  // registered observers.
  ///
  void(CEF_CALLBACK* notify_current_routes)(struct _cef_media_router_t* self);
 } cef_media_router_t;

 ///
-/// Returns the MediaRouter object associated with the global request context.
-/// If |callback| is non-NULL it will be executed asnychronously on the UI
-/// thread after the manager's storage has been initialized. Equivalent to
-/// calling cef_request_context_t::cef_request_context_get_global_context()->get
-/// _media_router().
+// Returns the MediaRouter object associated with the global request context. If
+// |callback| is non-NULL it will be executed asnychronously on the UI thread
+// after the manager's storage has been initialized. Equivalent to calling cef_r
+// equest_context_t::cef_request_context_get_global_context()->get_media_router(
+// ).
 ///
 CEF_EXPORT cef_media_router_t* cef_media_router_get_global(
    struct _cef_completion_callback_t* callback);

 ///
-/// Implemented by the client to observe MediaRouter events and registered via
-/// cef_media_router_t::AddObserver. The functions of this structure will be
-/// called on the browser process UI thread.
+// Implemented by the client to observe MediaRouter events and registered via
+// cef_media_router_t::AddObserver. The functions of this structure will be
+// called on the browser process UI thread.
 ///
 typedef struct _cef_media_observer_t {
  ///
-  /// Base structure.
+  // Base structure.
  ///
  cef_base_ref_counted_t base;

  ///
-  /// The list of available media sinks has changed or
-  /// cef_media_router_t::NotifyCurrentSinks was called.
+  // The list of available media sinks has changed or
+  // cef_media_router_t::NotifyCurrentSinks was called.
  ///
  void(CEF_CALLBACK* on_sinks)(struct _cef_media_observer_t* self,
                               size_t sinksCount,
                               struct _cef_media_sink_t* const* sinks);

  ///
-  /// The list of available media routes has changed or
-  /// cef_media_router_t::NotifyCurrentRoutes was called.
+  // The list of available media routes has changed or
+  // cef_media_router_t::NotifyCurrentRoutes was called.
  ///
  void(CEF_CALLBACK* on_routes)(struct _cef_media_observer_t* self,
                                size_t routesCount,
                                struct _cef_media_route_t* const* routes);

  ///
-  /// The connection state of |route| has changed.
+  // The connection state of |route| has changed.
  ///
  void(CEF_CALLBACK* on_route_state_changed)(
      struct _cef_media_observer_t* self,
@@ -156,8 +156,8 @@ typedef struct _cef_media_observer_t {
      cef_media_route_connection_state_t state);

  ///
-  /// A message was recieved over |route|. |message| is only valid for the scope
-  /// of this callback and should be copied if necessary.
+  // A message was recieved over |route|. |message| is only valid for the scope
+  // of this callback and should be copied if necessary.
  ///
  void(CEF_CALLBACK* on_route_message_received)(
      struct _cef_media_observer_t* self,
@@ -167,65 +167,65 @@ typedef struct _cef_media_observer_t {
 } cef_media_observer_t;

 ///
-/// Represents the route between a media source and sink. Instances of this
-/// object are created via cef_media_router_t::CreateRoute and retrieved via
-/// cef_media_observer_t::OnRoutes. Contains the status and metadata of a
-/// routing operation. The functions of this structure may be called on any
-/// browser process thread unless otherwise indicated.
+// Represents the route between a media source and sink. Instances of this
+// object are created via cef_media_router_t::CreateRoute and retrieved via
+// cef_media_observer_t::OnRoutes. Contains the status and metadata of a routing
+// operation. The functions of this structure may be called on any browser
+// process thread unless otherwise indicated.
 ///
 typedef struct _cef_media_route_t {
  ///
-  /// Base structure.
+  // Base structure.
  ///
  cef_base_ref_counted_t base;

  ///
-  /// Returns the ID for this route.
+  // Returns the ID for this route.
  ///
  // The resulting string must be freed by calling cef_string_userfree_free().
  cef_string_userfree_t(CEF_CALLBACK* get_id)(struct _cef_media_route_t* self);

  ///
-  /// Returns the source associated with this route.
+  // Returns the source associated with this route.
  ///
  struct _cef_media_source_t*(CEF_CALLBACK* get_source)(
      struct _cef_media_route_t* self);

  ///
-  /// Returns the sink associated with this route.
+  // Returns the sink associated with this route.
  ///
  struct _cef_media_sink_t*(CEF_CALLBACK* get_sink)(
      struct _cef_media_route_t* self);

  ///
-  /// Send a message over this route. |message| will be copied if necessary.
+  // Send a message over this route. |message| will be copied if necessary.
  ///
  void(CEF_CALLBACK* send_route_message)(struct _cef_media_route_t* self,
                                         const void* message,
                                         size_t message_size);

  ///
-  /// Terminate this route. Will result in an asynchronous call to
-  /// cef_media_observer_t::OnRoutes on all registered observers.
+  // Terminate this route. Will result in an asynchronous call to
+  // cef_media_observer_t::OnRoutes on all registered observers.
  ///
  void(CEF_CALLBACK* terminate)(struct _cef_media_route_t* self);
 } cef_media_route_t;

 ///
-/// Callback structure for cef_media_router_t::CreateRoute. The functions of
-/// this structure will be called on the browser process UI thread.
+// Callback structure for cef_media_router_t::CreateRoute. The functions of this
+// structure will be called on the browser process UI thread.
 ///
 typedef struct _cef_media_route_create_callback_t {
  ///
-  /// Base structure.
+  // Base structure.
  ///
  cef_base_ref_counted_t base;

  ///
-  /// Method that will be executed when the route creation has finished.
-  /// |result| will be CEF_MRCR_OK if the route creation succeeded. |error| will
-  /// be a description of the error if the route creation failed. |route| is the
-  /// resulting route, or NULL if the route creation failed.
+  // Method that will be executed when the route creation has finished. |result|
+  // will be CEF_MRCR_OK if the route creation succeeded. |error| will be a
+  // description of the error if the route creation failed. |route| is the
+  // resulting route, or NULL if the route creation failed.
  ///
  void(CEF_CALLBACK* on_media_route_create_finished)(
      struct _cef_media_route_create_callback_t* self,
@@ -235,78 +235,78 @@ typedef struct _cef_media_route_create_callback_t {
 } cef_media_route_create_callback_t;

 ///
-/// Represents a sink to which media can be routed. Instances of this object are
-/// retrieved via cef_media_observer_t::OnSinks. The functions of this structure
-/// may be called on any browser process thread unless otherwise indicated.
+// Represents a sink to which media can be routed. Instances of this object are
+// retrieved via cef_media_observer_t::OnSinks. The functions of this structure
+// may be called on any browser process thread unless otherwise indicated.
 ///
 typedef struct _cef_media_sink_t {
  ///
-  /// Base structure.
+  // Base structure.
  ///
  cef_base_ref_counted_t base;

  ///
-  /// Returns the ID for this sink.
+  // Returns the ID for this sink.
  ///
  // The resulting string must be freed by calling cef_string_userfree_free().
  cef_string_userfree_t(CEF_CALLBACK* get_id)(struct _cef_media_sink_t* self);

  ///
-  /// Returns the name of this sink.
+  // Returns the name of this sink.
  ///
  // The resulting string must be freed by calling cef_string_userfree_free().
  cef_string_userfree_t(CEF_CALLBACK* get_name)(struct _cef_media_sink_t* self);

  ///
-  /// Returns the description of this sink.
+  // Returns the description of this sink.
  ///
  // The resulting string must be freed by calling cef_string_userfree_free().
  cef_string_userfree_t(CEF_CALLBACK* get_description)(
      struct _cef_media_sink_t* self);

  ///
-  /// Returns the icon type for this sink.
+  // Returns the icon type for this sink.
  ///
  cef_media_sink_icon_type_t(CEF_CALLBACK* get_icon_type)(
      struct _cef_media_sink_t* self);

  ///
-  /// Asynchronously retrieves device info.
+  // Asynchronously retrieves device info.
  ///
  void(CEF_CALLBACK* get_device_info)(
      struct _cef_media_sink_t* self,
      struct _cef_media_sink_device_info_callback_t* callback);

  ///
-  /// Returns true (1) if this sink accepts content via Cast.
+  // Returns true (1) if this sink accepts content via Cast.
  ///
  int(CEF_CALLBACK* is_cast_sink)(struct _cef_media_sink_t* self);

  ///
-  /// Returns true (1) if this sink accepts content via DIAL.
+  // Returns true (1) if this sink accepts content via DIAL.
  ///
  int(CEF_CALLBACK* is_dial_sink)(struct _cef_media_sink_t* self);

  ///
-  /// Returns true (1) if this sink is compatible with |source|.
+  // Returns true (1) if this sink is compatible with |source|.
  ///
  int(CEF_CALLBACK* is_compatible_with)(struct _cef_media_sink_t* self,
                                        struct _cef_media_source_t* source);
 } cef_media_sink_t;

 ///
-/// Callback structure for cef_media_sink_t::GetDeviceInfo. The functions of
-/// this structure will be called on the browser process UI thread.
+// Callback structure for cef_media_sink_t::GetDeviceInfo. The functions of this
+// structure will be called on the browser process UI thread.
 ///
 typedef struct _cef_media_sink_device_info_callback_t {
  ///
-  /// Base structure.
+  // Base structure.
  ///
  cef_base_ref_counted_t base;

  ///
-  /// Method that will be executed asyncronously once device information has
-  /// been retrieved.
+  // Method that will be executed asyncronously once device information has been
+  // retrieved.
  ///
  void(CEF_CALLBACK* on_media_sink_device_info)(
      struct _cef_media_sink_device_info_callback_t* self,
@@ -314,30 +314,30 @@ typedef struct _cef_media_sink_device_info_callback_t {
 } cef_media_sink_device_info_callback_t;

 ///
-/// Represents a source from which media can be routed. Instances of this object
-/// are retrieved via cef_media_router_t::GetSource. The functions of this
-/// structure may be called on any browser process thread unless otherwise
-/// indicated.
+// Represents a source from which media can be routed. Instances of this object
+// are retrieved via cef_media_router_t::GetSource. The functions of this
+// structure may be called on any browser process thread unless otherwise
+// indicated.
 ///
 typedef struct _cef_media_source_t {
  ///
-  /// Base structure.
+  // Base structure.
  ///
  cef_base_ref_counted_t base;

  ///
-  /// Returns the ID (media source URN or URL) for this source.
+  // Returns the ID (media source URN or URL) for this source.
  ///
  // The resulting string must be freed by calling cef_string_userfree_free().
  cef_string_userfree_t(CEF_CALLBACK* get_id)(struct _cef_media_source_t* self);

  ///
-  /// Returns true (1) if this source outputs its content via Cast.
+  // Returns true (1) if this source outputs its content via Cast.
  ///
  int(CEF_CALLBACK* is_cast_source)(struct _cef_media_source_t* self);

  ///
-  /// Returns true (1) if this source outputs its content via DIAL.
+  // Returns true (1) if this source outputs its content via DIAL.
  ///
  int(CEF_CALLBACK* is_dial_source)(struct _cef_media_source_t* self);
 } cef_media_source_t;
--- a/include/capi/cef_menu_model_capi.h
+++ b/include/capi/cef_menu_model_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=4bf9250599e3ba26e7f74ec22338548492202625$
+// $hash=28fa978051bd3ddff69d58e0dc8f445f64a61480$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_MENU_MODEL_CAPI_H_
@@ -48,54 +48,54 @@ extern "C" {
 #endif

 ///
-/// Supports creation and modification of menus. See cef_menu_id_t for the
-/// command ids that have default implementations. All user-defined command ids
-/// should be between MENU_ID_USER_FIRST and MENU_ID_USER_LAST. The functions of
-/// this structure can only be accessed on the browser process the UI thread.
+// Supports creation and modification of menus. See cef_menu_id_t for the
+// command ids that have default implementations. All user-defined command ids
+// should be between MENU_ID_USER_FIRST and MENU_ID_USER_LAST. The functions of
+// this structure can only be accessed on the browser process the UI thread.
 ///
 typedef struct _cef_menu_model_t {
  ///
-  /// Base structure.
+  // Base structure.
  ///
  cef_base_ref_counted_t base;

  ///
-  /// Returns true (1) if this menu is a submenu.
+  // Returns true (1) if this menu is a submenu.
  ///
  int(CEF_CALLBACK* is_sub_menu)(struct _cef_menu_model_t* self);

  ///
-  /// Clears the menu. Returns true (1) on success.
+  // Clears the menu. Returns true (1) on success.
  ///
  int(CEF_CALLBACK* clear)(struct _cef_menu_model_t* self);

  ///
-  /// Returns the number of items in this menu.
+  // Returns the number of items in this menu.
  ///
-  size_t(CEF_CALLBACK* get_count)(struct _cef_menu_model_t* self);
+  int(CEF_CALLBACK* get_count)(struct _cef_menu_model_t* self);

  ///
-  /// Add a separator to the menu. Returns true (1) on success.
+  // Add a separator to the menu. Returns true (1) on success.
  ///
  int(CEF_CALLBACK* add_separator)(struct _cef_menu_model_t* self);

  ///
-  /// Add an item to the menu. Returns true (1) on success.
+  // Add an item to the menu. Returns true (1) on success.
  ///
  int(CEF_CALLBACK* add_item)(struct _cef_menu_model_t* self,
                              int command_id,
                              const cef_string_t* label);

  ///
-  /// Add a check item to the menu. Returns true (1) on success.
+  // Add a check item to the menu. Returns true (1) on success.
  ///
  int(CEF_CALLBACK* add_check_item)(struct _cef_menu_model_t* self,
                                    int command_id,
                                    const cef_string_t* label);

  ///
-  /// Add a radio item to the menu. Only a single item with the specified
-  /// |group_id| can be checked at a time. Returns true (1) on success.
+  // Add a radio item to the menu. Only a single item with the specified
+  // |group_id| can be checked at a time. Returns true (1) on success.
  ///
  int(CEF_CALLBACK* add_radio_item)(struct _cef_menu_model_t* self,
                                    int command_id,
@@ -103,7 +103,7 @@ typedef struct _cef_menu_model_t {
                                    int group_id);

  ///
-  /// Add a sub-menu to the menu. The new sub-menu is returned.
+  // Add a sub-menu to the menu. The new sub-menu is returned.
  ///
  struct _cef_menu_model_t*(CEF_CALLBACK* add_sub_menu)(
      struct _cef_menu_model_t* self,
@@ -111,266 +111,260 @@ typedef struct _cef_menu_model_t {
      const cef_string_t* label);

  ///
-  /// Insert a separator in the menu at the specified |index|. Returns true (1)
-  /// on success.
+  // Insert a separator in the menu at the specified |index|. Returns true (1)
+  // on success.
  ///
  int(CEF_CALLBACK* insert_separator_at)(struct _cef_menu_model_t* self,
-                                         size_t index);
+                                         int index);

  ///
-  /// Insert an item in the menu at the specified |index|. Returns true (1) on
-  /// success.
+  // Insert an item in the menu at the specified |index|. Returns true (1) on
+  // success.
  ///
  int(CEF_CALLBACK* insert_item_at)(struct _cef_menu_model_t* self,
-                                    size_t index,
+                                    int index,
                                    int command_id,
                                    const cef_string_t* label);

  ///
-  /// Insert a check item in the menu at the specified |index|. Returns true (1)
-  /// on success.
+  // Insert a check item in the menu at the specified |index|. Returns true (1)
+  // on success.
  ///
  int(CEF_CALLBACK* insert_check_item_at)(struct _cef_menu_model_t* self,
-                                          size_t index,
+                                          int index,
                                          int command_id,
                                          const cef_string_t* label);

  ///
-  /// Insert a radio item in the menu at the specified |index|. Only a single
-  /// item with the specified |group_id| can be checked at a time. Returns true
-  /// (1) on success.
+  // Insert a radio item in the menu at the specified |index|. Only a single
+  // item with the specified |group_id| can be checked at a time. Returns true
+  // (1) on success.
  ///
  int(CEF_CALLBACK* insert_radio_item_at)(struct _cef_menu_model_t* self,
-                                          size_t index,
+                                          int index,
                                          int command_id,
                                          const cef_string_t* label,
                                          int group_id);

  ///
-  /// Insert a sub-menu in the menu at the specified |index|. The new sub-menu
-  /// is returned.
+  // Insert a sub-menu in the menu at the specified |index|. The new sub-menu is
+  // returned.
  ///
  struct _cef_menu_model_t*(CEF_CALLBACK* insert_sub_menu_at)(
      struct _cef_menu_model_t* self,
-      size_t index,
+      int index,
      int command_id,
      const cef_string_t* label);

  ///
-  /// Removes the item with the specified |command_id|. Returns true (1) on
-  /// success.
+  // Removes the item with the specified |command_id|. Returns true (1) on
+  // success.
  ///
  int(CEF_CALLBACK* remove)(struct _cef_menu_model_t* self, int command_id);

  ///
-  /// Removes the item at the specified |index|. Returns true (1) on success.
+  // Removes the item at the specified |index|. Returns true (1) on success.
  ///
-  int(CEF_CALLBACK* remove_at)(struct _cef_menu_model_t* self, size_t index);
+  int(CEF_CALLBACK* remove_at)(struct _cef_menu_model_t* self, int index);

  ///
-  /// Returns the index associated with the specified |command_id| or -1 if not
-  /// found due to the command id not existing in the menu.
+  // Returns the index associated with the specified |command_id| or -1 if not
+  // found due to the command id not existing in the menu.
  ///
  int(CEF_CALLBACK* get_index_of)(struct _cef_menu_model_t* self,
                                  int command_id);

  ///
-  /// Returns the command id at the specified |index| or -1 if not found due to
-  /// invalid range or the index being a separator.
+  // Returns the command id at the specified |index| or -1 if not found due to
+  // invalid range or the index being a separator.
  ///
  int(CEF_CALLBACK* get_command_id_at)(struct _cef_menu_model_t* self,
-                                       size_t index);
+                                       int index);

  ///
-  /// Sets the command id at the specified |index|. Returns true (1) on success.
+  // Sets the command id at the specified |index|. Returns true (1) on success.
  ///
  int(CEF_CALLBACK* set_command_id_at)(struct _cef_menu_model_t* self,
-                                       size_t index,
+                                       int index,
                                       int command_id);

  ///
-  /// Returns the label for the specified |command_id| or NULL if not found.
+  // Returns the label for the specified |command_id| or NULL if not found.
  ///
  // The resulting string must be freed by calling cef_string_userfree_free().
  cef_string_userfree_t(CEF_CALLBACK* get_label)(struct _cef_menu_model_t* self,
                                                 int command_id);

  ///
-  /// Returns the label at the specified |index| or NULL if not found due to
-  /// invalid range or the index being a separator.
+  // Returns the label at the specified |index| or NULL if not found due to
+  // invalid range or the index being a separator.
  ///
  // The resulting string must be freed by calling cef_string_userfree_free().
  cef_string_userfree_t(
-      CEF_CALLBACK* get_label_at)(struct _cef_menu_model_t* self, size_t index);
+      CEF_CALLBACK* get_label_at)(struct _cef_menu_model_t* self, int index);

  ///
-  /// Sets the label for the specified |command_id|. Returns true (1) on
-  /// success.
+  // Sets the label for the specified |command_id|. Returns true (1) on success.
  ///
  int(CEF_CALLBACK* set_label)(struct _cef_menu_model_t* self,
                               int command_id,
                               const cef_string_t* label);

  ///
-  /// Set the label at the specified |index|. Returns true (1) on success.
+  // Set the label at the specified |index|. Returns true (1) on success.
  ///
  int(CEF_CALLBACK* set_label_at)(struct _cef_menu_model_t* self,
-                                  size_t index,
+                                  int index,
                                  const cef_string_t* label);

  ///
-  /// Returns the item type for the specified |command_id|.
+  // Returns the item type for the specified |command_id|.
  ///
  cef_menu_item_type_t(CEF_CALLBACK* get_type)(struct _cef_menu_model_t* self,
                                               int command_id);

  ///
-  /// Returns the item type at the specified |index|.
+  // Returns the item type at the specified |index|.
  ///
  cef_menu_item_type_t(
-      CEF_CALLBACK* get_type_at)(struct _cef_menu_model_t* self, size_t index);
+      CEF_CALLBACK* get_type_at)(struct _cef_menu_model_t* self, int index);

  ///
-  /// Returns the group id for the specified |command_id| or -1 if invalid.
+  // Returns the group id for the specified |command_id| or -1 if invalid.
  ///
  int(CEF_CALLBACK* get_group_id)(struct _cef_menu_model_t* self,
                                  int command_id);

  ///
-  /// Returns the group id at the specified |index| or -1 if invalid.
+  // Returns the group id at the specified |index| or -1 if invalid.
  ///
-  int(CEF_CALLBACK* get_group_id_at)(struct _cef_menu_model_t* self,
-                                     size_t index);
+  int(CEF_CALLBACK* get_group_id_at)(struct _cef_menu_model_t* self, int index);

  ///
-  /// Sets the group id for the specified |command_id|. Returns true (1) on
-  /// success.
+  // Sets the group id for the specified |command_id|. Returns true (1) on
+  // success.
  ///
  int(CEF_CALLBACK* set_group_id)(struct _cef_menu_model_t* self,
                                  int command_id,
                                  int group_id);

  ///
-  /// Sets the group id at the specified |index|. Returns true (1) on success.
+  // Sets the group id at the specified |index|. Returns true (1) on success.
  ///
  int(CEF_CALLBACK* set_group_id_at)(struct _cef_menu_model_t* self,
-                                     size_t index,
+                                     int index,
                                     int group_id);

  ///
-  /// Returns the submenu for the specified |command_id| or NULL if invalid.
+  // Returns the submenu for the specified |command_id| or NULL if invalid.
  ///
  struct _cef_menu_model_t*(CEF_CALLBACK* get_sub_menu)(
      struct _cef_menu_model_t* self,
      int command_id);

  ///
-  /// Returns the submenu at the specified |index| or NULL if invalid.
+  // Returns the submenu at the specified |index| or NULL if invalid.
  ///
-  struct _cef_menu_model_t*(CEF_CALLBACK* get_sub_menu_at)(
-      struct _cef_menu_model_t* self,
-      size_t index);
+  struct _cef_menu_model_t*(
+      CEF_CALLBACK* get_sub_menu_at)(struct _cef_menu_model_t* self, int index);

  ///
-  /// Returns true (1) if the specified |command_id| is visible.
+  // Returns true (1) if the specified |command_id| is visible.
  ///
  int(CEF_CALLBACK* is_visible)(struct _cef_menu_model_t* self, int command_id);

  ///
-  /// Returns true (1) if the specified |index| is visible.
+  // Returns true (1) if the specified |index| is visible.
  ///
-  int(CEF_CALLBACK* is_visible_at)(struct _cef_menu_model_t* self,
-                                   size_t index);
+  int(CEF_CALLBACK* is_visible_at)(struct _cef_menu_model_t* self, int index);

  ///
-  /// Change the visibility of the specified |command_id|. Returns true (1) on
-  /// success.
+  // Change the visibility of the specified |command_id|. Returns true (1) on
+  // success.
  ///
  int(CEF_CALLBACK* set_visible)(struct _cef_menu_model_t* self,
                                 int command_id,
                                 int visible);

  ///
-  /// Change the visibility at the specified |index|. Returns true (1) on
-  /// success.
+  // Change the visibility at the specified |index|. Returns true (1) on
+  // success.
  ///
  int(CEF_CALLBACK* set_visible_at)(struct _cef_menu_model_t* self,
-                                    size_t index,
+                                    int index,
                                    int visible);

  ///
-  /// Returns true (1) if the specified |command_id| is enabled.
+  // Returns true (1) if the specified |command_id| is enabled.
  ///
  int(CEF_CALLBACK* is_enabled)(struct _cef_menu_model_t* self, int command_id);

  ///
-  /// Returns true (1) if the specified |index| is enabled.
+  // Returns true (1) if the specified |index| is enabled.
  ///
-  int(CEF_CALLBACK* is_enabled_at)(struct _cef_menu_model_t* self,
-                                   size_t index);
+  int(CEF_CALLBACK* is_enabled_at)(struct _cef_menu_model_t* self, int index);

  ///
-  /// Change the enabled status of the specified |command_id|. Returns true (1)
-  /// on success.
+  // Change the enabled status of the specified |command_id|. Returns true (1)
+  // on success.
  ///
  int(CEF_CALLBACK* set_enabled)(struct _cef_menu_model_t* self,
                                 int command_id,
                                 int enabled);

  ///
-  /// Change the enabled status at the specified |index|. Returns true (1) on
-  /// success.
+  // Change the enabled status at the specified |index|. Returns true (1) on
+  // success.
  ///
  int(CEF_CALLBACK* set_enabled_at)(struct _cef_menu_model_t* self,
-                                    size_t index,
+                                    int index,
                                    int enabled);

  ///
-  /// Returns true (1) if the specified |command_id| is checked. Only applies to
-  /// check and radio items.
+  // Returns true (1) if the specified |command_id| is checked. Only applies to
+  // check and radio items.
  ///
  int(CEF_CALLBACK* is_checked)(struct _cef_menu_model_t* self, int command_id);

  ///
-  /// Returns true (1) if the specified |index| is checked. Only applies to
-  /// check and radio items.
+  // Returns true (1) if the specified |index| is checked. Only applies to check
+  // and radio items.
  ///
-  int(CEF_CALLBACK* is_checked_at)(struct _cef_menu_model_t* self,
-                                   size_t index);
+  int(CEF_CALLBACK* is_checked_at)(struct _cef_menu_model_t* self, int index);

  ///
-  /// Check the specified |command_id|. Only applies to check and radio items.
-  /// Returns true (1) on success.
+  // Check the specified |command_id|. Only applies to check and radio items.
+  // Returns true (1) on success.
  ///
  int(CEF_CALLBACK* set_checked)(struct _cef_menu_model_t* self,
                                 int command_id,
                                 int checked);

  ///
-  /// Check the specified |index|. Only applies to check and radio items.
-  /// Returns true (1) on success.
+  // Check the specified |index|. Only applies to check and radio items. Returns
+  // true (1) on success.
  ///
  int(CEF_CALLBACK* set_checked_at)(struct _cef_menu_model_t* self,
-                                    size_t index,
+                                    int index,
                                    int checked);

  ///
-  /// Returns true (1) if the specified |command_id| has a keyboard accelerator
-  /// assigned.
+  // Returns true (1) if the specified |command_id| has a keyboard accelerator
+  // assigned.
  ///
  int(CEF_CALLBACK* has_accelerator)(struct _cef_menu_model_t* self,
                                     int command_id);

  ///
-  /// Returns true (1) if the specified |index| has a keyboard accelerator
-  /// assigned.
+  // Returns true (1) if the specified |index| has a keyboard accelerator
+  // assigned.
  ///
  int(CEF_CALLBACK* has_accelerator_at)(struct _cef_menu_model_t* self,
-                                        size_t index);
+                                        int index);

  ///
-  /// Set the keyboard accelerator for the specified |command_id|. |key_code|
-  /// can be any virtual key or character value. Returns true (1) on success.
+  // Set the keyboard accelerator for the specified |command_id|. |key_code| can
+  // be any virtual key or character value. Returns true (1) on success.
  ///
  int(CEF_CALLBACK* set_accelerator)(struct _cef_menu_model_t* self,
                                     int command_id,
@@ -380,33 +374,33 @@ typedef struct _cef_menu_model_t {
                                     int alt_pressed);

  ///
-  /// Set the keyboard accelerator at the specified |index|. |key_code| can be
-  /// any virtual key or character value. Returns true (1) on success.
+  // Set the keyboard accelerator at the specified |index|. |key_code| can be
+  // any virtual key or character value. Returns true (1) on success.
  ///
  int(CEF_CALLBACK* set_accelerator_at)(struct _cef_menu_model_t* self,
-                                        size_t index,
+                                        int index,
                                        int key_code,
                                        int shift_pressed,
                                        int ctrl_pressed,
                                        int alt_pressed);

  ///
-  /// Remove the keyboard accelerator for the specified |command_id|. Returns
-  /// true (1) on success.
+  // Remove the keyboard accelerator for the specified |command_id|. Returns
+  // true (1) on success.
  ///
  int(CEF_CALLBACK* remove_accelerator)(struct _cef_menu_model_t* self,
                                        int command_id);

  ///
-  /// Remove the keyboard accelerator at the specified |index|. Returns true (1)
-  /// on success.
+  // Remove the keyboard accelerator at the specified |index|. Returns true (1)
+  // on success.
  ///
  int(CEF_CALLBACK* remove_accelerator_at)(struct _cef_menu_model_t* self,
-                                           size_t index);
+                                           int index);

  ///
-  /// Retrieves the keyboard accelerator for the specified |command_id|. Returns
-  /// true (1) on success.
+  // Retrieves the keyboard accelerator for the specified |command_id|. Returns
+  // true (1) on success.
  ///
  int(CEF_CALLBACK* get_accelerator)(struct _cef_menu_model_t* self,
                                     int command_id,
@@ -416,21 +410,21 @@ typedef struct _cef_menu_model_t {
                                     int* alt_pressed);

  ///
-  /// Retrieves the keyboard accelerator for the specified |index|. Returns true
-  /// (1) on success.
+  // Retrieves the keyboard accelerator for the specified |index|. Returns true
+  // (1) on success.
  ///
  int(CEF_CALLBACK* get_accelerator_at)(struct _cef_menu_model_t* self,
-                                        size_t index,
+                                        int index,
                                        int* key_code,
                                        int* shift_pressed,
                                        int* ctrl_pressed,
                                        int* alt_pressed);

  ///
-  /// Set the explicit color for |command_id| and |color_type| to |color|.
-  /// Specify a |color| value of 0 to remove the explicit color. If no explicit
-  /// color or default color is set for |color_type| then the system color will
-  /// be used. Returns true (1) on success.
+  // Set the explicit color for |command_id| and |color_type| to |color|.
+  // Specify a |color| value of 0 to remove the explicit color. If no explicit
+  // color or default color is set for |color_type| then the system color will
+  // be used. Returns true (1) on success.
  ///
  int(CEF_CALLBACK* set_color)(struct _cef_menu_model_t* self,
                               int command_id,
@@ -438,11 +432,11 @@ typedef struct _cef_menu_model_t {
                               cef_color_t color);

  ///
-  /// Set the explicit color for |command_id| and |index| to |color|. Specify a
-  /// |color| value of 0 to remove the explicit color. Specify an |index| value
-  /// of -1 to set the default color for items that do not have an explicit
-  /// color set. If no explicit color or default color is set for |color_type|
-  /// then the system color will be used. Returns true (1) on success.
+  // Set the explicit color for |command_id| and |index| to |color|. Specify a
+  // |color| value of 0 to remove the explicit color. Specify an |index| value
+  // of -1 to set the default color for items that do not have an explicit color
+  // set. If no explicit color or default color is set for |color_type| then the
+  // system color will be used. Returns true (1) on success.
  ///
  int(CEF_CALLBACK* set_color_at)(struct _cef_menu_model_t* self,
                                  int index,
@@ -450,9 +444,9 @@ typedef struct _cef_menu_model_t {
                                  cef_color_t color);

  ///
-  /// Returns in |color| the color that was explicitly set for |command_id| and
-  /// |color_type|. If a color was not set then 0 will be returned in |color|.
-  /// Returns true (1) on success.
+  // Returns in |color| the color that was explicitly set for |command_id| and
+  // |color_type|. If a color was not set then 0 will be returned in |color|.
+  // Returns true (1) on success.
  ///
  int(CEF_CALLBACK* get_color)(struct _cef_menu_model_t* self,
                               int command_id,
@@ -460,10 +454,10 @@ typedef struct _cef_menu_model_t {
                               cef_color_t* color);

  ///
-  /// Returns in |color| the color that was explicitly set for |command_id| and
-  /// |color_type|. Specify an |index| value of -1 to return the default color
-  /// in |color|. If a color was not set then 0 will be returned in |color|.
-  /// Returns true (1) on success.
+  // Returns in |color| the color that was explicitly set for |command_id| and
+  // |color_type|. Specify an |index| value of -1 to return the default color in
+  // |color|. If a color was not set then 0 will be returned in |color|. Returns
+  // true (1) on success.
  ///
  int(CEF_CALLBACK* get_color_at)(struct _cef_menu_model_t* self,
                                  int index,
@@ -471,33 +465,33 @@ typedef struct _cef_menu_model_t {
                                  cef_color_t* color);

  ///
-  /// Sets the font list for the specified |command_id|. If |font_list| is NULL
-  /// the system font will be used. Returns true (1) on success. The format is
-  /// "<FONT_FAMILY_LIST>,[STYLES] <SIZE>", where: - FONT_FAMILY_LIST is a
-  /// comma-separated list of font family names, - STYLES is an optional space-
-  /// separated list of style names
-  ///   (case-sensitive "Bold" and "Italic" are supported), and
-  /// - SIZE is an integer font size in pixels with the suffix "px".
-  ///
-  /// Here are examples of valid font description strings: - "Arial, Helvetica,
-  /// Bold Italic 14px" - "Arial, 14px"
+  // Sets the font list for the specified |command_id|. If |font_list| is NULL
+  // the system font will be used. Returns true (1) on success. The format is
+  // "<FONT_FAMILY_LIST>,[STYLES] <SIZE>", where: - FONT_FAMILY_LIST is a comma-
+  // separated list of font family names, - STYLES is an optional space-
+  // separated list of style names (case-sensitive
+  //   "Bold" and "Italic" are supported), and
+  // - SIZE is an integer font size in pixels with the suffix "px".
+  //
+  // Here are examples of valid font description strings: - "Arial, Helvetica,
+  // Bold Italic 14px" - "Arial, 14px"
  ///
  int(CEF_CALLBACK* set_font_list)(struct _cef_menu_model_t* self,
                                   int command_id,
                                   const cef_string_t* font_list);

  ///
-  /// Sets the font list for the specified |index|. Specify an |index| value of
-  /// -1 to set the default font. If |font_list| is NULL the system font will be
-  /// used. Returns true (1) on success. The format is
-  /// "<FONT_FAMILY_LIST>,[STYLES] <SIZE>", where: - FONT_FAMILY_LIST is a
-  /// comma-separated list of font family names, - STYLES is an optional space-
-  /// separated list of style names
-  ///   (case-sensitive "Bold" and "Italic" are supported), and
-  /// - SIZE is an integer font size in pixels with the suffix "px".
-  ///
-  /// Here are examples of valid font description strings: - "Arial, Helvetica,
-  /// Bold Italic 14px" - "Arial, 14px"
+  // Sets the font list for the specified |index|. Specify an |index| value of
+  // -1 to set the default font. If |font_list| is NULL the system font will be
+  // used. Returns true (1) on success. The format is
+  // "<FONT_FAMILY_LIST>,[STYLES] <SIZE>", where: - FONT_FAMILY_LIST is a comma-
+  // separated list of font family names, - STYLES is an optional space-
+  // separated list of style names (case-sensitive
+  //   "Bold" and "Italic" are supported), and
+  // - SIZE is an integer font size in pixels with the suffix "px".
+  //
+  // Here are examples of valid font description strings: - "Arial, Helvetica,
+  // Bold Italic 14px" - "Arial, 14px"
  ///
  int(CEF_CALLBACK* set_font_list_at)(struct _cef_menu_model_t* self,
                                      int index,
@@ -505,7 +499,7 @@ typedef struct _cef_menu_model_t {
 } cef_menu_model_t;

 ///
-/// Create a new MenuModel with the specified |delegate|.
+// Create a new MenuModel with the specified |delegate|.
 ///
 CEF_EXPORT cef_menu_model_t* cef_menu_model_create(
    struct _cef_menu_model_delegate_t* delegate);
--- a/include/capi/cef_menu_model_delegate_capi.h
+++ b/include/capi/cef_menu_model_delegate_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=8254165498a527d40517c1bc8ec413ad7a0ed259$
+// $hash=edc411cb0447a6c2965cdeb5f709fe56c43ec2bb$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_MENU_MODEL_DELEGATE_CAPI_H_
@@ -49,19 +49,19 @@ extern "C" {
 struct _cef_menu_model_t;

 ///
-/// Implement this structure to handle menu model events. The functions of this
-/// structure will be called on the browser process UI thread unless otherwise
-/// indicated.
+// Implement this structure to handle menu model events. The functions of this
+// structure will be called on the browser process UI thread unless otherwise
+// indicated.
 ///
 typedef struct _cef_menu_model_delegate_t {
  ///
-  /// Base structure.
+  // Base structure.
  ///
  cef_base_ref_counted_t base;

  ///
-  /// Perform the action associated with the specified |command_id| and optional
-  /// |event_flags|.
+  // Perform the action associated with the specified |command_id| and optional
+  // |event_flags|.
  ///
  void(CEF_CALLBACK* execute_command)(struct _cef_menu_model_delegate_t* self,
                                      struct _cef_menu_model_t* menu_model,
@@ -69,8 +69,8 @@ typedef struct _cef_menu_model_delegate_t {
                                      cef_event_flags_t event_flags);

  ///
-  /// Called when the user moves the mouse outside the menu and over the owning
-  /// window.
+  // Called when the user moves the mouse outside the menu and over the owning
+  // window.
  ///
  void(CEF_CALLBACK* mouse_outside_menu)(
      struct _cef_menu_model_delegate_t* self,
@@ -78,8 +78,8 @@ typedef struct _cef_menu_model_delegate_t {
      const cef_point_t* screen_point);

  ///
-  /// Called on unhandled open submenu keyboard commands. |is_rtl| will be true
-  /// (1) if the menu is displaying a right-to-left language.
+  // Called on unhandled open submenu keyboard commands. |is_rtl| will be true
+  // (1) if the menu is displaying a right-to-left language.
  ///
  void(CEF_CALLBACK* unhandled_open_submenu)(
      struct _cef_menu_model_delegate_t* self,
@@ -87,8 +87,8 @@ typedef struct _cef_menu_model_delegate_t {
      int is_rtl);

  ///
-  /// Called on unhandled close submenu keyboard commands. |is_rtl| will be true
-  /// (1) if the menu is displaying a right-to-left language.
+  // Called on unhandled close submenu keyboard commands. |is_rtl| will be true
+  // (1) if the menu is displaying a right-to-left language.
  ///
  void(CEF_CALLBACK* unhandled_close_submenu)(
      struct _cef_menu_model_delegate_t* self,
@@ -96,20 +96,20 @@ typedef struct _cef_menu_model_delegate_t {
      int is_rtl);

  ///
-  /// The menu is about to show.
+  // The menu is about to show.
  ///
  void(CEF_CALLBACK* menu_will_show)(struct _cef_menu_model_delegate_t* self,
                                     struct _cef_menu_model_t* menu_model);

  ///
-  /// The menu has closed.
+  // The menu has closed.
  ///
  void(CEF_CALLBACK* menu_closed)(struct _cef_menu_model_delegate_t* self,
                                  struct _cef_menu_model_t* menu_model);

  ///
-  /// Optionally modify a menu item label. Return true (1) if |label| was
-  /// modified.
+  // Optionally modify a menu item label. Return true (1) if |label| was
+  // modified.
  ///
  int(CEF_CALLBACK* format_label)(struct _cef_menu_model_delegate_t* self,
                                  struct _cef_menu_model_t* menu_model,
--- a/include/capi/cef_navigation_entry_capi.h
+++ b/include/capi/cef_navigation_entry_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=2822d96d72b7df816c0fefb4ce1cbba18add50ac$
+// $hash=f14afbd6941bcb37b14cce81569882512c3d7194$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_NAVIGATION_ENTRY_CAPI_H_
@@ -48,79 +48,78 @@ extern "C" {
 #endif

 ///
-/// Structure used to represent an entry in navigation history.
+// Structure used to represent an entry in navigation history.
 ///
 typedef struct _cef_navigation_entry_t {
  ///
-  /// Base structure.
+  // Base structure.
  ///
  cef_base_ref_counted_t base;

  ///
-  /// Returns true (1) if this object is valid. Do not call any other functions
-  /// if this function returns false (0).
+  // Returns true (1) if this object is valid. Do not call any other functions
+  // if this function returns false (0).
  ///
  int(CEF_CALLBACK* is_valid)(struct _cef_navigation_entry_t* self);

  ///
-  /// Returns the actual URL of the page. For some pages this may be data: URL
-  /// or similar. Use get_display_url() to return a display-friendly version.
+  // Returns the actual URL of the page. For some pages this may be data: URL or
+  // similar. Use get_display_url() to return a display-friendly version.
  ///
  // The resulting string must be freed by calling cef_string_userfree_free().
  cef_string_userfree_t(CEF_CALLBACK* get_url)(
      struct _cef_navigation_entry_t* self);

  ///
-  /// Returns a display-friendly version of the URL.
+  // Returns a display-friendly version of the URL.
  ///
  // The resulting string must be freed by calling cef_string_userfree_free().
  cef_string_userfree_t(CEF_CALLBACK* get_display_url)(
      struct _cef_navigation_entry_t* self);

  ///
-  /// Returns the original URL that was entered by the user before any
-  /// redirects.
+  // Returns the original URL that was entered by the user before any redirects.
  ///
  // The resulting string must be freed by calling cef_string_userfree_free().
  cef_string_userfree_t(CEF_CALLBACK* get_original_url)(
      struct _cef_navigation_entry_t* self);

  ///
-  /// Returns the title set by the page. This value may be NULL.
+  // Returns the title set by the page. This value may be NULL.
  ///
  // The resulting string must be freed by calling cef_string_userfree_free().
  cef_string_userfree_t(CEF_CALLBACK* get_title)(
      struct _cef_navigation_entry_t* self);

  ///
-  /// Returns the transition type which indicates what the user did to move to
-  /// this page from the previous page.
+  // Returns the transition type which indicates what the user did to move to
+  // this page from the previous page.
  ///
  cef_transition_type_t(CEF_CALLBACK* get_transition_type)(
      struct _cef_navigation_entry_t* self);

  ///
-  /// Returns true (1) if this navigation includes post data.
+  // Returns true (1) if this navigation includes post data.
  ///
  int(CEF_CALLBACK* has_post_data)(struct _cef_navigation_entry_t* self);

  ///
-  /// Returns the time for the last known successful navigation completion. A
-  /// navigation may be completed more than once if the page is reloaded. May be
-  /// 0 if the navigation has not yet completed.
+  // Returns the time for the last known successful navigation completion. A
+  // navigation may be completed more than once if the page is reloaded. May be
+  // 0 if the navigation has not yet completed.
  ///
-  cef_basetime_t(CEF_CALLBACK* get_completion_time)(
+  cef_time_t(CEF_CALLBACK* get_completion_time)(
      struct _cef_navigation_entry_t* self);

  ///
-  /// Returns the HTTP status code for the last known successful navigation
-  /// response. May be 0 if the response has not yet been received or if the
-  /// navigation has not yet completed.
+  // Returns the HTTP status code for the last known successful navigation
+  // response. May be 0 if the response has not yet been received or if the
+  // navigation has not yet completed.
  ///
  int(CEF_CALLBACK* get_http_status_code)(struct _cef_navigation_entry_t* self);

  ///
-  /// Returns the SSL information for this navigation entry.
+  // Returns the SSL information for this navigation entry.
  ///
  struct _cef_sslstatus_t*(CEF_CALLBACK* get_sslstatus)(
      struct _cef_navigation_entry_t* self);
--- a/include/capi/cef_origin_whitelist_capi.h
+++ b/include/capi/cef_origin_whitelist_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=a40860835e6e693ed2f85eab5fa7990b7f2c7bbe$
+// $hash=6798e6147540596c1abac8c7457d9d1d4d99bd54$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_ORIGIN_WHITELIST_CAPI_H_
@@ -47,41 +47,40 @@ extern "C" {
 #endif

 ///
-/// Add an entry to the cross-origin access whitelist.
-///
-/// The same-origin policy restricts how scripts hosted from different origins
-/// (scheme + domain + port) can communicate. By default, scripts can only
-/// access resources with the same origin. Scripts hosted on the HTTP and HTTPS
-/// schemes (but no other schemes) can use the "Access-Control-Allow-Origin"
-/// header to allow cross-origin requests. For example,
-/// https://source.example.com can make XMLHttpRequest requests on
-/// http://target.example.com if the http://target.example.com request returns
-/// an "Access-Control-Allow-Origin: https://source.example.com" response
-/// header.
-///
-/// Scripts in separate frames or iframes and hosted from the same protocol and
-/// domain suffix can execute cross-origin JavaScript if both pages set the
-/// document.domain value to the same domain suffix. For example,
-/// scheme://foo.example.com and scheme://bar.example.com can communicate using
-/// JavaScript if both domains set document.domain="example.com".
-///
-/// This function is used to allow access to origins that would otherwise
-/// violate the same-origin policy. Scripts hosted underneath the fully
-/// qualified |source_origin| URL (like http://www.example.com) will be allowed
-/// access to all resources hosted on the specified |target_protocol| and
-/// |target_domain|. If |target_domain| is non-NULL and
-/// |allow_target_subdomains| if false (0) only exact domain matches will be
-/// allowed. If |target_domain| contains a top- level domain component (like
-/// "example.com") and |allow_target_subdomains| is true (1) sub-domain matches
-/// will be allowed. If |target_domain| is NULL and |allow_target_subdomains| if
-/// true (1) all domains and IP addresses will be allowed.
-///
-/// This function cannot be used to bypass the restrictions on local or display
-/// isolated schemes. See the comments on CefRegisterCustomScheme for more
-/// information.
-///
-/// This function may be called on any thread. Returns false (0) if
-/// |source_origin| is invalid or the whitelist cannot be accessed.
+// Add an entry to the cross-origin access whitelist.
+//
+// The same-origin policy restricts how scripts hosted from different origins
+// (scheme + domain + port) can communicate. By default, scripts can only access
+// resources with the same origin. Scripts hosted on the HTTP and HTTPS schemes
+// (but no other schemes) can use the "Access-Control-Allow-Origin" header to
+// allow cross-origin requests. For example, https://source.example.com can make
+// XMLHttpRequest requests on http://target.example.com if the
+// http://target.example.com request returns an "Access-Control-Allow-Origin:
+// https://source.example.com" response header.
+//
+// Scripts in separate frames or iframes and hosted from the same protocol and
+// domain suffix can execute cross-origin JavaScript if both pages set the
+// document.domain value to the same domain suffix. For example,
+// scheme://foo.example.com and scheme://bar.example.com can communicate using
+// JavaScript if both domains set document.domain="example.com".
+//
+// This function is used to allow access to origins that would otherwise violate
+// the same-origin policy. Scripts hosted underneath the fully qualified
+// |source_origin| URL (like http://www.example.com) will be allowed access to
+// all resources hosted on the specified |target_protocol| and |target_domain|.
+// If |target_domain| is non-NULL and |allow_target_subdomains| if false (0)
+// only exact domain matches will be allowed. If |target_domain| contains a top-
+// level domain component (like "example.com") and |allow_target_subdomains| is
+// true (1) sub-domain matches will be allowed. If |target_domain| is NULL and
+// |allow_target_subdomains| if true (1) all domains and IP addresses will be
+// allowed.
+//
+// This function cannot be used to bypass the restrictions on local or display
+// isolated schemes. See the comments on CefRegisterCustomScheme for more
+// information.
+//
+// This function may be called on any thread. Returns false (0) if
+// |source_origin| is invalid or the whitelist cannot be accessed.
 ///
 CEF_EXPORT int cef_add_cross_origin_whitelist_entry(
    const cef_string_t* source_origin,
@@ -90,8 +89,8 @@ CEF_EXPORT int cef_add_cross_origin_whitelist_entry(
    int allow_target_subdomains);

 ///
-/// Remove an entry from the cross-origin access whitelist. Returns false (0) if
-/// |source_origin| is invalid or the whitelist cannot be accessed.
+// Remove an entry from the cross-origin access whitelist. Returns false (0) if
+// |source_origin| is invalid or the whitelist cannot be accessed.
 ///
 CEF_EXPORT int cef_remove_cross_origin_whitelist_entry(
    const cef_string_t* source_origin,
@@ -100,10 +99,10 @@ CEF_EXPORT int cef_remove_cross_origin_whitelist_entry(
    int allow_target_subdomains);

 ///
-/// Remove all entries from the cross-origin access whitelist. Returns false (0)
-/// if the whitelist cannot be accessed.
+// Remove all entries from the cross-origin access whitelist. Returns false (0)
+// if the whitelist cannot be accessed.
 ///
-CEF_EXPORT int cef_clear_cross_origin_whitelist(void);
+CEF_EXPORT int cef_clear_cross_origin_whitelist();

 #ifdef __cplusplus
 }
--- a/include/capi/cef_parser_capi.h
+++ b/include/capi/cef_parser_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=a6cb0abd77320cfd9ddfa3f16ca0a6ff3987521a$
+// $hash=84149324b177c47287b935dcb3d5900a33acfdf5$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_PARSER_CAPI_H_
@@ -47,84 +47,84 @@ extern "C" {
 #endif

 ///
-/// Parse the specified |url| into its component parts. Returns false (0) if the
-/// URL is NULL or invalid.
+// Parse the specified |url| into its component parts. Returns false (0) if the
+// URL is NULL or invalid.
 ///
 CEF_EXPORT int cef_parse_url(const cef_string_t* url,
                             struct _cef_urlparts_t* parts);

 ///
-/// Creates a URL from the specified |parts|, which must contain a non-NULL spec
-/// or a non-NULL host and path (at a minimum), but not both. Returns false (0)
-/// if |parts| isn't initialized as described.
+// Creates a URL from the specified |parts|, which must contain a non-NULL spec
+// or a non-NULL host and path (at a minimum), but not both. Returns false (0)
+// if |parts| isn't initialized as described.
 ///
 CEF_EXPORT int cef_create_url(const struct _cef_urlparts_t* parts,
                              cef_string_t* url);

 ///
-/// This is a convenience function for formatting a URL in a concise and human-
-/// friendly way to help users make security-related decisions (or in other
-/// circumstances when people need to distinguish sites, origins, or otherwise-
-/// simplified URLs from each other). Internationalized domain names (IDN) may
-/// be presented in Unicode if the conversion is considered safe. The returned
-/// value will (a) omit the path for standard schemes, excepting file and
-/// filesystem, and (b) omit the port if it is the default for the scheme. Do
-/// not use this for URLs which will be parsed or sent to other applications.
+// This is a convenience function for formatting a URL in a concise and human-
+// friendly way to help users make security-related decisions (or in other
+// circumstances when people need to distinguish sites, origins, or otherwise-
+// simplified URLs from each other). Internationalized domain names (IDN) may be
+// presented in Unicode if the conversion is considered safe. The returned value
+// will (a) omit the path for standard schemes, excepting file and filesystem,
+// and (b) omit the port if it is the default for the scheme. Do not use this
+// for URLs which will be parsed or sent to other applications.
 ///
 // The resulting string must be freed by calling cef_string_userfree_free().
 CEF_EXPORT cef_string_userfree_t
 cef_format_url_for_security_display(const cef_string_t* origin_url);

 ///
-/// Returns the mime type for the specified file extension or an NULL string if
-/// unknown.
+// Returns the mime type for the specified file extension or an NULL string if
+// unknown.
 ///
 // The resulting string must be freed by calling cef_string_userfree_free().
 CEF_EXPORT cef_string_userfree_t
 cef_get_mime_type(const cef_string_t* extension);

 ///
-/// Get the extensions associated with the given mime type. This should be
-/// passed in lower case. There could be multiple extensions for a given mime
-/// type, like "html,htm" for "text/html", or "txt,text,html,..." for "text/*".
-/// Any existing elements in the provided vector will not be erased.
+// Get the extensions associated with the given mime type. This should be passed
+// in lower case. There could be multiple extensions for a given mime type, like
+// "html,htm" for "text/html", or "txt,text,html,..." for "text/*". Any existing
+// elements in the provided vector will not be erased.
 ///
 CEF_EXPORT void cef_get_extensions_for_mime_type(const cef_string_t* mime_type,
                                                 cef_string_list_t extensions);

 ///
-/// Encodes |data| as a base64 string.
+// Encodes |data| as a base64 string.
 ///
 // The resulting string must be freed by calling cef_string_userfree_free().
 CEF_EXPORT cef_string_userfree_t cef_base64encode(const void* data,
                                                  size_t data_size);

 ///
-/// Decodes the base64 encoded string |data|. The returned value will be NULL if
-/// the decoding fails.
+// Decodes the base64 encoded string |data|. The returned value will be NULL if
+// the decoding fails.
 ///
 CEF_EXPORT struct _cef_binary_value_t* cef_base64decode(
    const cef_string_t* data);

 ///
-/// Escapes characters in |text| which are unsuitable for use as a query
-/// parameter value. Everything except alphanumerics and -_.!~*'() will be
-/// converted to "%XX". If |use_plus| is true (1) spaces will change to "+". The
-/// result is basically the same as encodeURIComponent in Javacript.
+// Escapes characters in |text| which are unsuitable for use as a query
+// parameter value. Everything except alphanumerics and -_.!~*'() will be
+// converted to "%XX". If |use_plus| is true (1) spaces will change to "+". The
+// result is basically the same as encodeURIComponent in Javacript.
 ///
 // The resulting string must be freed by calling cef_string_userfree_free().
 CEF_EXPORT cef_string_userfree_t cef_uriencode(const cef_string_t* text,
                                               int use_plus);

 ///
-/// Unescapes |text| and returns the result. Unescaping consists of looking for
-/// the exact pattern "%XX" where each X is a hex digit and converting to the
-/// character with the numerical value of those digits (e.g. "i%20=%203%3b"
-/// unescapes to "i = 3;"). If |convert_to_utf8| is true (1) this function will
-/// attempt to interpret the initial decoded result as UTF-8. If the result is
-/// convertable into UTF-8 it will be returned as converted. Otherwise the
-/// initial decoded result will be returned.  The |unescape_rule| parameter
-/// supports further customization the decoding process.
+// Unescapes |text| and returns the result. Unescaping consists of looking for
+// the exact pattern "%XX" where each X is a hex digit and converting to the
+// character with the numerical value of those digits (e.g. "i%20=%203%3b"
+// unescapes to "i = 3;"). If |convert_to_utf8| is true (1) this function will
+// attempt to interpret the initial decoded result as UTF-8. If the result is
+// convertable into UTF-8 it will be returned as converted. Otherwise the
+// initial decoded result will be returned.  The |unescape_rule| parameter
+// supports further customization the decoding process.
 ///
 // The resulting string must be freed by calling cef_string_userfree_free().
 CEF_EXPORT cef_string_userfree_t
@@ -133,17 +133,17 @@ cef_uridecode(const cef_string_t* text,
              cef_uri_unescape_rule_t unescape_rule);

 ///
-/// Parses the specified |json_string| and returns a dictionary or list
-/// representation. If JSON parsing fails this function returns NULL.
+// Parses the specified |json_string| and returns a dictionary or list
+// representation. If JSON parsing fails this function returns NULL.
 ///
 CEF_EXPORT struct _cef_value_t* cef_parse_json(
    const cef_string_t* json_string,
    cef_json_parser_options_t options);

 ///
-/// Parses the specified UTF8-encoded |json| buffer of size |json_size| and
-/// returns a dictionary or list representation. If JSON parsing fails this
-/// function returns NULL.
+// Parses the specified UTF8-encoded |json| buffer of size |json_size| and
+// returns a dictionary or list representation. If JSON parsing fails this
+// function returns NULL.
 ///
 CEF_EXPORT struct _cef_value_t* cef_parse_json_buffer(
    const void* json,
@@ -151,9 +151,9 @@ CEF_EXPORT struct _cef_value_t* cef_parse_json_buffer(
    cef_json_parser_options_t options);

 ///
-/// Parses the specified |json_string| and returns a dictionary or list
-/// representation. If JSON parsing fails this function returns NULL and
-/// populates |error_msg_out| with a formatted error message.
+// Parses the specified |json_string| and returns a dictionary or list
+// representation. If JSON parsing fails this function returns NULL and
+// populates |error_msg_out| with a formatted error message.
 ///
 CEF_EXPORT struct _cef_value_t* cef_parse_jsonand_return_error(
    const cef_string_t* json_string,
@@ -161,9 +161,9 @@ CEF_EXPORT struct _cef_value_t* cef_parse_jsonand_return_error(
    cef_string_t* error_msg_out);

 ///
-/// Generates a JSON string from the specified root |node| which should be a
-/// dictionary or list value. Returns an NULL string on failure. This function
-/// requires exclusive access to |node| including any underlying data.
+// Generates a JSON string from the specified root |node| which should be a
+// dictionary or list value. Returns an NULL string on failure. This function
+// requires exclusive access to |node| including any underlying data.
 ///
 // The resulting string must be freed by calling cef_string_userfree_free().
 CEF_EXPORT cef_string_userfree_t
--- a/include/capi/cef_path_util_capi.h
+++ b/include/capi/cef_path_util_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=0b3af613a60e4c74ec83c0bb8f5280464cbe7f48$
+// $hash=0ae1fe7f7141eb05eb7fd44c2d41e4c576afae1e$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_PATH_UTIL_CAPI_H_
@@ -47,8 +47,8 @@ extern "C" {
 #endif

 ///
-/// Retrieve the path associated with the specified |key|. Returns true (1) on
-/// success. Can be called on any thread in the browser process.
+// Retrieve the path associated with the specified |key|. Returns true (1) on
+// success. Can be called on any thread in the browser process.
 ///
 CEF_EXPORT int cef_get_path(cef_path_key_t key, cef_string_t* path);

--- a/include/capi/cef_permission_handler_capi.h
+++ b/include/capi/cef_permission_handler_capi.h
@@ -1,164 +0,0 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//    * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//    * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//    * Neither the name of Google Inc. nor the name Chromium Embedded
-// Framework nor the names of its contributors may be used to endorse
-// or promote products derived from this software without specific prior
-// written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// ---------------------------------------------------------------------------
-//
-// This file was generated by the CEF translator tool and should not edited
-// by hand. See the translator.README.txt file in the tools directory for
-// more information.
-//
-// $hash=8f2ae563306d1e4ba5fa84a5f9a60712c6fc585f$
-//
-
-#ifndef CEF_INCLUDE_CAPI_CEF_PERMISSION_HANDLER_CAPI_H_
-#define CEF_INCLUDE_CAPI_CEF_PERMISSION_HANDLER_CAPI_H_
-#pragma once
-
-#include "include/capi/cef_base_capi.h"
-#include "include/capi/cef_browser_capi.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-///
-/// Callback structure used for asynchronous continuation of media access
-/// permission requests.
-///
-typedef struct _cef_media_access_callback_t {
-  ///
-  /// Base structure.
-  ///
-  cef_base_ref_counted_t base;
-
-  ///
-  /// Call to allow or deny media access. If this callback was initiated in
-  /// response to a getUserMedia (indicated by
-  /// CEF_MEDIA_PERMISSION_DEVICE_AUDIO_CAPTURE and/or
-  /// CEF_MEDIA_PERMISSION_DEVICE_VIDEO_CAPTURE being set) then
-  /// |allowed_permissions| must match |required_permissions| passed to
-  /// OnRequestMediaAccessPermission.
-  ///
-  void(CEF_CALLBACK* cont)(struct _cef_media_access_callback_t* self,
-                           uint32 allowed_permissions);
-
-  ///
-  /// Cancel the media access request.
-  ///
-  void(CEF_CALLBACK* cancel)(struct _cef_media_access_callback_t* self);
-} cef_media_access_callback_t;
-
-///
-/// Callback structure used for asynchronous continuation of permission prompts.
-///
-typedef struct _cef_permission_prompt_callback_t {
-  ///
-  /// Base structure.
-  ///
-  cef_base_ref_counted_t base;
-
-  ///
-  /// Complete the permissions request with the specified |result|.
-  ///
-  void(CEF_CALLBACK* cont)(struct _cef_permission_prompt_callback_t* self,
-                           cef_permission_request_result_t result);
-} cef_permission_prompt_callback_t;
-
-///
-/// Implement this structure to handle events related to permission requests.
-/// The functions of this structure will be called on the browser process UI
-/// thread.
-///
-typedef struct _cef_permission_handler_t {
-  ///
-  /// Base structure.
-  ///
-  cef_base_ref_counted_t base;
-
-  ///
-  /// Called when a page requests permission to access media.
-  /// |requesting_origin| is the URL origin requesting permission.
-  /// |requested_permissions| is a combination of values from
-  /// cef_media_access_permission_types_t that represent the requested
-  /// permissions. Return true (1) and call cef_media_access_callback_t
-  /// functions either in this function or at a later time to continue or cancel
-  /// the request. Return false (0) to proceed with default handling. With the
-  /// Chrome runtime, default handling will display the permission request UI.
-  /// With the Alloy runtime, default handling will deny the request. This
-  /// function will not be called if the "--enable-media-stream" command-line
-  /// switch is used to grant all permissions.
-  ///
-  int(CEF_CALLBACK* on_request_media_access_permission)(
-      struct _cef_permission_handler_t* self,
-      struct _cef_browser_t* browser,
-      struct _cef_frame_t* frame,
-      const cef_string_t* requesting_origin,
-      uint32 requested_permissions,
-      struct _cef_media_access_callback_t* callback);
-
-  ///
-  /// Called when a page should show a permission prompt. |prompt_id| uniquely
-  /// identifies the prompt. |requesting_origin| is the URL origin requesting
-  /// permission. |requested_permissions| is a combination of values from
-  /// cef_permission_request_types_t that represent the requested permissions.
-  /// Return true (1) and call cef_permission_prompt_callback_t::Continue either
-  /// in this function or at a later time to continue or cancel the request.
-  /// Return false (0) to proceed with default handling. With the Chrome
-  /// runtime, default handling will display the permission prompt UI. With the
-  /// Alloy runtime, default handling is CEF_PERMISSION_RESULT_IGNORE.
-  ///
-  int(CEF_CALLBACK* on_show_permission_prompt)(
-      struct _cef_permission_handler_t* self,
-      struct _cef_browser_t* browser,
-      uint64 prompt_id,
-      const cef_string_t* requesting_origin,
-      uint32 requested_permissions,
-      struct _cef_permission_prompt_callback_t* callback);
-
-  ///
-  /// Called when a permission prompt handled via OnShowPermissionPrompt is
-  /// dismissed. |prompt_id| will match the value that was passed to
-  /// OnShowPermissionPrompt. |result| will be the value passed to
-  /// cef_permission_prompt_callback_t::Continue or CEF_PERMISSION_RESULT_IGNORE
-  /// if the dialog was dismissed for other reasons such as navigation, browser
-  /// closure, etc. This function will not be called if OnShowPermissionPrompt
-  /// returned false (0) for |prompt_id|.
-  ///
-  void(CEF_CALLBACK* on_dismiss_permission_prompt)(
-      struct _cef_permission_handler_t* self,
-      struct _cef_browser_t* browser,
-      uint64 prompt_id,
-      cef_permission_request_result_t result);
-} cef_permission_handler_t;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // CEF_INCLUDE_CAPI_CEF_PERMISSION_HANDLER_CAPI_H_
--- a/include/capi/cef_print_handler_capi.h
+++ b/include/capi/cef_print_handler_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=0621c349d0ef1e5befe0dc653a5b8ba49e51a54e$
+// $hash=84fc58b3898f25476d9cdd260553390ba5e0b30b$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_PRINT_HANDLER_CAPI_H_
@@ -49,66 +49,65 @@ extern "C" {
 #endif

 ///
-/// Callback structure for asynchronous continuation of print dialog requests.
+// Callback structure for asynchronous continuation of print dialog requests.
 ///
 typedef struct _cef_print_dialog_callback_t {
  ///
-  /// Base structure.
+  // Base structure.
  ///
  cef_base_ref_counted_t base;

  ///
-  /// Continue printing with the specified |settings|.
+  // Continue printing with the specified |settings|.
  ///
  void(CEF_CALLBACK* cont)(struct _cef_print_dialog_callback_t* self,
                           struct _cef_print_settings_t* settings);

  ///
-  /// Cancel the printing.
+  // Cancel the printing.
  ///
  void(CEF_CALLBACK* cancel)(struct _cef_print_dialog_callback_t* self);
 } cef_print_dialog_callback_t;

 ///
-/// Callback structure for asynchronous continuation of print job requests.
+// Callback structure for asynchronous continuation of print job requests.
 ///
 typedef struct _cef_print_job_callback_t {
  ///
-  /// Base structure.
+  // Base structure.
  ///
  cef_base_ref_counted_t base;

  ///
-  /// Indicate completion of the print job.
+  // Indicate completion of the print job.
  ///
  void(CEF_CALLBACK* cont)(struct _cef_print_job_callback_t* self);
 } cef_print_job_callback_t;

 ///
-/// Implement this structure to handle printing on Linux. Each browser will have
-/// only one print job in progress at a time. The functions of this structure
-/// will be called on the browser process UI thread.
+// Implement this structure to handle printing on Linux. Each browser will have
+// only one print job in progress at a time. The functions of this structure
+// will be called on the browser process UI thread.
 ///
 typedef struct _cef_print_handler_t {
  ///
-  /// Base structure.
+  // Base structure.
  ///
  cef_base_ref_counted_t base;

  ///
-  /// Called when printing has started for the specified |browser|. This
-  /// function will be called before the other OnPrint*() functions and
-  /// irrespective of how printing was initiated (e.g.
-  /// cef_browser_host_t::print(), JavaScript window.print() or PDF extension
-  /// print button).
+  // Called when printing has started for the specified |browser|. This function
+  // will be called before the other OnPrint*() functions and irrespective of
+  // how printing was initiated (e.g. cef_browser_host_t::print(), JavaScript
+  // window.print() or PDF extension print button).
  ///
  void(CEF_CALLBACK* on_print_start)(struct _cef_print_handler_t* self,
                                     struct _cef_browser_t* browser);

  ///
-  /// Synchronize |settings| with client state. If |get_defaults| is true (1)
-  /// then populate |settings| with the default print settings. Do not keep a
-  /// reference to |settings| outside of this callback.
+  // Synchronize |settings| with client state. If |get_defaults| is true (1)
+  // then populate |settings| with the default print settings. Do not keep a
+  // reference to |settings| outside of this callback.
  ///
  void(CEF_CALLBACK* on_print_settings)(struct _cef_print_handler_t* self,
                                        struct _cef_browser_t* browser,
@@ -116,9 +115,9 @@ typedef struct _cef_print_handler_t {
                                        int get_defaults);

  ///
-  /// Show the print dialog. Execute |callback| once the dialog is dismissed.
-  /// Return true (1) if the dialog will be displayed or false (0) to cancel the
-  /// printing immediately.
+  // Show the print dialog. Execute |callback| once the dialog is dismissed.
+  // Return true (1) if the dialog will be displayed or false (0) to cancel the
+  // printing immediately.
  ///
  int(CEF_CALLBACK* on_print_dialog)(
      struct _cef_print_handler_t* self,
@@ -127,9 +126,9 @@ typedef struct _cef_print_handler_t {
      struct _cef_print_dialog_callback_t* callback);

  ///
-  /// Send the print job to the printer. Execute |callback| once the job is
-  /// completed. Return true (1) if the job will proceed or false (0) to cancel
-  /// the job immediately.
+  // Send the print job to the printer. Execute |callback| once the job is
+  // completed. Return true (1) if the job will proceed or false (0) to cancel
+  // the job immediately.
  ///
  int(CEF_CALLBACK* on_print_job)(struct _cef_print_handler_t* self,
                                  struct _cef_browser_t* browser,
@@ -138,14 +137,14 @@ typedef struct _cef_print_handler_t {
                                  struct _cef_print_job_callback_t* callback);

  ///
-  /// Reset client state related to printing.
+  // Reset client state related to printing.
  ///
  void(CEF_CALLBACK* on_print_reset)(struct _cef_print_handler_t* self,
                                     struct _cef_browser_t* browser);

  ///
-  /// Return the PDF paper size in device units. Used in combination with
-  /// cef_browser_host_t::print_to_pdf().
+  // Return the PDF paper size in device units. Used in combination with
+  // cef_browser_host_t::print_to_pdf().
  ///
  cef_size_t(CEF_CALLBACK* get_pdf_paper_size)(
      struct _cef_print_handler_t* self,
--- a/include/capi/cef_print_settings_capi.h
+++ b/include/capi/cef_print_settings_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=22959da4d5a2c94edc7647334507e38c44d40250$
+// $hash=4b52323c4ce2d0ebcc3438e16fc9a9b181a58adc$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_PRINT_SETTINGS_CAPI_H_
@@ -47,41 +47,41 @@ extern "C" {
 #endif

 ///
-/// Structure representing print settings.
+// Structure representing print settings.
 ///
 typedef struct _cef_print_settings_t {
  ///
-  /// Base structure.
+  // Base structure.
  ///
  cef_base_ref_counted_t base;

  ///
-  /// Returns true (1) if this object is valid. Do not call any other functions
-  /// if this function returns false (0).
+  // Returns true (1) if this object is valid. Do not call any other functions
+  // if this function returns false (0).
  ///
  int(CEF_CALLBACK* is_valid)(struct _cef_print_settings_t* self);

  ///
-  /// Returns true (1) if the values of this object are read-only. Some APIs may
-  /// expose read-only objects.
+  // Returns true (1) if the values of this object are read-only. Some APIs may
+  // expose read-only objects.
  ///
  int(CEF_CALLBACK* is_read_only)(struct _cef_print_settings_t* self);

  ///
-  /// Set the page orientation.
+  // Set the page orientation.
  ///
  void(CEF_CALLBACK* set_orientation)(struct _cef_print_settings_t* self,
                                      int landscape);

  ///
-  /// Returns true (1) if the orientation is landscape.
+  // Returns true (1) if the orientation is landscape.
  ///
  int(CEF_CALLBACK* is_landscape)(struct _cef_print_settings_t* self);

  ///
-  /// Set the printer printable area in device units. Some platforms already
-  /// provide flipped area. Set |landscape_needs_flip| to false (0) on those
-  /// platforms to avoid double flipping.
+  // Set the printer printable area in device units. Some platforms already
+  // provide flipped area. Set |landscape_needs_flip| to false (0) on those
+  // platforms to avoid double flipping.
  ///
  void(CEF_CALLBACK* set_printer_printable_area)(
      struct _cef_print_settings_t* self,
@@ -90,110 +90,110 @@ typedef struct _cef_print_settings_t {
      int landscape_needs_flip);

  ///
-  /// Set the device name.
+  // Set the device name.
  ///
  void(CEF_CALLBACK* set_device_name)(struct _cef_print_settings_t* self,
                                      const cef_string_t* name);

  ///
-  /// Get the device name.
+  // Get the device name.
  ///
  // The resulting string must be freed by calling cef_string_userfree_free().
  cef_string_userfree_t(CEF_CALLBACK* get_device_name)(
      struct _cef_print_settings_t* self);

  ///
-  /// Set the DPI (dots per inch).
+  // Set the DPI (dots per inch).
  ///
  void(CEF_CALLBACK* set_dpi)(struct _cef_print_settings_t* self, int dpi);

  ///
-  /// Get the DPI (dots per inch).
+  // Get the DPI (dots per inch).
  ///
  int(CEF_CALLBACK* get_dpi)(struct _cef_print_settings_t* self);

  ///
-  /// Set the page ranges.
+  // Set the page ranges.
  ///
  void(CEF_CALLBACK* set_page_ranges)(struct _cef_print_settings_t* self,
                                      size_t rangesCount,
                                      cef_range_t const* ranges);

  ///
-  /// Returns the number of page ranges that currently exist.
+  // Returns the number of page ranges that currently exist.
  ///
  size_t(CEF_CALLBACK* get_page_ranges_count)(
      struct _cef_print_settings_t* self);

  ///
-  /// Retrieve the page ranges.
+  // Retrieve the page ranges.
  ///
  void(CEF_CALLBACK* get_page_ranges)(struct _cef_print_settings_t* self,
                                      size_t* rangesCount,
                                      cef_range_t* ranges);

  ///
-  /// Set whether only the selection will be printed.
+  // Set whether only the selection will be printed.
  ///
  void(CEF_CALLBACK* set_selection_only)(struct _cef_print_settings_t* self,
                                         int selection_only);

  ///
-  /// Returns true (1) if only the selection will be printed.
+  // Returns true (1) if only the selection will be printed.
  ///
  int(CEF_CALLBACK* is_selection_only)(struct _cef_print_settings_t* self);

  ///
-  /// Set whether pages will be collated.
+  // Set whether pages will be collated.
  ///
  void(CEF_CALLBACK* set_collate)(struct _cef_print_settings_t* self,
                                  int collate);

  ///
-  /// Returns true (1) if pages will be collated.
+  // Returns true (1) if pages will be collated.
  ///
  int(CEF_CALLBACK* will_collate)(struct _cef_print_settings_t* self);

  ///
-  /// Set the color model.
+  // Set the color model.
  ///
  void(CEF_CALLBACK* set_color_model)(struct _cef_print_settings_t* self,
                                      cef_color_model_t model);

  ///
-  /// Get the color model.
+  // Get the color model.
  ///
  cef_color_model_t(CEF_CALLBACK* get_color_model)(
      struct _cef_print_settings_t* self);

  ///
-  /// Set the number of copies.
+  // Set the number of copies.
  ///
  void(CEF_CALLBACK* set_copies)(struct _cef_print_settings_t* self,
                                 int copies);

  ///
-  /// Get the number of copies.
+  // Get the number of copies.
  ///
  int(CEF_CALLBACK* get_copies)(struct _cef_print_settings_t* self);

  ///
-  /// Set the duplex mode.
+  // Set the duplex mode.
  ///
  void(CEF_CALLBACK* set_duplex_mode)(struct _cef_print_settings_t* self,
                                      cef_duplex_mode_t mode);

  ///
-  /// Get the duplex mode.
+  // Get the duplex mode.
  ///
  cef_duplex_mode_t(CEF_CALLBACK* get_duplex_mode)(
      struct _cef_print_settings_t* self);
 } cef_print_settings_t;

 ///
-/// Create a new cef_print_settings_t object.
+// Create a new cef_print_settings_t object.
 ///
-CEF_EXPORT cef_print_settings_t* cef_print_settings_create(void);
+CEF_EXPORT cef_print_settings_t* cef_print_settings_create();

 #ifdef __cplusplus
 }
--- a/include/capi/cef_process_message_capi.h
+++ b/include/capi/cef_process_message_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=7b8bbe145aa8d54d868b9d9e4ce6ff2e6a596e53$
+// $hash=53ff22b73527aa331d2bd96e008f4cb4f0413042$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_PROCESS_MESSAGE_CAPI_H_
@@ -41,7 +41,6 @@
 #pragma once

 #include "include/capi/cef_base_capi.h"
-#include "include/capi/cef_shared_memory_region_capi.h"
 #include "include/capi/cef_values_capi.h"

 #ifdef __cplusplus
@@ -49,57 +48,48 @@ extern "C" {
 #endif

 ///
-/// Structure representing a message. Can be used on any process and thread.
+// Structure representing a message. Can be used on any process and thread.
 ///
 typedef struct _cef_process_message_t {
  ///
-  /// Base structure.
+  // Base structure.
  ///
  cef_base_ref_counted_t base;

  ///
-  /// Returns true (1) if this object is valid. Do not call any other functions
-  /// if this function returns false (0).
+  // Returns true (1) if this object is valid. Do not call any other functions
+  // if this function returns false (0).
  ///
  int(CEF_CALLBACK* is_valid)(struct _cef_process_message_t* self);

  ///
-  /// Returns true (1) if the values of this object are read-only. Some APIs may
-  /// expose read-only objects.
+  // Returns true (1) if the values of this object are read-only. Some APIs may
+  // expose read-only objects.
  ///
  int(CEF_CALLBACK* is_read_only)(struct _cef_process_message_t* self);

  ///
-  /// Returns a writable copy of this object. Returns nullptr when message
-  /// contains a shared memory region.
+  // Returns a writable copy of this object.
  ///
  struct _cef_process_message_t*(CEF_CALLBACK* copy)(
      struct _cef_process_message_t* self);

  ///
-  /// Returns the message name.
+  // Returns the message name.
  ///
  // The resulting string must be freed by calling cef_string_userfree_free().
  cef_string_userfree_t(CEF_CALLBACK* get_name)(
      struct _cef_process_message_t* self);

  ///
-  /// Returns the list of arguments. Returns nullptr when message contains a
-  /// shared memory region.
+  // Returns the list of arguments.
  ///
  struct _cef_list_value_t*(CEF_CALLBACK* get_argument_list)(
      struct _cef_process_message_t* self);
-
-  ///
-  /// Returns the shared memory region. Returns nullptr when message contains an
-  /// argument list.
-  ///
-  struct _cef_shared_memory_region_t*(CEF_CALLBACK* get_shared_memory_region)(
-      struct _cef_process_message_t* self);
 } cef_process_message_t;

 ///
-/// Create a new cef_process_message_t object with the specified name.
+// Create a new cef_process_message_t object with the specified name.
 ///
 CEF_EXPORT cef_process_message_t* cef_process_message_create(
    const cef_string_t* name);
--- a/include/capi/cef_process_util_capi.h
+++ b/include/capi/cef_process_util_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=f6b215445a54f565a26f1a62d2671156635d6d46$
+// $hash=c476a8d22852994d9d9695db901efaef13bbfc9d$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_PROCESS_UTIL_CAPI_H_
@@ -47,14 +47,14 @@ extern "C" {
 #endif

 ///
-/// Launches the process specified via |command_line|. Returns true (1) upon
-/// success. Must be called on the browser process TID_PROCESS_LAUNCHER thread.
-///
-/// Unix-specific notes: - All file descriptors open in the parent process will
-/// be closed in the
-///   child process except for stdin, stdout, and stderr.
-/// - If the first argument on the command line does not contain a slash,
-///   PATH will be searched. (See man execvp.)
+// Launches the process specified via |command_line|. Returns true (1) upon
+// success. Must be called on the browser process TID_PROCESS_LAUNCHER thread.
+//
+// Unix-specific notes: - All file descriptors open in the parent process will
+// be closed in the
+//   child process except for stdin, stdout, and stderr.
+// - If the first argument on the command line does not contain a slash,
+//   PATH will be searched. (See man execvp.)
 ///
 CEF_EXPORT int cef_launch_process(struct _cef_command_line_t* command_line);

--- a/include/capi/cef_registration_capi.h
+++ b/include/capi/cef_registration_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=28371116427e9457ea366c9f0546cd5eefd8f08a$
+// $hash=8cde223bdb8d25ff163edd95da0d9e238b298016$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_REGISTRATION_CAPI_H_
@@ -47,11 +47,11 @@ extern "C" {
 #endif

 ///
-/// Generic callback structure used for managing the lifespan of a registration.
+// Generic callback structure used for managing the lifespan of a registration.
 ///
 typedef struct _cef_registration_t {
  ///
-  /// Base structure.
+  // Base structure.
  ///
  cef_base_ref_counted_t base;
 } cef_registration_t;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Marshall Greenblatt	274abcf792	Fix ExecuteJavaScript failure with null CefRenderProcessHandler (see issue #2421 ) When CefApp::GetRenderProcessHandler returned null CefRenderFrameObserver::DidCreateScriptContext was returning early (not calling CefFrameImpl::OnContextCreated) and consequently queued actions such as JavaScript were never executed.	2021-08-18 18:05:18 -04:00
CEF Spotify	9d87c1f976	Update to Chromium version 92.0.4515.159	2021-08-17 15:59:55 +00:00
Marshall Greenblatt	d15cfa853e	chrome: Fix AssertBlockingAllowed() with disk-based Profile creation (see issue #2969 )	2021-08-04 15:19:32 -04:00
CEF Spotify	4045acff92	Update to Chromium version 92.0.4515.131	2021-08-04 18:46:00 +00:00
Marshall Greenblatt	01c8529f74	views: Fix multiple issues with hide-frame (fixes issue #3168 )	2021-08-04 14:20:31 -04:00
Marshall Greenblatt	5ffe90cd56	Fix assertion when client handles HTTPS URL without certificate.	2021-08-04 14:19:27 -04:00
Marshall Greenblatt	a9ec100d85	ceftests: Don't use std::make_unique which requires C++14	2021-07-29 11:53:23 -04:00
Marshall Greenblatt	7cfecf12ac	Mac: ceftests: Add missing gtest_teamcity dependency	2021-07-28 13:01:19 -04:00
Marshall Greenblatt	bc6d8f3bee	Fix ceftest failures with BackForwardCache enabled (see issue #2421 ) When BackForwardCache is enabled the old RFH tree may be cached instead of being immediately deleted as a result of main frame navigation. If a RFH is cached then delivery of the CefFrameHandler::OnFrameDetached callback will be delayed until the the RFH is ejected from the cache (possibly not occurring until the browser is destroyed). This change in OnFrameDetached timing was causing FrameHandlerTest.OrderSubCrossOrigin* to fail, and the inclusion of cached frames in CefBrowserInfo::GetAllFrames was causing FrameTest.NestedIframesDiffOrigin to fail. BackForwardCache is currently being tested via field trials (see https://crbug.com/1171298) and can be explicitly disabled using the `--disable-back-forward-cache` or `--disable-features=BackForwardCache` command-line flags.	2021-07-28 12:23:23 -04:00
Marshall Greenblatt	6bd1124a61	chrome: Linux: Fix ceftest DraggableRegionsTest.DraggableRegions failure (see issue #2969 )	2021-07-28 12:23:23 -04:00
Marshall Greenblatt	af1a5c6f6b	chrome: Fix potential UAF of ChromeBrowserContext and Profile (see issue #2969 )	2021-07-28 12:23:23 -04:00
CEF Spotify	3492b1bd76	Update to Chromium version 92.0.4515.107	2021-07-20 20:08:36 +00:00
CEF Spotify	159e6553a5	Update to Chromium version 92.0.4515.101	2021-07-19 15:40:54 +00:00
CEF Spotify	add734afd4	Update to Chromium version 92.0.4515.81	2021-07-01 16:09:27 +00:00
Marshall Greenblatt	e75b87161d	Linux: Fix SchemeHandlerTest.Custom*StandardNoResponse test failures	2021-06-30 12:35:59 -04:00
Marshall Greenblatt	1bed986adb	Windows: Fix cef_sandbox.lib unresolved external throw_bad_optional_access Fixes the following linker error with the official cef_sandbox.lib build: cef_sandbox.lib(task_queue_selector.obj) : error LNK2001: unresolved external symbol "void __cdecl absl::optional_internal::throw_bad_optional_access(void)" (?throw_bad_optional_access@optional_internal@absl@@YAXXZ)	2021-06-30 12:33:32 -04:00
Marshall Greenblatt	439421f195	gtest: Add plugin for TeamCity integration Automatically report unit tests to the TeamCity server if run within TeamCity. See tests/gtest/teamcity/README.cef for details. To test: Set the TEAMCITY_PROJECT_NAME environment variable and run ceftests.	2021-06-29 12:44:09 -04:00
CEF Spotify	108795e566	Update to Chromium version 92.0.4515.70	2021-06-29 01:39:58 +00:00
Matthew Isaacs	847fba0d7f	widevine: Add arm64 arch manifest value (see issue #2981 )	2021-06-17 10:10:08 -04:00
Marshall Greenblatt	d7c630a930	alloy: Fix link click navigation in PDF files (fixes issue #3143 ) This change adds a minimal implementation of the \|tabs.update\| extension API and modifies StreamsPrivateAPI::SendExecuteMimeTypeHandlerEvent to return a valid \|streamInfo.tabId\| value as required by the navigateInCurrentTab implementation in chrome/browser/resources/pdf/browser_api.js.	2021-06-16 16:06:25 -04:00
Alex Maitland	f6aa203222	Expose certificate error codes to OnLoadError	2021-06-16 12:01:34 -04:00
Marshall Greenblatt	ad7b8d9a08	widevine: Fix VP9 version string for v4.10.2209.0 (fixes issue #3138 )	2021-06-14 14:48:56 -04:00
Marshall Greenblatt	2804be0749	Windows: Allow non-component Debug official sandbox builds (see issue #2679 )	2021-06-11 20:56:55 -04:00
Marshall Greenblatt	023df80e74	Use Chromium code for cookie date validity check (fixes issue #2927 )	2021-06-11 13:43:42 -04:00
Marshall Greenblatt	bfc5648634	Add --disable-request-handling-for-testing option Add a command-line option to bypass request handling in CEF to faciliate debugging of network-related issues.	2021-06-11 13:43:35 -04:00
Marshall Greenblatt	052b61ddd9	Windows: Forbid non-component Debug builds (see issue #2679 )	2021-06-11 13:43:28 -04:00
Marshall Greenblatt	008ace03fc	Update to Chromium version 92.0.4515.51	2021-06-11 11:08:25 -04:00