Add missing current_view_bounds_ member (see issue #2733 )

Fix OSR surface sizing on browser resize (fixes issue #2733 ).
This includes the following changes: - Update usage of surface IDs to match the Aura implementation from the RWHVAura/Window classes. - Batch CefBrowserHost::WasResized calls to avoid excessive/unnecessary calls to SynchronizeVisualProperties. - Cache the results of CefRenderHandler::GetViewRect after resize and make RWHVOSR::GetViewBounds the source of truth for all size calculations. - Fix bounds calculations in CefVideoConsumerOSR with GPU enabled. Known issues: - The size passed to OnPaint may be off by 1 pixel in cases where the device scale factor is not 1 and does not divide evenly into the pixel size. This is due to the inexact conversion from integer pixel size to integer logical size for GetViewRect.
2025-06-05 21:39:12 +02:00 · 2020-02-22 12:31:41 -05:00 · 2020-02-21 15:03:26 -05:00 · 2020-01-29 17:37:53 -05:00 · 2020-01-27 20:39:16 -05:00 · 2020-01-27 18:47:49 -05:00
1067 changed files with 18390 additions and 38561 deletions
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -1,8 +1,6 @@
-# This file is an addendum to the Chromium AUTHORS file. It lists authors
-# through March 16, 2015 when Git was introduced for source code management.
-# A list of additional authors added after that date can be found by executing
-# this command on a local Git checkout:
-# git log --all --format="%aN <%aE>" | sort -u
+# This file is an addendum to the Chromium AUTHORS file.
+# Names should be added to this file like so:
+# Name or Organization <email address>

 Marshall Greenblatt <magreenblatt@gmail.com>
 Jamie Kirkpatrick <jkp@spotify.com>
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -106,7 +106,6 @@ import("//media/media_options.gni")
 import("//mojo/public/tools/bindings/mojom.gni")
 import("//ppapi/buildflags/buildflags.gni")
 import("//printing/buildflags/buildflags.gni")
-import("//testing/test.gni")
 import("//third_party/icu/config.gni")
 import("//third_party/widevine/cdm/widevine.gni")
 import("//tools/grit/repack.gni")
@@ -122,8 +121,8 @@ if (is_linux) {
  import("//third_party/fontconfig/fontconfig.gni")
 }
 if (is_mac) {
-  import("//build/apple/tweak_info_plist.gni")
  import("//build/config/mac/rules.gni")
+  import("//build/mac/tweak_info_plist.gni")
  import("//build/util/version.gni")
  import("//media/cdm/library_cdm/cdm_paths.gni")
  import("//build/config/mac/base_rules.gni")
@@ -254,6 +253,7 @@ if (is_linux) {
 # Set ENABLE_PRINTING=1 ENABLE_BASIC_PRINTING=1.
 assert(enable_basic_printing)
 assert(enable_print_preview)
+assert(!enable_service_discovery)

 # Enable support for Widevine CDM.
 assert(enable_widevine)
@@ -263,6 +263,12 @@ if (is_clang) {
  assert(!clang_use_chrome_plugins)
 }

+if (is_linux) {
+  # Use system fontconfig. This avoids a startup hang on Ubuntu 16.04.4 (see
+  # issue #2424).
+  assert(!use_bundled_fontconfig)
+}
+
 if (is_mac) {
  # Always generate dSYM files. The make_distrib script will fail if
  # enable_dsyms=true is not explicitly set when is_official_build=false.
@@ -297,10 +303,6 @@ gypi_paths2 = exec_script("//cef/tools/gypi_to_gn.py",
                          "scope",
                          [ "cef_paths2.gypi" ])

-includes_common = gypi_paths2.includes_common + gypi_paths2.includes_common_capi
-includes_mac = gypi_paths2.includes_mac + gypi_paths2.includes_mac_capi
-includes_linux = gypi_paths2.includes_linux + gypi_paths2.includes_linux_capi
-includes_win = gypi_paths2.includes_win + gypi_paths2.includes_win_capi

 #
 # Targets that will be built when depending on "//cef".
@@ -311,7 +313,6 @@ group("cef") {
  deps = [
    ":cefsimple",
    ":ceftests",
-    ":libcef_static_unittests",
  ]

  if (!is_linux || use_x11) {
@@ -369,75 +370,21 @@ if (is_win) {
  }
 }

-# libcef_static source files that have unit tests.
-source_set("libcef_static_unittested") {
-  sources = [
-    "libcef/browser/devtools/devtools_util.cc",
-    "libcef/browser/devtools/devtools_util.h",
-  ]
-
-  deps = [
-    "//base",
-  ]
-
-  configs += [
-    "libcef/features:config",
-    "//build/config:precompiled_headers",
-  ]
-}
-
-# Executable target for libcef_static unit tests.
-test("libcef_static_unittests") {
-  sources = [
-    "libcef/browser/devtools/devtools_util_unittest.cc",
-  ]
-
-  deps = [
-    ":libcef_static_unittested",
-    "//base/test:run_all_unittests",
-    "//testing/gtest",
-  ]
-
-  configs += [
-    "libcef/features:config",
-    "//build/config:precompiled_headers",
-  ]
-}
-
 static_library("libcef_static") {
-  sources = includes_common +
+  sources = gypi_paths2.includes_common +
            gypi_paths.autogen_cpp_includes + [
-    "libcef/browser/alloy/alloy_browser_context.cc",
-    "libcef/browser/alloy/alloy_browser_context.h",
-    "libcef/browser/alloy/alloy_browser_host_impl.cc",
-    "libcef/browser/alloy/alloy_browser_host_impl.h",
-    "libcef/browser/alloy/alloy_browser_main.cc",
-    "libcef/browser/alloy/alloy_browser_main.h",
-    "libcef/browser/alloy/browser_platform_delegate_alloy.cc",
-    "libcef/browser/alloy/browser_platform_delegate_alloy.h",
-    "libcef/browser/alloy/chrome_browser_process_alloy.cc",
-    "libcef/browser/alloy/chrome_browser_process_alloy.h",
-    "libcef/browser/alloy/chrome_profile_manager_alloy.cc",
-    "libcef/browser/alloy/chrome_profile_manager_alloy.h",
-    "libcef/browser/alloy/chrome_profile_alloy.cc",
-    "libcef/browser/alloy/chrome_profile_alloy.h",
-    "libcef/browser/alloy/alloy_content_browser_client.cc",
-    "libcef/browser/alloy/alloy_content_browser_client.h",
-    "libcef/browser/audio_capturer.cc",
-    "libcef/browser/audio_capturer.h",
-    "libcef/browser/browser_contents_delegate.cc",
-    "libcef/browser/browser_contents_delegate.h",
    "libcef/browser/browser_context.cc",
    "libcef/browser/browser_context.h",
    "libcef/browser/browser_context_keyed_service_factories.cc",
    "libcef/browser/browser_context_keyed_service_factories.h",
-    "libcef/browser/browser_host_base.cc",
-    "libcef/browser/browser_host_base.h",
-    "libcef/browser/browser_host_create.cc",
+    "libcef/browser/browser_host_impl.cc",
+    "libcef/browser/browser_host_impl.h",
    "libcef/browser/browser_info.cc",
    "libcef/browser/browser_info.h",
    "libcef/browser/browser_info_manager.cc",
    "libcef/browser/browser_info_manager.h",
+    "libcef/browser/browser_main.cc",
+    "libcef/browser/browser_main.h",
    "libcef/browser/browser_message_filter.cc",
    "libcef/browser/browser_message_filter.h",
    "libcef/browser/browser_message_loop.cc",
@@ -447,32 +394,23 @@ static_library("libcef_static") {
    "libcef/browser/browser_platform_delegate_create.cc",
    "libcef/browser/browser_util.cc",
    "libcef/browser/browser_util.h",
-    "libcef/browser/chrome/browser_delegate.h",
-    "libcef/browser/chrome/browser_platform_delegate_chrome.cc",
-    "libcef/browser/chrome/browser_platform_delegate_chrome.h",
-    "libcef/browser/chrome/chrome_browser_context.cc",
-    "libcef/browser/chrome/chrome_browser_context.h",
-    "libcef/browser/chrome/chrome_browser_delegate.cc",
-    "libcef/browser/chrome/chrome_browser_delegate.h",
-    "libcef/browser/chrome/chrome_browser_host_impl.cc",
-    "libcef/browser/chrome/chrome_browser_host_impl.h",
-    "libcef/browser/chrome/chrome_browser_main_extra_parts_cef.cc",
-    "libcef/browser/chrome/chrome_browser_main_extra_parts_cef.h",
-    "libcef/browser/chrome/chrome_content_browser_client_cef.cc",
-    "libcef/browser/chrome/chrome_content_browser_client_cef.h",
+    "libcef/browser/chrome_browser_process_stub.cc",
+    "libcef/browser/chrome_browser_process_stub.h",
    "libcef/browser/chrome_crash_reporter_client_stub.cc",
+    "libcef/browser/chrome_profile_manager_stub.cc",
+    "libcef/browser/chrome_profile_manager_stub.h",
+    "libcef/browser/chrome_profile_stub.cc",
+    "libcef/browser/chrome_profile_stub.h",
+    "libcef/browser/content_browser_client.cc",
+    "libcef/browser/content_browser_client.h",
    "libcef/browser/context.cc",
    "libcef/browser/context.h",
    "libcef/browser/context_menu_params_impl.cc",
    "libcef/browser/context_menu_params_impl.h",
-    "libcef/browser/devtools/devtools_controller.cc",
-    "libcef/browser/devtools/devtools_controller.h",
    "libcef/browser/devtools/devtools_file_manager.cc",
    "libcef/browser/devtools/devtools_file_manager.h",
    "libcef/browser/devtools/devtools_frontend.cc",
    "libcef/browser/devtools/devtools_frontend.h",
-    "libcef/browser/devtools/devtools_manager.cc",
-    "libcef/browser/devtools/devtools_manager.h",
    "libcef/browser/devtools/devtools_manager_delegate.cc",
    "libcef/browser/devtools/devtools_manager_delegate.h",
    "libcef/browser/download_item_impl.cc",
@@ -530,25 +468,11 @@ static_library("libcef_static") {
    "libcef/browser/frame_host_impl.h",
    "libcef/browser/image_impl.cc",
    "libcef/browser/image_impl.h",
-    "libcef/browser/iothread_state.cc",
-    "libcef/browser/iothread_state.h",
    "libcef/browser/javascript_dialog_runner.h",
    "libcef/browser/javascript_dialog_manager.cc",
    "libcef/browser/javascript_dialog_manager.h",
-    "libcef/browser/main_runner.cc",
-    "libcef/browser/main_runner.h",
    "libcef/browser/media_capture_devices_dispatcher.cc",
    "libcef/browser/media_capture_devices_dispatcher.h",
-    "libcef/browser/media_router/media_route_impl.cc",
-    "libcef/browser/media_router/media_route_impl.h",
-    "libcef/browser/media_router/media_router_impl.cc",
-    "libcef/browser/media_router/media_router_impl.h",
-    "libcef/browser/media_router/media_router_manager.cc",
-    "libcef/browser/media_router/media_router_manager.h",
-    "libcef/browser/media_router/media_sink_impl.cc",
-    "libcef/browser/media_router/media_sink_impl.h",
-    "libcef/browser/media_router/media_source_impl.cc",
-    "libcef/browser/media_router/media_source_impl.h",
    "libcef/browser/menu_manager.cc",
    "libcef/browser/menu_manager.h",
    "libcef/browser/menu_model_impl.cc",
@@ -556,8 +480,6 @@ static_library("libcef_static") {
    "libcef/browser/menu_runner.h",
    "libcef/browser/native/browser_platform_delegate_native.cc",
    "libcef/browser/native/browser_platform_delegate_native.h",
-    "libcef/browser/native/cursor_util.h",
-    "libcef/browser/native/cursor_util.cc",
    "libcef/browser/navigate_params.cc",
    "libcef/browser/navigate_params.h",
    "libcef/browser/navigation_entry_impl.cc",
@@ -571,8 +493,6 @@ static_library("libcef_static") {
    "libcef/browser/net/internal_scheme_handler.h",
    "libcef/browser/net/scheme_handler.cc",
    "libcef/browser/net/scheme_handler.h",
-    "libcef/browser/net/throttle_handler.cc",
-    "libcef/browser/net/throttle_handler.h",
    "libcef/browser/net_service/browser_urlrequest_impl.cc",
    "libcef/browser/net_service/browser_urlrequest_impl.h",
    "libcef/browser/net_service/cookie_helper.cc",
@@ -631,6 +551,8 @@ static_library("libcef_static") {
    "libcef/browser/printing/print_view_manager.cc",
    "libcef/browser/printing/print_view_manager.h",
    "libcef/browser/process_util_impl.cc",
+    "libcef/browser/resource_context.cc",
+    "libcef/browser/resource_context.h",
    "libcef/browser/request_context_handler_map.cc",
    "libcef/browser/request_context_handler_map.h",
    "libcef/browser/request_context_impl.cc",
@@ -664,14 +586,6 @@ static_library("libcef_static") {
    "libcef/browser/xml_reader_impl.h",
    "libcef/browser/zip_reader_impl.cc",
    "libcef/browser/zip_reader_impl.h",
-    "libcef/common/alloy/alloy_content_client.cc",
-    "libcef/common/alloy/alloy_content_client.h",
-    "libcef/common/alloy/alloy_main_delegate.cc",
-    "libcef/common/alloy/alloy_main_delegate.h",
-    "libcef/common/alloy/alloy_main_runner_delegate.cc",
-    "libcef/common/alloy/alloy_main_runner_delegate.h",
-    "libcef/common/app_manager.cc",
-    "libcef/common/app_manager.h",
    "libcef/common/base_impl.cc",
    "libcef/common/cef_message_generator.cc",
    "libcef/common/cef_message_generator.h",
@@ -679,14 +593,10 @@ static_library("libcef_static") {
    "libcef/common/cef_messages.h",
    "libcef/common/cef_switches.cc",
    "libcef/common/cef_switches.h",
-    "libcef/common/chrome/chrome_content_client_cef.cc",
-    "libcef/common/chrome/chrome_content_client_cef.h",
-    "libcef/common/chrome/chrome_main_delegate_cef.cc",
-    "libcef/common/chrome/chrome_main_delegate_cef.h",
-    "libcef/common/chrome/chrome_main_runner_delegate.cc",
-    "libcef/common/chrome/chrome_main_runner_delegate.h",
    "libcef/common/command_line_impl.cc",
    "libcef/common/command_line_impl.h",
+    "libcef/common/content_client.cc",
+    "libcef/common/content_client.h",
    "libcef/common/crash_reporter_client.cc",
    "libcef/common/crash_reporter_client.h",
    "libcef/common/crash_reporting.cc",
@@ -705,8 +615,8 @@ static_library("libcef_static") {
    "libcef/common/frame_util.cc",
    "libcef/common/frame_util.h",
    "libcef/common/json_impl.cc",
-    "libcef/common/main_runner_delegate.h",
-    "libcef/common/main_runner_handler.h",
+    "libcef/common/main_delegate.cc",
+    "libcef/common/main_delegate.h",
    "libcef/common/net/http_header_utils.cc",
    "libcef/common/net/http_header_utils.h",
    "libcef/common/net/net_resource_provider.cc",
@@ -728,8 +638,6 @@ static_library("libcef_static") {
    "libcef/common/resource_bundle_delegate.h",
    "libcef/common/resource_bundle_impl.cc",
    "libcef/common/resource_bundle_impl.h",
-    "libcef/common/resource_util.cc",
-    "libcef/common/resource_util.h",
    "libcef/common/response_impl.cc",
    "libcef/common/response_impl.h",
    "libcef/common/response_manager.cc",
@@ -743,8 +651,6 @@ static_library("libcef_static") {
    "libcef/common/task_impl.cc",
    "libcef/common/task_runner_impl.cc",
    "libcef/common/task_runner_impl.h",
-    "libcef/common/task_runner_manager.cc",
-    "libcef/common/task_runner_manager.h",
    "libcef/common/test/translator_test_impl.cc",
    "libcef/common/thread_impl.cc",
    "libcef/common/thread_impl.h",
@@ -761,22 +667,10 @@ static_library("libcef_static") {
    "libcef/common/waitable_event_impl.h",
    "libcef/common/widevine_loader.cc",
    "libcef/common/widevine_loader.h",
-    "libcef/features/runtime.h",
-    "libcef/features/runtime_checks.h",
-    "libcef/renderer/alloy/alloy_content_renderer_client.cc",
-    "libcef/renderer/alloy/alloy_content_renderer_client.h",
-    "libcef/renderer/alloy/alloy_render_frame_observer.cc",
-    "libcef/renderer/alloy/alloy_render_frame_observer.h",
-    "libcef/renderer/alloy/alloy_render_thread_observer.cc",
-    "libcef/renderer/alloy/alloy_render_thread_observer.h",
-    "libcef/renderer/alloy/url_loader_throttle_provider_impl.cc",
-    "libcef/renderer/alloy/url_loader_throttle_provider_impl.h",
    "libcef/renderer/browser_impl.cc",
    "libcef/renderer/browser_impl.h",
-    "libcef/renderer/browser_manager.cc",
-    "libcef/renderer/browser_manager.h",
-    "libcef/renderer/chrome/chrome_content_renderer_client_cef.cc",
-    "libcef/renderer/chrome/chrome_content_renderer_client_cef.h",
+    "libcef/renderer/content_renderer_client.cc",
+    "libcef/renderer/content_renderer_client.h",
    "libcef/renderer/dom_document_impl.cc",
    "libcef/renderer/dom_document_impl.h",
    "libcef/renderer/dom_node_impl.cc",
@@ -793,17 +687,28 @@ static_library("libcef_static") {
    "libcef/renderer/render_frame_observer.h",
    "libcef/renderer/render_frame_util.cc",
    "libcef/renderer/render_frame_util.h",
+    "libcef/renderer/render_message_filter.cc",
+    "libcef/renderer/render_message_filter.h",
    "libcef/renderer/render_thread_observer.cc",
    "libcef/renderer/render_thread_observer.h",
    "libcef/renderer/render_urlrequest_impl.cc",
    "libcef/renderer/render_urlrequest_impl.h",
    "libcef/renderer/thread_util.h",
+    "libcef/renderer/url_loader_throttle_provider_impl.cc",
+    "libcef/renderer/url_loader_throttle_provider_impl.h",
    "libcef/renderer/v8_impl.cc",
    "libcef/renderer/v8_impl.h",

-    # For Chrome runtime support.
-    "//chrome/app/chrome_main_delegate.cc",
-    "//chrome/app/chrome_main_delegate.h",
+    "//chrome/browser/local_discovery/service_discovery_device_lister.cc",
+    "//chrome/browser/local_discovery/service_discovery_device_lister.h",
+    "//chrome/browser/local_discovery/service_discovery_client_impl.cc",
+    "//chrome/browser/local_discovery/service_discovery_client_impl.h",
+    "//chrome/browser/local_discovery/service_discovery_client.cc",
+    "//chrome/browser/local_discovery/service_discovery_client.h",
+    "//chrome/browser/local_discovery/service_discovery_client_mdns.cc",
+    "//chrome/browser/local_discovery/service_discovery_client_mdns.h",
+    "//chrome/browser/local_discovery/service_discovery_shared_client.cc",
+    "//chrome/browser/local_discovery/service_discovery_shared_client.h",    
  ]

  configs += [
@@ -830,8 +735,7 @@ static_library("libcef_static") {

  deps = [
    ":cef_make_headers",
-
-    ":libcef_static_unittested",
+    ":cef_service_manifests",

    # Generate API bindings for extensions.
    # TODO(cef): Enable if/when CEF exposes its own Mojo APIs. See
@@ -845,13 +749,12 @@ static_library("libcef_static") {
    "//base:base_static",
    "//base/third_party/dynamic_annotations",
    "//cc",
-    "//chrome:browser_dependencies",
-    "//chrome:child_dependencies",
-    "//chrome:packed_resources",
-    "//chrome:resources",
-    "//chrome:strings",
-    "//chrome/common:buildflags",
+    "//chrome/browser",
+    "//chrome/child",
+    "//chrome/common",
+    "//chrome/renderer",
    "//chrome/services/printing:lib",
+    "//chrome/utility",
    "//components/cdm/renderer",
    "//components/certificate_transparency",
    "//components/content_settings/core/browser",
@@ -861,9 +764,8 @@ static_library("libcef_static") {
    "//components/google/core/common",
    "//components/keyed_service/content:content",
    "//components/keyed_service/core:core",
-    "//components/media_router/common/mojom:media_router",
    "//components/navigation_interception",
-    "//components/network_session_configurator/common",
+    "//components/network_session_configurator/browser",
    "//components/pdf/browser",
    "//components/pdf/renderer",
    "//components/plugins/renderer",
@@ -872,9 +774,10 @@ static_library("libcef_static") {
    "//components/printing/common",
    "//components/printing/renderer",
    "//components/proxy_config",
-    "//components/safe_browsing/core/db:test_database_manager",
-    "//components/services/print_compositor/public/cpp",
-    "//components/services/print_compositor/public/mojom",
+    "//components/safe_browsing/db:test_database_manager",
+    "//components/services/pdf_compositor/public/cpp",
+    "//components/services/pdf_compositor/public/mojom",
+    "//components/tracing",
    "//components/update_client",
    "//components/url_formatter",
    "//components/user_prefs",
@@ -884,7 +787,7 @@ static_library("libcef_static") {
    "//components/visitedlink/renderer",
    "//components/viz/service",
    "//components/web_cache/renderer",
-    "//content/public/app",
+    "//content/public/app:both",
    "//content/public/browser",
    "//content/public/child",
    "//content/public/common",
@@ -904,11 +807,13 @@ static_library("libcef_static") {
    "//media",
    "//media/blink",
    "//net",
+    "//net:net_with_v8",
    "//pdf",
    "//ppapi/buildflags",
    "//printing/buildflags",
    "//services/network:network_service",
    "//services/network/public/cpp",
+    "//services/service_manager/embedder",
    "//services/service_manager/public/cpp",
    "//skia",
    "//storage/browser",
@@ -917,7 +822,7 @@ static_library("libcef_static") {
    "//third_party/cld_3/src/src:cld_3",
    "//third_party/hunspell",
    "//third_party/leveldatabase",
-    "//third_party/libxml:libxml",
+    "//third_party/libxml",
    "//third_party/widevine/cdm:headers",
    "//third_party/widevine/cdm",
    "//third_party/icu",
@@ -936,11 +841,10 @@ static_library("libcef_static") {
  ]

  if (is_win) {
-    sources += includes_win + [
-      "libcef/browser/alloy/alloy_browser_main_win.cc",
+    sources += gypi_paths2.includes_win + [
+      "libcef/browser/browser_main_win.cc",
      "libcef/browser/native/browser_platform_delegate_native_win.cc",
      "libcef/browser/native/browser_platform_delegate_native_win.h",
-      "libcef/browser/native/cursor_util_win.cc",
      "libcef/browser/native/file_dialog_runner_win.cc",
      "libcef/browser/native/file_dialog_runner_win.h",
      "libcef/browser/native/javascript_dialog_runner_win.cc",
@@ -954,6 +858,7 @@ static_library("libcef_static") {
      "libcef/browser/native/native_menu_win.h",
      "libcef/browser/osr/browser_platform_delegate_osr_win.cc",
      "libcef/browser/osr/browser_platform_delegate_osr_win.h",
+      "libcef/browser/osr/render_widget_host_view_osr_win.cc",

      # Part of //chrome/utility.
      "//chrome/utility/printing_handler.cc",
@@ -981,14 +886,14 @@ static_library("libcef_static") {
  }

  if (is_linux) {
-    sources += includes_linux + [
+    sources += gypi_paths2.includes_linux + [
      "libcef/browser/native/browser_platform_delegate_native_linux.cc",
      "libcef/browser/native/browser_platform_delegate_native_linux.h",
-      "libcef/browser/native/cursor_util_linux.cc",
      "libcef/browser/native/menu_runner_linux.cc",
      "libcef/browser/native/menu_runner_linux.h",
      "libcef/browser/osr/browser_platform_delegate_osr_linux.cc",
      "libcef/browser/osr/browser_platform_delegate_osr_linux.h",
+      "libcef/browser/osr/render_widget_host_view_osr_linux.cc",
      "libcef/browser/printing/print_dialog_linux.cc",
      "libcef/browser/printing/print_dialog_linux.h",
    ]
@@ -1013,7 +918,7 @@ static_library("libcef_static") {
  }

  if (is_mac) {
-    sources += includes_mac + [
+    sources += gypi_paths2.includes_mac + [
      "libcef/browser/native/browser_platform_delegate_native_mac.h",
      "libcef/browser/native/browser_platform_delegate_native_mac.mm",
      "libcef/browser/native/file_dialog_runner_mac.h",
@@ -1026,10 +931,6 @@ static_library("libcef_static") {
      "libcef/browser/osr/browser_platform_delegate_osr_mac.mm",
      "libcef/common/util_mac.h",
      "libcef/common/util_mac.mm",
-
-      # For Chrome runtime support.
-      "//chrome/app/chrome_main_mac.h",
-      "//chrome/app/chrome_main_mac.mm",
    ]
  }

@@ -1048,7 +949,7 @@ static_library("libcef_static") {
    ]

    deps += [
-      "//components/crash/core/app",
+      "//components/crash/content/app",
      "//components/crash/content/browser",
    ]
  }
@@ -1180,14 +1081,16 @@ static_library("libcef_static") {
        "//ui/aura/test/aura_test_utils.cc",
        "//ui/aura/test/aura_test_utils.h",
        # Part of //ui/events:test_support which is testingonly.
-        "//ui/events/test/x11_event_waiter.cc",
-        "//ui/events/test/x11_event_waiter.h",
+        "//ui/events/test/platform_event_waiter.cc",
+        "//ui/events/test/platform_event_waiter.h",
      ]

      if (use_x11) {
        sources += [
          # Support for UI input events.
          # Part of //ui/aura:test_support which is testingonly.
+          "//ui/aura/test/ui_controls_factory_aurax11.cc",
+          "//ui/aura/test/x11_event_sender.cc",
          "//ui/aura/test/x11_event_sender.h",
          # Part of //ui/views:test_support which is testingonly.
          "//ui/views/test/ui_controls_factory_desktop_aurax11.cc",
@@ -1195,13 +1098,6 @@ static_library("libcef_static") {
        ]
      }
    }
-
-    if (is_win || is_linux) {
-      sources += [
-        "libcef/browser/native/browser_platform_delegate_native_aura.cc",
-        "libcef/browser/native/browser_platform_delegate_native_aura.h",
-      ]
-    }
  } else {
    sources += [
      # Provides stub implementations for the views static methods.
@@ -1229,7 +1125,7 @@ config("libcef_dll_wrapper_config") {

 # libcef_dll_wrapper target.
 static_library("libcef_dll_wrapper") {
-  sources = includes_common +
+  sources = gypi_paths2.includes_common +
            gypi_paths.autogen_cpp_includes +
            gypi_paths2.includes_capi +
            gypi_paths.autogen_capi_includes +
@@ -1258,7 +1154,7 @@ if (is_win) {
    sources = [ "libcef_dll/sandbox/sandbox_win.cc" ]
    # CEF sources use include paths relative to the CEF root directory.
    include_dirs = [ "." ]
-    deps = [ "libcef/features", "//sandbox" ]
+    deps = [ "//sandbox" ]
  }
 }

@@ -1267,13 +1163,61 @@ if (is_mac) {
    sources = [ "libcef_dll/sandbox/sandbox_mac.mm" ]
    # CEF sources use include paths relative to the CEF root directory.
    include_dirs = [ "." ]
-    deps = [
-      "//build/config:executable_deps",
-      "//sandbox/mac:seatbelt"
-    ]
+    deps = [ "//sandbox/mac:seatbelt" ]
  }
 }

+#
+# Service manifests.
+#
+
+source_set("cef_content_browser_overlay_manifest") {
+  sources = [
+    "libcef/common/service_manifests/cef_content_browser_overlay_manifest.cc",
+    "libcef/common/service_manifests/cef_content_browser_overlay_manifest.h",
+  ]
+
+  configs += [
+    "libcef/features:config"
+  ]
+
+  deps = [
+    "//base",
+    "//extensions/buildflags",
+    "//extensions/common:mojom",
+    "//extensions/common/api:mojom",
+    "//services/service_manager/public/cpp",
+    "//third_party/blink/public/common",
+  ]
+}
+
+source_set("cef_content_renderer_overlay_manifest") {
+  sources = [
+    "libcef/common/service_manifests/cef_content_renderer_overlay_manifest.cc",
+    "libcef/common/service_manifests/cef_content_renderer_overlay_manifest.h",
+  ]
+
+  configs += [
+    "libcef/features:config"
+  ]
+
+  deps = [
+    "//base",
+    "//components/subresource_filter/content/mojom",
+    "//extensions/buildflags",
+    "//extensions/common:mojom",
+    "//services/service_manager/public/cpp",
+    "//third_party/blink/public/common",
+  ]
+}
+
+source_set("cef_service_manifests") {
+  public_deps = [
+    ":cef_content_browser_overlay_manifest",
+    ":cef_content_renderer_overlay_manifest",
+  ]
+}
+
 #
 # Resource grit/pack targets.
 #
@@ -1342,15 +1286,13 @@ repack("pak_devtools") {
  # Add associated .h files in the make_pack_header("resources") target.
  sources = [
    "$root_gen_dir/content/browser/devtools/devtools_resources.pak",
-    "$root_gen_dir/third_party/blink/public/resources/inspector_overlay_resources.pak",
  ]

  # Use public_deps so that generated grit headers are discoverable from
  # the libcef_static target. Grit deps that generate .cc files must be
  # listed both here and in the libcef_static target.
  public_deps = [
-    "//content/browser/devtools:devtools_resources",
-    "//third_party/blink/public:devtools_inspector_resources",
+    "//content/browser/devtools:resources",
  ]

  output = "$root_out_dir/devtools_resources.pak"
@@ -1362,8 +1304,6 @@ repack("pak_extensions") {
  # Add associated .h files in the make_pack_header("resources") target.
  sources = [
    "$root_gen_dir/chrome/component_extension_resources.pak",
-    "$root_gen_dir/content/browser/resources/media/media_internals_resources.pak",
-    "$root_gen_dir/content/browser/webrtc/resources/webrtc_internals_resources.pak",
    "$root_gen_dir/extensions/extensions_renderer_resources.pak",
    "$root_gen_dir/extensions/extensions_resources.pak",
    "$root_gen_dir/mojo/public/js/mojo_bindings_resources.pak",
@@ -1375,8 +1315,6 @@ repack("pak_extensions") {
  # listed both here and in the libcef_static target.
  public_deps = [
    "//chrome/browser/resources:component_extension_resources",
-    "//content/browser/resources/media:media_internals_resources",
-    "//content/browser/webrtc/resources",
    "//extensions:extensions_renderer_resources",
    "//extensions:extensions_resources_grd",
    "//mojo/public/js:resources",
@@ -1432,17 +1370,13 @@ repack("pak") {
  # Add associated .h files in the make_pack_header("resources") target.
  sources = [
    "$root_gen_dir/chrome/browser_resources.pak",
-    "$root_gen_dir/chrome/dev_ui_browser_resources.pak",
    "$root_gen_dir/chrome/net_internals_resources.pak",
-    "$root_gen_dir/chrome/print_preview_pdf_resources.pak",
    "$root_gen_dir/chrome/print_preview_resources.pak",
    "$root_gen_dir/chrome/common_resources.pak",
    "$root_gen_dir/components/components_resources.pak",
-    "$root_gen_dir/components/dev_ui_components_resources.pak",
    "$root_gen_dir/cef/cef_resources.pak",
    "$root_gen_dir/content/browser/tracing/tracing_resources.pak",
    "$root_gen_dir/content/content_resources.pak",
-    "$root_gen_dir/content/dev_ui_content_resources.pak",
    "$root_gen_dir/net/net_resources.pak",
    "$root_gen_dir/third_party/blink/public/resources/blink_resources.pak",
  ]
@@ -1451,18 +1385,14 @@ repack("pak") {
  # the libcef_static target. Grit deps that generate .cc files must be
  # listed both here and in the libcef_static target.
  public_deps = [
-    "//chrome/browser:dev_ui_browser_resources",
    "//chrome/browser:resources",
-    "//chrome/browser/resources/net_internals:net_internals_resources",
-    "//chrome/browser/resources:print_preview_pdf_resources",
+    "//chrome/browser/resources:net_internals_resources",
    "//chrome/browser/resources:print_preview_resources",
    "//chrome/common:resources",
    "//components/resources:components_resources",
-    "//components/resources:dev_ui_components_resources",
    ":cef_resources",
    "//content/browser/tracing:resources",
-    "//content:content_resources",
-    "//content:dev_ui_content_resources",
+    "//content:resources",
    "//net:net_resources",
    "//third_party/blink/public:resources",
  ]
@@ -1505,17 +1435,12 @@ make_pack_header("resources") {
    "$root_gen_dir/chrome/grit/browser_resources.h",
    "$root_gen_dir/chrome/grit/common_resources.h",
    "$root_gen_dir/chrome/grit/component_extension_resources.h",
-    "$root_gen_dir/chrome/grit/dev_ui_browser_resources.h",
    "$root_gen_dir/chrome/grit/net_internals_resources.h",
-    "$root_gen_dir/chrome/grit/print_preview_pdf_resources.h",
-    "$root_gen_dir/chrome/grit/print_preview_resources.h",
    "$root_gen_dir/chrome/grit/renderer_resources.h",
    "$root_gen_dir/components/grit/components_resources.h",
-    "$root_gen_dir/components/grit/dev_ui_components_resources.h",
    "$root_gen_dir/content/browser/devtools/grit/devtools_resources.h",
    "$root_gen_dir/content/browser/tracing/grit/tracing_resources.h",
    "$root_gen_dir/content/grit/content_resources.h",
-    "$root_gen_dir/content/grit/dev_ui_content_resources.h",
    "$root_gen_dir/extensions/grit/extensions_browser_resources.h",
    "$root_gen_dir/extensions/grit/extensions_renderer_resources.h",
    "$root_gen_dir/extensions/grit/extensions_resources.h",
@@ -1536,7 +1461,6 @@ make_pack_header("strings") {
    "$root_gen_dir/chrome/grit/generated_resources.h",
    "$root_gen_dir/chrome/grit/locale_settings.h",
    "$root_gen_dir/chrome/grit/platform_locale_settings.h",
-    "$root_gen_dir/components/strings/grit/components_chromium_strings.h",
    "$root_gen_dir/components/strings/grit/components_strings.h",
    "$root_gen_dir/extensions/strings/grit/extensions_strings.h",
    "$root_gen_dir/services/strings/grit/services_strings.h",
@@ -1545,29 +1469,11 @@ make_pack_header("strings") {
  ]
 }

-# Generate cef_api_hash.h.
-action("make_api_hash_header") {
-  script = "tools/make_api_hash_header.py"
-
-  # List of all C API files that will be checked for changes by cef_api_hash.py.
-  inputs = gypi_paths2.includes_common_capi +
-           gypi_paths2.includes_linux_capi +
-           gypi_paths2.includes_mac_capi +
-           gypi_paths2.includes_win_capi +
-           gypi_paths2.includes_capi +
-           gypi_paths.autogen_capi_includes
-  include_dir = [ "include" ]
-  outputs = [ "$root_out_dir/includes/include/cef_api_hash.h" ]
-
-  args = rebase_path(outputs + include_dir, root_build_dir)
-}
-
 # Generate pack files and associated CEF header files.
 group("cef_make_headers") {
  deps = [
    ":make_pack_header_resources",
    ":make_pack_header_strings",
-    ":make_api_hash_header",
  ]
 }

@@ -1631,11 +1537,12 @@ if (is_mac) {

    if (v8_use_external_startup_data) {
      sources += [
+        "$root_out_dir/natives_blob.bin",
        "$root_out_dir/snapshot_blob.bin",
      ]
      public_deps += [ "//v8" ]
      if (use_v8_context_snapshot) {
-        sources += [ "$root_out_dir/$v8_context_snapshot_filename" ]
+        sources += [ "$root_out_dir/v8_context_snapshot.bin" ]
        public_deps += [ "//tools/v8_context_snapshot" ]
      }
    }
@@ -1665,15 +1572,12 @@ if (is_mac) {
      sources = [
        "$root_out_dir/egl_intermediates/libswiftshader_libEGL.dylib",
        "$root_out_dir/egl_intermediates/libswiftshader_libGLESv2.dylib",
-        "$root_out_dir/vk_intermediates/libvk_swiftshader.dylib",
-        "$root_out_dir/vk_intermediates/vk_swiftshader_icd.json",
      ]
      outputs = [
        "{{bundle_contents_dir}}/Libraries/{{source_file_part}}",
      ]
      public_deps = [
-        "//ui/gl:swiftshader_egl_library_copy",
-        "//ui/gl:swiftshader_vk_library_copy",
+        "//ui/gl:swiftshader_library_copy",
      ]
    }
  }
@@ -1703,14 +1607,18 @@ if (is_mac) {
      "Resources",
    ]

-    sources = includes_common +
-              includes_mac +
+    sources = gypi_paths2.includes_common +
+              gypi_paths2.includes_mac +
              gypi_paths.autogen_cpp_includes +
              gypi_paths2.includes_capi +
              gypi_paths.autogen_capi_includes +
              gypi_paths2.libcef_sources_common +
              gypi_paths.autogen_library_side

+    # TODO(rsesek): Handle these missing pieces:
+    #   - crash_inspector
+    #   - crash_report_sender.app
+
    deps = [
      ":cef_framework_angle_library",
      ":cef_framework_locales",
@@ -1743,7 +1651,7 @@ if (is_mac) {
  }
 } else {
  shared_library("libcef") {
-    sources = includes_common +
+    sources = gypi_paths2.includes_common +
              gypi_paths.autogen_cpp_includes +
              gypi_paths2.includes_capi +
              gypi_paths.autogen_capi_includes +
@@ -1755,10 +1663,15 @@ if (is_mac) {
    ]

    if (is_win) {
-      sources += includes_win + [
+      sources += gypi_paths2.includes_win + [
        "libcef_dll/libcef_dll.rc",
      ]

+      # This is a large module that can't do incremental linking in some cases.
+      configs -= [ "//build/config/win:default_incremental_linking" ]
+      configs +=
+          [ "//build/config/win:default_large_module_incremental_linking" ]
+
      deps += [ 
        # Bring in ui_unscaled_resources.rc which contains custom cursors.
        # TODO(cef): Remove this once custom cursors can be loaded via
@@ -1911,8 +1824,8 @@ if (is_mac) {
        deps += invoker.deps
      }

-      if (defined(invoker.frameworks)) {
-        frameworks = invoker.frameworks
+      if (defined(invoker.libs)) {
+        libs = invoker.libs
      }

      if (defined(invoker.defines)) {
@@ -1966,8 +1879,8 @@ if (is_mac) {

  cef_app("cefclient") {
    helper_info_plist = "tests/cefclient/resources/mac/helper-Info.plist"
-    helper_sources = includes_common +
-                     includes_mac +
+    helper_sources = gypi_paths2.includes_mac +
+                     gypi_paths2.includes_common +
                     gypi_paths2.includes_wrapper +
                     gypi_paths2.includes_wrapper_mac +
                     gypi_paths2.shared_sources_common +
@@ -1980,8 +1893,8 @@ if (is_mac) {
    ]

    info_plist = "tests/cefclient/resources/mac/Info.plist"
-    sources = includes_common +
-              includes_mac +
+    sources = gypi_paths2.includes_mac +
+              gypi_paths2.includes_common +
              gypi_paths2.includes_wrapper +
              gypi_paths2.includes_wrapper_mac +
              gypi_paths2.shared_sources_browser +
@@ -1996,7 +1909,7 @@ if (is_mac) {
      ":cefclient_resources_bundle_data_english",
      ":cefclient_xibs",
    ]
-    frameworks = [
+    libs = [
      "AppKit.framework",
      "OpenGL.framework",
    ]
@@ -2039,8 +1952,8 @@ if (is_mac) {

  cef_app("cefsimple") {
    helper_info_plist = "tests/cefsimple/mac/helper-Info.plist"
-    helper_sources = includes_common +
-                     includes_mac +
+    helper_sources = gypi_paths2.includes_mac +
+                     gypi_paths2.includes_common +
                     gypi_paths2.includes_wrapper +
                     gypi_paths2.includes_wrapper_mac +
                     gypi_paths2.cefsimple_sources_mac_helper
@@ -2049,8 +1962,8 @@ if (is_mac) {
    ]

    info_plist = "tests/cefsimple/mac/Info.plist"
-    sources = includes_common +
-              includes_mac +
+    sources = gypi_paths2.includes_mac +
+              gypi_paths2.includes_common +
              gypi_paths2.includes_wrapper +
              gypi_paths2.includes_wrapper_mac +
              gypi_paths2.cefsimple_sources_common +
@@ -2060,7 +1973,7 @@ if (is_mac) {
      ":cefsimple_resources_bundle_data_english",
      ":cefsimple_xibs",
    ]
-    frameworks = [
+    libs = [
      "AppKit.framework",
    ]
    defines = [
@@ -2116,8 +2029,8 @@ if (is_mac) {
    ]

    info_plist = "tests/ceftests/resources/mac/Info.plist"
-    sources = includes_common +
-              includes_mac +
+    sources = gypi_paths2.includes_mac +
+              gypi_paths2.includes_common +
              gypi_paths2.includes_wrapper +
              gypi_paths2.includes_wrapper_mac +
              gypi_paths2.shared_sources_browser +
@@ -2131,7 +2044,7 @@ if (is_mac) {
      ":ceftests_xibs",
      "//testing/gtest",
    ]
-    frameworks = [
+    libs = [
      "AppKit.framework",
    ]
    defines = [
@@ -2185,7 +2098,7 @@ if (is_mac) {
  }

  executable("cefclient") {
-    sources = includes_common +
+    sources = gypi_paths2.includes_common +
              gypi_paths2.includes_wrapper +
              gypi_paths2.shared_sources_browser +
              gypi_paths2.shared_sources_common +
@@ -2204,7 +2117,7 @@ if (is_mac) {
    ]

    if (is_win) {
-      sources += includes_win +
+      sources += gypi_paths2.includes_win +
                 gypi_paths2.shared_sources_win +
                 gypi_paths2.cefclient_sources_win

@@ -2224,22 +2137,17 @@ if (is_mac) {
      libs = [
        "comctl32.lib",
        "d3d11.lib",
+        "glu32.lib",
        "imm32.lib",
        "oleacc.lib",
+        "opengl32.lib",
        "rpcrt4.lib",
        "shlwapi.lib",
      ]
-
-      if (target_cpu != "arm64") {
-        libs += [
-          "opengl32.lib",
-          "glu32.lib"
-        ]
-      }
    }

    if (is_linux) {
-      sources += includes_linux +
+      sources += gypi_paths2.includes_linux +
                 gypi_paths2.shared_sources_linux +
                 gypi_paths2.cefclient_sources_linux

@@ -2278,7 +2186,7 @@ if (is_mac) {
  #

  executable("cefsimple") {
-    sources = includes_common +
+    sources = gypi_paths2.includes_common +
              gypi_paths2.includes_wrapper +
              gypi_paths2.cefsimple_sources_common

@@ -2292,7 +2200,7 @@ if (is_mac) {
    ]

    if (is_win) {
-      sources += includes_win +
+      sources += gypi_paths2.includes_win +
                 gypi_paths2.cefsimple_sources_win

      # Set /SUBSYSTEM:WINDOWS.
@@ -2312,7 +2220,7 @@ if (is_mac) {
    }

    if (is_linux) {
-      sources += includes_linux +
+      sources += gypi_paths2.includes_linux +
                 gypi_paths2.cefsimple_sources_linux

      if (use_x11) {
@@ -2343,7 +2251,7 @@ if (is_mac) {
  executable("ceftests") {
    testonly = true

-    sources = includes_common +
+    sources = gypi_paths2.includes_common +
              gypi_paths2.includes_wrapper +
              gypi_paths2.shared_sources_browser +
              gypi_paths2.shared_sources_common +
--- a/CHROMIUM_BUILD_COMPATIBILITY.txt
+++ b/CHROMIUM_BUILD_COMPATIBILITY.txt
@@ -7,6 +7,5 @@
 # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding

 {
-  'chromium_checkout': 'refs/tags/87.0.4280.141',
-  'depot_tools_checkout': '39d870e1f0'
+  'chromium_checkout': 'refs/tags/79.0.3945.130'
 }
--- a/CHROMIUM_UPDATE.txt
+++ b/CHROMIUM_UPDATE.txt
@@ -27,6 +27,8 @@
  # Files in the chromium/src directory that should be evaluated for changes.
  # Similar changes may need to be applied to the CEF source code.
  'files': [
+    'chrome/app/chrome_*_manifest.*',
+    'chrome/app/chrome_*_manifests.*',
    'chrome/browser/browser_process.h',
    'chrome/browser/extensions/api/tabs/tabs_api.*',
    'chrome/browser/extensions/chrome_component_extension_resource_manager.*',
@@ -55,9 +57,7 @@
    'content/shell/renderer/shell_*',
    'content/shell/utility/shell_*',
    'extensions/shell/*',
-    'net/base/features.cc',
    'net/cookies/cookie_store.h',
-    'services/network/public/cpp/features.cc',
    'ui/base/ui_base_features.cc',
  ],
  # Patterns that should not be found in the chromium/src directory after
--- a/CMakeLists.txt.in
+++ b/CMakeLists.txt.in
@@ -12,8 +12,8 @@
 # distribution include:
 #
 # Linux:      Ninja, Unix Makefiles
-# MacOS:      Ninja, Xcode 8+ (x64) or Xcode 12.2+ (ARM64)
-# Windows:    Ninja, Visual Studio 2015+
+# Mac OS X:   Ninja, Xcode 5+
+# Windows:    Ninja, Visual Studio 2010+
 #
 # 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
@@ -40,21 +40,21 @@
 #
 # - Linux requirements:
 #   Currently supported distributions include Debian Wheezy, Ubuntu Precise, and
-#   related. Ubuntu 18.04 64-bit is recommended. Newer versions will likely also
+#   related. Ubuntu 14.04 64-bit is recommended. Newer versions will likely also
 #   work but may not have been tested.
 #   Required packages include:
 #     build-essential
 #     libgtk2.0-dev     (required by the cefclient target only)
 #     libgtkglext1-dev  (required by the cefclient target only)
 #
-# - MacOS requirements:
-#   Xcode 8 or newer building on MacOS 10.10 (Yosemite) or newer. Xcode 11.2
-#   and MacOS 10.14 are recommended. The Xcode command-line tools must also be
-#   installed. Only 64-bit builds are supported.
+# - Mac OS X requirements:
+#   Xcode 5 or newer building on Mac OS X 10.9 (Mavericks) or newer. Xcode 8.3
+#   and OS X 10.12 are recommended. The Xcode command-line tools must also be
+#   installed. Only 64-bit builds are supported on OS X.
 #
 # - Windows requirements:
-#   Visual Studio 2015 Update 2 or newer building on Windows 7 or newer. Visual
-#   Studio 2019 and Windows 10 64-bit are recommended.
+#   Visual Studio 2010 or newer building on Windows 7 or newer. Visual Studio
+#   2015 Update 3 and Windows 10 64-bit are recommended.
 #
 # BUILD EXAMPLES
 #
@@ -75,7 +75,7 @@
 #     > cmake -G "Ninja" -DCMAKE_BUILD_TYPE=Debug ..
 #     > ninja cefclient cefsimple
 #
-# To perform a MacOS build using a 64-bit CEF binary distribution:
+# To perform a Mac OS X build using a 64-bit CEF binary distribution:
 #   Using the Xcode IDE:
 #     > cmake -G "Xcode" -DPROJECT_ARCH="x86_64" ..
 #     Open build\cef.xcodeproj in Xcode and select Product > Build.
@@ -84,34 +84,25 @@
 #     > cmake -G "Ninja" -DPROJECT_ARCH="x86_64" -DCMAKE_BUILD_TYPE=Debug ..
 #     > ninja cefclient cefsimple
 #
-# To perform a MacOS build using an ARM64 CEF binary distribution:
-#   Using the Xcode IDE:
-#     > cmake -G "Xcode" -DPROJECT_ARCH="arm64" ..
-#     Open build\cef.xcodeproj in Xcode and select Product > Build.
-#
-#   Using Ninja:
-#     > cmake -G "Ninja" -DPROJECT_ARCH="arm64" -DCMAKE_BUILD_TYPE=Debug ..
-#     > ninja cefclient cefsimple
-#
 # To perform a Windows build using a 32-bit CEF binary distribution:
-#   Using the Visual Studio 2019 IDE:
-#     > cmake -G "Visual Studio 16" -A Win32 ..
+#   Using the Visual Studio 2015 IDE:
+#     > cmake -G "Visual Studio 14" ..
 #     Open build\cef.sln in Visual Studio and select Build > Build Solution.
 #
-#   Using Ninja with Visual Studio 2019 command-line tools:
+#   Using Ninja with Visual Studio 2015 command-line tools:
 #     (this path may be different depending on your Visual Studio installation)
-#     > "C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvars32.bat"
+#     > "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\vcvars32.bat"
 #     > cmake -G "Ninja" -DCMAKE_BUILD_TYPE=Debug ..
 #     > ninja cefclient cefsimple
 #
 # To perform a Windows build using a 64-bit CEF binary distribution:
-#   Using the Visual Studio 2019 IDE:
-#     > cmake -G "Visual Studio 16" -A x64 ..
+#   Using the Visual Studio 2015 IDE:
+#     > cmake -G "Visual Studio 14 Win64" ..
 #     Open build\cef.sln in Visual Studio and select Build > Build Solution.
 #
-#   Using Ninja with Visual Studio 2019 command-line tools:
+#   Using Ninja with Visual Studio 2015 command-line tools:
 #     (this path may be different depending on your Visual Studio installation)
-#     > "C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvars64.bat"
+#     > "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\amd64\vcvars64.bat"
 #     > cmake -G "Ninja" -DCMAKE_BUILD_TYPE=Debug ..
 #     > ninja cefclient cefsimple

--- a/cef_paths.gypi
+++ b/cef_paths.gypi
@@ -8,7 +8,7 @@
 # by hand. See the translator.README.txt file in the tools directory for
 # more information.
 #
-# $hash=72268a78a76d7d91b8ad47f6b6e9f6d9cb04d9cf$
+# $hash=98198bc4243deb46c848735f0d5499aa4891e535$
 #

 {
@@ -16,7 +16,6 @@
    'autogen_cpp_includes': [
      'include/cef_accessibility_handler.h',
      'include/cef_app.h',
-      'include/cef_audio_handler.h',
      'include/cef_auth_callback.h',
      'include/cef_browser.h',
      'include/cef_browser_process_handler.h',
@@ -26,7 +25,6 @@
      'include/cef_context_menu_handler.h',
      'include/cef_cookie.h',
      'include/cef_crash_util.h',
-      'include/cef_devtools_message_observer.h',
      'include/cef_dialog_handler.h',
      'include/cef_display_handler.h',
      'include/cef_dom.h',
@@ -45,7 +43,6 @@
      'include/cef_keyboard_handler.h',
      'include/cef_life_span_handler.h',
      'include/cef_load_handler.h',
-      'include/cef_media_router.h',
      'include/cef_menu_model.h',
      'include/cef_menu_model_delegate.h',
      'include/cef_navigation_entry.h',
@@ -56,7 +53,6 @@
      'include/cef_print_settings.h',
      'include/cef_process_message.h',
      'include/cef_process_util.h',
-      'include/cef_registration.h',
      'include/cef_render_handler.h',
      'include/cef_render_process_handler.h',
      'include/cef_request.h',
@@ -113,7 +109,6 @@
    'autogen_capi_includes': [
      'include/capi/cef_accessibility_handler_capi.h',
      'include/capi/cef_app_capi.h',
-      'include/capi/cef_audio_handler_capi.h',
      'include/capi/cef_auth_callback_capi.h',
      'include/capi/cef_browser_capi.h',
      'include/capi/cef_browser_process_handler_capi.h',
@@ -123,7 +118,6 @@
      'include/capi/cef_context_menu_handler_capi.h',
      'include/capi/cef_cookie_capi.h',
      'include/capi/cef_crash_util_capi.h',
-      'include/capi/cef_devtools_message_observer_capi.h',
      'include/capi/cef_dialog_handler_capi.h',
      'include/capi/cef_display_handler_capi.h',
      'include/capi/cef_dom_capi.h',
@@ -142,7 +136,6 @@
      'include/capi/cef_keyboard_handler_capi.h',
      'include/capi/cef_life_span_handler_capi.h',
      'include/capi/cef_load_handler_capi.h',
-      'include/capi/cef_media_router_capi.h',
      'include/capi/cef_menu_model_capi.h',
      'include/capi/cef_menu_model_delegate_capi.h',
      'include/capi/cef_navigation_entry_capi.h',
@@ -153,7 +146,6 @@
      'include/capi/cef_print_settings_capi.h',
      'include/capi/cef_process_message_capi.h',
      'include/capi/cef_process_util_capi.h',
-      'include/capi/cef_registration_capi.h',
      'include/capi/cef_render_handler_capi.h',
      'include/capi/cef_render_process_handler_capi.h',
      'include/capi/cef_request_capi.h',
@@ -212,8 +204,6 @@
      'libcef_dll/ctocpp/accessibility_handler_ctocpp.h',
      'libcef_dll/ctocpp/app_ctocpp.cc',
      'libcef_dll/ctocpp/app_ctocpp.h',
-      'libcef_dll/ctocpp/audio_handler_ctocpp.cc',
-      'libcef_dll/ctocpp/audio_handler_ctocpp.h',
      'libcef_dll/cpptoc/auth_callback_cpptoc.cc',
      'libcef_dll/cpptoc/auth_callback_cpptoc.h',
      'libcef_dll/cpptoc/before_download_callback_cpptoc.cc',
@@ -262,8 +252,6 @@
      'libcef_dll/ctocpp/domvisitor_ctocpp.h',
      'libcef_dll/ctocpp/delete_cookies_callback_ctocpp.cc',
      'libcef_dll/ctocpp/delete_cookies_callback_ctocpp.h',
-      'libcef_dll/ctocpp/dev_tools_message_observer_ctocpp.cc',
-      'libcef_dll/ctocpp/dev_tools_message_observer_ctocpp.h',
      'libcef_dll/ctocpp/dialog_handler_ctocpp.cc',
      'libcef_dll/ctocpp/dialog_handler_ctocpp.h',
      'libcef_dll/cpptoc/dictionary_value_cpptoc.cc',
@@ -320,20 +308,6 @@
      'libcef_dll/cpptoc/list_value_cpptoc.h',
      'libcef_dll/ctocpp/load_handler_ctocpp.cc',
      'libcef_dll/ctocpp/load_handler_ctocpp.h',
-      'libcef_dll/ctocpp/media_observer_ctocpp.cc',
-      'libcef_dll/ctocpp/media_observer_ctocpp.h',
-      'libcef_dll/cpptoc/media_route_cpptoc.cc',
-      'libcef_dll/cpptoc/media_route_cpptoc.h',
-      'libcef_dll/ctocpp/media_route_create_callback_ctocpp.cc',
-      'libcef_dll/ctocpp/media_route_create_callback_ctocpp.h',
-      'libcef_dll/cpptoc/media_router_cpptoc.cc',
-      'libcef_dll/cpptoc/media_router_cpptoc.h',
-      'libcef_dll/cpptoc/media_sink_cpptoc.cc',
-      'libcef_dll/cpptoc/media_sink_cpptoc.h',
-      'libcef_dll/ctocpp/media_sink_device_info_callback_ctocpp.cc',
-      'libcef_dll/ctocpp/media_sink_device_info_callback_ctocpp.h',
-      'libcef_dll/cpptoc/media_source_cpptoc.cc',
-      'libcef_dll/cpptoc/media_source_cpptoc.h',
      'libcef_dll/cpptoc/views/menu_button_cpptoc.cc',
      'libcef_dll/cpptoc/views/menu_button_cpptoc.h',
      'libcef_dll/ctocpp/views/menu_button_delegate_ctocpp.cc',
@@ -372,8 +346,6 @@
      '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',
      'libcef_dll/ctocpp/render_handler_ctocpp.h',
      'libcef_dll/ctocpp/render_process_handler_ctocpp.cc',
@@ -522,8 +494,6 @@
      'libcef_dll/cpptoc/accessibility_handler_cpptoc.h',
      'libcef_dll/cpptoc/app_cpptoc.cc',
      'libcef_dll/cpptoc/app_cpptoc.h',
-      'libcef_dll/cpptoc/audio_handler_cpptoc.cc',
-      'libcef_dll/cpptoc/audio_handler_cpptoc.h',
      'libcef_dll/ctocpp/auth_callback_ctocpp.cc',
      'libcef_dll/ctocpp/auth_callback_ctocpp.h',
      'libcef_dll/ctocpp/before_download_callback_ctocpp.cc',
@@ -572,8 +542,6 @@
      'libcef_dll/cpptoc/domvisitor_cpptoc.h',
      'libcef_dll/cpptoc/delete_cookies_callback_cpptoc.cc',
      'libcef_dll/cpptoc/delete_cookies_callback_cpptoc.h',
-      'libcef_dll/cpptoc/dev_tools_message_observer_cpptoc.cc',
-      'libcef_dll/cpptoc/dev_tools_message_observer_cpptoc.h',
      'libcef_dll/cpptoc/dialog_handler_cpptoc.cc',
      'libcef_dll/cpptoc/dialog_handler_cpptoc.h',
      'libcef_dll/ctocpp/dictionary_value_ctocpp.cc',
@@ -630,20 +598,6 @@
      'libcef_dll/ctocpp/list_value_ctocpp.h',
      'libcef_dll/cpptoc/load_handler_cpptoc.cc',
      'libcef_dll/cpptoc/load_handler_cpptoc.h',
-      'libcef_dll/cpptoc/media_observer_cpptoc.cc',
-      'libcef_dll/cpptoc/media_observer_cpptoc.h',
-      'libcef_dll/ctocpp/media_route_ctocpp.cc',
-      'libcef_dll/ctocpp/media_route_ctocpp.h',
-      'libcef_dll/cpptoc/media_route_create_callback_cpptoc.cc',
-      'libcef_dll/cpptoc/media_route_create_callback_cpptoc.h',
-      'libcef_dll/ctocpp/media_router_ctocpp.cc',
-      'libcef_dll/ctocpp/media_router_ctocpp.h',
-      'libcef_dll/ctocpp/media_sink_ctocpp.cc',
-      'libcef_dll/ctocpp/media_sink_ctocpp.h',
-      'libcef_dll/cpptoc/media_sink_device_info_callback_cpptoc.cc',
-      'libcef_dll/cpptoc/media_sink_device_info_callback_cpptoc.h',
-      'libcef_dll/ctocpp/media_source_ctocpp.cc',
-      'libcef_dll/ctocpp/media_source_ctocpp.h',
      'libcef_dll/ctocpp/views/menu_button_ctocpp.cc',
      'libcef_dll/ctocpp/views/menu_button_ctocpp.h',
      'libcef_dll/cpptoc/views/menu_button_delegate_cpptoc.cc',
@@ -682,8 +636,6 @@
      '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',
      'libcef_dll/cpptoc/render_handler_cpptoc.h',
      'libcef_dll/cpptoc/render_process_handler_cpptoc.cc',
--- a/cef_paths2.gypi
+++ b/cef_paths2.gypi
@@ -39,21 +39,19 @@
      '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_types_wrappers.h',
-    ],
-    'includes_common_capi': [
      'include/internal/cef_logging_internal.h',
+      'include/internal/cef_ptr.h',
      'include/internal/cef_string.h',
      'include/internal/cef_string_list.h',
      'include/internal/cef_string_map.h',
      'include/internal/cef_string_multimap.h',
      'include/internal/cef_string_types.h',
+      'include/internal/cef_string_wrappers.h',
      'include/internal/cef_thread_internal.h',
      'include/internal/cef_time.h',
      'include/internal/cef_trace_event_internal.h',
      'include/internal/cef_types.h',
+      'include/internal/cef_types_wrappers.h',
    ],
    'includes_capi': [
      'include/capi/cef_base_capi.h',
@@ -77,10 +75,8 @@
      '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',
-    ],
-    'includes_win_capi': [
      'include/internal/cef_types_win.h',
+      'include/internal/cef_win.h',
    ],
    'includes_mac': [
      'include/base/internal/cef_atomicops_atomicword_compat.h',
@@ -88,8 +84,6 @@
      'include/cef_application_mac.h',
      'include/cef_sandbox_mac.h',
      'include/internal/cef_mac.h',
-    ],
-    'includes_mac_capi': [
      'include/internal/cef_types_mac.h',
    ],
    'includes_linux': [
@@ -98,8 +92,6 @@
      'include/base/internal/cef_atomicops_arm64_gcc.h',
      'include/base/internal/cef_atomicops_x86_gcc.h',
      'include/internal/cef_linux.h',
-    ],
-    'includes_linux_capi': [
      'include/internal/cef_types_linux.h',
    ],
    'libcef_sources_common': [
@@ -246,8 +238,6 @@
      'tests/cefclient/browser/main_context.h',
      'tests/cefclient/browser/main_context_impl.cc',
      'tests/cefclient/browser/main_context_impl.h',
-      'tests/cefclient/browser/media_router_test.cc',
-      'tests/cefclient/browser/media_router_test.h',
      'tests/cefclient/browser/osr_dragdrop_events.h',
      'tests/cefclient/browser/osr_renderer.h',
      'tests/cefclient/browser/osr_renderer.cc',
@@ -297,7 +287,6 @@
      'tests/cefclient/resources/drm.html',
      'tests/cefclient/resources/localstorage.html',
      'tests/cefclient/resources/logo.png',
-      'tests/cefclient/resources/media_router.html',
      'tests/cefclient/resources/menu_icon.1x.png',
      'tests/cefclient/resources/menu_icon.2x.png',
      'tests/cefclient/resources/other_tests.html',
@@ -466,12 +455,9 @@
      'tests/cefsimple/simple_handler_linux.cc',
    ],
    'ceftests_sources_common': [
-      'tests/ceftests/audio_output_unittest.cc',
      'tests/ceftests/browser_info_map_unittest.cc',
      'tests/ceftests/command_line_unittest.cc',
      'tests/ceftests/cookie_unittest.cc',
-      'tests/ceftests/cors_unittest.cc',
-      'tests/ceftests/devtools_message_unittest.cc',
      'tests/ceftests/dialog_unittest.cc',
      'tests/ceftests/display_unittest.cc',
      'tests/ceftests/dom_unittest.cc',
@@ -521,11 +507,6 @@
      'tests/ceftests/task_unittest.cc',
      'tests/ceftests/test_handler.cc',
      'tests/ceftests/test_handler.h',
-      'tests/ceftests/test_request.cc',
-      'tests/ceftests/test_request.h',
-      'tests/ceftests/test_server.cc',
-      'tests/ceftests/test_server.h',
-      'tests/ceftests/test_server_unittest.cc',
      'tests/ceftests/test_suite.cc',
      'tests/ceftests/test_suite.h',
      'tests/ceftests/test_util.cc',
@@ -534,7 +515,6 @@
      'tests/ceftests/thread_helper.h',
      'tests/ceftests/thread_unittest.cc',
      'tests/ceftests/tracing_unittest.cc',
-      'tests/ceftests/track_callback.h',
      'tests/ceftests/translator_unittest.cc',
      'tests/ceftests/urlrequest_unittest.cc',
      'tests/ceftests/v8_unittest.cc',
@@ -574,7 +554,6 @@
      'tests/shared/browser/resource_util.h',
      'tests/shared/browser/resource_util_mac.mm',
      'tests/shared/browser/resource_util_posix.cc',
-      'tests/ceftests/audio_output_unittest.cc',
      'tests/ceftests/client_app_delegates.cc',
      'tests/ceftests/cookie_unittest.cc',
      'tests/ceftests/dom_unittest.cc',
@@ -594,15 +573,10 @@
      'tests/ceftests/urlrequest_unittest.cc',
      'tests/ceftests/test_handler.cc',
      'tests/ceftests/test_handler.h',
-      'tests/ceftests/test_request.cc',
-      'tests/ceftests/test_request.h',
-      'tests/ceftests/test_server.cc',
-      'tests/ceftests/test_server.h',
      'tests/ceftests/test_suite.cc',
      'tests/ceftests/test_suite.h',
      'tests/ceftests/test_util.cc',
      'tests/ceftests/test_util.h',
-      'tests/ceftests/track_callback.h',
      'tests/ceftests/thread_helper.cc',
      'tests/ceftests/thread_helper.h',
      'tests/ceftests/thread_unittest.cc',
--- a/cef_repack_locales.gni
+++ b/cef_repack_locales.gni
@@ -34,7 +34,6 @@ template("_repack_one_locale") {
      "${root_gen_dir}/chrome/generated_resources_${locale}.pak",
      "${root_gen_dir}/chrome/locale_settings_${locale}.pak",
      "${root_gen_dir}/chrome/platform_locale_settings_${locale}.pak",
-      "${root_gen_dir}/components/strings/components_chromium_strings_${locale}.pak",
      "${root_gen_dir}/components/strings/components_locale_settings_${locale}.pak",
      "${root_gen_dir}/components/strings/components_strings_${locale}.pak",
      "${root_gen_dir}/extensions/strings/extensions_strings_${locale}.pak",
@@ -53,7 +52,6 @@ template("_repack_one_locale") {
      "//chrome/app:generated_resources",
      "//chrome/app/resources:locale_settings",
      "//chrome/app/resources:platform_locale_settings",
-      "//components/strings:components_chromium_strings",
      "//components/strings:components_locale_settings",
      "//components/strings:components_strings",
      "//extensions/strings",
--- a/cmake/cef_macros.cmake.in
+++ b/cmake/cef_macros.cmake.in
@@ -25,7 +25,7 @@ macro(PRINT_CEF_CONFIG)

  message(STATUS "Binary distribution root:     ${_CEF_ROOT}")

-  if(OS_MAC)
+  if(OS_MACOSX)
    message(STATUS "Base SDK:                     ${CMAKE_OSX_SYSROOT}")
    message(STATUS "Target SDK:                   ${CEF_TARGET_SDK}")
  endif()
@@ -75,8 +75,8 @@ macro(APPEND_PLATFORM_SOURCES name_of_list)
  if(OS_WINDOWS AND ${name_of_list}_WINDOWS)
    list(APPEND ${name_of_list} ${${name_of_list}_WINDOWS})
  endif()
-  if(OS_MAC AND ${name_of_list}_MAC)
-    list(APPEND ${name_of_list} ${${name_of_list}_MAC})
+  if(OS_MACOSX AND ${name_of_list}_MACOSX)
+    list(APPEND ${name_of_list} ${${name_of_list}_MACOSX})
  endif()
 endmacro()

@@ -184,10 +184,10 @@ endif(OS_LINUX)
 # Mac OS X macros.
 #

-if(OS_MAC)
+if(OS_MACOSX)

 # Manually process and copy over resource files.
-macro(COPY_MAC_RESOURCES resource_list prefix_list target source_dir app_path)
+macro(COPY_MACOSX_RESOURCES resource_list prefix_list target source_dir app_path)
  foreach(FILENAME ${resource_list})
    # Remove one or more prefixes from the source paths.
    set(TARGET_FILENAME "${FILENAME}")
@@ -229,7 +229,7 @@ macro(COPY_MAC_RESOURCES resource_list prefix_list target source_dir app_path)
  endforeach()
 endmacro()

-endif(OS_MAC)
+endif(OS_MACOSX)


 #
@@ -298,7 +298,7 @@ macro(SET_COMMON_TARGET_PROPERTIES target)
    set_property(TARGET ${target} PROPERTY LINK_FLAGS_RELEASE ${_flags_str})
  endif()

-  if(OS_MAC)
+  if(OS_MACOSX)
    # Set Xcode target properties.
    set_target_properties(${target} PROPERTIES
      XCODE_ATTRIBUTE_ALWAYS_SEARCH_USER_PATHS                    NO
--- a/cmake/cef_variables.cmake.in
+++ b/cmake/cef_variables.cmake.in
@@ -14,8 +14,7 @@ endif()

 # Determine the platform.
 if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
-  set(OS_MAC 1)
-  set(OS_MACOSX 1)  # For backwards compatibility.
+  set(OS_MACOSX 1)
  set(OS_POSIX 1)
 elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
  set(OS_LINUX 1)
@@ -32,7 +31,7 @@ if(NOT DEFINED PROJECT_ARCH)
    set(PROJECT_ARCH "x86")
  endif()

-  if(OS_MAC)
+  if(OS_MACOSX)
    # PROJECT_ARCH should be specified on Mac OS X.
    message(WARNING "No PROJECT_ARCH value specified, using ${PROJECT_ARCH}")
  endif()
@@ -219,6 +218,7 @@ if(OS_LINUX)
    libcef.so
    libEGL.so
    libGLESv2.so
+    natives_blob.bin
    snapshot_blob.bin
    v8_context_snapshot.bin
    swiftshader
@@ -247,7 +247,7 @@ endif()
 # Mac OS X configuration.
 #

-if(OS_MAC)
+if(OS_MACOSX)
  # Platform-specific compiler/linker flags.
  # See also Xcode target properties in cef_macros.cmake.
  set(CEF_LIBTYPE SHARED)
@@ -311,7 +311,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 10.12 10.11 10.10)
+  foreach(OS_VERSION 10.11 10.10 10.9)
    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})
@@ -319,7 +319,7 @@ if(OS_MAC)
  endforeach()

  # Target SDK.
-  set(CEF_TARGET_SDK               "10.10")
+  set(CEF_TARGET_SDK               "10.9")
  list(APPEND CEF_COMPILER_FLAGS
    -mmacosx-version-min=${CEF_TARGET_SDK}
  )
@@ -328,8 +328,6 @@ if(OS_MAC)
  # Target architecture.
  if(PROJECT_ARCH STREQUAL "x86_64")
    set(CMAKE_OSX_ARCHITECTURES "x86_64")
-  elseif(PROJECT_ARCH STREQUAL "arm64")
-    set(CMAKE_OSX_ARCHITECTURES "arm64")
  else()
    set(CMAKE_OSX_ARCHITECTURES "i386")
  endif()
@@ -378,8 +376,25 @@ if(OS_WINDOWS)

  if(USE_SANDBOX)
    # Check if the current MSVC version is compatible with the cef_sandbox.lib
-    # static library. We require VS2015 or newer.
-    if(MSVC_VERSION LESS 1900)
+    # static library. For a list of all version numbers see
+    # https://en.wikipedia.org/wiki/Microsoft_Visual_C%2B%2B#Internal_version_numbering
+    list(APPEND supported_msvc_versions
+      1900  # VS2015 and updates 1, 2, & 3
+      1910  # VS2017 version 15.1 & 15.2
+      1911  # VS2017 version 15.3 & 15.4
+      1912  # VS2017 version 15.5
+      1913  # VS2017 version 15.6
+      1914  # VS2017 version 15.7
+      1915  # VS2017 version 15.8
+      1916  # VS2017 version 15.9
+      1920  # VS2019 version 16.0
+      1921  # VS2019 version 16.1
+      1922  # VS2019 version 16.2
+      1923  # VS2019 version 16.3
+      1924  # VS2019 version 16.4
+      )
+    list(FIND supported_msvc_versions ${MSVC_VERSION} _index)
+    if (${_index} EQUAL -1)
      message(WARNING "CEF sandbox is not compatible with the current MSVC version (${MSVC_VERSION})")
      set(USE_SANDBOX OFF)
    endif()
@@ -466,6 +481,7 @@ if(OS_WINDOWS)
    libcef.dll
    libEGL.dll
    libGLESv2.dll
+    natives_blob.bin
    snapshot_blob.bin
    v8_context_snapshot.bin
    swiftshader
--- a/include/base/cef_atomicops.h
+++ b/include/base/cef_atomicops.h
@@ -178,9 +178,9 @@ Atomic64 Release_Load(volatile const Atomic64* ptr);
 // 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))
+#elif defined(OS_WIN) && defined(__ARM_ARCH_ISA_A64)
 #include "include/base/internal/cef_atomicops_arm64_msvc.h"
-#elif defined(OS_MAC)
+#elif defined(OS_MACOSX)
 #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"
@@ -194,7 +194,7 @@ Atomic64 Release_Load(volatile const Atomic64* ptr);

 // On some platforms we need additional declarations to make
 // AtomicWord compatible with our other Atomic* types.
-#if defined(OS_MAC) || defined(OS_OPENBSD)
+#if defined(OS_MACOSX) || defined(OS_OPENBSD)
 #include "include/base/internal/cef_atomicops_atomicword_compat.h"
 #endif

--- a/include/base/cef_basictypes.h
+++ b/include/base/cef_basictypes.h
@@ -42,7 +42,7 @@
 //
 // On Mac OS X, |long long| is used for 64-bit types for compatibility with
 // <inttypes.h> format macros even in the LP64 model.
-#if defined(__LP64__) && !defined(OS_MAC) && !defined(OS_OPENBSD)
+#if defined(__LP64__) && !defined(OS_MACOSX) && !defined(OS_OPENBSD)
 typedef long int64;
 typedef unsigned long uint64;
 #else
--- a/include/base/cef_build.h
+++ b/include/base/cef_build.h
@@ -44,14 +44,6 @@
 #define OS_WIN 1
 #endif
 #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
-// Old platform defines retained for backwards compatibility.
 #ifndef OS_MACOSX
 #define OS_MACOSX 1
 #endif
@@ -65,7 +57,7 @@

 // For access to standard POSIXish features, use OS_POSIX instead of a
 // more specific macro.
-#if defined(OS_MAC) || defined(OS_LINUX)
+#if defined(OS_MACOSX) || defined(OS_LINUX)
 #ifndef OS_POSIX
 #define OS_POSIX 1
 #endif
@@ -103,7 +95,7 @@
 #define ARCH_CPU_ARMEL 1
 #define ARCH_CPU_32_BITS 1
 #define ARCH_CPU_LITTLE_ENDIAN 1
-#elif defined(__aarch64__) || defined(_M_ARM64)
+#elif defined(__aarch64__)
 #define ARCH_CPU_ARM_FAMILY 1
 #define ARCH_CPU_ARM64 1
 #define ARCH_CPU_64_BITS 1
--- a/include/base/cef_logging.h
+++ b/include/base/cef_logging.h
@@ -136,11 +136,7 @@
 #define CEF_INCLUDE_BASE_CEF_LOGGING_H_
 #pragma once

-#if defined(USING_CHROMIUM_INCLUDES)
-// When building CEF include the Chromium header directly.
-#include "base/logging.h"
-#include "base/notreached.h"
-#elif defined(DCHECK)
+#if defined(DCHECK)
 // 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
@@ -148,12 +144,15 @@

 // Always define the DCHECK_IS_ON macro which is used from other CEF headers.
 #if defined(NDEBUG) && !defined(DCHECK_ALWAYS_ON)
-#define DCHECK_IS_ON() false
+#define DCHECK_IS_ON() 0
 #else
-#define DCHECK_IS_ON() true
+#define DCHECK_IS_ON() 1
 #endif

-#else  // !defined(DCHECK)
+#elif defined(USING_CHROMIUM_INCLUDES)
+// When building CEF include the Chromium header directly.
+#include "base/logging.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/include/base/cef_weak_ptr.h
+++ b/include/base/cef_weak_ptr.h
@@ -250,11 +250,11 @@ class WeakPtr : public cef_internal::WeakPtrBase {
  T* get() const { return ref_.is_valid() ? ptr_ : NULL; }

  T& operator*() const {
-    CHECK(ref_.is_valid());
+    DCHECK(get() != NULL);
    return *get();
  }
  T* operator->() const {
-    CHECK(ref_.is_valid());
+    DCHECK(get() != NULL);
    return get();
  }

--- a/include/capi/cef_audio_handler_capi.h
+++ b/include/capi/cef_audio_handler_capi.h
@@ -1,121 +0,0 @@
-// Copyright (c) 2020 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=430877d950508a545d0baa18c8c8c0d2d183fec4$
-//
-
-#ifndef CEF_INCLUDE_CAPI_CEF_AUDIO_HANDLER_CAPI_H_
-#define CEF_INCLUDE_CAPI_CEF_AUDIO_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 audio events.
-///
-typedef struct _cef_audio_handler_t {
-  ///
-  // 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.
-  ///
-  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. 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,
-      struct _cef_browser_t* browser,
-      const cef_audio_parameters_t* params,
-      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.
-  ///
-  void(CEF_CALLBACK* on_audio_stream_packet)(struct _cef_audio_handler_t* self,
-                                             struct _cef_browser_t* browser,
-                                             const float** data,
-                                             int frames,
-                                             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.
-  ///
-  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.
-  ///
-  void(CEF_CALLBACK* on_audio_stream_error)(struct _cef_audio_handler_t* self,
-                                            struct _cef_browser_t* browser,
-                                            const cef_string_t* message);
-} cef_audio_handler_t;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // CEF_INCLUDE_CAPI_CEF_AUDIO_HANDLER_CAPI_H_
--- a/include/capi/cef_browser_capi.h
+++ b/include/capi/cef_browser_capi.h
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=965eb2e55afec0a4618a7acd9478b9c1215be29d$
+// $hash=ba4033eaf40a8ee24408b89b78496bf1381e7e6b$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_BROWSER_CAPI_H_
@@ -41,12 +41,10 @@
 #pragma once

 #include "include/capi/cef_base_capi.h"
-#include "include/capi/cef_devtools_message_observer_capi.h"
 #include "include/capi/cef_drag_data_capi.h"
 #include "include/capi/cef_frame_capi.h"
 #include "include/capi/cef_image_capi.h"
 #include "include/capi/cef_navigation_entry_capi.h"
-#include "include/capi/cef_registration_capi.h"
 #include "include/capi/cef_request_context_capi.h"

 #ifdef __cplusplus
@@ -486,71 +484,6 @@ typedef struct _cef_browser_host_t {
  ///
  int(CEF_CALLBACK* has_dev_tools)(struct _cef_browser_host_t* self);

-  ///
-  // Send a function call message over the DevTools protocol. |message| must be
-  // a UTF8-encoded JSON dictionary that contains "id" (int), "function"
-  // (string) and "params" (dictionary, optional) values. See the DevTools
-  // protocol documentation at https://chromedevtools.github.io/devtools-
-  // protocol/ for details of supported functions and the expected "params"
-  // dictionary contents. |message| will be copied if necessary. This function
-  // will return true (1) if called on the UI thread and the message was
-  // successfully submitted for validation, otherwise false (0). Validation will
-  // be applied asynchronously and any messages that fail due to formatting
-  // errors or missing parameters may be discarded without notification. Prefer
-  // ExecuteDevToolsMethod if a more structured approach to message formatting
-  // is desired.
-  //
-  // Every valid function call will result in an asynchronous function result or
-  // error message that references the sent message "id". Event messages are
-  // received while notifications are enabled (for example, between function
-  // calls for "Page.enable" and "Page.disable"). All received messages will be
-  // delivered to the observer(s) registered with AddDevToolsMessageObserver.
-  // See cef_dev_tools_message_observer_t::OnDevToolsMessage documentation for
-  // details of received message contents.
-  //
-  // Usage of the SendDevToolsMessage, ExecuteDevToolsMethod and
-  // AddDevToolsMessageObserver functions does not require an active DevTools
-  // front-end or remote-debugging session. Other active DevTools sessions will
-  // continue to function independently. However, any modification of global
-  // browser state by one session may not be reflected in the UI of other
-  // sessions.
-  //
-  // Communication with the DevTools front-end (when displayed) can be logged
-  // for development purposes by passing the `--devtools-protocol-log-
-  // file=<path>` command-line flag.
-  ///
-  int(CEF_CALLBACK* send_dev_tools_message)(struct _cef_browser_host_t* self,
-                                            const void* message,
-                                            size_t message_size);
-
-  ///
-  // Execute a function call over the DevTools protocol. This is a more
-  // structured version of SendDevToolsMessage. |message_id| is an incremental
-  // number that uniquely identifies the message (pass 0 to have the next number
-  // assigned automatically based on previous values). |function| is the
-  // function name. |params| are the function parameters, which may be NULL. See
-  // the DevTools protocol documentation (linked above) for details of supported
-  // functions and the expected |params| dictionary contents. This function will
-  // return the assigned message ID if called on the UI thread and the message
-  // was successfully submitted for validation, otherwise 0. See the
-  // SendDevToolsMessage documentation for additional usage information.
-  ///
-  int(CEF_CALLBACK* execute_dev_tools_method)(
-      struct _cef_browser_host_t* self,
-      int message_id,
-      const cef_string_t* method,
-      struct _cef_dictionary_value_t* params);
-
-  ///
-  // Add an observer for DevTools protocol messages (function results and
-  // events). The observer will remain registered until the returned
-  // Registration object is destroyed. See the SendDevToolsMessage documentation
-  // for additional usage information.
-  ///
-  struct _cef_registration_t*(CEF_CALLBACK* add_dev_tools_message_observer)(
-      struct _cef_browser_host_t* self,
-      struct _cef_dev_tools_message_observer_t* observer);
-
  ///
  // Retrieve a snapshot of current navigation entries as values sent to the
  // specified visitor. If |current_only| is true (1) only the current
@@ -562,6 +495,19 @@ typedef struct _cef_browser_host_t {
      struct _cef_navigation_entry_visitor_t* visitor,
      int current_only);

+  ///
+  // Set whether mouse cursor change is disabled.
+  ///
+  void(CEF_CALLBACK* set_mouse_cursor_change_disabled)(
+      struct _cef_browser_host_t* self,
+      int disabled);
+
+  ///
+  // Returns true (1) if mouse cursor change is disabled.
+  ///
+  int(CEF_CALLBACK* is_mouse_cursor_change_disabled)(
+      struct _cef_browser_host_t* self);
+
  ///
  // If a misspelled word is currently selected in an editable node calling this
  // function will replace it with the specified |word|.
--- a/include/capi/cef_browser_process_handler_capi.h
+++ b/include/capi/cef_browser_process_handler_capi.h
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=d56cbf83d6faefa9f716c7308bf7007dad98697d$
+// $hash=b15ba2c750f5227b6b40fea59965817ba4431ee0$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_BROWSER_PROCESS_HANDLER_CAPI_H_
@@ -41,7 +41,6 @@
 #pragma once

 #include "include/capi/cef_base_capi.h"
-#include "include/capi/cef_client_capi.h"
 #include "include/capi/cef_command_line_capi.h"
 #include "include/capi/cef_print_handler_capi.h"
 #include "include/capi/cef_values_capi.h"
@@ -61,25 +60,6 @@ typedef struct _cef_browser_process_handler_t {
  ///
  cef_base_ref_counted_t base;

-  ///
-  // Called on the browser process UI thread to retrieve the list of schemes
-  // that should support cookies. If |include_defaults| is true (1) the default
-  // schemes ("http", "https", "ws" and "wss") will also be supported. Providing
-  // an NULL |schemes| value and setting |include_defaults| to false (0) will
-  // disable all loading and saving of cookies.
-  //
-  // This state will apply to the cef_cookie_manager_t associated with the
-  // global cef_request_context_t. It will also be used as the initial state for
-  // any new cef_request_context_ts created by the client. After creating a new
-  // cef_request_context_t the cef_cookie_manager_t::SetSupportedSchemes
-  // function may be called on the associated cef_cookie_manager_t to futher
-  // override these values.
-  ///
-  void(CEF_CALLBACK* get_cookieable_schemes)(
-      struct _cef_browser_process_handler_t* self,
-      cef_string_list_t schemes,
-      int* include_defaults);
-
  ///
  // Called on the browser process UI thread immediately after the CEF context
  // has been initialized.
@@ -98,6 +78,17 @@ typedef struct _cef_browser_process_handler_t {
      struct _cef_browser_process_handler_t* self,
      struct _cef_command_line_t* command_line);

+  ///
+  // Called on the browser process IO thread after the main thread has been
+  // created for a new render process. Provides an opportunity to specify extra
+  // information that will be passed to
+  // cef_render_process_handler_t::on_render_thread_created() in the render
+  // process. Do not keep a reference to |extra_info| outside of this function.
+  ///
+  void(CEF_CALLBACK* on_render_process_thread_created)(
+      struct _cef_browser_process_handler_t* self,
+      struct _cef_list_value_t* extra_info);
+
  ///
  // Return the handler for printing on Linux. If a print handler is not
  // provided then printing will not be supported on the Linux platform.
@@ -121,16 +112,6 @@ typedef struct _cef_browser_process_handler_t {
  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.
-  ///
-  struct _cef_client_t*(CEF_CALLBACK* get_default_client)(
-      struct _cef_browser_process_handler_t* self);
 } cef_browser_process_handler_t;

 #ifdef __cplusplus
--- a/include/capi/cef_client_capi.h
+++ b/include/capi/cef_client_capi.h
@@ -33,14 +33,13 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=8d4cb3e0bbf230804c93898daa4a8b2866a2c1ce$
+// $hash=6a0312765614a697d56e87c8503afba8404bb08b$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_CLIENT_CAPI_H_
 #define CEF_INCLUDE_CAPI_CEF_CLIENT_CAPI_H_
 #pragma once

-#include "include/capi/cef_audio_handler_capi.h"
 #include "include/capi/cef_base_capi.h"
 #include "include/capi/cef_context_menu_handler_capi.h"
 #include "include/capi/cef_dialog_handler_capi.h"
@@ -70,12 +69,6 @@ typedef struct _cef_client_t {
  ///
  cef_base_ref_counted_t base;

-  ///
-  // 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 context menus. If no handler is provided the default
  // implementation will be used.
--- a/include/capi/cef_devtools_message_observer_capi.h
+++ b/include/capi/cef_devtools_message_observer_capi.h
@@ -1,147 +0,0 @@
-// Copyright (c) 2020 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=86906c2e971fea7e479738f59bbf85d71ce31953$
-//
-
-#ifndef CEF_INCLUDE_CAPI_CEF_DEVTOOLS_MESSAGE_OBSERVER_CAPI_H_
-#define CEF_INCLUDE_CAPI_CEF_DEVTOOLS_MESSAGE_OBSERVER_CAPI_H_
-#pragma once
-
-#include "include/capi/cef_base_capi.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-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.
-///
-typedef struct _cef_dev_tools_message_observer_t {
-  ///
-  // 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).
-  ///
-  int(CEF_CALLBACK* on_dev_tools_message)(
-      struct _cef_dev_tools_message_observer_t* self,
-      struct _cef_browser_t* browser,
-      const void* message,
-      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.
-  ///
-  void(CEF_CALLBACK* on_dev_tools_method_result)(
-      struct _cef_dev_tools_message_observer_t* self,
-      struct _cef_browser_t* browser,
-      int message_id,
-      int success,
-      const void* result,
-      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.
-  ///
-  void(CEF_CALLBACK* on_dev_tools_event)(
-      struct _cef_dev_tools_message_observer_t* self,
-      struct _cef_browser_t* browser,
-      const cef_string_t* method,
-      const void* params,
-      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.
-  ///
-  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.
-  ///
-  void(CEF_CALLBACK* on_dev_tools_agent_detached)(
-      struct _cef_dev_tools_message_observer_t* self,
-      struct _cef_browser_t* browser);
-} cef_dev_tools_message_observer_t;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // CEF_INCLUDE_CAPI_CEF_DEVTOOLS_MESSAGE_OBSERVER_CAPI_H_
--- a/include/capi/cef_display_handler_capi.h
+++ b/include/capi/cef_display_handler_capi.h
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=eada7e92085d96497f4e69f3e8a7e8aa6746b175$
+// $hash=951c936c8070dbf9bd246cc766b81cdfe06a3d81$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_DISPLAY_HANDLER_CAPI_H_
@@ -141,19 +141,6 @@ typedef struct _cef_display_handler_t {
      struct _cef_display_handler_t* self,
      struct _cef_browser_t* browser,
      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.
-  ///
-  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 struct _cef_cursor_info_t* custom_cursor_info);
 } cef_display_handler_t;

 #ifdef __cplusplus
--- a/include/capi/cef_media_router_capi.h
+++ b/include/capi/cef_media_router_capi.h
@@ -1,345 +0,0 @@
-// Copyright (c) 2020 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=4f4a0d76efaf87055ebf5e784f5d1b69fafdabc2$
-//
-
-#ifndef CEF_INCLUDE_CAPI_CEF_MEDIA_ROUTER_CAPI_H_
-#define CEF_INCLUDE_CAPI_CEF_MEDIA_ROUTER_CAPI_H_
-#pragma once
-
-#include "include/capi/cef_base_capi.h"
-#include "include/capi/cef_registration_capi.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct _cef_media_observer_t;
-struct _cef_media_route_create_callback_t;
-struct _cef_media_route_t;
-struct _cef_media_sink_device_info_callback_t;
-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.
-///
-typedef struct _cef_media_router_t {
-  ///
-  // 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.
-  ///
-  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>").
-  ///
-  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.
-  ///
-  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.
-  ///
-  void(CEF_CALLBACK* create_route)(
-      struct _cef_media_router_t* self,
-      struct _cef_media_source_t* source,
-      struct _cef_media_sink_t* sink,
-      struct _cef_media_route_create_callback_t* callback);
-
-  ///
-  // 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.
-// Equivalent to calling cef_request_context_t::cef_request_context_get_global_c
-// ontext()->get_media_router().
-///
-CEF_EXPORT cef_media_router_t* cef_media_router_get_global();
-
-///
-// 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.
-  ///
-  cef_base_ref_counted_t base;
-
-  ///
-  // 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.
-  ///
-  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.
-  ///
-  void(CEF_CALLBACK* on_route_state_changed)(
-      struct _cef_media_observer_t* self,
-      struct _cef_media_route_t* route,
-      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.
-  ///
-  void(CEF_CALLBACK* on_route_message_received)(
-      struct _cef_media_observer_t* self,
-      struct _cef_media_route_t* route,
-      const void* message,
-      size_t message_size);
-} 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.
-///
-typedef struct _cef_media_route_t {
-  ///
-  // Base structure.
-  ///
-  cef_base_ref_counted_t base;
-
-  ///
-  // 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.
-  ///
-  struct _cef_media_source_t*(CEF_CALLBACK* get_source)(
-      struct _cef_media_route_t* self);
-
-  ///
-  // 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.
-  ///
-  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.
-  ///
-  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.
-///
-typedef struct _cef_media_route_create_callback_t {
-  ///
-  // 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.
-  ///
-  void(CEF_CALLBACK* on_media_route_create_finished)(
-      struct _cef_media_route_create_callback_t* self,
-      cef_media_route_create_result_t result,
-      const cef_string_t* error,
-      struct _cef_media_route_t* route);
-} 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.
-///
-typedef struct _cef_media_sink_t {
-  ///
-  // Base structure.
-  ///
-  cef_base_ref_counted_t base;
-
-  ///
-  // 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.
-  ///
-  // 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.
-  ///
-  // 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.
-  ///
-  cef_media_sink_icon_type_t(CEF_CALLBACK* get_icon_type)(
-      struct _cef_media_sink_t* self);
-
-  ///
-  // 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.
-  ///
-  int(CEF_CALLBACK* is_cast_sink)(struct _cef_media_sink_t* self);
-
-  ///
-  // 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|.
-  ///
-  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.
-///
-typedef struct _cef_media_sink_device_info_callback_t {
-  ///
-  // Base structure.
-  ///
-  cef_base_ref_counted_t base;
-
-  ///
-  // 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,
-      const struct _cef_media_sink_device_info_t* device_info);
-} 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.
-///
-typedef struct _cef_media_source_t {
-  ///
-  // Base structure.
-  ///
-  cef_base_ref_counted_t base;
-
-  ///
-  // 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.
-  ///
-  int(CEF_CALLBACK* is_cast_source)(struct _cef_media_source_t* self);
-
-  ///
-  // 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;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // CEF_INCLUDE_CAPI_CEF_MEDIA_ROUTER_CAPI_H_
--- a/include/capi/cef_parser_capi.h
+++ b/include/capi/cef_parser_capi.h
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=19337a70a13352e70452be7fcc25ef2de4b1ae4c$
+// $hash=3bc4225f43428d8a3a24dcac1830dafac18b0caf$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_PARSER_CAPI_H_
@@ -140,24 +140,16 @@ 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.
-///
-CEF_EXPORT struct _cef_value_t* cef_parse_json_buffer(
-    const void* json,
-    size_t json_size,
-    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.
+// populates |error_code_out| and |error_msg_out| with an error code and a
+// formatted error message respectively.
 ///
 CEF_EXPORT struct _cef_value_t* cef_parse_jsonand_return_error(
    const cef_string_t* json_string,
    cef_json_parser_options_t options,
+    cef_json_parser_error_t* error_code_out,
    cef_string_t* error_msg_out);

 ///
--- a/include/capi/cef_registration_capi.h
+++ b/include/capi/cef_registration_capi.h
@@ -1,63 +0,0 @@
-// Copyright (c) 2020 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=029e237cf80f94a25453bac5a9b1e0765bb56f37$
-//
-
-#ifndef CEF_INCLUDE_CAPI_CEF_REGISTRATION_CAPI_H_
-#define CEF_INCLUDE_CAPI_CEF_REGISTRATION_CAPI_H_
-#pragma once
-
-#include "include/capi/cef_base_capi.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-///
-// Generic callback structure used for managing the lifespan of a registration.
-///
-typedef struct _cef_registration_t {
-  ///
-  // Base structure.
-  ///
-  cef_base_ref_counted_t base;
-} cef_registration_t;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // CEF_INCLUDE_CAPI_CEF_REGISTRATION_CAPI_H_
--- a/include/capi/cef_render_handler_capi.h
+++ b/include/capi/cef_render_handler_capi.h
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=f9806cd79f33b6a762fff25edd4189ae42bc8fd2$
+// $hash=e642fc1fe3b97a90c0eae7f0fc0a5cfd385e3e17$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_RENDER_HANDLER_CAPI_H_
@@ -159,6 +159,17 @@ typedef struct _cef_render_handler_t {
                                           cef_rect_t const* dirtyRects,
                                           void* shared_handle);

+  ///
+  // 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.
+  ///
+  void(CEF_CALLBACK* on_cursor_change)(
+      struct _cef_render_handler_t* self,
+      struct _cef_browser_t* browser,
+      cef_cursor_handle_t cursor,
+      cef_cursor_type_t type,
+      const struct _cef_cursor_info_t* custom_cursor_info);
+
  ///
  // Called when the user starts dragging content in the web view. Contextual
  // information about the dragged content is supplied by |drag_data|. (|x|,
--- a/include/capi/cef_render_process_handler_capi.h
+++ b/include/capi/cef_render_process_handler_capi.h
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=8419eb3eba9dd372b019bd367d4f195433b21c9b$
+// $hash=3630a82a4ea731b43ed4ba468a57c5dfe15f8679$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_RENDER_PROCESS_HANDLER_CAPI_H_
@@ -64,6 +64,16 @@ typedef struct _cef_render_process_handler_t {
  ///
  cef_base_ref_counted_t base;

+  ///
+  // Called after the render process main thread has been created. |extra_info|
+  // is a read-only value originating from
+  // cef_browser_process_handler_t::on_render_process_thread_created(). Do not
+  // keep a reference to |extra_info| outside of this function.
+  ///
+  void(CEF_CALLBACK* on_render_thread_created)(
+      struct _cef_render_process_handler_t* self,
+      struct _cef_list_value_t* extra_info);
+
  ///
  // Called after WebKit has been initialized.
  ///
--- a/include/capi/cef_request_context_capi.h
+++ b/include/capi/cef_request_context_capi.h
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=7ce0953f069204a4dd2037c4a05ac9454c5e66a6$
+// $hash=2b01472d9b9a8cc9d1b2e669c91c2849bdb162e9$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_REQUEST_CONTEXT_CAPI_H_
@@ -44,7 +44,6 @@
 #include "include/capi/cef_cookie_capi.h"
 #include "include/capi/cef_extension_capi.h"
 #include "include/capi/cef_extension_handler_capi.h"
-#include "include/capi/cef_media_router_capi.h"
 #include "include/capi/cef_values_capi.h"

 #ifdef __cplusplus
@@ -354,12 +353,6 @@ typedef struct _cef_request_context_t {
  struct _cef_extension_t*(CEF_CALLBACK* get_extension)(
      struct _cef_request_context_t* self,
      const cef_string_t* extension_id);
-
-  ///
-  // Returns the MediaRouter object associated with this context.
-  ///
-  struct _cef_media_router_t*(CEF_CALLBACK* get_media_router)(
-      struct _cef_request_context_t* self);
 } cef_request_context_t;

 ///
--- a/include/capi/cef_request_handler_capi.h
+++ b/include/capi/cef_request_handler_capi.h
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=0167eb1abe614bd6391d273a8085fa3e53e7c217$
+// $hash=a28219cc8c1cb53faacaf236374c3cf2c0c45bef$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_REQUEST_HANDLER_CAPI_H_
@@ -253,14 +253,6 @@ typedef struct _cef_request_handler_t {
      struct _cef_request_handler_t* self,
      struct _cef_browser_t* browser,
      cef_termination_status_t status);
-
-  ///
-  // Called on the browser process UI thread when the window.document object of
-  // the main frame has been created.
-  ///
-  void(CEF_CALLBACK* on_document_available_in_main_frame)(
-      struct _cef_request_handler_t* self,
-      struct _cef_browser_t* browser);
 } cef_request_handler_t;

 #ifdef __cplusplus
--- a/include/capi/cef_resource_bundle_capi.h
+++ b/include/capi/cef_resource_bundle_capi.h
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=b0e2b63b467c6d4e990405d948908da3546ea1c7$
+// $hash=b9577b495df3990284d4e4a3db2824196175dc91$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_RESOURCE_BUNDLE_CAPI_H_
@@ -41,7 +41,6 @@
 #pragma once

 #include "include/capi/cef_base_capi.h"
-#include "include/capi/cef_values_capi.h"

 #ifdef __cplusplus
 extern "C" {
@@ -71,25 +70,34 @@ typedef struct _cef_resource_bundle_t {
      int string_id);

  ///
-  // Returns a cef_binary_value_t containing the decompressed contents of the
-  // specified scale independent |resource_id| or NULL if not found. Include
-  // cef_pack_resources.h for a listing of valid resource ID values.
+  // Retrieves the contents of the specified scale independent |resource_id|. If
+  // the value is found then |data| and |data_size| will be populated and this
+  // function will return true (1). If the value is not found then this function
+  // will return false (0). The returned |data| pointer will remain resident in
+  // memory and should not be freed. Include cef_pack_resources.h for a listing
+  // of valid resource ID values.
  ///
-  struct _cef_binary_value_t*(CEF_CALLBACK* get_data_resource)(
-      struct _cef_resource_bundle_t* self,
-      int resource_id);
+  int(CEF_CALLBACK* get_data_resource)(struct _cef_resource_bundle_t* self,
+                                       int resource_id,
+                                       void** data,
+                                       size_t* data_size);

  ///
-  // Returns a cef_binary_value_t containing the decompressed contents of the
-  // specified |resource_id| nearest the scale factor |scale_factor| or NULL if
-  // not found. Use a |scale_factor| value of SCALE_FACTOR_NONE for scale
-  // independent resources or call GetDataResource instead.Include
-  // cef_pack_resources.h for a listing of valid resource ID values.
+  // Retrieves the contents of the specified |resource_id| nearest the scale
+  // factor |scale_factor|. Use a |scale_factor| value of SCALE_FACTOR_NONE for
+  // scale independent resources or call GetDataResource instead. If the value
+  // is found then |data| and |data_size| will be populated and this function
+  // will return true (1). If the value is not found then this function will
+  // return false (0). The returned |data| pointer will remain resident in
+  // memory and should not be freed. Include cef_pack_resources.h for a listing
+  // of valid resource ID values.
  ///
-  struct _cef_binary_value_t*(CEF_CALLBACK* get_data_resource_for_scale)(
+  int(CEF_CALLBACK* get_data_resource_for_scale)(
      struct _cef_resource_bundle_t* self,
      int resource_id,
-      cef_scale_factor_t scale_factor);
+      cef_scale_factor_t scale_factor,
+      void** data,
+      size_t* data_size);
 } cef_resource_bundle_t;

 ///
--- a/include/capi/cef_thread_capi.h
+++ b/include/capi/cef_thread_capi.h
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=d443c0990241554b548bc946f46f35582445e818$
+// $hash=370cdeaa3252a9ed0e1a627d858dcab23af24ee1$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_THREAD_CAPI_H_
@@ -98,8 +98,8 @@ typedef struct _cef_thread_t {
 // identify the thread. |priority| is the thread execution priority.
 // |message_loop_type| indicates the set of asynchronous events that the thread
 // can process. If |stoppable| is true (1) the thread will stopped and joined on
-// destruction or when stop() is called; otherwise, the thread cannot be stopped
-// and will be leaked on shutdown. On Windows the |com_init_mode| value
+// destruction or when stop() is called; otherwise, the the thread cannot be
+// stopped and will be leaked on shutdown. On Windows the |com_init_mode| value
 // specifies how COM will be initialized for the thread. If |com_init_mode| is
 // set to COM_INIT_MODE_STA then |message_loop_type| must be set to ML_TYPE_UI.
 ///
--- a/include/capi/cef_urlrequest_capi.h
+++ b/include/capi/cef_urlrequest_capi.h
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=75f4f7a9ff628a6ae699a697722caa5d49546784$
+// $hash=63d875f5a922dd2c2e1efaaf0ddaa20475f79ef8$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_URLREQUEST_CAPI_H_
@@ -115,13 +115,20 @@ typedef struct _cef_urlrequest_t {
 // Create a new URL request that is not associated with a specific browser or
 // frame. Use cef_frame_t::CreateURLRequest instead if you want the request to
 // have this association, in which case it may be handled differently (see
-// documentation on that function). A request created with this function may
-// only originate from the browser process, and will behave as follows:
+// documentation on that function). Requests may originate from the both browser
+// process and the render process.
+//
+// For requests originating from the browser process:
 //   - It may be intercepted by the client via CefResourceRequestHandler or
 //     CefSchemeHandlerFactory.
 //   - POST data may only contain only a single element of type PDE_TYPE_FILE
 //     or PDE_TYPE_BYTES.
 //   - If |request_context| is empty the global request context will be used.
+// For requests originating from the render process:
+//   - It cannot be intercepted by the client so only http(s) and blob schemes
+//     are supported.
+//   - POST data may only contain a single element of type PDE_TYPE_BYTES.
+//   - The |request_context| parameter must be NULL.
 //
 // The |request| object will be marked as read-only after calling this function.
 ///
--- a/include/capi/views/cef_display_capi.h
+++ b/include/capi/views/cef_display_capi.h
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=652ac7a90c6cd10b1cbc6ae99a549c03f36c794e$
+// $hash=422243fda6e1404222aca7bdd4e7b84b961a9626$
 //

 #ifndef CEF_INCLUDE_CAPI_VIEWS_CEF_DISPLAY_CAPI_H_
@@ -50,9 +50,9 @@ extern "C" {
 // This structure typically, but not always, corresponds to a physical display
 // connected to the system. A fake Display may exist on a headless system, or a
 // Display may correspond to a remote, virtual display. All size and position
-// values are in density independent pixel (DIP) coordinates unless otherwise
-// indicated. Methods must be called on the browser process UI thread unless
-// otherwise indicated.
+// values are in density independent pixels (DIP) unless otherwise indicated.
+// Methods must be called on the browser process UI thread unless otherwise
+// indicated.
 ///
 typedef struct _cef_display_t {
  ///
@@ -74,28 +74,27 @@ typedef struct _cef_display_t {
  float(CEF_CALLBACK* get_device_scale_factor)(struct _cef_display_t* self);

  ///
-  // Convert |point| from DIP coordinates to pixel coordinates using this
-  // Display's device scale factor.
+  // Convert |point| from density independent pixels (DIP) to pixel coordinates
+  // using this Display's device scale factor.
  ///
  void(CEF_CALLBACK* convert_point_to_pixels)(struct _cef_display_t* self,
                                              cef_point_t* point);

  ///
-  // Convert |point| from pixel coordinates to DIP coordinates using this
-  // Display's device scale factor.
+  // Convert |point| from pixel coordinates to density independent pixels (DIP)
+  // using this Display's device scale factor.
  ///
  void(CEF_CALLBACK* convert_point_from_pixels)(struct _cef_display_t* self,
                                                cef_point_t* point);

  ///
-  // Returns this Display's bounds in DIP screen coordinates. This is the full
-  // size of the display.
+  // Returns this Display's bounds. This is the full size of the display.
  ///
  cef_rect_t(CEF_CALLBACK* get_bounds)(struct _cef_display_t* self);

  ///
-  // Returns this Display's work area in DIP screen coordinates. This excludes
-  // areas of the display that are occupied with window manager toolbars, etc.
+  // Returns this Display's work area. This excludes areas of the display that
+  // are occupied for window manager toolbars, etc.
  ///
  cef_rect_t(CEF_CALLBACK* get_work_area)(struct _cef_display_t* self);

@@ -112,7 +111,7 @@ CEF_EXPORT cef_display_t* cef_display_get_primary();

 ///
 // Returns the Display nearest |point|. Set |input_pixel_coords| to true (1) if
-// |point| is in pixel screen coordinates instead of DIP screen coordinates.
+// |point| is in pixel coordinates instead of density independent pixels (DIP).
 ///
 CEF_EXPORT cef_display_t* cef_display_get_nearest_point(
    const cef_point_t* point,
@@ -120,8 +119,8 @@ CEF_EXPORT cef_display_t* cef_display_get_nearest_point(

 ///
 // Returns the Display that most closely intersects |bounds|.  Set
-// |input_pixel_coords| to true (1) if |bounds| is in pixel screen coordinates
-// instead of DIP screen coordinates.
+// |input_pixel_coords| to true (1) if |bounds| is in pixel coordinates instead
+// of density independent pixels (DIP).
 ///
 CEF_EXPORT cef_display_t* cef_display_get_matching_bounds(
    const cef_rect_t* bounds,
--- a/include/capi/views/cef_textfield_capi.h
+++ b/include/capi/views/cef_textfield_capi.h
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=06f1c03ba824052122c6217c1227931f15dadd08$
+// $hash=71ba0e5714400e2bea3ca564cab4527d95e4b52c$
 //

 #ifndef CEF_INCLUDE_CAPI_VIEWS_CEF_TEXTFIELD_CAPI_H_
@@ -219,13 +219,16 @@ typedef struct _cef_textfield_t {
  // enabled. See additional comments on execute_command().
  ///
  int(CEF_CALLBACK* is_command_enabled)(struct _cef_textfield_t* self,
-                                        cef_text_field_commands_t command_id);
+                                        int command_id);

  ///
-  // Performs the action associated with the specified command id.
+  // Performs the action associated with the specified command id. Valid values
+  // include IDS_APP_UNDO, IDS_APP_REDO, IDS_APP_CUT, IDS_APP_COPY,
+  // IDS_APP_PASTE, IDS_APP_DELETE, IDS_APP_SELECT_ALL, IDS_DELETE_* and
+  // IDS_MOVE_*. See include/cef_pack_strings.h for definitions.
  ///
  void(CEF_CALLBACK* execute_command)(struct _cef_textfield_t* self,
-                                      cef_text_field_commands_t command_id);
+                                      int command_id);

  ///
  // Clears Edit history.
--- a/include/capi/views/cef_view_capi.h
+++ b/include/capi/views/cef_view_capi.h
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=55be3e44016d9861bb8e9270b52f2bf45c8a53f5$
+// $hash=45b421dfcf8ee7cf61b1991a336bc65d33fbe10a$
 //

 #ifndef CEF_INCLUDE_CAPI_VIEWS_CEF_VIEW_CAPI_H_
@@ -176,72 +176,64 @@ typedef struct _cef_view_t {
                                                     int id);

  ///
-  // Sets the bounds (size and position) of this View. |bounds| is in parent
-  // coordinates, or DIP screen coordinates if there is no parent.
+  // Sets the bounds (size and position) of this View. Position is in parent
+  // coordinates.
  ///
  void(CEF_CALLBACK* set_bounds)(struct _cef_view_t* self,
                                 const cef_rect_t* bounds);

  ///
-  // Returns the bounds (size and position) of this View in parent coordinates,
-  // or DIP screen coordinates if there is no parent.
+  // Returns the bounds (size and position) of this View. Position is in parent
+  // coordinates.
  ///
  cef_rect_t(CEF_CALLBACK* get_bounds)(struct _cef_view_t* self);

  ///
-  // Returns the bounds (size and position) of this View in DIP screen
+  // Returns the bounds (size and position) of this View. Position is in screen
  // coordinates.
  ///
  cef_rect_t(CEF_CALLBACK* get_bounds_in_screen)(struct _cef_view_t* self);

  ///
-  // Sets the size of this View without changing the position. |size| in parent
-  // coordinates, or DIP screen coordinates if there is no parent.
+  // Sets the size of this View without changing the position.
  ///
  void(CEF_CALLBACK* set_size)(struct _cef_view_t* self,
                               const cef_size_t* size);

  ///
-  // Returns the size of this View in parent coordinates, or DIP screen
-  // coordinates if there is no parent.
+  // Returns the size of this View.
  ///
  cef_size_t(CEF_CALLBACK* get_size)(struct _cef_view_t* self);

  ///
  // Sets the position of this View without changing the size. |position| is in
-  // parent coordinates, or DIP screen coordinates if there is no parent.
+  // parent coordinates.
  ///
  void(CEF_CALLBACK* set_position)(struct _cef_view_t* self,
                                   const cef_point_t* position);

  ///
-  // Returns the position of this View. Position is in parent coordinates, or
-  // DIP screen coordinates if there is no parent.
+  // Returns the position of this View. Position is in parent coordinates.
  ///
  cef_point_t(CEF_CALLBACK* get_position)(struct _cef_view_t* self);

  ///
  // Returns the size this View would like to be if enough space is available.
-  // Size is in parent coordinates, or DIP screen coordinates if there is no
-  // parent.
  ///
  cef_size_t(CEF_CALLBACK* get_preferred_size)(struct _cef_view_t* self);

  ///
-  // Size this View to its preferred size. Size is in parent coordinates, or DIP
-  // screen coordinates if there is no parent.
+  // Size this View to its preferred size.
  ///
  void(CEF_CALLBACK* size_to_preferred_size)(struct _cef_view_t* self);

  ///
-  // Returns the minimum size for this View. Size is in parent coordinates, or
-  // DIP screen coordinates if there is no parent.
+  // Returns the minimum size for this View.
  ///
  cef_size_t(CEF_CALLBACK* get_minimum_size)(struct _cef_view_t* self);

  ///
-  // Returns the maximum size for this View. Size is in parent coordinates, or
-  // DIP screen coordinates if there is no parent.
+  // Returns the maximum size for this View.
  ///
  cef_size_t(CEF_CALLBACK* get_maximum_size)(struct _cef_view_t* self);

@@ -335,21 +327,21 @@ typedef struct _cef_view_t {
  cef_color_t(CEF_CALLBACK* get_background_color)(struct _cef_view_t* self);

  ///
-  // Convert |point| from this View's coordinate system to DIP screen
-  // coordinates. This View must belong to a Window when calling this function.
-  // Returns true (1) if the conversion is successful or false (0) otherwise.
-  // Use cef_display_t::convert_point_to_pixels() after calling this function if
+  // Convert |point| from this View's coordinate system to that of the screen.
+  // This View must belong to a Window when calling this function. Returns true
+  // (1) if the conversion is successful or false (0) otherwise. Use
+  // cef_display_t::convert_point_to_pixels() after calling this function if
  // further conversion to display-specific pixel coordinates is desired.
  ///
  int(CEF_CALLBACK* convert_point_to_screen)(struct _cef_view_t* self,
                                             cef_point_t* point);

  ///
-  // Convert |point| to this View's coordinate system from DIP screen
-  // coordinates. This View must belong to a Window when calling this function.
-  // Returns true (1) if the conversion is successful or false (0) otherwise.
-  // Use cef_display_t::convert_point_from_pixels() before calling this function
-  // if conversion from display-specific pixel coordinates is necessary.
+  // Convert |point| to this View's coordinate system from that of the screen.
+  // This View must belong to a Window when calling this function. Returns true
+  // (1) if the conversion is successful or false (0) otherwise. Use
+  // cef_display_t::convert_point_from_pixels() before calling this function if
+  // conversion from display-specific pixel coordinates is necessary.
  ///
  int(CEF_CALLBACK* convert_point_from_screen)(struct _cef_view_t* self,
                                               cef_point_t* point);
--- a/include/capi/views/cef_window_delegate_capi.h
+++ b/include/capi/views/cef_window_delegate_capi.h
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=fee25d300df47c6143b935d0f99d543ea888f55c$
+// $hash=a0cec778fbaf0b1f5c9b3ef75dc7bbeeba777a44$
 //

 #ifndef CEF_INCLUDE_CAPI_VIEWS_CEF_WINDOW_DELEGATE_CAPI_H_
@@ -87,18 +87,6 @@ typedef struct _cef_window_delegate_t {
      int* is_menu,
      int* can_activate_menu);

-  ///
-  // Return the initial bounds for |window| in density independent pixel (DIP)
-  // coordinates. If this function returns an NULL CefRect then
-  // get_preferred_size() will be called to retrieve the size, and the window
-  // will be placed on the screen with origin (0,0). This function can be used
-  // in combination with cef_view_t::get_bounds_in_screen() to restore the
-  // previous window bounds.
-  ///
-  cef_rect_t(CEF_CALLBACK* get_initial_bounds)(
-      struct _cef_window_delegate_t* self,
-      struct _cef_window_t* window);
-
  ///
  // Return true (1) if |window| should be created without a frame or title bar.
  // The window will be resizable if can_resize() returns true (1). Use
--- a/include/cef_api_hash.h
+++ b/include/cef_api_hash.h
@@ -29,7 +29,12 @@
 //
 // ---------------------------------------------------------------------------
 //
-// This file was generated by the make_api_hash_header.py tool.
+// This file was generated by the CEF translator tool. If making changes by
+// hand only do so within the body of existing method and function
+// implementations. See the translator.README.txt file in the tools directory
+// for more information.
+//
+// $hash=06d0c1ccfa43926a01cbeb3ec95ff2a001fd0b45$
 //

 #ifndef CEF_INCLUDE_API_HASH_H_
@@ -42,13 +47,13 @@
 // way that may cause binary incompatibility with other builds. The universal
 // hash value will change if any platform is affected whereas the platform hash
 // values will change only if that particular platform is affected.
-#define CEF_API_HASH_UNIVERSAL "7f349b7262bfe13bda037370004f56a6081e543b"
+#define CEF_API_HASH_UNIVERSAL "3ad9591f7024619a1e2fd796c7ad51ae3a34abbb"
 #if defined(OS_WIN)
-#define CEF_API_HASH_PLATFORM "8a5523fec15255e2fb1de64deaa15dc3554b91e5"
-#elif defined(OS_MAC)
-#define CEF_API_HASH_PLATFORM "f572c8f7d3aee3cd3b85bd398b0ba43eb7fe79a0"
+#define CEF_API_HASH_PLATFORM "3b8e38ae40c1a930227c6277c39dbc24081ccec1"
+#elif defined(OS_MACOSX)
+#define CEF_API_HASH_PLATFORM "4a77f1908fabccdb01a2d3bdbede5ca09fbaa394"
 #elif defined(OS_LINUX)
-#define CEF_API_HASH_PLATFORM "abf4cc6ff102e5cd019aaf51f13eb30f9bfeae45"
+#define CEF_API_HASH_PLATFORM "434da6be7db70fd90c4265118ac47ace4073c6ae"
 #endif

 #ifdef __cplusplus
--- a/include/cef_app.h
+++ b/include/cef_app.h
@@ -178,7 +178,7 @@ class CefApp : public virtual CefBaseRefCounted {
  ///
  /*--cef()--*/
  virtual CefRefPtr<CefResourceBundleHandler> GetResourceBundleHandler() {
-    return nullptr;
+    return NULL;
  }

  ///
@@ -187,7 +187,7 @@ class CefApp : public virtual CefBaseRefCounted {
  ///
  /*--cef()--*/
  virtual CefRefPtr<CefBrowserProcessHandler> GetBrowserProcessHandler() {
-    return nullptr;
+    return NULL;
  }

  ///
@@ -196,7 +196,7 @@ class CefApp : public virtual CefBaseRefCounted {
  ///
  /*--cef()--*/
  virtual CefRefPtr<CefRenderProcessHandler> GetRenderProcessHandler() {
-    return nullptr;
+    return NULL;
  }
 };

--- a/include/cef_application_mac.h
+++ b/include/cef_application_mac.h
@@ -35,7 +35,7 @@
 #include "include/cef_base.h"
 #endif  // __cplusplus

-#if defined(OS_MAC) && defined(__OBJC__)
+#if defined(OS_MACOSX) && defined(__OBJC__)

 #ifdef USING_CHROMIUM_INCLUDES

@@ -105,6 +105,6 @@ class CefScopedSendingEvent {

 #endif  // __cplusplus

-#endif  // defined(OS_MAC) && defined(__OBJC__)
+#endif  // defined(OS_MACOSX) && defined(__OBJC__)

 #endif  // CEF_INCLUDE_CEF_APPLICATION_MAC_H_
--- a/include/cef_audio_handler.h
+++ b/include/cef_audio_handler.h
@@ -1,111 +0,0 @@
-// Copyright (c) 2019 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.
-//
-// ---------------------------------------------------------------------------
-//
-// The contents of this file must follow a specific format in order to
-// support the CEF translator tool. See the translator.README.txt file in the
-// tools directory for more information.
-//
-
-#ifndef CEF_INCLUDE_CEF_AUDIO_HANDLER_H_
-#define CEF_INCLUDE_CEF_AUDIO_HANDLER_H_
-#pragma once
-
-#include "include/cef_base.h"
-#include "include/cef_browser.h"
-
-///
-// Implement this interface to handle audio events.
-///
-/*--cef(source=client)--*/
-class CefAudioHandler : public virtual CefBaseRefCounted {
- public:
-  typedef cef_channel_layout_t ChannelLayout;
-
-  ///
-  // Called on the UI thread to allow configuration of audio stream parameters.
-  // Return true to proceed with audio stream capture, or false to cancel it.
-  // All members of |params| can optionally be configured here, but they are
-  // also pre-filled with some sensible defaults.
-  ///
-  /*--cef()--*/
-  virtual bool GetAudioParameters(CefRefPtr<CefBrowser> browser,
-                                  CefAudioParameters& params) {
-    return true;
-  }
-
-  ///
-  // Called on a browser audio capture thread when the browser starts
-  // streaming audio. OnAudioSteamStopped will always be called after
-  // OnAudioStreamStarted; both methods 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.
-  ///
-  /*--cef()--*/
-  virtual void OnAudioStreamStarted(CefRefPtr<CefBrowser> browser,
-                                    const CefAudioParameters& params,
-                                    int channels) = 0;
-
-  ///
-  // 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.
-  ///
-  /*--cef()--*/
-  virtual void OnAudioStreamPacket(CefRefPtr<CefBrowser> browser,
-                                   const float** data,
-                                   int frames,
-                                   int64 pts) = 0;
-
-  ///
-  // Called on the UI thread when the stream has stopped. OnAudioSteamStopped
-  // will always be called after OnAudioStreamStarted; both methods may be
-  // called multiple times for the same stream.
-  ///
-  /*--cef()--*/
-  virtual void OnAudioStreamStopped(CefRefPtr<CefBrowser> browser) = 0;
-
-  ///
-  // 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.
-  ///
-  /*--cef()--*/
-  virtual void OnAudioStreamError(CefRefPtr<CefBrowser> browser,
-                                  const CefString& message) = 0;
-};
-
-#endif  // CEF_INCLUDE_CEF_AUDIO_HANDLER_H_
--- a/include/cef_base.h
+++ b/include/cef_base.h
@@ -40,7 +40,7 @@
 #include "include/internal/cef_types_wrappers.h"
 #if defined(OS_WIN)
 #include "include/internal/cef_win.h"
-#elif defined(OS_MAC)
+#elif defined(OS_MACOSX)
 #include "include/internal/cef_mac.h"
 #elif defined(OS_LINUX)
 #include "include/internal/cef_linux.h"
--- a/include/cef_browser.h
+++ b/include/cef_browser.h
@@ -40,12 +40,10 @@

 #include <vector>
 #include "include/cef_base.h"
-#include "include/cef_devtools_message_observer.h"
 #include "include/cef_drag_data.h"
 #include "include/cef_frame.h"
 #include "include/cef_image.h"
 #include "include/cef_navigation_entry.h"
-#include "include/cef_registration.h"
 #include "include/cef_request_context.h"

 class CefBrowserHost;
@@ -519,69 +517,6 @@ class CefBrowserHost : public virtual CefBaseRefCounted {
  /*--cef()--*/
  virtual bool HasDevTools() = 0;

-  ///
-  // Send a method call message over the DevTools protocol. |message| must be a
-  // UTF8-encoded JSON dictionary that contains "id" (int), "method" (string)
-  // and "params" (dictionary, optional) values. See the DevTools protocol
-  // documentation at https://chromedevtools.github.io/devtools-protocol/ for
-  // details of supported methods and the expected "params" dictionary contents.
-  // |message| will be copied if necessary. This method will return true if
-  // called on the UI thread and the message was successfully submitted for
-  // validation, otherwise false. Validation will be applied asynchronously and
-  // any messages that fail due to formatting errors or missing parameters may
-  // be discarded without notification. Prefer ExecuteDevToolsMethod if a more
-  // structured approach to message formatting is desired.
-  //
-  // Every valid method call will result in an asynchronous method result or
-  // error message that references the sent message "id". Event messages are
-  // received while notifications are enabled (for example, between method calls
-  // for "Page.enable" and "Page.disable"). All received messages will be
-  // delivered to the observer(s) registered with AddDevToolsMessageObserver.
-  // See CefDevToolsMessageObserver::OnDevToolsMessage documentation for details
-  // of received message contents.
-  //
-  // Usage of the SendDevToolsMessage, ExecuteDevToolsMethod and
-  // AddDevToolsMessageObserver methods does not require an active DevTools
-  // front-end or remote-debugging session. Other active DevTools sessions will
-  // continue to function independently. However, any modification of global
-  // browser state by one session may not be reflected in the UI of other
-  // sessions.
-  //
-  // Communication with the DevTools front-end (when displayed) can be logged
-  // for development purposes by passing the
-  // `--devtools-protocol-log-file=<path>` command-line flag.
-  ///
-  /*--cef()--*/
-  virtual bool SendDevToolsMessage(const void* message,
-                                   size_t message_size) = 0;
-
-  ///
-  // Execute a method call over the DevTools protocol. This is a more structured
-  // version of SendDevToolsMessage. |message_id| is an incremental number that
-  // uniquely identifies the message (pass 0 to have the next number assigned
-  // automatically based on previous values). |method| is the method name.
-  // |params| are the method parameters, which may be empty. See the DevTools
-  // protocol documentation (linked above) for details of supported methods and
-  // the expected |params| dictionary contents. This method will return the
-  // assigned message ID if called on the UI thread and the message was
-  // successfully submitted for validation, otherwise 0. See the
-  // SendDevToolsMessage documentation for additional usage information.
-  ///
-  /*--cef(optional_param=params)--*/
-  virtual int ExecuteDevToolsMethod(int message_id,
-                                    const CefString& method,
-                                    CefRefPtr<CefDictionaryValue> params) = 0;
-
-  ///
-  // Add an observer for DevTools protocol messages (method results and events).
-  // The observer will remain registered until the returned Registration object
-  // is destroyed. See the SendDevToolsMessage documentation for additional
-  // usage information.
-  ///
-  /*--cef()--*/
-  virtual CefRefPtr<CefRegistration> AddDevToolsMessageObserver(
-      CefRefPtr<CefDevToolsMessageObserver> observer) = 0;
-
  ///
  // Retrieve a snapshot of current navigation entries as values sent to the
  // specified visitor. If |current_only| is true only the current navigation
@@ -592,6 +527,18 @@ class CefBrowserHost : public virtual CefBaseRefCounted {
      CefRefPtr<CefNavigationEntryVisitor> visitor,
      bool current_only) = 0;

+  ///
+  // Set whether mouse cursor change is disabled.
+  ///
+  /*--cef()--*/
+  virtual void SetMouseCursorChangeDisabled(bool disabled) = 0;
+
+  ///
+  // Returns true if mouse cursor change is disabled.
+  ///
+  /*--cef()--*/
+  virtual bool IsMouseCursorChangeDisabled() = 0;
+
  ///
  // If a misspelled word is currently selected in an editable node calling
  // this method will replace it with the specified |word|.
--- a/include/cef_browser_process_handler.h
+++ b/include/cef_browser_process_handler.h
@@ -39,7 +39,6 @@
 #pragma once

 #include "include/cef_base.h"
-#include "include/cef_client.h"
 #include "include/cef_command_line.h"
 #include "include/cef_print_handler.h"
 #include "include/cef_values.h"
@@ -51,23 +50,6 @@
 /*--cef(source=client,no_debugct_check)--*/
 class CefBrowserProcessHandler : public virtual CefBaseRefCounted {
 public:
-  ///
-  // Called on the browser process UI thread to retrieve the list of schemes
-  // that should support cookies. If |include_defaults| is true the default
-  // schemes ("http", "https", "ws" and "wss") will also be supported. Providing
-  // an empty |schemes| value and setting |include_defaults| to false will
-  // disable all loading and saving of cookies.
-  //
-  // This state will apply to the CefCookieManager associated with the global
-  // CefRequestContext. It will also be used as the initial state for any new
-  // CefRequestContexts created by the client. After creating a new
-  // CefRequestContext the CefCookieManager::SetSupportedSchemes method may be
-  // called on the associated CefCookieManager to futher override these values.
-  ///
-  /*--cef()--*/
-  virtual void GetCookieableSchemes(std::vector<CefString>& schemes,
-                                    bool& include_defaults) {}
-
  ///
  // Called on the browser process UI thread immediately after the CEF context
  // has been initialized.
@@ -86,12 +68,23 @@ class CefBrowserProcessHandler : public virtual CefBaseRefCounted {
  virtual void OnBeforeChildProcessLaunch(
      CefRefPtr<CefCommandLine> command_line) {}

+  ///
+  // Called on the browser process IO thread after the main thread has been
+  // created for a new render process. Provides an opportunity to specify extra
+  // information that will be passed to
+  // CefRenderProcessHandler::OnRenderThreadCreated() in the render process. Do
+  // not keep a reference to |extra_info| outside of this method.
+  ///
+  /*--cef()--*/
+  virtual void OnRenderProcessThreadCreated(
+      CefRefPtr<CefListValue> extra_info) {}
+
  ///
  // Return the handler for printing on Linux. If a print handler is not
  // provided then printing will not be supported on the Linux platform.
  ///
  /*--cef()--*/
-  virtual CefRefPtr<CefPrintHandler> GetPrintHandler() { return nullptr; }
+  virtual CefRefPtr<CefPrintHandler> GetPrintHandler() { return NULL; }

  ///
  // Called from any thread when work has been scheduled for the browser process
@@ -108,16 +101,6 @@ class CefBrowserProcessHandler : public virtual CefBaseRefCounted {
  ///
  /*--cef()--*/
  virtual void OnScheduleMessagePumpWork(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 method is currently only used
-  // with the chrome runtime.
-  ///
-  /*--cef()--*/
-  virtual CefRefPtr<CefClient> GetDefaultClient() { return nullptr; }
 };

 #endif  // CEF_INCLUDE_CEF_BROWSER_PROCESS_HANDLER_H_
--- a/include/cef_client.h
+++ b/include/cef_client.h
@@ -38,7 +38,6 @@
 #define CEF_INCLUDE_CEF_CLIENT_H_
 #pragma once

-#include "include/cef_audio_handler.h"
 #include "include/cef_base.h"
 #include "include/cef_context_menu_handler.h"
 #include "include/cef_dialog_handler.h"
@@ -61,19 +60,13 @@
 /*--cef(source=client,no_debugct_check)--*/
 class CefClient : public virtual CefBaseRefCounted {
 public:
-  ///
-  // Return the handler for audio rendering events.
-  ///
-  /*--cef()--*/
-  virtual CefRefPtr<CefAudioHandler> GetAudioHandler() { return nullptr; }
-
  ///
  // Return the handler for context menus. If no handler is provided the default
  // implementation will be used.
  ///
  /*--cef()--*/
  virtual CefRefPtr<CefContextMenuHandler> GetContextMenuHandler() {
-    return nullptr;
+    return NULL;
  }

  ///
@@ -81,75 +74,75 @@ class CefClient : public virtual CefBaseRefCounted {
  // implementation will be used.
  ///
  /*--cef()--*/
-  virtual CefRefPtr<CefDialogHandler> GetDialogHandler() { return nullptr; }
+  virtual CefRefPtr<CefDialogHandler> GetDialogHandler() { return NULL; }

  ///
  // Return the handler for browser display state events.
  ///
  /*--cef()--*/
-  virtual CefRefPtr<CefDisplayHandler> GetDisplayHandler() { return nullptr; }
+  virtual CefRefPtr<CefDisplayHandler> GetDisplayHandler() { return NULL; }

  ///
  // Return the handler for download events. If no handler is returned downloads
  // will not be allowed.
  ///
  /*--cef()--*/
-  virtual CefRefPtr<CefDownloadHandler> GetDownloadHandler() { return nullptr; }
+  virtual CefRefPtr<CefDownloadHandler> GetDownloadHandler() { return NULL; }

  ///
  // Return the handler for drag events.
  ///
  /*--cef()--*/
-  virtual CefRefPtr<CefDragHandler> GetDragHandler() { return nullptr; }
+  virtual CefRefPtr<CefDragHandler> GetDragHandler() { return NULL; }

  ///
  // Return the handler for find result events.
  ///
  /*--cef()--*/
-  virtual CefRefPtr<CefFindHandler> GetFindHandler() { return nullptr; }
+  virtual CefRefPtr<CefFindHandler> GetFindHandler() { return NULL; }

  ///
  // Return the handler for focus events.
  ///
  /*--cef()--*/
-  virtual CefRefPtr<CefFocusHandler> GetFocusHandler() { return nullptr; }
+  virtual CefRefPtr<CefFocusHandler> GetFocusHandler() { return NULL; }

  ///
  // Return the handler for JavaScript dialogs. If no handler is provided the
  // default implementation will be used.
  ///
  /*--cef()--*/
-  virtual CefRefPtr<CefJSDialogHandler> GetJSDialogHandler() { return nullptr; }
+  virtual CefRefPtr<CefJSDialogHandler> GetJSDialogHandler() { return NULL; }

  ///
  // Return the handler for keyboard events.
  ///
  /*--cef()--*/
-  virtual CefRefPtr<CefKeyboardHandler> GetKeyboardHandler() { return nullptr; }
+  virtual CefRefPtr<CefKeyboardHandler> GetKeyboardHandler() { return NULL; }

  ///
  // Return the handler for browser life span events.
  ///
  /*--cef()--*/
-  virtual CefRefPtr<CefLifeSpanHandler> GetLifeSpanHandler() { return nullptr; }
+  virtual CefRefPtr<CefLifeSpanHandler> GetLifeSpanHandler() { return NULL; }

  ///
  // Return the handler for browser load status events.
  ///
  /*--cef()--*/
-  virtual CefRefPtr<CefLoadHandler> GetLoadHandler() { return nullptr; }
+  virtual CefRefPtr<CefLoadHandler> GetLoadHandler() { return NULL; }

  ///
  // Return the handler for off-screen rendering events.
  ///
  /*--cef()--*/
-  virtual CefRefPtr<CefRenderHandler> GetRenderHandler() { return nullptr; }
+  virtual CefRefPtr<CefRenderHandler> GetRenderHandler() { return NULL; }

  ///
  // Return the handler for browser request events.
  ///
  /*--cef()--*/
-  virtual CefRefPtr<CefRequestHandler> GetRequestHandler() { return nullptr; }
+  virtual CefRefPtr<CefRequestHandler> GetRequestHandler() { return NULL; }

  ///
  // Called when a new message is received from a different process. Return true
--- a/include/cef_devtools_message_observer.h
+++ b/include/cef_devtools_message_observer.h
@@ -1,130 +0,0 @@
-// Copyright (c) 2020 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.
-//
-// ---------------------------------------------------------------------------
-//
-// The contents of this file must follow a specific format in order to
-// support the CEF translator tool. See the translator.README.txt file in the
-// tools directory for more information.
-//
-
-#ifndef CEF_INCLUDE_CEF_DEVTOOLS_MESSAGE_OBSERVER_H_
-#define CEF_INCLUDE_CEF_DEVTOOLS_MESSAGE_OBSERVER_H_
-#pragma once
-
-#include "include/cef_base.h"
-
-class CefBrowser;
-
-///
-// Callback interface for CefBrowserHost::AddDevToolsMessageObserver. The
-// methods of this class will be called on the browser process UI thread.
-///
-/*--cef(source=client)--*/
-class CefDevToolsMessageObserver : public virtual CefBaseRefCounted {
- public:
-  ///
-  // 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 method result or an event. |message|
-  // is only valid for the scope of this callback and should be copied if
-  // necessary. Return true if the message was handled or false if the message
-  // should be further processed and passed to the OnDevToolsMethodResult or
-  // OnDevToolsEvent methods as appropriate.
-  //
-  // Method result dictionaries include an "id" (int) value that identifies the
-  // orginating method call sent from CefBrowserHost::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 "method" (string) value and optionally
-  // a "params" (dictionary) value. See the DevTools protocol documentation at
-  // https://chromedevtools.github.io/devtools-protocol/ for details of
-  // supported method 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).
-  ///
-  /*--cef()--*/
-  virtual bool OnDevToolsMessage(CefRefPtr<CefBrowser> browser,
-                                 const void* message,
-                                 size_t message_size) {
-    return false;
-  }
-
-  ///
-  // Method that will be called after attempted execution of a DevTools protocol
-  // method. |browser| is the originating browser instance. |message_id| is the
-  // "id" value that identifies the originating method call message. If the
-  // method succeeded |success| will be true and |result| will be the
-  // UTF8-encoded JSON "result" dictionary value (which may be empty). If the
-  // method failed |success| will be false 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.
-  ///
-  /*--cef(optional_param=result)--*/
-  virtual void OnDevToolsMethodResult(CefRefPtr<CefBrowser> browser,
-                                      int message_id,
-                                      bool success,
-                                      const void* result,
-                                      size_t result_size) {}
-
-  ///
-  // Method that will be called on receipt of a DevTools protocol event.
-  // |browser| is the originating browser instance. |method| is the "method"
-  // value. |params| is the UTF8-encoded JSON "params" dictionary value (which
-  // may be empty). |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.
-  ///
-  /*--cef(optional_param=params)--*/
-  virtual void OnDevToolsEvent(CefRefPtr<CefBrowser> browser,
-                               const CefString& method,
-                               const void* params,
-                               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.
-  ///
-  /*--cef()--*/
-  virtual void OnDevToolsAgentAttached(CefRefPtr<CefBrowser> browser) {}
-
-  ///
-  // Method that will be called when the DevTools agent has detached. |browser|
-  // is the originating browser instance. Any method results that were pending
-  // before the agent became detached will not be delivered, and any active
-  // event subscriptions will be canceled.
-  ///
-  /*--cef()--*/
-  virtual void OnDevToolsAgentDetached(CefRefPtr<CefBrowser> browser) {}
-};
-
-#endif  // CEF_INCLUDE_CEF_DEVTOOLS_MESSAGE_OBSERVER_H_
--- a/include/cef_display_handler.h
+++ b/include/cef_display_handler.h
@@ -135,19 +135,6 @@ class CefDisplayHandler : public virtual CefBaseRefCounted {
  /*--cef()--*/
  virtual void OnLoadingProgressChange(CefRefPtr<CefBrowser> browser,
                                       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 if the cursor change was handled or false for default handling.
-  ///
-  /*--cef()--*/
-  virtual bool OnCursorChange(CefRefPtr<CefBrowser> browser,
-                              CefCursorHandle cursor,
-                              cef_cursor_type_t type,
-                              const CefCursorInfo& custom_cursor_info) {
-    return false;
-  }
 };

 #endif  // CEF_INCLUDE_CEF_DISPLAY_HANDLER_H_
--- a/include/cef_extension_handler.h
+++ b/include/cef_extension_handler.h
@@ -157,7 +157,7 @@ class CefExtensionHandler : public virtual CefBaseRefCounted {
      CefRefPtr<CefExtension> extension,
      CefRefPtr<CefBrowser> browser,
      bool include_incognito) {
-    return nullptr;
+    return NULL;
  }

  ///
--- a/include/cef_media_router.h
+++ b/include/cef_media_router.h
@@ -1,320 +0,0 @@
-// Copyright (c) 2020 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.
-//
-// ---------------------------------------------------------------------------
-//
-// The contents of this file must follow a specific format in order to
-// support the CEF translator tool. See the translator.README.txt file in the
-// tools directory for more information.
-//
-
-#ifndef CEF_INCLUDE_CEF_MEDIA_ROUTER_H_
-#define CEF_INCLUDE_CEF_MEDIA_ROUTER_H_
-#pragma once
-
-#include <vector>
-#include "include/cef_base.h"
-#include "include/cef_registration.h"
-
-class CefMediaObserver;
-class CefMediaRoute;
-class CefMediaRouteCreateCallback;
-class CefMediaSink;
-class CefMediaSinkDeviceInfoCallback;
-class CefMediaSource;
-
-///
-// Supports discovery of and communication with media devices on the local
-// network via the Cast and DIAL protocols. The methods of this class may be
-// called on any browser process thread unless otherwise indicated.
-///
-/*--cef(source=library)--*/
-class CefMediaRouter : public virtual CefBaseRefCounted {
- public:
-  ///
-  // Returns the MediaRouter object associated with the global request context.
-  // Equivalent to calling
-  // CefRequestContext::GetGlobalContext()->GetMediaRouter().
-  ///
-  /*--cef()--*/
-  static CefRefPtr<CefMediaRouter> GetGlobalMediaRouter();
-
-  ///
-  // Add an observer for MediaRouter events. The observer will remain registered
-  // until the returned Registration object is destroyed.
-  ///
-  /*--cef()--*/
-  virtual CefRefPtr<CefRegistration> AddObserver(
-      CefRefPtr<CefMediaObserver> observer) = 0;
-
-  ///
-  // 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>").
-  ///
-  /*--cef()--*/
-  virtual CefRefPtr<CefMediaSource> GetSource(const CefString& urn) = 0;
-
-  ///
-  // Trigger an asynchronous call to CefMediaObserver::OnSinks on all
-  // registered observers.
-  ///
-  /*--cef()--*/
-  virtual void NotifyCurrentSinks() = 0;
-
-  ///
-  // Create a new route between |source| and |sink|. Source and sink must be
-  // valid, compatible (as reported by CefMediaSink::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 CefMediaObserver::OnRoutes on all registered
-  // observers.
-  ///
-  /*--cef()--*/
-  virtual void CreateRoute(CefRefPtr<CefMediaSource> source,
-                           CefRefPtr<CefMediaSink> sink,
-                           CefRefPtr<CefMediaRouteCreateCallback> callback) = 0;
-
-  ///
-  // Trigger an asynchronous call to CefMediaObserver::OnRoutes on all
-  // registered observers.
-  ///
-  /*--cef()--*/
-  virtual void NotifyCurrentRoutes() = 0;
-};
-
-///
-// Implemented by the client to observe MediaRouter events and registered via
-// CefMediaRouter::AddObserver. The methods of this class will be called on the
-// browser process UI thread.
-///
-/*--cef(source=client)--*/
-class CefMediaObserver : public virtual CefBaseRefCounted {
- public:
-  typedef cef_media_route_connection_state_t ConnectionState;
-
-  ///
-  // The list of available media sinks has changed or
-  // CefMediaRouter::NotifyCurrentSinks was called.
-  ///
-  /*--cef()--*/
-  virtual void OnSinks(const std::vector<CefRefPtr<CefMediaSink>>& sinks) = 0;
-
-  ///
-  // The list of available media routes has changed or
-  // CefMediaRouter::NotifyCurrentRoutes was called.
-  ///
-  /*--cef()--*/
-  virtual void OnRoutes(
-      const std::vector<CefRefPtr<CefMediaRoute>>& routes) = 0;
-
-  ///
-  // The connection state of |route| has changed.
-  ///
-  /*--cef()--*/
-  virtual void OnRouteStateChanged(CefRefPtr<CefMediaRoute> route,
-                                   ConnectionState state) = 0;
-
-  ///
-  // A message was recieved over |route|. |message| is only valid for
-  // the scope of this callback and should be copied if necessary.
-  ///
-  /*--cef()--*/
-  virtual void OnRouteMessageReceived(CefRefPtr<CefMediaRoute> route,
-                                      const void* message,
-                                      size_t message_size) = 0;
-};
-
-///
-// Represents the route between a media source and sink. Instances of this
-// object are created via CefMediaRouter::CreateRoute and retrieved via
-// CefMediaObserver::OnRoutes. Contains the status and metadata of a
-// routing operation. The methods of this class may be called on any browser
-// process thread unless otherwise indicated.
-///
-/*--cef(source=library)--*/
-class CefMediaRoute : public virtual CefBaseRefCounted {
- public:
-  ///
-  // Returns the ID for this route.
-  ///
-  /*--cef()--*/
-  virtual CefString GetId() = 0;
-
-  ///
-  // Returns the source associated with this route.
-  ///
-  /*--cef()--*/
-  virtual CefRefPtr<CefMediaSource> GetSource() = 0;
-
-  ///
-  // Returns the sink associated with this route.
-  ///
-  /*--cef()--*/
-  virtual CefRefPtr<CefMediaSink> GetSink() = 0;
-
-  ///
-  // Send a message over this route. |message| will be copied if necessary.
-  ///
-  /*--cef()--*/
-  virtual void SendRouteMessage(const void* message, size_t message_size) = 0;
-
-  ///
-  // Terminate this route. Will result in an asynchronous call to
-  // CefMediaObserver::OnRoutes on all registered observers.
-  ///
-  /*--cef()--*/
-  virtual void Terminate() = 0;
-};
-
-///
-// Callback interface for CefMediaRouter::CreateRoute. The methods of this
-// class will be called on the browser process UI thread.
-///
-/*--cef(source=client)--*/
-class CefMediaRouteCreateCallback : public virtual CefBaseRefCounted {
- public:
-  typedef cef_media_route_create_result_t RouteCreateResult;
-
-  ///
-  // 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 empty if the route creation failed.
-  ///
-  /*--cef(optional_param=error,optional_param=route)--*/
-  virtual void OnMediaRouteCreateFinished(RouteCreateResult result,
-                                          const CefString& error,
-                                          CefRefPtr<CefMediaRoute> route) = 0;
-};
-
-///
-// Represents a sink to which media can be routed. Instances of this object are
-// retrieved via CefMediaObserver::OnSinks. The methods of this class may
-// be called on any browser process thread unless otherwise indicated.
-///
-/*--cef(source=library)--*/
-class CefMediaSink : public virtual CefBaseRefCounted {
- public:
-  typedef cef_media_sink_icon_type_t IconType;
-
-  ///
-  // Returns the ID for this sink.
-  ///
-  /*--cef()--*/
-  virtual CefString GetId() = 0;
-
-  ///
-  // Returns the name of this sink.
-  ///
-  /*--cef()--*/
-  virtual CefString GetName() = 0;
-
-  ///
-  // Returns the description of this sink.
-  ///
-  /*--cef()--*/
-  virtual CefString GetDescription() = 0;
-
-  ///
-  // Returns the icon type for this sink.
-  ///
-  /*--cef(default_retval=CEF_MSIT_GENERIC)--*/
-  virtual IconType GetIconType() = 0;
-
-  ///
-  // Asynchronously retrieves device info.
-  ///
-  /*--cef()--*/
-  virtual void GetDeviceInfo(
-      CefRefPtr<CefMediaSinkDeviceInfoCallback> callback) = 0;
-
-  ///
-  // Returns true if this sink accepts content via Cast.
-  ///
-  /*--cef()--*/
-  virtual bool IsCastSink() = 0;
-
-  ///
-  // Returns true if this sink accepts content via DIAL.
-  ///
-  /*--cef()--*/
-  virtual bool IsDialSink() = 0;
-
-  ///
-  // Returns true if this sink is compatible with |source|.
-  ///
-  /*--cef()--*/
-  virtual bool IsCompatibleWith(CefRefPtr<CefMediaSource> source) = 0;
-};
-
-///
-// Callback interface for CefMediaSink::GetDeviceInfo. The methods of this
-// class will be called on the browser process UI thread.
-///
-/*--cef(source=client)--*/
-class CefMediaSinkDeviceInfoCallback : public virtual CefBaseRefCounted {
- public:
-  ///
-  // Method that will be executed asyncronously once device information has been
-  // retrieved.
-  ///
-  /*--cef()--*/
-  virtual void OnMediaSinkDeviceInfo(
-      const CefMediaSinkDeviceInfo& device_info) = 0;
-};
-
-///
-// Represents a source from which media can be routed. Instances of this object
-// are retrieved via CefMediaRouter::GetSource. The methods of this class may be
-// called on any browser process thread unless otherwise indicated.
-///
-/*--cef(source=library)--*/
-class CefMediaSource : public virtual CefBaseRefCounted {
- public:
-  ///
-  // Returns the ID (media source URN or URL) for this source.
-  ///
-  /*--cef()--*/
-  virtual CefString GetId() = 0;
-
-  ///
-  // Returns true if this source outputs its content via Cast.
-  ///
-  /*--cef()--*/
-  virtual bool IsCastSource() = 0;
-
-  ///
-  // Returns true if this source outputs its content via DIAL.
-  ///
-  /*--cef()--*/
-  virtual bool IsDialSource() = 0;
-};
-
-#endif  // CEF_INCLUDE_CEF_MEDIA_ROUTER_H_
--- a/include/cef_parser.h
+++ b/include/cef_parser.h
@@ -133,25 +133,17 @@ CefString CefURIDecode(const CefString& text,
 CefRefPtr<CefValue> CefParseJSON(const CefString& 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
-// method returns NULL.
-///
-/*--cef(capi_name=cef_parse_json_buffer)--*/
-CefRefPtr<CefValue> CefParseJSON(const void* json,
-                                 size_t json_size,
-                                 cef_json_parser_options_t options);
-
 ///
 // Parses the specified |json_string| and returns a dictionary or list
 // representation. If JSON parsing fails this method returns NULL and populates
-// |error_msg_out| with a formatted error message.
+// |error_code_out| and |error_msg_out| with an error code and a formatted error
+// message respectively.
 ///
 /*--cef()--*/
 CefRefPtr<CefValue> CefParseJSONAndReturnError(
    const CefString& json_string,
    cef_json_parser_options_t options,
+    cef_json_parser_error_t& error_code_out,
    CefString& error_msg_out);

 ///
--- a/include/cef_registration.h
+++ b/include/cef_registration.h
@@ -1,49 +0,0 @@
-// Copyright (c) 2020 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.
-//
-// ---------------------------------------------------------------------------
-//
-// The contents of this file must follow a specific format in order to
-// support the CEF translator tool. See the translator.README.txt file in the
-// tools directory for more information.
-//
-
-#ifndef CEF_INCLUDE_CEF_REGISTRATION_H_
-#define CEF_INCLUDE_CEF_REGISTRATION_H_
-#pragma once
-
-#include "include/cef_base.h"
-
-///
-// Generic callback interface used for managing the lifespan of a registration.
-///
-/*--cef(source=library)--*/
-class CefRegistration : public virtual CefBaseRefCounted {};
-
-#endif  // CEF_INCLUDE_CEF_REGISTRATION_H_
--- a/include/cef_render_handler.h
+++ b/include/cef_render_handler.h
@@ -52,6 +52,7 @@
 /*--cef(source=client)--*/
 class CefRenderHandler : public virtual CefBaseRefCounted {
 public:
+  typedef cef_cursor_type_t CursorType;
  typedef cef_drag_operations_mask_t DragOperation;
  typedef cef_drag_operations_mask_t DragOperationsMask;
  typedef cef_paint_element_type_t PaintElementType;
@@ -64,7 +65,7 @@ class CefRenderHandler : public virtual CefBaseRefCounted {
  ///
  /*--cef()--*/
  virtual CefRefPtr<CefAccessibilityHandler> GetAccessibilityHandler() {
-    return nullptr;
+    return NULL;
  }

  ///
@@ -161,6 +162,16 @@ class CefRenderHandler : public virtual CefBaseRefCounted {
                                  const RectList& dirtyRects,
                                  void* shared_handle) {}

+  ///
+  // 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.
+  ///
+  /*--cef()--*/
+  virtual void OnCursorChange(CefRefPtr<CefBrowser> browser,
+                              CefCursorHandle cursor,
+                              CursorType type,
+                              const CefCursorInfo& custom_cursor_info) {}
+
  ///
  // Called when the user starts dragging content in the web view. Contextual
  // information about the dragged content is supplied by |drag_data|.
--- a/include/cef_render_process_handler.h
+++ b/include/cef_render_process_handler.h
@@ -57,6 +57,15 @@ class CefRenderProcessHandler : public virtual CefBaseRefCounted {
 public:
  typedef cef_navigation_type_t NavigationType;

+  ///
+  // Called after the render process main thread has been created. |extra_info|
+  // is a read-only value originating from
+  // CefBrowserProcessHandler::OnRenderProcessThreadCreated(). Do not keep a
+  // reference to |extra_info| outside of this method.
+  ///
+  /*--cef()--*/
+  virtual void OnRenderThreadCreated(CefRefPtr<CefListValue> extra_info) {}
+
  ///
  // Called after WebKit has been initialized.
  ///
@@ -84,7 +93,7 @@ class CefRenderProcessHandler : public virtual CefBaseRefCounted {
  // Return the handler for browser load status events.
  ///
  /*--cef()--*/
-  virtual CefRefPtr<CefLoadHandler> GetLoadHandler() { return nullptr; }
+  virtual CefRefPtr<CefLoadHandler> GetLoadHandler() { return NULL; }

  ///
  // Called immediately after the V8 context for a frame has been created. To
--- a/include/cef_request_context.h
+++ b/include/cef_request_context.h
@@ -44,7 +44,6 @@
 #include "include/cef_cookie.h"
 #include "include/cef_extension.h"
 #include "include/cef_extension_handler.h"
-#include "include/cef_media_router.h"
 #include "include/cef_values.h"

 class CefRequestContextHandler;
@@ -362,12 +361,6 @@ class CefRequestContext : public virtual CefBaseRefCounted {
  /*--cef()--*/
  virtual CefRefPtr<CefExtension> GetExtension(
      const CefString& extension_id) = 0;
-
-  ///
-  // Returns the MediaRouter object associated with this context.
-  ///
-  /*--cef()--*/
-  virtual CefRefPtr<CefMediaRouter> GetMediaRouter() = 0;
 };

 #endif  // CEF_INCLUDE_CEF_REQUEST_CONTEXT_H_
--- a/include/cef_request_context_handler.h
+++ b/include/cef_request_context_handler.h
@@ -119,7 +119,7 @@ class CefRequestContextHandler : public virtual CefBaseRefCounted {
      bool is_download,
      const CefString& request_initiator,
      bool& disable_default_handling) {
-    return nullptr;
+    return NULL;
  }
 };

--- a/include/cef_request_handler.h
+++ b/include/cef_request_handler.h
@@ -145,7 +145,7 @@ class CefRequestHandler : public virtual CefBaseRefCounted {
      bool is_download,
      const CefString& request_initiator,
      bool& disable_default_handling) {
-    return nullptr;
+    return NULL;
  }

  ///
@@ -252,13 +252,6 @@ class CefRequestHandler : public virtual CefBaseRefCounted {
  /*--cef()--*/
  virtual void OnRenderProcessTerminated(CefRefPtr<CefBrowser> browser,
                                         TerminationStatus status) {}
-
-  ///
-  // Called on the browser process UI thread when the window.document object of
-  // the main frame has been created.
-  ///
-  /*--cef()--*/
-  virtual void OnDocumentAvailableInMainFrame(CefRefPtr<CefBrowser> browser) {}
 };

 #endif  // CEF_INCLUDE_CEF_REQUEST_HANDLER_H_
--- a/include/cef_resource_bundle.h
+++ b/include/cef_resource_bundle.h
@@ -39,7 +39,6 @@
 #pragma once

 #include "include/cef_base.h"
-#include "include/cef_values.h"

 ///
 // Class used for retrieving resources from the resource bundle (*.pak) files
@@ -68,24 +67,33 @@ class CefResourceBundle : public virtual CefBaseRefCounted {
  virtual CefString GetLocalizedString(int string_id) = 0;

  ///
-  // Returns a CefBinaryValue containing the decompressed contents of the
-  // specified scale independent |resource_id| or NULL if not found. Include
-  // cef_pack_resources.h for a listing of valid resource ID values.
+  // Retrieves the contents of the specified scale independent |resource_id|.
+  // If the value is found then |data| and |data_size| will be populated and
+  // this method will return true. If the value is not found then this method
+  // will return false. The returned |data| pointer will remain resident in
+  // memory and should not be freed. Include cef_pack_resources.h for a listing
+  // of valid resource ID values.
  ///
  /*--cef()--*/
-  virtual CefRefPtr<CefBinaryValue> GetDataResource(int resource_id) = 0;
+  virtual bool GetDataResource(int resource_id,
+                               void*& data,
+                               size_t& data_size) = 0;

  ///
-  // Returns a CefBinaryValue containing the decompressed contents of the
-  // specified |resource_id| nearest the scale factor |scale_factor| or NULL if
-  // not found. Use a |scale_factor| value of SCALE_FACTOR_NONE for scale
-  // independent resources or call GetDataResource instead.Include
-  // cef_pack_resources.h for a listing of valid resource ID values.
+  // Retrieves the contents of the specified |resource_id| nearest the scale
+  // factor |scale_factor|. Use a |scale_factor| value of SCALE_FACTOR_NONE for
+  // scale independent resources or call GetDataResource instead. If the value
+  // is found then |data| and |data_size| will be populated and this method will
+  // return true. If the value is not found then this method will return false.
+  // The returned |data| pointer will remain resident in memory and should not
+  // be freed. Include cef_pack_resources.h for a listing of valid resource ID
+  // values.
  ///
  /*--cef()--*/
-  virtual CefRefPtr<CefBinaryValue> GetDataResourceForScale(
-      int resource_id,
-      ScaleFactor scale_factor) = 0;
+  virtual bool GetDataResourceForScale(int resource_id,
+                                       ScaleFactor scale_factor,
+                                       void*& data,
+                                       size_t& data_size) = 0;
 };

 #endif  // CEF_INCLUDE_CEF_RESOURCE_BUNDLE_H_
--- a/include/cef_resource_request_handler.h
+++ b/include/cef_resource_request_handler.h
@@ -72,7 +72,7 @@ class CefResourceRequestHandler : public virtual CefBaseRefCounted {
      CefRefPtr<CefBrowser> browser,
      CefRefPtr<CefFrame> frame,
      CefRefPtr<CefRequest> request) {
-    return nullptr;
+    return NULL;
  }

  ///
@@ -109,7 +109,7 @@ class CefResourceRequestHandler : public virtual CefBaseRefCounted {
      CefRefPtr<CefBrowser> browser,
      CefRefPtr<CefFrame> frame,
      CefRefPtr<CefRequest> request) {
-    return nullptr;
+    return NULL;
  }

  ///
@@ -163,7 +163,7 @@ class CefResourceRequestHandler : public virtual CefBaseRefCounted {
      CefRefPtr<CefFrame> frame,
      CefRefPtr<CefRequest> request,
      CefRefPtr<CefResponse> response) {
-    return nullptr;
+    return NULL;
  }

  ///
--- a/include/cef_sandbox_mac.h
+++ b/include/cef_sandbox_mac.h
@@ -34,7 +34,7 @@
 #include "include/base/cef_build.h"
 #include "include/internal/cef_export.h"

-#if defined(OS_MAC)
+#if defined(OS_MACOSX)

 #ifdef __cplusplus
 extern "C" {
@@ -83,6 +83,6 @@ class CEF_EXPORT CefScopedSandboxContext {
 };
 #endif  // __cplusplus

-#endif  // defined(OS_MAC)
+#endif  // defined(OS_MACOSX)

 #endif  // CEF_INCLUDE_CEF_SANDBOX_MAC_H_
--- a/include/cef_thread.h
+++ b/include/cef_thread.h
@@ -61,7 +61,7 @@ class CefThread : public CefBaseRefCounted {
  // to identify the thread. |priority| is the thread execution priority.
  // |message_loop_type| indicates the set of asynchronous events that the
  // thread can process. If |stoppable| is true the thread will stopped and
-  // joined on destruction or when Stop() is called; otherwise, the thread
+  // joined on destruction or when Stop() is called; otherwise, the the thread
  // cannot be stopped and will be leaked on shutdown. On Windows the
  // |com_init_mode| value specifies how COM will be initialized for the thread.
  // If |com_init_mode| is set to COM_INIT_MODE_STA then |message_loop_type|
--- a/include/cef_urlrequest.h
+++ b/include/cef_urlrequest.h
@@ -63,13 +63,20 @@ class CefURLRequest : public virtual CefBaseRefCounted {
  // Create a new URL request that is not associated with a specific browser or
  // frame. Use CefFrame::CreateURLRequest instead if you want the request to
  // have this association, in which case it may be handled differently (see
-  // documentation on that method). A request created with this method may only
-  // originate from the browser process, and will behave as follows:
+  // documentation on that method). Requests may originate from the both browser
+  // process and the render process.
+  //
+  // For requests originating from the browser process:
  //   - It may be intercepted by the client via CefResourceRequestHandler or
  //     CefSchemeHandlerFactory.
  //   - POST data may only contain only a single element of type PDE_TYPE_FILE
  //     or PDE_TYPE_BYTES.
  //   - If |request_context| is empty the global request context will be used.
+  // For requests originating from the render process:
+  //   - It cannot be intercepted by the client so only http(s) and blob schemes
+  //     are supported.
+  //   - POST data may only contain a single element of type PDE_TYPE_BYTES.
+  //   - The |request_context| parameter must be NULL.
  //
  // The |request| object will be marked as read-only after calling this method.
  ///
--- a/include/internal/cef_types.h
+++ b/include/internal/cef_types.h
@@ -39,7 +39,7 @@
 // Bring in platform-specific definitions.
 #if defined(OS_WIN)
 #include "include/internal/cef_types_win.h"
-#elif defined(OS_MAC)
+#elif defined(OS_MACOSX)
 #include "include/internal/cef_types_mac.h"
 #elif defined(OS_LINUX)
 #include "include/internal/cef_types_linux.h"
@@ -170,35 +170,26 @@ typedef struct _cef_settings_t {
  // will be used. If this value is empty on macOS then a helper executable must
  // exist at "Contents/Frameworks/<app> Helper.app/Contents/MacOS/<app> Helper"
  // in the top-level app bundle. See the comments on CefExecuteProcess() for
-  // details. If this value is non-empty then it must be an absolute path. Also
-  // configurable using the "browser-subprocess-path" command-line switch.
+  // details. Also configurable using the "browser-subprocess-path" command-line
+  // switch.
  ///
  cef_string_t browser_subprocess_path;

  ///
  // The path to the CEF framework directory on macOS. If this value is empty
  // then the framework must exist at "Contents/Frameworks/Chromium Embedded
-  // Framework.framework" in the top-level app bundle. If this value is
-  // non-empty then it must be an absolute path. Also configurable using the
-  // "framework-dir-path" command-line switch.
+  // Framework.framework" in the top-level app bundle. Also configurable using
+  // the "framework-dir-path" command-line switch.
  ///
  cef_string_t framework_dir_path;

  ///
  // The path to the main bundle on macOS. If this value is empty then it
-  // defaults to the top-level app bundle. If this value is non-empty then it
-  // must be an absolute path. Also configurable using the "main-bundle-path"
-  // command-line switch.
+  // defaults to the top-level app bundle. Also configurable using
+  // the "main-bundle-path" command-line switch.
  ///
  cef_string_t main_bundle_path;

-  ///
-  // Set to true (1) to enable use of the Chrome runtime in CEF. This feature is
-  // considered experimental and is not recommended for most users at this time.
-  // See issue #2969 for details.
-  ///
-  int chrome_runtime;
-
  ///
  // Set to true (1) to have the browser process message loop run in a separate
  // thread. If false (0) than the CefDoMessageLoopWork() function must be
@@ -236,35 +227,33 @@ typedef struct _cef_settings_t {

  ///
  // The location where data for the global browser cache will be stored on
-  // disk. If this value is non-empty then it must be an absolute path that is
-  // either equal to or a child directory of CefSettings.root_cache_path. If
-  // this value is empty then browsers will be created in "incognito mode" where
-  // in-memory caches are used for storage and no data is persisted to disk.
-  // HTML5 databases such as localStorage will only persist across sessions if a
-  // cache path is specified. Can be overridden for individual CefRequestContext
-  // instances via the CefRequestContextSettings.cache_path value.
+  // disk. If non-empty this must be either equal to or a child directory of
+  // CefSettings.root_cache_path. If empty then browsers will be created in
+  // "incognito mode" where in-memory caches are used for storage and no data is
+  // persisted to disk. HTML5 databases such as localStorage will only persist
+  // across sessions if a cache path is specified. Can be overridden for
+  // individual CefRequestContext instances via the
+  // CefRequestContextSettings.cache_path value.
  ///
  cef_string_t cache_path;

  ///
  // The root directory that all CefSettings.cache_path and
  // CefRequestContextSettings.cache_path values must have in common. If this
-  // value is empty and CefSettings.cache_path is non-empty then it will
-  // default to the CefSettings.cache_path value. If this value is non-empty
-  // then it must be an absolute path. Failure to set this value correctly may
-  // result in the sandbox blocking read/write access to the cache_path
-  // directory.
+  // value is empty and CefSettings.cache_path is non-empty then this value will
+  // default to the CefSettings.cache_path value. Failure to set this value
+  // correctly may result in the sandbox blocking read/write access to the
+  // cache_path directory.
  ///
  cef_string_t root_cache_path;

  ///
  // The location where user data such as spell checking dictionary files will
-  // be stored on disk. If this value is empty then the default
-  // platform-specific user data directory will be used ("~/.cef_user_data"
-  // directory on Linux, "~/Library/Application Support/CEF/User Data" directory
-  // on Mac OS X, "Local Settings\Application Data\CEF\User Data" directory
-  // under the user profile directory on Windows). If this value is non-empty
-  // then it must be an absolute path.
+  // be stored on disk. If empty then the default platform-specific user data
+  // directory will be used ("~/.cef_user_data" directory on Linux,
+  // "~/Library/Application Support/CEF/User Data" directory on Mac OS X,
+  // "Local Settings\Application Data\CEF\User Data" directory under the user
+  // profile directory on Windows).
  ///
  cef_string_t user_data_path;

@@ -344,17 +333,16 @@ typedef struct _cef_settings_t {
  // The fully qualified path for the resources directory. If this value is
  // empty the cef.pak and/or devtools_resources.pak files must be located in
  // the module directory on Windows/Linux or the app bundle Resources directory
-  // on Mac OS X. If this value is non-empty then it must be an absolute path.
-  // Also configurable using the "resources-dir-path" command-line switch.
+  // on Mac OS X. Also configurable using the "resources-dir-path" command-line
+  // switch.
  ///
  cef_string_t resources_dir_path;

  ///
  // The fully qualified path for the locales directory. If this value is empty
-  // the locales directory must be located in the module directory. If this
-  // value is non-empty then it must be an absolute path. This value is ignored
-  // on Mac OS X where pack files are always loaded from the app bundle
-  // Resources directory. Also configurable using the "locales-dir-path"
+  // the locales directory must be located in the module directory. This value
+  // is ignored on Mac OS X where pack files are always loaded from the app
+  // bundle Resources directory. Also configurable using the "locales-dir-path"
  // command-line switch.
  ///
  cef_string_t locales_dir_path;
@@ -440,13 +428,13 @@ typedef struct _cef_request_context_settings_t {

  ///
  // The location where cache data for this request context will be stored on
-  // disk. If this value is non-empty then it must be an absolute path that is
-  // either equal to or a child directory of CefSettings.root_cache_path. If
-  // this value is empty then browsers will be created in "incognito mode" where
-  // in-memory caches are used for storage and no data is persisted to disk.
-  // HTML5 databases such as localStorage will only persist across sessions if a
-  // cache path is specified. To share the global browser cache and related
-  // configuration set this value to match the CefSettings.cache_path value.
+  // disk. If non-empty this must be either equal to or a child directory of
+  // CefSettings.root_cache_path. If empty then browsers will be created in
+  // "incognito mode" where in-memory caches are used for storage and no data is
+  // persisted to disk. HTML5 databases such as localStorage will only persist
+  // across sessions if a cache path is specified. To share the global browser
+  // cache and related configuration set this value to match the
+  // CefSettings.cache_path value.
  ///
  cef_string_t cache_path;

@@ -737,32 +725,8 @@ typedef struct _cef_urlparts_t {
  // Query string component (i.e., everything following the '?').
  ///
  cef_string_t query;
-
-  ///
-  // Fragment (hash) identifier component (i.e., the string following the '#').
-  ///
-  cef_string_t fragment;
 } cef_urlparts_t;

-///
-// Cookie priority values.
-///
-typedef enum {
-  CEF_COOKIE_PRIORITY_LOW = -1,
-  CEF_COOKIE_PRIORITY_MEDIUM = 0,
-  CEF_COOKIE_PRIORITY_HIGH = 1,
-} cef_cookie_priority_t;
-
-///
-// Cookie same site values.
-///
-typedef enum {
-  CEF_COOKIE_SAME_SITE_UNSPECIFIED,
-  CEF_COOKIE_SAME_SITE_NO_RESTRICTION,
-  CEF_COOKIE_SAME_SITE_LAX_MODE,
-  CEF_COOKIE_SAME_SITE_STRICT_MODE,
-} cef_cookie_same_site_t;
-
 ///
 // Cookie information.
 ///
@@ -817,16 +781,6 @@ typedef struct _cef_cookie_t {
  ///
  int has_expires;
  cef_time_t expires;
-
-  ///
-  // Same site.
-  ///
-  cef_cookie_same_site_t same_site;
-
-  ///
-  // Priority.
-  ///
-  cef_cookie_priority_t priority;
 } cef_cookie_t;

 ///
@@ -1153,8 +1107,9 @@ typedef enum {
  TT_LINK = 0,

  ///
-  // Source is some other "explicit" navigation. This is the default value for
-  // navigations where the actual type is unknown. See also TT_DIRECT_LOAD_FLAG.
+  // Source is some other "explicit" navigation action such as creating a new
+  // browser or using the LoadURL function. This is also the default value
+  // for navigations where the actual type is unknown.
  ///
  TT_EXPLICIT = 1,

@@ -1206,15 +1161,9 @@ typedef enum {

  ///
  // Used the Forward or Back function to navigate among browsing history.
-  // Will be ORed to the transition type for the original load.
  ///
  TT_FORWARD_BACK_FLAG = 0x01000000,

-  ///
-  // Loaded a URL directly via CreateBrowser, LoadURL or LoadRequest.
-  ///
-  TT_DIRECT_LOAD_FLAG = 0x02000000,
-
  ///
  // The beginning of a navigation chain.
  ///
@@ -1479,7 +1428,7 @@ typedef enum {
  ///
  // The main thread in the renderer. Used for all WebKit and V8 interaction.
  // Tasks may be posted to this thread after
-  // CefRenderProcessHandler::OnWebKitInitialized but are not guaranteed to
+  // CefRenderProcessHandler::OnRenderThreadCreated but are not guaranteed to
  // run before sub-process termination (sub-processes may be killed at any time
  // without warning).
  ///
@@ -1821,7 +1770,6 @@ typedef enum {
  EVENTFLAG_IS_KEY_PAD = 1 << 9,
  EVENTFLAG_IS_LEFT = 1 << 10,
  EVENTFLAG_IS_RIGHT = 1 << 11,
-  EVENTFLAG_ALTGR_DOWN = 1 << 12,
 } cef_event_flags_t;

 ///
@@ -2279,13 +2227,7 @@ typedef enum {
  CT_ZOOMOUT,
  CT_GRAB,
  CT_GRABBING,
-  CT_MIDDLE_PANNING_VERTICAL,
-  CT_MIDDLE_PANNING_HORIZONTAL,
  CT_CUSTOM,
-  CT_DND_NONE,
-  CT_DND_MOVE,
-  CT_DND_COPY,
-  CT_DND_LINK,
 } cef_cursor_type_t;

 ///
@@ -2345,10 +2287,21 @@ typedef enum {
  ///
  UU_URL_SPECIAL_CHARS_EXCEPT_PATH_SEPARATORS = 1 << 3,

+  ///
+  // Unescapes characters that can be used in spoofing attempts (such as LOCK)
+  // and control characters (such as BiDi control characters and %01).  This
+  // INCLUDES NULLs.  This is used for rare cases such as data: URL decoding
+  // where the result is binary data.
+  //
+  // DO NOT use UU_SPOOFING_AND_CONTROL_CHARS if the URL is going to be
+  // displayed in the UI for security reasons.
+  ///
+  UU_SPOOFING_AND_CONTROL_CHARS = 1 << 4,
+
  ///
  // URL queries use "+" for space. This flag controls that replacement.
  ///
-  UU_REPLACE_PLUS_WITH_SPACE = 1 << 4,
+  UU_REPLACE_PLUS_WITH_SPACE = 1 << 5,
 } cef_uri_unescape_rule_t;

 ///
@@ -2367,6 +2320,22 @@ typedef enum {
  JSON_PARSER_ALLOW_TRAILING_COMMAS = 1 << 0,
 } cef_json_parser_options_t;

+///
+// Error codes that can be returned from CefParseJSONAndReturnError.
+///
+typedef enum {
+  JSON_NO_ERROR = 0,
+  JSON_INVALID_ESCAPE,
+  JSON_SYNTAX_ERROR,
+  JSON_UNEXPECTED_TOKEN,
+  JSON_TRAILING_COMMA,
+  JSON_TOO_MUCH_NESTING,
+  JSON_UNEXPECTED_DATA_AFTER_ROOT,
+  JSON_UNSUPPORTED_ENCODING,
+  JSON_UNQUOTED_DICTIONARY_KEY,
+  JSON_PARSE_ERROR_COUNT
+} cef_json_parser_error_t;
+
 ///
 // Options that can be passed to CefWriteJSON.
 ///
@@ -2455,13 +2424,13 @@ typedef struct _cef_pdf_print_settings_t {
  int scale_factor;

  ///
-  // Margins in points. Only used if |margin_type| is set to
+  // Margins in millimeters. Only used if |margin_type| is set to
  // PDF_PRINT_MARGIN_CUSTOM.
  ///
-  int margin_top;
-  int margin_right;
-  int margin_bottom;
-  int margin_left;
+  double margin_top;
+  double margin_right;
+  double margin_bottom;
+  double margin_left;

  ///
  // Margin type.
@@ -2952,16 +2921,6 @@ typedef enum {
  CEF_CDM_REGISTRATION_ERROR_NOT_SUPPORTED,
 } cef_cdm_registration_error_t;

-///
-// Composition underline style.
-///
-typedef enum {
-  CEF_CUS_SOLID,
-  CEF_CUS_DOT,
-  CEF_CUS_DASH,
-  CEF_CUS_NONE,
-} cef_composition_underline_style_t;
-
 ///
 // Structure representing IME composition underline information. This is a thin
 // wrapper around Blink's WebCompositionUnderline class and should be kept in
@@ -2987,211 +2946,8 @@ typedef struct _cef_composition_underline_t {
  // Set to true (1) for thick underline.
  ///
  int thick;
-
-  ///
-  // Style.
-  ///
-  cef_composition_underline_style_t style;
 } cef_composition_underline_t;

-///
-// Enumerates the various representations of the ordering of audio channels.
-// Must be kept synchronized with media::ChannelLayout from Chromium.
-// See media\base\channel_layout.h
-///
-typedef enum {
-  CEF_CHANNEL_LAYOUT_NONE = 0,
-  CEF_CHANNEL_LAYOUT_UNSUPPORTED = 1,
-
-  // Front C
-  CEF_CHANNEL_LAYOUT_MONO = 2,
-
-  // Front L, Front R
-  CEF_CHANNEL_LAYOUT_STEREO = 3,
-
-  // Front L, Front R, Back C
-  CEF_CHANNEL_LAYOUT_2_1 = 4,
-
-  // Front L, Front R, Front C
-  CEF_CHANNEL_LAYOUT_SURROUND = 5,
-
-  // Front L, Front R, Front C, Back C
-  CEF_CHANNEL_LAYOUT_4_0 = 6,
-
-  // Front L, Front R, Side L, Side R
-  CEF_CHANNEL_LAYOUT_2_2 = 7,
-
-  // Front L, Front R, Back L, Back R
-  CEF_CHANNEL_LAYOUT_QUAD = 8,
-
-  // Front L, Front R, Front C, Side L, Side R
-  CEF_CHANNEL_LAYOUT_5_0 = 9,
-
-  // Front L, Front R, Front C, LFE, Side L, Side R
-  CEF_CHANNEL_LAYOUT_5_1 = 10,
-
-  // Front L, Front R, Front C, Back L, Back R
-  CEF_CHANNEL_LAYOUT_5_0_BACK = 11,
-
-  // Front L, Front R, Front C, LFE, Back L, Back R
-  CEF_CHANNEL_LAYOUT_5_1_BACK = 12,
-
-  // Front L, Front R, Front C, Side L, Side R, Back L, Back R
-  CEF_CHANNEL_LAYOUT_7_0 = 13,
-
-  // Front L, Front R, Front C, LFE, Side L, Side R, Back L, Back R
-  CEF_CHANNEL_LAYOUT_7_1 = 14,
-
-  // Front L, Front R, Front C, LFE, Side L, Side R, Front LofC, Front RofC
-  CEF_CHANNEL_LAYOUT_7_1_WIDE = 15,
-
-  // Stereo L, Stereo R
-  CEF_CHANNEL_LAYOUT_STEREO_DOWNMIX = 16,
-
-  // Stereo L, Stereo R, LFE
-  CEF_CHANNEL_LAYOUT_2POINT1 = 17,
-
-  // Stereo L, Stereo R, Front C, LFE
-  CEF_CHANNEL_LAYOUT_3_1 = 18,
-
-  // Stereo L, Stereo R, Front C, Rear C, LFE
-  CEF_CHANNEL_LAYOUT_4_1 = 19,
-
-  // Stereo L, Stereo R, Front C, Side L, Side R, Back C
-  CEF_CHANNEL_LAYOUT_6_0 = 20,
-
-  // Stereo L, Stereo R, Side L, Side R, Front LofC, Front RofC
-  CEF_CHANNEL_LAYOUT_6_0_FRONT = 21,
-
-  // Stereo L, Stereo R, Front C, Rear L, Rear R, Rear C
-  CEF_CHANNEL_LAYOUT_HEXAGONAL = 22,
-
-  // Stereo L, Stereo R, Front C, LFE, Side L, Side R, Rear Center
-  CEF_CHANNEL_LAYOUT_6_1 = 23,
-
-  // Stereo L, Stereo R, Front C, LFE, Back L, Back R, Rear Center
-  CEF_CHANNEL_LAYOUT_6_1_BACK = 24,
-
-  // Stereo L, Stereo R, Side L, Side R, Front LofC, Front RofC, LFE
-  CEF_CHANNEL_LAYOUT_6_1_FRONT = 25,
-
-  // Front L, Front R, Front C, Side L, Side R, Front LofC, Front RofC
-  CEF_CHANNEL_LAYOUT_7_0_FRONT = 26,
-
-  // Front L, Front R, Front C, LFE, Back L, Back R, Front LofC, Front RofC
-  CEF_CHANNEL_LAYOUT_7_1_WIDE_BACK = 27,
-
-  // Front L, Front R, Front C, Side L, Side R, Rear L, Back R, Back C.
-  CEF_CHANNEL_LAYOUT_OCTAGONAL = 28,
-
-  // Channels are not explicitly mapped to speakers.
-  CEF_CHANNEL_LAYOUT_DISCRETE = 29,
-
-  // Front L, Front R, Front C. Front C contains the keyboard mic audio. This
-  // layout is only intended for input for WebRTC. The Front C channel
-  // is stripped away in the WebRTC audio input pipeline and never seen outside
-  // of that.
-  CEF_CHANNEL_LAYOUT_STEREO_AND_KEYBOARD_MIC = 30,
-
-  // Front L, Front R, Side L, Side R, LFE
-  CEF_CHANNEL_LAYOUT_4_1_QUAD_SIDE = 31,
-
-  // Actual channel layout is specified in the bitstream and the actual channel
-  // count is unknown at Chromium media pipeline level (useful for audio
-  // pass-through mode).
-  CEF_CHANNEL_LAYOUT_BITSTREAM = 32,
-
-  // Max value, must always equal the largest entry ever logged.
-  CEF_CHANNEL_LAYOUT_MAX = CEF_CHANNEL_LAYOUT_BITSTREAM
-} cef_channel_layout_t;
-
-///
-// Structure representing the audio parameters for setting up the audio handler.
-///
-typedef struct _cef_audio_parameters_t {
-  ///
-  // Layout of the audio channels
-  ///
-  cef_channel_layout_t channel_layout;
-
-  ///
-  // Sample rate
-  //
-  int sample_rate;
-
-  ///
-  // Number of frames per buffer
-  ///
-  int frames_per_buffer;
-} cef_audio_parameters_t;
-
-///
-// Result codes for CefMediaRouter::CreateRoute. Should be kept in sync with
-// Chromium's media_router::RouteRequestResult::ResultCode type.
-///
-typedef enum {
-  CEF_MRCR_UNKNOWN_ERROR = 0,
-  CEF_MRCR_OK = 1,
-  CEF_MRCR_TIMED_OUT = 2,
-  CEF_MRCR_ROUTE_NOT_FOUND = 3,
-  CEF_MRCR_SINK_NOT_FOUND = 4,
-  CEF_MRCR_INVALID_ORIGIN = 5,
-  CEF_MRCR_NO_SUPPORTED_PROVIDER = 7,
-  CEF_MRCR_CANCELLED = 8,
-  CEF_MRCR_ROUTE_ALREADY_EXISTS = 9,
-
-  CEF_MRCR_TOTAL_COUNT = 11  // The total number of values.
-} cef_media_route_create_result_t;
-
-///
-// Connection state for a MediaRoute object.
-///
-typedef enum {
-  CEF_MRCS_UNKNOWN,
-  CEF_MRCS_CONNECTING,
-  CEF_MRCS_CONNECTED,
-  CEF_MRCS_CLOSED,
-  CEF_MRCS_TERMINATED,
-} cef_media_route_connection_state_t;
-
-///
-// Icon types for a MediaSink object. Should be kept in sync with Chromium's
-// media_router::SinkIconType type.
-///
-typedef enum {
-  CEF_MSIT_CAST,
-  CEF_MSIT_CAST_AUDIO_GROUP,
-  CEF_MSIT_CAST_AUDIO,
-  CEF_MSIT_MEETING,
-  CEF_MSIT_HANGOUT,
-  CEF_MSIT_EDUCATION,
-  CEF_MSIT_WIRED_DISPLAY,
-  CEF_MSIT_GENERIC,
-
-  CEF_MSIT_TOTAL_COUNT,  // The total number of values.
-} cef_media_sink_icon_type_t;
-
-///
-// Device information for a MediaSink object.
-///
-typedef struct _cef_media_sink_device_info_t {
-  cef_string_t ip_address;
-  int port;
-  cef_string_t model_name;
-} cef_media_sink_device_info_t;
-
-///
-// Represents commands available to TextField.
-///
-typedef enum {
-  CEF_TFC_CUT = 1,
-  CEF_TFC_COPY,
-  CEF_TFC_PASTE,
-  CEF_TFC_UNDO,
-  CEF_TFC_DELETE,
-  CEF_TFC_SELECT_ALL,
-} cef_text_field_commands_t;
-
 #ifdef __cplusplus
 }
 #endif
--- a/include/internal/cef_types_mac.h
+++ b/include/internal/cef_types_mac.h
@@ -33,7 +33,7 @@

 #include "include/base/cef_build.h"

-#if defined(OS_MAC)
+#if defined(OS_MACOSX)
 #include "include/internal/cef_string.h"

 // Handle types.
@@ -137,6 +137,6 @@ typedef struct _cef_window_info_t {
 }
 #endif

-#endif  // OS_MAC
+#endif  // OS_MACOSX

 #endif  // CEF_INCLUDE_INTERNAL_CEF_TYPES_MAC_H_
--- a/include/internal/cef_types_wrappers.h
+++ b/include/internal/cef_types_wrappers.h
@@ -569,7 +569,6 @@ struct CefSettingsTraits {
                   &target->framework_dir_path, copy);
    cef_string_set(src->main_bundle_path.str, src->main_bundle_path.length,
                   &target->main_bundle_path, copy);
-    target->chrome_runtime = src->chrome_runtime;
    target->multi_threaded_message_loop = src->multi_threaded_message_loop;
    target->external_message_pump = src->external_message_pump;
    target->windowless_rendering_enabled = src->windowless_rendering_enabled;
@@ -744,7 +743,6 @@ struct CefURLPartsTraits {
    cef_string_clear(&s->origin);
    cef_string_clear(&s->path);
    cef_string_clear(&s->query);
-    cef_string_clear(&s->fragment);
  }

  static inline void set(const struct_type* src,
@@ -761,8 +759,6 @@ struct CefURLPartsTraits {
    cef_string_set(src->origin.str, src->origin.length, &target->origin, copy);
    cef_string_set(src->path.str, src->path.length, &target->path, copy);
    cef_string_set(src->query.str, src->query.length, &target->query, copy);
-    cef_string_set(src->fragment.str, src->fragment.length, &target->fragment,
-                   copy);
  }
 };

@@ -852,8 +848,6 @@ struct CefCookieTraits {
    target->last_access = src->last_access;
    target->has_expires = src->has_expires;
    target->expires = src->expires;
-    target->same_site = src->same_site;
-    target->priority = src->priority;
  }
 };

@@ -872,7 +866,10 @@ struct CefCursorInfoTraits {
  static inline void set(const struct_type* src,
                         struct_type* target,
                         bool copy) {
-    *target = *src;
+    target->hotspot = src->hotspot;
+    target->image_scale_factor = src->image_scale_factor;
+    target->buffer = src->buffer;
+    target->size = src->size;
  }
 };

@@ -945,14 +942,23 @@ typedef CefStructBase<CefBoxLayoutSettingsTraits> CefBoxLayoutSettings;
 struct CefCompositionUnderlineTraits {
  typedef cef_composition_underline_t struct_type;

-  static inline void init(struct_type* s) {}
+  static inline void init(struct_type* s) {
+    s->range.from = 0;
+    s->range.to = 0;
+    s->color = 0;
+    s->background_color = 0;
+    s->thick = 0;
+  }

  static inline void clear(struct_type* s) {}

  static inline void set(const struct_type* src,
                         struct_type* target,
                         bool copy) {
-    *target = *src;
+    target->range = src->range;
+    target->color = src->color;
+    target->background_color = src->background_color;
+    target->thick = src->thick;
  }
 };

@@ -961,49 +967,4 @@ struct CefCompositionUnderlineTraits {
 ///
 typedef CefStructBase<CefCompositionUnderlineTraits> CefCompositionUnderline;

-struct CefAudioParametersTraits {
-  typedef cef_audio_parameters_t struct_type;
-
-  static inline void init(struct_type* s) {}
-
-  static inline void clear(struct_type* s) {}
-
-  static inline void set(const struct_type* src,
-                         struct_type* target,
-                         bool copy) {
-    *target = *src;
-  }
-};
-
-///
-// Class representing CefAudioParameters settings
-///
-typedef CefStructBase<CefAudioParametersTraits> CefAudioParameters;
-
-struct CefMediaSinkDeviceInfoTraits {
-  typedef cef_media_sink_device_info_t struct_type;
-
-  static inline void init(struct_type* s) {}
-
-  static inline void clear(struct_type* s) {
-    cef_string_clear(&s->ip_address);
-    cef_string_clear(&s->model_name);
-  }
-
-  static inline void set(const struct_type* src,
-                         struct_type* target,
-                         bool copy) {
-    cef_string_set(src->ip_address.str, src->ip_address.length,
-                   &target->ip_address, copy);
-    target->port = src->port;
-    cef_string_set(src->model_name.str, src->model_name.length,
-                   &target->model_name, copy);
-  }
-};
-
-///
-// Class representing MediaSink device info.
-///
-typedef CefStructBase<CefMediaSinkDeviceInfoTraits> CefMediaSinkDeviceInfo;
-
 #endif  // CEF_INCLUDE_INTERNAL_CEF_TYPES_WRAPPERS_H_
--- a/include/views/cef_display.h
+++ b/include/views/cef_display.h
@@ -46,9 +46,9 @@
 // This class typically, but not always, corresponds to a physical display
 // connected to the system. A fake Display may exist on a headless system, or a
 // Display may correspond to a remote, virtual display. All size and position
-// values are in density independent pixel (DIP) coordinates unless otherwise
-// indicated. Methods must be called on the browser process UI thread unless
-// otherwise indicated.
+// values are in density independent pixels (DIP) unless otherwise indicated.
+// Methods must be called on the browser process UI thread unless otherwise
+// indicated.
 ///
 /*--cef(source=library)--*/
 class CefDisplay : public CefBaseRefCounted {
@@ -61,7 +61,8 @@ class CefDisplay : public CefBaseRefCounted {

  ///
  // Returns the Display nearest |point|. Set |input_pixel_coords| to true if
-  // |point| is in pixel screen coordinates instead of DIP screen coordinates.
+  // |point| is in pixel coordinates instead of density independent pixels
+  // (DIP).
  ///
  /*--cef()--*/
  static CefRefPtr<CefDisplay> GetDisplayNearestPoint(const CefPoint& point,
@@ -69,8 +70,8 @@ class CefDisplay : public CefBaseRefCounted {

  ///
  // Returns the Display that most closely intersects |bounds|.  Set
-  // |input_pixel_coords| to true if |bounds| is in pixel screen coordinates
-  // instead of DIP screen coordinates.
+  // |input_pixel_coords| to true if |bounds| is in pixel coordinates instead of
+  // density independent pixels (DIP).
  ///
  /*--cef()--*/
  static CefRefPtr<CefDisplay> GetDisplayMatchingBounds(
@@ -107,29 +108,28 @@ class CefDisplay : public CefBaseRefCounted {
  virtual float GetDeviceScaleFactor() = 0;

  ///
-  // Convert |point| from DIP coordinates to pixel coordinates using this
-  // Display's device scale factor.
+  // Convert |point| from density independent pixels (DIP) to pixel coordinates
+  // using this Display's device scale factor.
  ///
  /*--cef()--*/
  virtual void ConvertPointToPixels(CefPoint& point) = 0;

  ///
-  // Convert |point| from pixel coordinates to DIP coordinates using this
-  // Display's device scale factor.
+  // Convert |point| from pixel coordinates to density independent pixels (DIP)
+  // using this Display's device scale factor.
  ///
  /*--cef()--*/
  virtual void ConvertPointFromPixels(CefPoint& point) = 0;

  ///
-  // Returns this Display's bounds in DIP screen coordinates. This is the full
-  // size of the display.
+  // Returns this Display's bounds. This is the full size of the display.
  ///
  /*--cef()--*/
  virtual CefRect GetBounds() = 0;

  ///
-  // Returns this Display's work area in DIP screen coordinates. This excludes
-  // areas of the display that are occupied with window manager toolbars, etc.
+  // Returns this Display's work area. This excludes areas of the display that
+  // are occupied for window manager toolbars, etc.
  ///
  /*--cef()--*/
  virtual CefRect GetWorkArea() = 0;
--- a/include/views/cef_textfield.h
+++ b/include/views/cef_textfield.h
@@ -224,13 +224,16 @@ class CefTextfield : public CefView {
  // enabled. See additional comments on ExecuteCommand().
  ///
  /*--cef()--*/
-  virtual bool IsCommandEnabled(cef_text_field_commands_t command_id) = 0;
+  virtual bool IsCommandEnabled(int command_id) = 0;

  ///
-  // Performs the action associated with the specified command id.
+  // Performs the action associated with the specified command id. Valid values
+  // include IDS_APP_UNDO, IDS_APP_REDO, IDS_APP_CUT, IDS_APP_COPY,
+  // IDS_APP_PASTE, IDS_APP_DELETE, IDS_APP_SELECT_ALL, IDS_DELETE_* and
+  // IDS_MOVE_*. See include/cef_pack_strings.h for definitions.
  ///
  /*--cef()--*/
-  virtual void ExecuteCommand(cef_text_field_commands_t command_id) = 0;
+  virtual void ExecuteCommand(int command_id) = 0;

  ///
  // Clears Edit history.
--- a/include/views/cef_view.h
+++ b/include/views/cef_view.h
@@ -174,79 +174,71 @@ class CefView : public CefBaseRefCounted {
  virtual CefRefPtr<CefView> GetViewForID(int id) = 0;

  ///
-  // Sets the bounds (size and position) of this View. |bounds| is in parent
-  // coordinates, or DIP screen coordinates if there is no parent.
+  // Sets the bounds (size and position) of this View. Position is in parent
+  // coordinates.
  ///
  /*--cef()--*/
  virtual void SetBounds(const CefRect& bounds) = 0;

  ///
-  // Returns the bounds (size and position) of this View in parent coordinates,
-  // or DIP screen coordinates if there is no parent.
+  // Returns the bounds (size and position) of this View. Position is in parent
+  // coordinates.
  ///
  /*--cef()--*/
  virtual CefRect GetBounds() = 0;

  ///
-  // Returns the bounds (size and position) of this View in DIP screen
+  // Returns the bounds (size and position) of this View. Position is in screen
  // coordinates.
  ///
  /*--cef()--*/
  virtual CefRect GetBoundsInScreen() = 0;

  ///
-  // Sets the size of this View without changing the position. |size| in
-  // parent coordinates, or DIP screen coordinates if there is no parent.
+  // Sets the size of this View without changing the position.
  ///
  /*--cef()--*/
  virtual void SetSize(const CefSize& size) = 0;

  ///
-  // Returns the size of this View in parent coordinates, or DIP screen
-  // coordinates if there is no parent.
+  // Returns the size of this View.
  ///
  /*--cef()--*/
  virtual CefSize GetSize() = 0;

  ///
  // Sets the position of this View without changing the size. |position| is in
-  // parent coordinates, or DIP screen coordinates if there is no parent.
+  // parent coordinates.
  ///
  /*--cef()--*/
  virtual void SetPosition(const CefPoint& position) = 0;

  ///
-  // Returns the position of this View. Position is in parent coordinates, or
-  // DIP screen coordinates if there is no parent.
+  // Returns the position of this View. Position is in parent coordinates.
  ///
  /*--cef()--*/
  virtual CefPoint GetPosition() = 0;

  ///
  // Returns the size this View would like to be if enough space is available.
-  // Size is in parent coordinates, or DIP screen coordinates if there is no
-  // parent.
  ///
  /*--cef()--*/
  virtual CefSize GetPreferredSize() = 0;

  ///
-  // Size this View to its preferred size. Size is in parent coordinates, or
-  // DIP screen coordinates if there is no parent.
+  // Size this View to its preferred size.
  ///
  /*--cef()--*/
  virtual void SizeToPreferredSize() = 0;

  ///
-  // Returns the minimum size for this View. Size is in parent coordinates, or
-  // DIP screen coordinates if there is no parent.
+  // Returns the minimum size for this View.
  ///
  /*--cef()--*/
  virtual CefSize GetMinimumSize() = 0;

  ///
-  // Returns the maximum size for this View. Size is in parent coordinates, or
-  // DIP screen coordinates if there is no parent.
+  // Returns the maximum size for this View.
  ///
  /*--cef()--*/
  virtual CefSize GetMaximumSize() = 0;
@@ -353,9 +345,9 @@ class CefView : public CefBaseRefCounted {
  virtual cef_color_t GetBackgroundColor() = 0;

  ///
-  // Convert |point| from this View's coordinate system to DIP screen
-  // coordinates. This View must belong to a Window when calling this method.
-  // Returns true if the conversion is successful or false otherwise. Use
+  // Convert |point| from this View's coordinate system to that of the screen.
+  // This View must belong to a Window when calling this method. Returns true
+  // if the conversion is successful or false otherwise. Use
  // CefDisplay::ConvertPointToPixels() after calling this method if further
  // conversion to display-specific pixel coordinates is desired.
  ///
@@ -363,9 +355,9 @@ class CefView : public CefBaseRefCounted {
  virtual bool ConvertPointToScreen(CefPoint& point) = 0;

  ///
-  // Convert |point| to this View's coordinate system from DIP screen
-  // coordinates. This View must belong to a Window when calling this method.
-  // Returns true if the conversion is successful or false otherwise. Use
+  // Convert |point| to this View's coordinate system from that of the screen.
+  // This View must belong to a Window when calling this method. Returns true if
+  // the conversion is successful or false otherwise. Use
  // CefDisplay::ConvertPointFromPixels() before calling this method if
  // conversion from display-specific pixel coordinates is necessary.
  ///
--- a/include/views/cef_window_delegate.h
+++ b/include/views/cef_window_delegate.h
@@ -75,20 +75,7 @@ class CefWindowDelegate : public CefPanelDelegate {
  virtual CefRefPtr<CefWindow> GetParentWindow(CefRefPtr<CefWindow> window,
                                               bool* is_menu,
                                               bool* can_activate_menu) {
-    return nullptr;
-  }
-
-  ///
-  // Return the initial bounds for |window| in density independent pixel (DIP)
-  // coordinates. If this method returns an empty CefRect then
-  // GetPreferredSize() will be called to retrieve the size, and the window will
-  // be placed on the screen with origin (0,0). This method can be used in
-  // combination with CefView::GetBoundsInScreen() to restore the previous
-  // window bounds.
-  ///
-  /*--cef()--*/
-  virtual CefRect GetInitialBounds(CefRefPtr<CefWindow> window) {
-    return CefRect();
+    return NULL;
  }

  ///
--- a/include/wrapper/cef_helpers.h
+++ b/include/wrapper/cef_helpers.h
@@ -89,32 +89,6 @@ struct CefDeleteOnIOThread : public CefDeleteOnThread<TID_IO> {};
 struct CefDeleteOnFileThread : public CefDeleteOnThread<TID_FILE> {};
 struct CefDeleteOnRendererThread : public CefDeleteOnThread<TID_RENDERER> {};

-// Same as IMPLEMENT_REFCOUNTING() but using the specified Destructor.
-#define IMPLEMENT_REFCOUNTING_EX(ClassName, Destructor)              \
- public:                                                             \
-  void AddRef() const OVERRIDE { ref_count_.AddRef(); }              \
-  bool Release() const OVERRIDE {                                    \
-    if (ref_count_.Release()) {                                      \
-      Destructor::Destruct(this);                                    \
-      return true;                                                   \
-    }                                                                \
-    return false;                                                    \
-  }                                                                  \
-  bool HasOneRef() const OVERRIDE { return ref_count_.HasOneRef(); } \
-  bool HasAtLeastOneRef() const OVERRIDE {                           \
-    return ref_count_.HasAtLeastOneRef();                            \
-  }                                                                  \
-                                                                     \
- private:                                                            \
-  CefRefCount ref_count_
-
-#define IMPLEMENT_REFCOUNTING_DELETE_ON_UIT(ClassName) \
-  IMPLEMENT_REFCOUNTING_EX(ClassName, CefDeleteOnUIThread)
-
-#define IMPLEMENT_REFCOUNTING_DELETE_ON_IOT(ClassName) \
-  IMPLEMENT_REFCOUNTING_EX(ClassName, CefDeleteOnIOThread)
-
-
 ///
 // Helper class to manage a scoped copy of |argv|.
 ///
--- a/include/wrapper/cef_library_loader.h
+++ b/include/wrapper/cef_library_loader.h
@@ -56,7 +56,7 @@ int cef_unload_library();
 #ifdef __cplusplus
 }

-#if defined(OS_MAC)
+#if defined(OS_MACOSX)

 ///
 // Scoped helper for loading and unloading the CEF framework library at
@@ -122,7 +122,7 @@ class CefScopedLibraryLoader {
  DISALLOW_COPY_AND_ASSIGN(CefScopedLibraryLoader);
 };

-#endif  // defined(OS_MAC)
+#endif  // defined(OS_MACOSX)
 #endif  // __cplusplus

 #endif  // CEF_INCLUDE_WRAPPER_CEF_LIBRARY_LOADER_H_
--- a/libcef/browser/alloy/alloy_browser_context.cc
+++ b/libcef/browser/alloy/alloy_browser_context.cc
@@ -1,456 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "libcef/browser/alloy/alloy_browser_context.h"
-
-#include <map>
-#include <utility>
-
-#include "libcef/browser/download_manager_delegate.h"
-#include "libcef/browser/extensions/extension_system.h"
-#include "libcef/browser/prefs/browser_prefs.h"
-#include "libcef/browser/ssl_host_state_delegate.h"
-#include "libcef/browser/thread_util.h"
-#include "libcef/common/cef_switches.h"
-#include "libcef/common/extensions/extensions_util.h"
-
-#include "base/command_line.h"
-#include "base/files/file_util.h"
-#include "base/lazy_instance.h"
-#include "base/logging.h"
-#include "base/strings/string_util.h"
-#include "chrome/browser/font_family_cache.h"
-#include "chrome/browser/media/media_device_id_salt.h"
-#include "chrome/browser/plugins/chrome_plugin_service_filter.h"
-#include "chrome/browser/profiles/profile_key.h"
-#include "chrome/browser/ui/zoom/chrome_zoom_level_prefs.h"
-#include "chrome/common/pref_names.h"
-#include "components/guest_view/browser/guest_view_manager.h"
-#include "components/keyed_service/content/browser_context_dependency_manager.h"
-#include "components/keyed_service/core/simple_dependency_manager.h"
-#include "components/keyed_service/core/simple_key_map.h"
-#include "components/prefs/pref_service.h"
-#include "components/proxy_config/pref_proxy_config_tracker_impl.h"
-#include "components/user_prefs/user_prefs.h"
-#include "components/visitedlink/browser/visitedlink_event_listener.h"
-#include "components/visitedlink/browser/visitedlink_writer.h"
-#include "components/zoom/zoom_event_manager.h"
-#include "content/public/browser/browser_task_traits.h"
-#include "content/public/browser/browser_thread.h"
-#include "content/public/browser/download_manager.h"
-#include "content/public/browser/resource_context.h"
-#include "content/public/browser/storage_partition.h"
-#include "extensions/browser/extension_protocols.h"
-#include "extensions/browser/process_manager.h"
-#include "extensions/common/constants.h"
-#include "net/proxy_resolution/proxy_config_service.h"
-#include "services/network/public/mojom/cors_origin_pattern.mojom.h"
-
-using content::BrowserThread;
-
-// Creates and manages VisitedLinkEventListener objects for each
-// AlloyBrowserContext sharing the same VisitedLinkWriter.
-class CefVisitedLinkListener : public visitedlink::VisitedLinkWriter::Listener {
- public:
-  CefVisitedLinkListener() { DCHECK(listener_map_.empty()); }
-
-  void CreateListenerForContext(content::BrowserContext* context) {
-    CEF_REQUIRE_UIT();
-    auto listener =
-        std::make_unique<visitedlink::VisitedLinkEventListener>(context);
-    listener_map_.insert(std::make_pair(context, std::move(listener)));
-  }
-
-  void RemoveListenerForContext(content::BrowserContext* context) {
-    CEF_REQUIRE_UIT();
-    ListenerMap::iterator it = listener_map_.find(context);
-    DCHECK(it != listener_map_.end());
-    listener_map_.erase(it);
-  }
-
-  // visitedlink::VisitedLinkWriter::Listener methods.
-
-  void NewTable(base::ReadOnlySharedMemoryRegion* table_region) override {
-    CEF_REQUIRE_UIT();
-    ListenerMap::iterator it = listener_map_.begin();
-    for (; it != listener_map_.end(); ++it)
-      it->second->NewTable(table_region);
-  }
-
-  void Add(visitedlink::VisitedLinkCommon::Fingerprint fingerprint) override {
-    CEF_REQUIRE_UIT();
-    ListenerMap::iterator it = listener_map_.begin();
-    for (; it != listener_map_.end(); ++it)
-      it->second->Add(fingerprint);
-  }
-
-  void Reset(bool invalidate_hashes) override {
-    CEF_REQUIRE_UIT();
-    ListenerMap::iterator it = listener_map_.begin();
-    for (; it != listener_map_.end(); ++it)
-      it->second->Reset(invalidate_hashes);
-  }
-
- private:
-  // Map of AlloyBrowserContext to the associated VisitedLinkEventListener.
-  typedef std::map<const content::BrowserContext*,
-                   std::unique_ptr<visitedlink::VisitedLinkEventListener>>
-      ListenerMap;
-  ListenerMap listener_map_;
-
-  DISALLOW_COPY_AND_ASSIGN(CefVisitedLinkListener);
-};
-
-AlloyBrowserContext::AlloyBrowserContext(
-    const CefRequestContextSettings& settings)
-    : CefBrowserContext(settings) {}
-
-AlloyBrowserContext::~AlloyBrowserContext() {
-  if (resource_context_) {
-    content::BrowserThread::DeleteSoon(content::BrowserThread::IO, FROM_HERE,
-                                       resource_context_.release());
-  }
-}
-
-void AlloyBrowserContext::Initialize() {
-  CefBrowserContext::Initialize();
-
-  key_ = std::make_unique<ProfileKey>(cache_path_);
-  SimpleKeyMap::GetInstance()->Associate(this, key_.get());
-
-  // Initialize the PrefService object.
-  pref_service_ = browser_prefs::CreatePrefService(
-      this, cache_path_, !!settings_.persist_user_preferences);
-
-  // This must be called before creating any services to avoid hitting
-  // DependencyManager::AssertContextWasntDestroyed when creating/destroying
-  // multiple browser contexts (due to pointer address reuse).
-  BrowserContextDependencyManager::GetInstance()->CreateBrowserContextServices(
-      this);
-
-  const bool extensions_enabled = extensions::ExtensionsEnabled();
-  if (extensions_enabled) {
-    // Create the custom ExtensionSystem first because other KeyedServices
-    // depend on it.
-    extension_system_ = static_cast<extensions::CefExtensionSystem*>(
-        extensions::ExtensionSystem::Get(this));
-    extension_system_->InitForRegularProfile(true);
-
-    // Make sure the ProcessManager is created so that it receives extension
-    // load notifications. This is necessary for the proper initialization of
-    // background/event pages.
-    extensions::ProcessManager::Get(this);
-  }
-
-  // Initialize visited links management.
-  base::FilePath visited_link_path;
-  if (!cache_path_.empty())
-    visited_link_path = cache_path_.Append(FILE_PATH_LITERAL("Visited Links"));
-  visitedlink_listener_ = new CefVisitedLinkListener;
-  visitedlink_master_.reset(new visitedlink::VisitedLinkWriter(
-      visitedlink_listener_, this, !visited_link_path.empty(), false,
-      visited_link_path, 0));
-  visitedlink_listener_->CreateListenerForContext(this);
-  visitedlink_master_->Init();
-
-  // Initialize proxy configuration tracker.
-  pref_proxy_config_tracker_.reset(new PrefProxyConfigTrackerImpl(
-      GetPrefs(), content::GetIOThreadTaskRunner({})));
-
-  // Spell checking support and possibly other subsystems retrieve the
-  // PrefService associated with a BrowserContext via UserPrefs::Get().
-  PrefService* pref_service = GetPrefs();
-  DCHECK(pref_service);
-  user_prefs::UserPrefs::Set(this, pref_service);
-  key_->SetPrefs(pref_service);
-
-  if (extensions_enabled)
-    extension_system_->Init();
-
-  ChromePluginServiceFilter::GetInstance()->RegisterProfile(this);
-
-  media_device_id_salt_ = new MediaDeviceIDSalt(pref_service);
-}
-
-void AlloyBrowserContext::Shutdown() {
-  CefBrowserContext::Shutdown();
-
-  // Send notifications to clean up objects associated with this Profile.
-  MaybeSendDestroyedNotification();
-
-  ChromePluginServiceFilter::GetInstance()->UnregisterProfile(this);
-
-  // Remove any BrowserContextKeyedServiceFactory associations. This must be
-  // called before the ProxyService owned by AlloyBrowserContext is destroyed.
-  // The SimpleDependencyManager should always be passed after the
-  // BrowserContextDependencyManager. This is because the KeyedService instances
-  // in the BrowserContextDependencyManager's dependency graph can depend on the
-  // ones in the SimpleDependencyManager's graph.
-  DependencyManager::PerformInterlockedTwoPhaseShutdown(
-      BrowserContextDependencyManager::GetInstance(), this,
-      SimpleDependencyManager::GetInstance(), key_.get());
-
-  key_.reset();
-  SimpleKeyMap::GetInstance()->Dissociate(this);
-
-  // Shuts down the storage partitions associated with this browser context.
-  // This must be called before the browser context is actually destroyed
-  // and before a clean-up task for its corresponding IO thread residents
-  // (e.g. ResourceContext) is posted, so that the classes that hung on
-  // StoragePartition can have time to do necessary cleanups on IO thread.
-  ShutdownStoragePartitions();
-
-  visitedlink_listener_->RemoveListenerForContext(this);
-
-  // The FontFamilyCache references the ProxyService so delete it before the
-  // ProxyService is deleted.
-  SetUserData(&kFontFamilyCacheKey, nullptr);
-
-  pref_proxy_config_tracker_->DetachFromPrefService();
-
-  // Delete the download manager delegate here because otherwise we'll crash
-  // when it's accessed from the content::BrowserContext destructor.
-  if (download_manager_delegate_)
-    download_manager_delegate_.reset(nullptr);
-}
-
-void AlloyBrowserContext::RemoveCefRequestContext(
-    CefRequestContextImpl* context) {
-  CEF_REQUIRE_UIT();
-
-  if (extensions::ExtensionsEnabled()) {
-    extension_system()->OnRequestContextDeleted(context);
-  }
-
-  // May result in |this| being deleted.
-  CefBrowserContext::RemoveCefRequestContext(context);
-}
-
-void AlloyBrowserContext::LoadExtension(
-    const CefString& root_directory,
-    CefRefPtr<CefDictionaryValue> manifest,
-    CefRefPtr<CefExtensionHandler> handler,
-    CefRefPtr<CefRequestContext> loader_context) {
-  if (!extensions::ExtensionsEnabled()) {
-    if (handler)
-      handler->OnExtensionLoadFailed(ERR_ABORTED);
-    return;
-  }
-
-  if (manifest && manifest->GetSize() > 0) {
-    CefDictionaryValueImpl* value_impl =
-        static_cast<CefDictionaryValueImpl*>(manifest.get());
-    extension_system()->LoadExtension(base::WrapUnique(value_impl->CopyValue()),
-                                      root_directory, false /* builtin */,
-                                      loader_context, handler);
-  } else {
-    extension_system()->LoadExtension(root_directory, false /* builtin */,
-                                      loader_context, handler);
-  }
-}
-
-bool AlloyBrowserContext::GetExtensions(std::vector<CefString>& extension_ids) {
-  if (!extensions::ExtensionsEnabled())
-    return false;
-
-  extensions::CefExtensionSystem::ExtensionMap extension_map =
-      extension_system()->GetExtensions();
-  extensions::CefExtensionSystem::ExtensionMap::const_iterator it =
-      extension_map.begin();
-  for (; it != extension_map.end(); ++it)
-    extension_ids.push_back(it->second->GetIdentifier());
-
-  return true;
-}
-
-CefRefPtr<CefExtension> AlloyBrowserContext::GetExtension(
-    const CefString& extension_id) {
-  if (!extensions::ExtensionsEnabled())
-    return nullptr;
-
-  return extension_system()->GetExtension(extension_id);
-}
-
-bool AlloyBrowserContext::UnloadExtension(const CefString& extension_id) {
-  DCHECK(extensions::ExtensionsEnabled());
-  return extension_system()->UnloadExtension(extension_id);
-}
-
-bool AlloyBrowserContext::IsPrintPreviewSupported() const {
-  CEF_REQUIRE_UIT();
-  if (!extensions::PrintPreviewEnabled())
-    return false;
-
-  return !GetPrefs()->GetBoolean(prefs::kPrintPreviewDisabled);
-}
-
-content::ResourceContext* AlloyBrowserContext::GetResourceContext() {
-  if (!resource_context_) {
-    resource_context_ = std::make_unique<content::ResourceContext>();
-  }
-  return resource_context_.get();
-}
-
-content::ClientHintsControllerDelegate*
-AlloyBrowserContext::GetClientHintsControllerDelegate() {
-  return nullptr;
-}
-
-void AlloyBrowserContext::SetCorsOriginAccessListForOrigin(
-    const url::Origin& source_origin,
-    std::vector<network::mojom::CorsOriginPatternPtr> allow_patterns,
-    std::vector<network::mojom::CorsOriginPatternPtr> block_patterns,
-    base::OnceClosure closure) {
-  // This method is called for Extension support.
-  base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, std::move(closure));
-}
-
-ChromeZoomLevelPrefs* AlloyBrowserContext::GetZoomLevelPrefs() {
-  return static_cast<ChromeZoomLevelPrefs*>(
-      GetStoragePartition(this, nullptr)->GetZoomLevelDelegate());
-}
-
-scoped_refptr<network::SharedURLLoaderFactory>
-AlloyBrowserContext::GetURLLoaderFactory() {
-  return GetDefaultStoragePartition(this)
-      ->GetURLLoaderFactoryForBrowserProcess();
-}
-
-base::FilePath AlloyBrowserContext::GetPath() {
-  return cache_path_;
-}
-
-base::FilePath AlloyBrowserContext::GetPath() const {
-  return cache_path_;
-}
-
-std::unique_ptr<content::ZoomLevelDelegate>
-AlloyBrowserContext::CreateZoomLevelDelegate(
-    const base::FilePath& partition_path) {
-  if (cache_path_.empty())
-    return std::unique_ptr<content::ZoomLevelDelegate>();
-
-  return base::WrapUnique(new ChromeZoomLevelPrefs(
-      GetPrefs(), cache_path_, partition_path,
-      zoom::ZoomEventManager::GetForBrowserContext(this)->GetWeakPtr()));
-}
-
-bool AlloyBrowserContext::IsOffTheRecord() const {
-  // Alloy contexts are never flagged as off-the-record. It causes problems
-  // for the extension system.
-  return false;
-}
-
-content::DownloadManagerDelegate*
-AlloyBrowserContext::GetDownloadManagerDelegate() {
-  if (!download_manager_delegate_) {
-    content::DownloadManager* manager =
-        BrowserContext::GetDownloadManager(this);
-    download_manager_delegate_.reset(new CefDownloadManagerDelegate(manager));
-  }
-  return download_manager_delegate_.get();
-}
-
-content::BrowserPluginGuestManager* AlloyBrowserContext::GetGuestManager() {
-  DCHECK(extensions::ExtensionsEnabled());
-  return guest_view::GuestViewManager::FromBrowserContext(this);
-}
-
-storage::SpecialStoragePolicy* AlloyBrowserContext::GetSpecialStoragePolicy() {
-  return nullptr;
-}
-
-content::PushMessagingService* AlloyBrowserContext::GetPushMessagingService() {
-  return nullptr;
-}
-
-content::StorageNotificationService*
-AlloyBrowserContext::GetStorageNotificationService() {
-  return nullptr;
-}
-
-content::SSLHostStateDelegate* AlloyBrowserContext::GetSSLHostStateDelegate() {
-  if (!ssl_host_state_delegate_)
-    ssl_host_state_delegate_.reset(new CefSSLHostStateDelegate());
-  return ssl_host_state_delegate_.get();
-}
-
-content::PermissionControllerDelegate*
-AlloyBrowserContext::GetPermissionControllerDelegate() {
-  return nullptr;
-}
-
-content::BackgroundFetchDelegate*
-AlloyBrowserContext::GetBackgroundFetchDelegate() {
-  return nullptr;
-}
-
-content::BackgroundSyncController*
-AlloyBrowserContext::GetBackgroundSyncController() {
-  return nullptr;
-}
-
-content::BrowsingDataRemoverDelegate*
-AlloyBrowserContext::GetBrowsingDataRemoverDelegate() {
-  return nullptr;
-}
-
-std::string AlloyBrowserContext::GetMediaDeviceIDSalt() {
-  return media_device_id_salt_->GetSalt();
-}
-
-PrefService* AlloyBrowserContext::GetPrefs() {
-  return pref_service_.get();
-}
-
-const PrefService* AlloyBrowserContext::GetPrefs() const {
-  return pref_service_.get();
-}
-
-ProfileKey* AlloyBrowserContext::GetProfileKey() const {
-  DCHECK(key_);
-  return key_.get();
-}
-
-policy::SchemaRegistryService*
-AlloyBrowserContext::GetPolicySchemaRegistryService() {
-  NOTREACHED();
-  return nullptr;
-}
-
-policy::UserCloudPolicyManager*
-AlloyBrowserContext::GetUserCloudPolicyManager() {
-  NOTREACHED();
-  return nullptr;
-}
-
-policy::ProfilePolicyConnector*
-AlloyBrowserContext::GetProfilePolicyConnector() {
-  NOTREACHED();
-  return nullptr;
-}
-
-const policy::ProfilePolicyConnector*
-AlloyBrowserContext::GetProfilePolicyConnector() const {
-  NOTREACHED();
-  return nullptr;
-}
-
-void AlloyBrowserContext::RebuildTable(
-    const scoped_refptr<URLEnumerator>& enumerator) {
-  // Called when visited links will not or cannot be loaded from disk.
-  enumerator->OnComplete(true);
-}
-
-DownloadPrefs* AlloyBrowserContext::GetDownloadPrefs() {
-  CEF_REQUIRE_UIT();
-  if (!download_prefs_) {
-    download_prefs_.reset(new DownloadPrefs(this));
-  }
-  return download_prefs_.get();
-}
-
-void AlloyBrowserContext::AddVisitedURLs(const std::vector<GURL>& urls) {
-  visitedlink_master_->AddURLs(urls);
-}
--- a/libcef/browser/alloy/alloy_browser_context.h
+++ b/libcef/browser/alloy/alloy_browser_context.h
@@ -1,150 +0,0 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CEF_LIBCEF_BROWSER_ALLOY_ALLOY_BROWSER_CONTEXT_H_
-#define CEF_LIBCEF_BROWSER_ALLOY_ALLOY_BROWSER_CONTEXT_H_
-#pragma once
-
-#include "include/cef_request_context_handler.h"
-#include "libcef/browser/alloy/chrome_profile_alloy.h"
-#include "libcef/browser/browser_context.h"
-#include "libcef/browser/request_context_handler_map.h"
-
-#include "chrome/browser/download/download_prefs.h"
-#include "components/proxy_config/pref_proxy_config_tracker.h"
-#include "components/visitedlink/browser/visitedlink_delegate.h"
-
-class CefDownloadManagerDelegate;
-class CefSSLHostStateDelegate;
-class CefVisitedLinkListener;
-class MediaDeviceIDSalt;
-class PrefService;
-
-namespace extensions {
-class CefExtensionSystem;
-}
-
-namespace visitedlink {
-class VisitedLinkWriter;
-}
-
-// See CefBrowserContext documentation for usage. Only accessed on the UI thread
-// unless otherwise indicated. ChromeProfileAlloy must be the first listed base
-// class to avoid issues when casting between void* and content::BrowserContext*
-// in Chromium code.
-class AlloyBrowserContext : public ChromeProfileAlloy,
-                            public CefBrowserContext,
-                            public visitedlink::VisitedLinkDelegate {
- public:
-  explicit AlloyBrowserContext(const CefRequestContextSettings& settings);
-
-  // CefBrowserContext overrides.
-  content::BrowserContext* AsBrowserContext() override { return this; }
-  Profile* AsProfile() override { return this; }
-  void Initialize() override;
-  void Shutdown() override;
-  void RemoveCefRequestContext(CefRequestContextImpl* context) override;
-  void LoadExtension(const CefString& root_directory,
-                     CefRefPtr<CefDictionaryValue> manifest,
-                     CefRefPtr<CefExtensionHandler> handler,
-                     CefRefPtr<CefRequestContext> loader_context) override;
-  bool GetExtensions(std::vector<CefString>& extension_ids) override;
-  CefRefPtr<CefExtension> GetExtension(const CefString& extension_id) override;
-  bool UnloadExtension(const CefString& extension_id) override;
-  bool IsPrintPreviewSupported() const override;
-
-  // content::BrowserContext overrides.
-  content::ResourceContext* GetResourceContext() override;
-  content::ClientHintsControllerDelegate* GetClientHintsControllerDelegate()
-      override;
-  void SetCorsOriginAccessListForOrigin(
-      const url::Origin& source_origin,
-      std::vector<network::mojom::CorsOriginPatternPtr> allow_patterns,
-      std::vector<network::mojom::CorsOriginPatternPtr> block_patterns,
-      base::OnceClosure closure) override;
-  base::FilePath GetPath() override;
-  base::FilePath GetPath() const override;
-  std::unique_ptr<content::ZoomLevelDelegate> CreateZoomLevelDelegate(
-      const base::FilePath& partition_path) override;
-  bool IsOffTheRecord() const override;
-  content::DownloadManagerDelegate* GetDownloadManagerDelegate() override;
-  content::BrowserPluginGuestManager* GetGuestManager() override;
-  storage::SpecialStoragePolicy* GetSpecialStoragePolicy() override;
-  content::PushMessagingService* GetPushMessagingService() override;
-  content::StorageNotificationService* GetStorageNotificationService() override;
-  content::SSLHostStateDelegate* GetSSLHostStateDelegate() override;
-  content::PermissionControllerDelegate* GetPermissionControllerDelegate()
-      override;
-  content::BackgroundFetchDelegate* GetBackgroundFetchDelegate() override;
-  content::BackgroundSyncController* GetBackgroundSyncController() override;
-  content::BrowsingDataRemoverDelegate* GetBrowsingDataRemoverDelegate()
-      override;
-  std::string GetMediaDeviceIDSalt() override;
-
-  // Profile overrides.
-  ChromeZoomLevelPrefs* GetZoomLevelPrefs() override;
-  scoped_refptr<network::SharedURLLoaderFactory> GetURLLoaderFactory() override;
-  PrefService* GetPrefs() override;
-  bool AllowsBrowserWindows() const override { return false; }
-  const PrefService* GetPrefs() const override;
-  ProfileKey* GetProfileKey() const override;
-  policy::SchemaRegistryService* GetPolicySchemaRegistryService() override;
-  policy::UserCloudPolicyManager* GetUserCloudPolicyManager() override;
-  policy::ProfilePolicyConnector* GetProfilePolicyConnector() override;
-  const policy::ProfilePolicyConnector* GetProfilePolicyConnector()
-      const override;
-
-  // Values checked in ProfileNetworkContextService::CreateNetworkContextParams
-  // when creating the NetworkContext.
-  bool ShouldRestoreOldSessionCookies() const override {
-    return ShouldPersistSessionCookies();
-  }
-  bool ShouldPersistSessionCookies() const override {
-    return !!settings_.persist_session_cookies;
-  }
-
-  // visitedlink::VisitedLinkDelegate methods.
-  void RebuildTable(const scoped_refptr<URLEnumerator>& enumerator) override;
-
-  // Manages extensions.
-  extensions::CefExtensionSystem* extension_system() const {
-    return extension_system_;
-  }
-
-  // Called from AlloyBrowserHostImpl::DidFinishNavigation to update the table
-  // of visited links.
-  void AddVisitedURLs(const std::vector<GURL>& urls);
-
-  // Called from DownloadPrefs::FromBrowserContext.
-  DownloadPrefs* GetDownloadPrefs();
-
- private:
-  ~AlloyBrowserContext() override;
-
-  std::unique_ptr<PrefService> pref_service_;
-  std::unique_ptr<PrefProxyConfigTracker> pref_proxy_config_tracker_;
-
-  std::unique_ptr<CefDownloadManagerDelegate> download_manager_delegate_;
-  std::unique_ptr<CefSSLHostStateDelegate> ssl_host_state_delegate_;
-  std::unique_ptr<visitedlink::VisitedLinkWriter> visitedlink_master_;
-  // |visitedlink_listener_| is owned by visitedlink_master_.
-  CefVisitedLinkListener* visitedlink_listener_ = nullptr;
-
-  // Owned by the KeyedService system.
-  extensions::CefExtensionSystem* extension_system_ = nullptr;
-
-  // The key to index KeyedService instances created by
-  // SimpleKeyedServiceFactory.
-  std::unique_ptr<ProfileKey> key_;
-
-  std::unique_ptr<DownloadPrefs> download_prefs_;
-
-  std::unique_ptr<content::ResourceContext> resource_context_;
-
-  scoped_refptr<MediaDeviceIDSalt> media_device_id_salt_;
-
-  DISALLOW_COPY_AND_ASSIGN(AlloyBrowserContext);
-};
-
-#endif  // CEF_LIBCEF_BROWSER_ALLOY_ALLOY_BROWSER_CONTEXT_H_
--- a/libcef/browser/alloy/alloy_browser_host_impl.cc
+++ b/libcef/browser/alloy/alloy_browser_host_impl.cc
--- a/libcef/browser/alloy/browser_platform_delegate_alloy.cc
+++ b/libcef/browser/alloy/browser_platform_delegate_alloy.cc
@@ -1,470 +0,0 @@
-// Copyright 2015 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.
-
-#include "libcef/browser/alloy/browser_platform_delegate_alloy.h"
-
-#include "libcef/browser/alloy/alloy_browser_host_impl.h"
-#include "libcef/browser/extensions/browser_extensions_util.h"
-#include "libcef/browser/extensions/extension_background_host.h"
-#include "libcef/browser/extensions/extension_system.h"
-#include "libcef/browser/extensions/extension_view_host.h"
-#include "libcef/browser/extensions/extension_web_contents_observer.h"
-#include "libcef/browser/printing/print_view_manager.h"
-#include "libcef/common/extensions/extensions_util.h"
-#include "libcef/features/runtime_checks.h"
-
-#include "base/logging.h"
-#include "chrome/browser/printing/print_view_manager.h"
-#include "chrome/browser/ui/prefs/prefs_tab_helper.h"
-#include "components/zoom/zoom_controller.h"
-#include "content/browser/renderer_host/render_widget_host_impl.h"
-#include "content/browser/web_contents/web_contents_impl.h"
-#include "content/public/browser/render_view_host.h"
-#include "content/public/browser/render_widget_host.h"
-#include "extensions/browser/process_manager.h"
-#include "third_party/blink/public/mojom/frame/find_in_page.mojom.h"
-
-namespace {
-
-printing::CefPrintViewManager* GetPrintViewManager(
-    content::WebContents* web_contents) {
-  return printing::CefPrintViewManager::FromWebContents(web_contents);
-}
-
-}  // namespace
-
-CefBrowserPlatformDelegateAlloy::CefBrowserPlatformDelegateAlloy()
-    : weak_ptr_factory_(this) {}
-
-content::WebContents* CefBrowserPlatformDelegateAlloy::CreateWebContents(
-    CefBrowserCreateParams& create_params,
-    bool& own_web_contents) {
-  REQUIRE_ALLOY_RUNTIME();
-  DCHECK(primary_);
-
-  // Get or create the request context and browser context.
-  CefRefPtr<CefRequestContextImpl> request_context_impl =
-      CefRequestContextImpl::GetOrCreateForRequestContext(
-          create_params.request_context);
-  CHECK(request_context_impl);
-  auto cef_browser_context = request_context_impl->GetBrowserContext();
-  CHECK(cef_browser_context);
-  auto browser_context = cef_browser_context->AsBrowserContext();
-
-  if (!create_params.request_context) {
-    // Using the global request context.
-    create_params.request_context = request_context_impl.get();
-  }
-
-  scoped_refptr<content::SiteInstance> site_instance;
-  if (extensions::ExtensionsEnabled() && !create_params.url.is_empty()) {
-    if (!create_params.extension) {
-      // We might be loading an extension app view where the extension URL is
-      // provided by the client.
-      create_params.extension =
-          extensions::GetExtensionForUrl(browser_context, create_params.url);
-    }
-    if (create_params.extension) {
-      if (create_params.extension_host_type == extensions::VIEW_TYPE_INVALID) {
-        // Default to dialog behavior.
-        create_params.extension_host_type =
-            extensions::VIEW_TYPE_EXTENSION_DIALOG;
-      }
-
-      // Extension resources will fail to load if we don't use a SiteInstance
-      // associated with the extension.
-      // (AlloyContentBrowserClient::SiteInstanceGotProcess won't find the
-      // extension to register with InfoMap, and AllowExtensionResourceLoad in
-      // ExtensionProtocolHandler::MaybeCreateJob will return false resulting in
-      // ERR_BLOCKED_BY_CLIENT).
-      site_instance = extensions::ProcessManager::Get(browser_context)
-                          ->GetSiteInstanceForURL(create_params.url);
-      DCHECK(site_instance);
-    }
-  }
-
-  content::WebContents::CreateParams wc_create_params(browser_context,
-                                                      site_instance);
-
-  if (IsWindowless()) {
-    // Create the OSR view for the WebContents.
-    CreateViewForWebContents(&wc_create_params.view,
-                             &wc_create_params.delegate_view);
-  }
-
-  auto web_contents = content::WebContents::Create(wc_create_params);
-  CHECK(web_contents);
-
-  own_web_contents = true;
-  return web_contents.release();
-}
-
-void CefBrowserPlatformDelegateAlloy::WebContentsCreated(
-    content::WebContents* web_contents,
-    bool owned) {
-  CefBrowserPlatformDelegate::WebContentsCreated(web_contents, owned);
-
-  if (owned) {
-    SetOwnedWebContents(web_contents);
-  }
-}
-
-void CefBrowserPlatformDelegateAlloy::AddNewContents(
-    content::WebContents* source,
-    std::unique_ptr<content::WebContents> new_contents,
-    const GURL& target_url,
-    WindowOpenDisposition disposition,
-    const gfx::Rect& initial_rect,
-    bool user_gesture,
-    bool* was_blocked) {
-  REQUIRE_ALLOY_RUNTIME();
-  DCHECK(primary_);
-
-  CefRefPtr<AlloyBrowserHostImpl> owner =
-      AlloyBrowserHostImpl::GetBrowserForContents(new_contents.get());
-  if (owner) {
-    // Taking ownership of |new_contents|.
-    static_cast<CefBrowserPlatformDelegateAlloy*>(
-        owner->platform_delegate_.get())
-        ->SetOwnedWebContents(new_contents.release());
-    return;
-  }
-
-  if (extension_host_) {
-    extension_host_->AddNewContents(source, std::move(new_contents), target_url,
-                                    disposition, initial_rect, user_gesture,
-                                    was_blocked);
-  }
-}
-
-bool CefBrowserPlatformDelegateAlloy::ShouldTransferNavigation(
-    bool is_main_frame_navigation) {
-  if (extension_host_) {
-    return extension_host_->ShouldTransferNavigation(is_main_frame_navigation);
-  }
-  return true;
-}
-
-void CefBrowserPlatformDelegateAlloy::RenderViewCreated(
-    content::RenderViewHost* render_view_host) {
-  // Indicate that the view has an external parent (namely us). This changes the
-  // default view behavior in some cases (e.g. focus handling on Linux).
-  if (!IsViewsHosted() && render_view_host->GetWidget()->GetView())
-    render_view_host->GetWidget()->GetView()->SetHasExternalParent(true);
-}
-
-void CefBrowserPlatformDelegateAlloy::RenderViewReady() {
-  ConfigureAutoResize();
-}
-
-void CefBrowserPlatformDelegateAlloy::BrowserCreated(
-    CefBrowserHostBase* browser) {
-  CefBrowserPlatformDelegate::BrowserCreated(browser);
-
-  // Only register WebContents delegate/observers if we're the primary delegate.
-  if (!primary_)
-    return;
-
-  DCHECK(!web_contents_->GetDelegate());
-  web_contents_->SetDelegate(static_cast<AlloyBrowserHostImpl*>(browser));
-
-  PrefsTabHelper::CreateForWebContents(web_contents_);
-  printing::CefPrintViewManager::CreateForWebContents(web_contents_);
-
-  if (extensions::ExtensionsEnabled()) {
-    extensions::CefExtensionWebContentsObserver::CreateForWebContents(
-        web_contents_);
-
-    // Used by the tabs extension API.
-    zoom::ZoomController::CreateForWebContents(web_contents_);
-  }
-
-  if (IsPrintPreviewSupported()) {
-    web_contents_dialog_helper_.reset(
-        new CefWebContentsDialogHelper(web_contents_, this));
-  }
-}
-
-void CefBrowserPlatformDelegateAlloy::CreateExtensionHost(
-    const extensions::Extension* extension,
-    const GURL& url,
-    extensions::ViewType host_type) {
-  REQUIRE_ALLOY_RUNTIME();
-  DCHECK(primary_);
-
-  // Should get WebContentsCreated and BrowserCreated calls first.
-  DCHECK(web_contents_);
-  DCHECK(browser_);
-  DCHECK(!extension_host_);
-
-  auto alloy_browser = static_cast<AlloyBrowserHostImpl*>(browser_);
-
-  if (host_type == extensions::VIEW_TYPE_EXTENSION_DIALOG ||
-      host_type == extensions::VIEW_TYPE_EXTENSION_POPUP) {
-    // Create an extension host that we own.
-    extension_host_ = new extensions::CefExtensionViewHost(
-        alloy_browser, extension, web_contents_, url, host_type);
-    // Trigger load of the extension URL.
-    extension_host_->CreateRenderViewSoon();
-  } else if (host_type == extensions::VIEW_TYPE_EXTENSION_BACKGROUND_PAGE) {
-    is_background_host_ = true;
-    alloy_browser->is_background_host_ = true;
-    // Create an extension host that will be owned by ProcessManager.
-    extension_host_ = new extensions::CefExtensionBackgroundHost(
-        alloy_browser,
-        base::BindOnce(&CefBrowserPlatformDelegateAlloy::OnExtensionHostDeleted,
-                       weak_ptr_factory_.GetWeakPtr()),
-        extension, web_contents_, url, host_type);
-    // Load will be triggered by ProcessManager::CreateBackgroundHost.
-  } else {
-    NOTREACHED() << " Unsupported extension host type: " << host_type;
-  }
-}
-
-extensions::ExtensionHost* CefBrowserPlatformDelegateAlloy::GetExtensionHost()
-    const {
-  return extension_host_;
-}
-
-void CefBrowserPlatformDelegateAlloy::BrowserDestroyed(
-    CefBrowserHostBase* browser) {
-  if (primary_) {
-    DestroyExtensionHost();
-    owned_web_contents_.reset();
-  }
-
-  CefBrowserPlatformDelegate::BrowserDestroyed(browser);
-}
-
-void CefBrowserPlatformDelegateAlloy::SendCaptureLostEvent() {
-  if (!web_contents_)
-    return;
-  content::RenderViewHost* host = web_contents_->GetRenderViewHost();
-  if (!host)
-    return;
-
-  content::RenderWidgetHostImpl* widget =
-      content::RenderWidgetHostImpl::From(host->GetWidget());
-  if (widget)
-    widget->LostCapture();
-}
-
-#if defined(OS_WIN) || (defined(OS_POSIX) && !defined(OS_MAC))
-void CefBrowserPlatformDelegateAlloy::NotifyMoveOrResizeStarted() {
-  if (!web_contents_)
-    return;
-
-  // Dismiss any existing popups.
-  content::RenderViewHost* host = web_contents_->GetRenderViewHost();
-  if (host)
-    host->NotifyMoveOrResizeStarted();
-}
-#endif
-
-bool CefBrowserPlatformDelegateAlloy::PreHandleGestureEvent(
-    content::WebContents* source,
-    const blink::WebGestureEvent& event) {
-  if (extension_host_)
-    return extension_host_->PreHandleGestureEvent(source, event);
-  return false;
-}
-
-bool CefBrowserPlatformDelegateAlloy::IsNeverComposited(
-    content::WebContents* web_contents) {
-  if (extension_host_)
-    return extension_host_->IsNeverComposited(web_contents);
-  return false;
-}
-
-void CefBrowserPlatformDelegateAlloy::SetAutoResizeEnabled(
-    bool enabled,
-    const CefSize& min_size,
-    const CefSize& max_size) {
-  if (enabled == auto_resize_enabled_)
-    return;
-
-  auto_resize_enabled_ = enabled;
-  if (enabled) {
-    auto_resize_min_ = gfx::Size(min_size.width, min_size.height);
-    auto_resize_max_ = gfx::Size(max_size.width, max_size.height);
-  } else {
-    auto_resize_min_ = auto_resize_max_ = gfx::Size();
-  }
-  ConfigureAutoResize();
-}
-
-void CefBrowserPlatformDelegateAlloy::ConfigureAutoResize() {
-  if (!web_contents_ || !web_contents_->GetRenderWidgetHostView()) {
-    return;
-  }
-
-  if (auto_resize_enabled_) {
-    web_contents_->GetRenderWidgetHostView()->EnableAutoResize(
-        auto_resize_min_, auto_resize_max_);
-  } else {
-    web_contents_->GetRenderWidgetHostView()->DisableAutoResize(gfx::Size());
-  }
-}
-
-void CefBrowserPlatformDelegateAlloy::SetAccessibilityState(
-    cef_state_t accessibility_state) {
-  // Do nothing if state is set to default. It'll be disabled by default and
-  // controlled by the commmand-line flags "force-renderer-accessibility" and
-  // "disable-renderer-accessibility".
-  if (accessibility_state == STATE_DEFAULT)
-    return;
-
-  content::WebContentsImpl* web_contents_impl =
-      static_cast<content::WebContentsImpl*>(web_contents_);
-
-  if (!web_contents_impl)
-    return;
-
-  ui::AXMode accMode;
-  // In windowless mode set accessibility to TreeOnly mode. Else native
-  // accessibility APIs, specific to each platform, are also created.
-  if (accessibility_state == STATE_ENABLED) {
-    accMode = IsWindowless() ? ui::kAXModeWebContentsOnly : ui::kAXModeComplete;
-  }
-  web_contents_impl->SetAccessibilityMode(accMode);
-}
-
-bool CefBrowserPlatformDelegateAlloy::IsPrintPreviewSupported() const {
-  REQUIRE_ALLOY_RUNTIME();
-
-  auto actionable_contents = GetActionableWebContents();
-  if (!actionable_contents)
-    return false;
-
-  auto cef_browser_context = CefBrowserContext::FromBrowserContext(
-      actionable_contents->GetBrowserContext());
-  if (!cef_browser_context->IsPrintPreviewSupported()) {
-    return false;
-  }
-
-  // Print preview is not currently supported with OSR.
-  return !IsWindowless();
-}
-
-void CefBrowserPlatformDelegateAlloy::Print() {
-  REQUIRE_ALLOY_RUNTIME();
-
-  auto actionable_contents = GetActionableWebContents();
-  if (!actionable_contents)
-    return;
-
-  auto rfh = actionable_contents->GetMainFrame();
-
-  if (IsPrintPreviewSupported()) {
-    GetPrintViewManager(actionable_contents)->PrintPreviewNow(rfh, false);
-  } else {
-    GetPrintViewManager(actionable_contents)->PrintNow(rfh);
-  }
-}
-
-void CefBrowserPlatformDelegateAlloy::PrintToPDF(
-    const CefString& path,
-    const CefPdfPrintSettings& settings,
-    CefRefPtr<CefPdfPrintCallback> callback) {
-  REQUIRE_ALLOY_RUNTIME();
-
-  content::WebContents* actionable_contents = GetActionableWebContents();
-  if (!actionable_contents)
-    return;
-  printing::CefPrintViewManager::PdfPrintCallback pdf_callback;
-  if (callback.get()) {
-    pdf_callback = base::Bind(&CefPdfPrintCallback::OnPdfPrintFinished,
-                              callback.get(), path);
-  }
-  GetPrintViewManager(actionable_contents)
-      ->PrintToPDF(actionable_contents->GetMainFrame(), base::FilePath(path),
-                   settings, pdf_callback);
-}
-
-void CefBrowserPlatformDelegateAlloy::Find(int identifier,
-                                           const CefString& searchText,
-                                           bool forward,
-                                           bool matchCase,
-                                           bool findNext) {
-  if (!web_contents_)
-    return;
-
-  // Every find request must have a unique ID and these IDs must strictly
-  // increase so that newer requests always have greater IDs than older
-  // requests.
-  if (identifier <= find_request_id_counter_)
-    identifier = ++find_request_id_counter_;
-  else
-    find_request_id_counter_ = identifier;
-
-  auto options = blink::mojom::FindOptions::New();
-  options->forward = forward;
-  options->match_case = matchCase;
-  options->find_match = findNext;
-  web_contents_->Find(identifier, searchText, std::move(options));
-}
-
-void CefBrowserPlatformDelegateAlloy::StopFinding(bool clearSelection) {
-  if (!web_contents_)
-    return;
-
-  content::StopFindAction action =
-      clearSelection ? content::STOP_FIND_ACTION_CLEAR_SELECTION
-                     : content::STOP_FIND_ACTION_KEEP_SELECTION;
-  web_contents_->StopFinding(action);
-}
-
-base::RepeatingClosure
-CefBrowserPlatformDelegateAlloy::GetBoundsChangedCallback() {
-  if (web_contents_dialog_helper_) {
-    return web_contents_dialog_helper_->GetBoundsChangedCallback();
-  }
-
-  return base::RepeatingClosure();
-}
-
-content::WebContents*
-CefBrowserPlatformDelegateAlloy::GetActionableWebContents() const {
-  if (web_contents_ && extensions::ExtensionsEnabled()) {
-    content::WebContents* guest_contents =
-        extensions::GetFullPageGuestForOwnerContents(web_contents_);
-    if (guest_contents)
-      return guest_contents;
-  }
-  return web_contents_;
-}
-
-void CefBrowserPlatformDelegateAlloy::SetOwnedWebContents(
-    content::WebContents* owned_contents) {
-  DCHECK(primary_);
-
-  // Should not currently own a WebContents.
-  CHECK(!owned_web_contents_);
-  owned_web_contents_.reset(owned_contents);
-}
-
-void CefBrowserPlatformDelegateAlloy::DestroyExtensionHost() {
-  if (!extension_host_)
-    return;
-  if (extension_host_->extension_host_type() ==
-      extensions::VIEW_TYPE_EXTENSION_BACKGROUND_PAGE) {
-    DCHECK(is_background_host_);
-    // Close notification for background pages arrives via CloseContents.
-    // The extension host will be deleted by
-    // ProcessManager::CloseBackgroundHost and OnExtensionHostDeleted will be
-    // called to notify us.
-    extension_host_->Close();
-  } else {
-    DCHECK(!is_background_host_);
-    // We own the extension host and must delete it.
-    delete extension_host_;
-    extension_host_ = nullptr;
-  }
-}
-
-void CefBrowserPlatformDelegateAlloy::OnExtensionHostDeleted() {
-  DCHECK(is_background_host_);
-  DCHECK(extension_host_);
-  extension_host_ = nullptr;
-}
--- a/libcef/browser/alloy/browser_platform_delegate_alloy.h
+++ b/libcef/browser/alloy/browser_platform_delegate_alloy.h
@@ -1,114 +0,0 @@
-// Copyright (c) 2015 The Chromium Embedded Framework Authors.
-// Portions copyright (c) 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CEF_LIBCEF_BROWSER_ALLOY_BROWSER_PLATFORM_DELEGATE_ALLOY_H_
-#define CEF_LIBCEF_BROWSER_ALLOY_BROWSER_PLATFORM_DELEGATE_ALLOY_H_
-
-#include "libcef/browser/browser_platform_delegate.h"
-#include "libcef/browser/web_contents_dialog_helper.h"
-
-#include "base/memory/weak_ptr.h"
-#include "content/public/browser/web_contents.h"
-#include "ui/gfx/geometry/size.h"
-
-// Implementation of Alloy-based browser functionality.
-class CefBrowserPlatformDelegateAlloy : public CefBrowserPlatformDelegate {
- public:
-  content::WebContents* CreateWebContents(CefBrowserCreateParams& create_params,
-                                          bool& own_web_contents) override;
-  void WebContentsCreated(content::WebContents* web_contents,
-                          bool owned) override;
-  void AddNewContents(content::WebContents* source,
-                      std::unique_ptr<content::WebContents> new_contents,
-                      const GURL& target_url,
-                      WindowOpenDisposition disposition,
-                      const gfx::Rect& initial_rect,
-                      bool user_gesture,
-                      bool* was_blocked) override;
-  bool ShouldTransferNavigation(bool is_main_frame_navigation) override;
-  void RenderViewCreated(content::RenderViewHost* render_view_host) override;
-  void RenderViewReady() override;
-  void BrowserCreated(CefBrowserHostBase* browser) override;
-  void CreateExtensionHost(const extensions::Extension* extension,
-                           const GURL& url,
-                           extensions::ViewType host_type) override;
-  extensions::ExtensionHost* GetExtensionHost() const override;
-  void BrowserDestroyed(CefBrowserHostBase* browser) override;
-  void SendCaptureLostEvent() override;
-#if defined(OS_WIN) || (defined(OS_POSIX) && !defined(OS_MAC))
-  void NotifyMoveOrResizeStarted() override;
-#endif
-  bool PreHandleGestureEvent(content::WebContents* source,
-                             const blink::WebGestureEvent& event) override;
-  bool IsNeverComposited(content::WebContents* web_contents) override;
-  void SetAutoResizeEnabled(bool enabled,
-                            const CefSize& min_size,
-                            const CefSize& max_size) override;
-  void SetAccessibilityState(cef_state_t accessibility_state) override;
-  bool IsPrintPreviewSupported() const override;
-  void Print() override;
-  void PrintToPDF(const CefString& path,
-                  const CefPdfPrintSettings& settings,
-                  CefRefPtr<CefPdfPrintCallback> callback) override;
-  void Find(int identifier,
-            const CefString& searchText,
-            bool forward,
-            bool matchCase,
-            bool findNext) override;
-  void StopFinding(bool clearSelection) override;
-
- protected:
-  CefBrowserPlatformDelegateAlloy();
-
-  base::RepeatingClosure GetBoundsChangedCallback();
-
-  // Returns the WebContents most likely to handle an action. If extensions are
-  // enabled and this browser has a full-page guest (for example, a full-page
-  // PDF viewer extension) then the guest's WebContents will be returned.
-  // Otherwise, the browser's WebContents will be returned.
-  content::WebContents* GetActionableWebContents() const;
-
-  // Called from BrowserPlatformDelegateNative::set_windowless_handler().
-  void set_as_secondary() { primary_ = false; }
-
- private:
-  void SetOwnedWebContents(content::WebContents* owned_contents);
-
-  void DestroyExtensionHost();
-  void OnExtensionHostDeleted();
-
-  void ConfigureAutoResize();
-
-  // Non-nullptr if this object owns the WebContents. Will be nullptr for popup
-  // browsers between the calls to WebContentsCreated() and AddNewContents(),
-  // and may never be set if the parent browser is destroyed during popup
-  // creation.
-  std::unique_ptr<content::WebContents> owned_web_contents_;
-
-  // Used for the print preview dialog.
-  std::unique_ptr<CefWebContentsDialogHelper> web_contents_dialog_helper_;
-
-  // Used to provide unique incremental IDs for each find request.
-  int find_request_id_counter_ = 0;
-
-  // Used when the browser is hosting an extension.
-  extensions::ExtensionHost* extension_host_ = nullptr;
-  bool is_background_host_ = false;
-
-  // Used with auto-resize.
-  bool auto_resize_enabled_ = false;
-  gfx::Size auto_resize_min_;
-  gfx::Size auto_resize_max_;
-
-  // True if this is the primary platform delegate, in which case it will
-  // register WebContents delegate/observers.
-  bool primary_ = true;
-
-  base::WeakPtrFactory<CefBrowserPlatformDelegateAlloy> weak_ptr_factory_;
-
-  DISALLOW_COPY_AND_ASSIGN(CefBrowserPlatformDelegateAlloy);
-};
-
-#endif  // CEF_LIBCEF_BROWSER_ALLOY_BROWSER_PLATFORM_DELEGATE_ALLOY_H_
--- a/libcef/browser/alloy/chrome_profile_alloy.cc
+++ b/libcef/browser/alloy/chrome_profile_alloy.cc
@@ -1,178 +0,0 @@
-// Copyright (c) 2015 The Chromium Embedded Framework Authors.
-// Portions copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "libcef/browser/alloy/chrome_profile_alloy.h"
-
-#include "base/no_destructor.h"
-#include "components/variations/variations_client.h"
-#include "components/variations/variations_ids_provider.h"
-#include "net/url_request/url_request_context.h"
-
-namespace {
-
-class CefVariationsClient : public variations::VariationsClient {
- public:
-  explicit CefVariationsClient(content::BrowserContext* browser_context)
-      : browser_context_(browser_context) {}
-
-  ~CefVariationsClient() override = default;
-
-  bool IsOffTheRecord() const override {
-    return browser_context_->IsOffTheRecord();
-  }
-
-  variations::mojom::VariationsHeadersPtr GetVariationsHeaders()
-      const override {
-    return variations::VariationsIdsProvider::GetInstance()
-        ->GetClientDataHeaders(false /* is_signed_in */);
-  }
-
- private:
-  content::BrowserContext* browser_context_;
-};
-
-}  // namespace
-
-ChromeProfileAlloy::ChromeProfileAlloy() {}
-
-ChromeProfileAlloy::~ChromeProfileAlloy() {}
-
-bool ChromeProfileAlloy::IsOffTheRecord() {
-  return false;
-}
-
-bool ChromeProfileAlloy::IsOffTheRecord() const {
-  return false;
-}
-
-const Profile::OTRProfileID& ChromeProfileAlloy::GetOTRProfileID() const {
-  NOTREACHED();
-  static base::NoDestructor<Profile::OTRProfileID> otr_profile_id(
-      "ProfileImp::NoOTRProfileID");
-  return *otr_profile_id;
-}
-
-variations::VariationsClient* ChromeProfileAlloy::GetVariationsClient() {
-  if (!variations_client_)
-    variations_client_ = std::make_unique<CefVariationsClient>(this);
-  return variations_client_.get();
-}
-
-scoped_refptr<base::SequencedTaskRunner> ChromeProfileAlloy::GetIOTaskRunner() {
-  NOTREACHED();
-  return scoped_refptr<base::SequencedTaskRunner>();
-}
-
-std::string ChromeProfileAlloy::GetProfileUserName() const {
-  NOTREACHED();
-  return std::string();
-}
-
-Profile* ChromeProfileAlloy::GetOffTheRecordProfile(
-    const Profile::OTRProfileID& otr_profile_id) {
-  NOTREACHED();
-  return nullptr;
-}
-
-std::vector<Profile*> ChromeProfileAlloy::GetAllOffTheRecordProfiles() {
-  return {};
-}
-
-void ChromeProfileAlloy::DestroyOffTheRecordProfile(Profile* otr_profile) {
-  NOTREACHED();
-}
-
-bool ChromeProfileAlloy::HasOffTheRecordProfile(
-    const Profile::OTRProfileID& otr_profile_id) {
-  return false;
-}
-
-bool ChromeProfileAlloy::HasAnyOffTheRecordProfile() {
-  return false;
-}
-
-Profile* ChromeProfileAlloy::GetOriginalProfile() {
-  return this;
-}
-
-const Profile* ChromeProfileAlloy::GetOriginalProfile() const {
-  return this;
-}
-
-bool ChromeProfileAlloy::IsSupervised() const {
-  return false;
-}
-
-bool ChromeProfileAlloy::IsChild() const {
-  return false;
-}
-
-bool ChromeProfileAlloy::IsLegacySupervised() const {
-  return false;
-}
-
-ExtensionSpecialStoragePolicy*
-ChromeProfileAlloy::GetExtensionSpecialStoragePolicy() {
-  NOTREACHED();
-  return nullptr;
-}
-
-PrefService* ChromeProfileAlloy::GetOffTheRecordPrefs() {
-  NOTREACHED();
-  return nullptr;
-}
-
-bool ChromeProfileAlloy::IsSameOrParent(Profile* profile) {
-  NOTREACHED();
-  return false;
-}
-
-base::Time ChromeProfileAlloy::GetStartTime() const {
-  NOTREACHED();
-  return base::Time();
-}
-
-base::FilePath ChromeProfileAlloy::last_selected_directory() {
-  NOTREACHED();
-  return base::FilePath();
-}
-
-void ChromeProfileAlloy::set_last_selected_directory(
-    const base::FilePath& path) {
-  NOTREACHED();
-}
-
-GURL ChromeProfileAlloy::GetHomePage() {
-  NOTREACHED();
-  return GURL();
-}
-
-bool ChromeProfileAlloy::WasCreatedByVersionOrLater(
-    const std::string& version) {
-  NOTREACHED();
-  return false;
-}
-
-void ChromeProfileAlloy::SetExitType(ExitType exit_type) {
-  NOTREACHED();
-}
-
-Profile::ExitType ChromeProfileAlloy::GetLastSessionExitType() const {
-  NOTREACHED();
-  return EXIT_NORMAL;
-}
-
-base::Time ChromeProfileAlloy::GetCreationTime() const {
-  NOTREACHED();
-  return base::Time();
-}
-
-void ChromeProfileAlloy::SetCreationTimeForTesting(base::Time creation_time) {
-  NOTREACHED();
-}
-
-void ChromeProfileAlloy::RecordMainFrameNavigation() {
-  NOTREACHED();
-}
--- a/libcef/browser/audio_capturer.cc
+++ b/libcef/browser/audio_capturer.cc
@@ -1,126 +0,0 @@
-// Copyright (c) 2019 The Chromium Embedded Framework Authors.
-// Portions copyright (c) 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "libcef/browser/audio_capturer.h"
-#include "libcef/browser/alloy/alloy_browser_host_impl.h"
-
-#include "components/mirroring/service/captured_audio_input.h"
-#include "content/public/browser/audio_loopback_stream_creator.h"
-#include "media/audio/audio_input_device.h"
-
-namespace {
-
-media::ChannelLayout TranslateChannelLayout(
-    cef_channel_layout_t channel_layout) {
-  // Verify that our enum matches Chromium's values. The enum values match
-  // between those enums and existing values don't ever change, so it's enough
-  // to check that there are no new ones added.
-  static_assert(
-      static_cast<int>(CEF_CHANNEL_LAYOUT_MAX) ==
-          static_cast<int>(media::CHANNEL_LAYOUT_MAX),
-      "cef_channel_layout_t must match the ChannelLayout enum in Chromium");
-  return static_cast<media::ChannelLayout>(channel_layout);
-}
-
-void StreamCreatorHelper(
-    content::WebContents* source_web_contents,
-    content::AudioLoopbackStreamCreator* audio_stream_creator,
-    mojo::PendingRemote<mirroring::mojom::AudioStreamCreatorClient> client,
-    const media::AudioParameters& params,
-    uint32_t total_segments) {
-  audio_stream_creator->CreateLoopbackStream(
-      source_web_contents, params, total_segments,
-      base::BindRepeating(
-          [](mojo::PendingRemote<mirroring::mojom::AudioStreamCreatorClient>
-                 client,
-             mojo::PendingRemote<media::mojom::AudioInputStream> stream,
-             mojo::PendingReceiver<media::mojom::AudioInputStreamClient>
-                 client_receiver,
-             media::mojom::ReadOnlyAudioDataPipePtr data_pipe) {
-            mojo::Remote<mirroring::mojom::AudioStreamCreatorClient>
-                audio_client(std::move(client));
-            audio_client->StreamCreated(std::move(stream),
-                                        std::move(client_receiver),
-                                        std::move(data_pipe));
-          },
-          base::Passed(&client)));
-}
-
-}  // namespace
-
-CefAudioCapturer::CefAudioCapturer(const CefAudioParameters& params,
-                                   CefRefPtr<AlloyBrowserHostImpl> browser,
-                                   CefRefPtr<CefAudioHandler> audio_handler)
-    : params_(params),
-      browser_(browser),
-      audio_handler_(audio_handler),
-      audio_stream_creator_(content::AudioLoopbackStreamCreator::
-                                CreateInProcessAudioLoopbackStreamCreator()) {
-  media::AudioParameters audio_params(
-      media::AudioParameters::AUDIO_PCM_LINEAR,
-      TranslateChannelLayout(params.channel_layout), params.sample_rate,
-      params.frames_per_buffer);
-
-  if (!audio_params.IsValid()) {
-    LOG(ERROR) << "Invalid audio parameters";
-    return;
-  }
-
-  DCHECK(browser_);
-  DCHECK(audio_handler_);
-  DCHECK(browser_->web_contents());
-
-  channels_ = audio_params.channels();
-  audio_input_device_ = new media::AudioInputDevice(
-      std::make_unique<mirroring::CapturedAudioInput>(base::BindRepeating(
-          &StreamCreatorHelper, base::Unretained(browser_->web_contents()),
-          base::Unretained(audio_stream_creator_.get()))),
-      media::AudioInputDevice::kLoopback,
-      media::AudioInputDevice::DeadStreamDetection::kEnabled);
-
-  audio_input_device_->Initialize(audio_params, this);
-  audio_input_device_->Start();
-}
-
-CefAudioCapturer::~CefAudioCapturer() {
-  StopStream();
-}
-
-void CefAudioCapturer::OnCaptureStarted() {
-  audio_handler_->OnAudioStreamStarted(browser_, params_, channels_);
-  DCHECK(!capturing_);
-  capturing_ = true;
-}
-
-void CefAudioCapturer::Capture(const media::AudioBus* source,
-                               base::TimeTicks audio_capture_time,
-                               double /*volume*/,
-                               bool /*key_pressed*/) {
-  const int channels = source->channels();
-  std::array<const float*, media::CHANNELS_MAX> data;
-  DCHECK(channels == channels_);
-  DCHECK(channels <= static_cast<int>(data.size()));
-  for (int c = 0; c < channels; ++c) {
-    data[c] = source->channel(c);
-  }
-  base::TimeDelta pts = audio_capture_time - base::TimeTicks::UnixEpoch();
-  audio_handler_->OnAudioStreamPacket(browser_, data.data(), source->frames(),
-                                      pts.InMilliseconds());
-}
-
-void CefAudioCapturer::OnCaptureError(const std::string& message) {
-  audio_handler_->OnAudioStreamError(browser_, message);
-  StopStream();
-}
-
-void CefAudioCapturer::StopStream() {
-  if (audio_input_device_)
-    audio_input_device_->Stop();
-  if (capturing_)
-    audio_handler_->OnAudioStreamStopped(browser_);
-
-  audio_input_device_ = nullptr;
-  capturing_ = false;
-}
--- a/libcef/browser/audio_capturer.h
+++ b/libcef/browser/audio_capturer.h
@@ -1,53 +0,0 @@
-// Copyright (c) 2019 The Chromium Embedded Framework Authors.
-// Portions copyright (c) 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CEF_LIBCEF_BROWSER_AUDIO_CAPTURER_H_
-#define CEF_LIBCEF_BROWSER_AUDIO_CAPTURER_H_
-#pragma once
-
-#include "include/internal/cef_ptr.h"
-#include "include/internal/cef_types_wrappers.h"
-
-#include "media/base/audio_capturer_source.h"
-
-namespace content {
-class AudioLoopbackStreamCreator;
-}  // namespace content
-
-namespace media {
-class AudioInputDevice;
-}  // namespace media
-
-class CefAudioHandler;
-class AlloyBrowserHostImpl;
-
-class CefAudioCapturer : public media::AudioCapturerSource::CaptureCallback {
- public:
-  CefAudioCapturer(const CefAudioParameters& params,
-                   CefRefPtr<AlloyBrowserHostImpl> browser,
-                   CefRefPtr<CefAudioHandler> audio_handler);
-  ~CefAudioCapturer() override;
-
- private:
-  void OnCaptureStarted() override;
-  void Capture(const media::AudioBus* audio_source,
-               base::TimeTicks audio_capture_time,
-               double volume,
-               bool key_pressed) override;
-  void OnCaptureError(const std::string& message) override;
-  void OnCaptureMuted(bool is_muted) override {}
-
-  void StopStream();
-
-  CefAudioParameters params_;
-  CefRefPtr<AlloyBrowserHostImpl> browser_;
-  CefRefPtr<CefAudioHandler> audio_handler_;
-  std::unique_ptr<content::AudioLoopbackStreamCreator> audio_stream_creator_;
-  scoped_refptr<media::AudioInputDevice> audio_input_device_;
-  bool capturing_ = false;
-  int channels_ = 0;
-};
-
-#endif  // CEF_LIBCEF_BROWSER_AUDIO_CAPTURER_H_
--- a/libcef/browser/browser_contents_delegate.cc
+++ b/libcef/browser/browser_contents_delegate.cc
@@ -1,616 +0,0 @@
-// Copyright 2020 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.
-
-#include "libcef/browser/browser_contents_delegate.h"
-
-#include "libcef/browser/browser_host_base.h"
-#include "libcef/browser/browser_platform_delegate.h"
-#include "libcef/browser/browser_util.h"
-
-#include "content/public/browser/keyboard_event_processing_result.h"
-#include "content/public/browser/native_web_keyboard_event.h"
-#include "content/public/browser/navigation_entry.h"
-#include "content/public/browser/navigation_handle.h"
-#include "content/public/browser/notification_details.h"
-#include "content/public/browser/notification_source.h"
-#include "content/public/browser/notification_types.h"
-#include "content/public/browser/render_view_host.h"
-
-using content::KeyboardEventProcessingResult;
-
-CefBrowserContentsDelegate::CefBrowserContentsDelegate(
-    scoped_refptr<CefBrowserInfo> browser_info)
-    : browser_info_(browser_info) {
-  DCHECK(browser_info_->browser());
-}
-
-void CefBrowserContentsDelegate::ObserveWebContents(
-    content::WebContents* new_contents) {
-  WebContentsObserver::Observe(new_contents);
-
-  if (new_contents) {
-    registrar_.reset(new content::NotificationRegistrar);
-
-    // When navigating through the history, the restored NavigationEntry's title
-    // will be used. If the entry ends up having the same title after we return
-    // to it, as will usually be the case, the
-    // NOTIFICATION_WEB_CONTENTS_TITLE_UPDATED will then be suppressed, since
-    // the NavigationEntry's title hasn't changed.
-    registrar_->Add(this, content::NOTIFICATION_LOAD_STOP,
-                    content::Source<content::NavigationController>(
-                        &new_contents->GetController()));
-
-    // Make sure RenderViewCreated is called at least one time.
-    RenderViewCreated(new_contents->GetRenderViewHost());
-
-    // Create the frame representation before OnAfterCreated is called for a new
-    // browser. Additionally, RenderFrameCreated is otherwise not called at all
-    // for new popup browsers.
-    RenderFrameCreated(new_contents->GetMainFrame());
-  } else {
-    registrar_.reset();
-  }
-}
-
-void CefBrowserContentsDelegate::AddObserver(Observer* observer) {
-  observers_.AddObserver(observer);
-}
-
-void CefBrowserContentsDelegate::RemoveObserver(Observer* observer) {
-  observers_.RemoveObserver(observer);
-}
-
-// |source| may be NULL for navigations in the current tab, or if the
-// navigation originates from a guest view via MaybeAllowNavigation.
-content::WebContents* CefBrowserContentsDelegate::OpenURLFromTab(
-    content::WebContents* source,
-    const content::OpenURLParams& params) {
-  bool cancel = false;
-
-  if (auto c = client()) {
-    if (auto handler = c->GetRequestHandler()) {
-      cancel = handler->OnOpenURLFromTab(
-          browser(), browser()->GetFrame(params.frame_tree_node_id),
-          params.url.spec(),
-          static_cast<cef_window_open_disposition_t>(params.disposition),
-          params.user_gesture);
-    }
-  }
-
-  // Returning nullptr will cancel the navigation.
-  return cancel ? nullptr : web_contents();
-}
-
-void CefBrowserContentsDelegate::LoadingStateChanged(
-    content::WebContents* source,
-    bool to_different_document) {
-  const int current_index =
-      source->GetController().GetLastCommittedEntryIndex();
-  const int max_index = source->GetController().GetEntryCount() - 1;
-
-  const bool is_loading = source->IsLoading();
-  const bool can_go_back = (current_index > 0);
-  const bool can_go_forward = (current_index < max_index);
-
-  // This method may be called multiple times in a row with |is_loading|
-  // true as a result of https://crrev.com/5e750ad0. Ignore the 2nd+ times.
-  if (is_loading_ == is_loading && can_go_back_ == can_go_back &&
-      can_go_forward_ == can_go_forward) {
-    return;
-  }
-
-  is_loading_ = is_loading;
-  can_go_back_ = can_go_back;
-  can_go_forward_ = can_go_forward;
-  OnStateChanged(State::kNavigation);
-
-  if (auto c = client()) {
-    if (auto handler = c->GetLoadHandler()) {
-      handler->OnLoadingStateChange(browser(), is_loading, can_go_back,
-                                    can_go_forward);
-    }
-  }
-}
-
-void CefBrowserContentsDelegate::UpdateTargetURL(content::WebContents* source,
-                                                 const GURL& url) {
-  if (auto c = client()) {
-    if (auto handler = c->GetDisplayHandler()) {
-      handler->OnStatusMessage(browser(), url.spec());
-    }
-  }
-}
-
-bool CefBrowserContentsDelegate::DidAddMessageToConsole(
-    content::WebContents* source,
-    blink::mojom::ConsoleMessageLevel log_level,
-    const base::string16& message,
-    int32_t line_no,
-    const base::string16& source_id) {
-  if (auto c = client()) {
-    if (auto handler = c->GetDisplayHandler()) {
-      // Use LOGSEVERITY_DEBUG for unrecognized |level| values.
-      cef_log_severity_t cef_level = LOGSEVERITY_DEBUG;
-      switch (log_level) {
-        case blink::mojom::ConsoleMessageLevel::kVerbose:
-          cef_level = LOGSEVERITY_DEBUG;
-          break;
-        case blink::mojom::ConsoleMessageLevel::kInfo:
-          cef_level = LOGSEVERITY_INFO;
-          break;
-        case blink::mojom::ConsoleMessageLevel::kWarning:
-          cef_level = LOGSEVERITY_WARNING;
-          break;
-        case blink::mojom::ConsoleMessageLevel::kError:
-          cef_level = LOGSEVERITY_ERROR;
-          break;
-      }
-
-      return handler->OnConsoleMessage(browser(), cef_level, message, source_id,
-                                       line_no);
-    }
-  }
-
-  return false;
-}
-
-void CefBrowserContentsDelegate::DidNavigateMainFramePostCommit(
-    content::WebContents* web_contents) {
-  has_document_ = false;
-  OnStateChanged(State::kDocument);
-}
-
-void CefBrowserContentsDelegate::EnterFullscreenModeForTab(
-    content::RenderFrameHost* requesting_frame,
-    const blink::mojom::FullscreenOptions& options) {
-  OnFullscreenModeChange(/*fullscreen=*/true);
-}
-
-void CefBrowserContentsDelegate::ExitFullscreenModeForTab(
-    content::WebContents* web_contents) {
-  OnFullscreenModeChange(/*fullscreen=*/false);
-}
-
-KeyboardEventProcessingResult
-CefBrowserContentsDelegate::PreHandleKeyboardEvent(
-    content::WebContents* source,
-    const content::NativeWebKeyboardEvent& event) {
-  if (auto delegate = platform_delegate()) {
-    if (auto c = client()) {
-      if (auto handler = c->GetKeyboardHandler()) {
-        CefKeyEvent cef_event;
-        if (browser_util::GetCefKeyEvent(event, cef_event)) {
-          cef_event.focus_on_editable_field = focus_on_editable_field_;
-
-          auto event_handle = delegate->GetEventHandle(event);
-          bool is_keyboard_shortcut = false;
-          bool result = handler->OnPreKeyEvent(
-              browser(), cef_event, event_handle, &is_keyboard_shortcut);
-          if (result) {
-            return KeyboardEventProcessingResult::HANDLED;
-          } else if (is_keyboard_shortcut) {
-            return KeyboardEventProcessingResult::NOT_HANDLED_IS_SHORTCUT;
-          }
-        }
-      }
-    }
-  }
-
-  return KeyboardEventProcessingResult::NOT_HANDLED;
-}
-
-bool CefBrowserContentsDelegate::HandleKeyboardEvent(
-    content::WebContents* source,
-    const content::NativeWebKeyboardEvent& event) {
-  // Check to see if event should be ignored.
-  if (event.skip_in_browser)
-    return false;
-
-  if (auto delegate = platform_delegate()) {
-    if (auto c = client()) {
-      if (auto handler = c->GetKeyboardHandler()) {
-        CefKeyEvent cef_event;
-        if (browser_util::GetCefKeyEvent(event, cef_event)) {
-          cef_event.focus_on_editable_field = focus_on_editable_field_;
-
-          auto event_handle = delegate->GetEventHandle(event);
-          if (handler->OnKeyEvent(browser(), cef_event, event_handle)) {
-            return true;
-          }
-        }
-      }
-    }
-  }
-
-  return false;
-}
-
-void CefBrowserContentsDelegate::RenderFrameCreated(
-    content::RenderFrameHost* render_frame_host) {
-  browser_info_->MaybeCreateFrame(render_frame_host, false /* is_guest_view */);
-}
-
-void CefBrowserContentsDelegate::RenderFrameHostChanged(
-    content::RenderFrameHost* old_host,
-    content::RenderFrameHost* new_host) {
-  // Just in case RenderFrameCreated wasn't called for some reason.
-  RenderFrameCreated(new_host);
-}
-
-void CefBrowserContentsDelegate::RenderFrameDeleted(
-    content::RenderFrameHost* render_frame_host) {
-  const auto frame_id = CefFrameHostImpl::MakeFrameId(render_frame_host);
-  browser_info_->RemoveFrame(render_frame_host);
-
-  if (focused_frame_ && focused_frame_->GetIdentifier() == frame_id) {
-    focused_frame_ = nullptr;
-    OnStateChanged(State::kFocusedFrame);
-  }
-}
-
-void CefBrowserContentsDelegate::RenderViewCreated(
-    content::RenderViewHost* render_view_host) {
-  // May be already registered if the renderer crashed previously.
-  if (!registrar_->IsRegistered(
-          this, content::NOTIFICATION_FOCUS_CHANGED_IN_PAGE,
-          content::Source<content::RenderViewHost>(render_view_host))) {
-    registrar_->Add(this, content::NOTIFICATION_FOCUS_CHANGED_IN_PAGE,
-                    content::Source<content::RenderViewHost>(render_view_host));
-  }
-}
-
-void CefBrowserContentsDelegate::RenderViewDeleted(
-    content::RenderViewHost* render_view_host) {
-  if (registrar_->IsRegistered(
-          this, content::NOTIFICATION_FOCUS_CHANGED_IN_PAGE,
-          content::Source<content::RenderViewHost>(render_view_host))) {
-    registrar_->Remove(
-        this, content::NOTIFICATION_FOCUS_CHANGED_IN_PAGE,
-        content::Source<content::RenderViewHost>(render_view_host));
-  }
-}
-
-void CefBrowserContentsDelegate::RenderViewReady() {
-  if (auto c = client()) {
-    if (auto handler = c->GetRequestHandler()) {
-      handler->OnRenderViewReady(browser());
-    }
-  }
-}
-
-void CefBrowserContentsDelegate::RenderProcessGone(
-    base::TerminationStatus status) {
-  cef_termination_status_t ts = TS_ABNORMAL_TERMINATION;
-  if (status == base::TERMINATION_STATUS_PROCESS_WAS_KILLED)
-    ts = TS_PROCESS_WAS_KILLED;
-  else if (status == base::TERMINATION_STATUS_PROCESS_CRASHED)
-    ts = TS_PROCESS_CRASHED;
-  else if (status == base::TERMINATION_STATUS_OOM)
-    ts = TS_PROCESS_OOM;
-  else if (status != base::TERMINATION_STATUS_ABNORMAL_TERMINATION)
-    return;
-
-  if (auto c = client()) {
-    if (auto handler = c->GetRequestHandler()) {
-      auto navigation_lock = browser_info_->CreateNavigationLock();
-      handler->OnRenderProcessTerminated(browser(), ts);
-    }
-  }
-}
-
-void CefBrowserContentsDelegate::OnFrameFocused(
-    content::RenderFrameHost* render_frame_host) {
-  CefRefPtr<CefFrameHostImpl> frame = static_cast<CefFrameHostImpl*>(
-      browser_info_->GetFrameForHost(render_frame_host).get());
-  if (!frame || frame->IsFocused())
-    return;
-
-  CefRefPtr<CefFrameHostImpl> previous_frame = focused_frame_;
-  if (frame->IsMain())
-    focused_frame_ = nullptr;
-  else
-    focused_frame_ = frame;
-
-  if (!previous_frame) {
-    // The main frame is focused by default.
-    previous_frame = browser_info_->GetMainFrame();
-  }
-
-  if (previous_frame->GetIdentifier() != frame->GetIdentifier()) {
-    previous_frame->SetFocused(false);
-    frame->SetFocused(true);
-  }
-
-  OnStateChanged(State::kFocusedFrame);
-}
-
-void CefBrowserContentsDelegate::DocumentAvailableInMainFrame() {
-  has_document_ = true;
-  OnStateChanged(State::kDocument);
-
-  if (auto c = client()) {
-    if (auto handler = c->GetRequestHandler()) {
-      handler->OnDocumentAvailableInMainFrame(browser());
-    }
-  }
-}
-
-void CefBrowserContentsDelegate::LoadProgressChanged(double progress) {
-  if (auto c = client()) {
-    if (auto handler = c->GetDisplayHandler()) {
-      handler->OnLoadingProgressChange(browser(), progress);
-    }
-  }
-}
-
-void CefBrowserContentsDelegate::DidStopLoading() {
-  // Notify all renderers that loading has stopped. We used to use
-  // RenderFrameObserver::DidStopLoading in the renderer process but that was
-  // removed in https://crrev.com/3e37dd0ead. However, that callback wasn't
-  // necessarily accurate because it wasn't called in all of the cases where
-  // RenderFrameImpl sends the FrameHostMsg_DidStopLoading message. This adds
-  // an additional round trip but should provide the same or improved
-  // functionality.
-  for (const auto& frame : browser_info_->GetAllFrames()) {
-    frame->MaybeSendDidStopLoading();
-  }
-}
-
-void CefBrowserContentsDelegate::DidFinishNavigation(
-    content::NavigationHandle* navigation_handle) {
-  const net::Error error_code = navigation_handle->GetNetErrorCode();
-
-  // Skip calls where the navigation has not yet committed and there is no
-  // error code. For example, when creating a browser without loading a URL.
-  if (!navigation_handle->HasCommitted() && error_code == net::OK)
-    return;
-
-  const bool is_main_frame = navigation_handle->IsInMainFrame();
-  const GURL& url =
-      (error_code == net::OK ? navigation_handle->GetURL() : GURL());
-
-  auto browser_info = browser_info_;
-
-  // May return NULL when starting a new navigation if the previous navigation
-  // caused the renderer process to crash during load.
-  CefRefPtr<CefFrameHostImpl> frame = browser_info->GetFrameForFrameTreeNode(
-      navigation_handle->GetFrameTreeNodeId());
-  if (!frame) {
-    if (is_main_frame) {
-      frame = browser_info->GetMainFrame();
-    } else {
-      frame =
-          browser_info->CreateTempSubFrame(CefFrameHostImpl::kInvalidFrameId);
-    }
-  }
-  frame->RefreshAttributes();
-
-  if (error_code == net::OK) {
-    // The navigation has been committed and there is no error.
-    DCHECK(navigation_handle->HasCommitted());
-
-    // Don't call OnLoadStart for same page navigations (fragments,
-    // history state).
-    if (!navigation_handle->IsSameDocument()) {
-      OnLoadStart(frame.get(), navigation_handle->GetPageTransition());
-    }
-
-    if (is_main_frame) {
-      OnAddressChange(url);
-    }
-  } else {
-    // The navigation failed with an error. This may happen before commit
-    // (e.g. network error) or after commit (e.g. response filter error).
-    // If the error happened before commit then this call will originate from
-    // RenderFrameHostImpl::OnDidFailProvisionalLoadWithError.
-    // OnLoadStart/OnLoadEnd will not be called.
-    OnLoadError(frame.get(), navigation_handle->GetURL(), error_code);
-  }
-}
-
-void CefBrowserContentsDelegate::DidFailLoad(
-    content::RenderFrameHost* render_frame_host,
-    const GURL& validated_url,
-    int error_code) {
-  // The navigation failed after commit. OnLoadStart was called so we also
-  // call OnLoadEnd.
-  auto frame = browser_info_->GetFrameForHost(render_frame_host);
-  frame->RefreshAttributes();
-  OnLoadError(frame, validated_url, error_code);
-  OnLoadEnd(frame, validated_url, error_code);
-}
-
-bool CefBrowserContentsDelegate::OnMessageReceived(
-    const IPC::Message& message,
-    content::RenderFrameHost* render_frame_host) {
-  // Messages may arrive after a frame is detached. Ignore those messages.
-  auto frame = browser_info_->GetFrameForHost(render_frame_host);
-  if (frame) {
-    return static_cast<CefFrameHostImpl*>(frame.get())
-        ->OnMessageReceived(message);
-  }
-  return false;
-}
-
-void CefBrowserContentsDelegate::TitleWasSet(content::NavigationEntry* entry) {
-  // |entry| may be NULL if a popup is created via window.open and never
-  // navigated.
-  if (entry)
-    OnTitleChange(entry->GetTitle());
-  else if (web_contents())
-    OnTitleChange(web_contents()->GetTitle());
-}
-
-void CefBrowserContentsDelegate::PluginCrashed(
-    const base::FilePath& plugin_path,
-    base::ProcessId plugin_pid) {
-  if (auto c = client()) {
-    if (auto handler = c->GetRequestHandler()) {
-      handler->OnPluginCrashed(browser(), plugin_path.value());
-    }
-  }
-}
-
-void CefBrowserContentsDelegate::DidUpdateFaviconURL(
-    content::RenderFrameHost* render_frame_host,
-    const std::vector<blink::mojom::FaviconURLPtr>& candidates) {
-  if (auto c = client()) {
-    if (auto handler = c->GetDisplayHandler()) {
-      std::vector<CefString> icon_urls;
-      for (const auto& icon : candidates) {
-        if (icon->icon_type == blink::mojom::FaviconIconType::kFavicon) {
-          icon_urls.push_back(icon->icon_url.spec());
-        }
-      }
-      if (!icon_urls.empty()) {
-        handler->OnFaviconURLChange(browser(), icon_urls);
-      }
-    }
-  }
-}
-
-void CefBrowserContentsDelegate::OnWebContentsFocused(
-    content::RenderWidgetHost* render_widget_host) {
-  if (auto c = client()) {
-    if (auto handler = c->GetFocusHandler()) {
-      handler->OnGotFocus(browser());
-    }
-  }
-}
-
-void CefBrowserContentsDelegate::WebContentsDestroyed() {
-  auto wc = web_contents();
-  ObserveWebContents(nullptr);
-  for (auto& observer : observers_) {
-    observer.OnWebContentsDestroyed(wc);
-  }
-}
-
-void CefBrowserContentsDelegate::Observe(
-    int type,
-    const content::NotificationSource& source,
-    const content::NotificationDetails& details) {
-  DCHECK(type == content::NOTIFICATION_LOAD_STOP ||
-         type == content::NOTIFICATION_FOCUS_CHANGED_IN_PAGE);
-
-  if (type == content::NOTIFICATION_LOAD_STOP) {
-    content::NavigationController* controller =
-        content::Source<content::NavigationController>(source).ptr();
-    OnTitleChange(controller->GetWebContents()->GetTitle());
-  } else if (type == content::NOTIFICATION_FOCUS_CHANGED_IN_PAGE) {
-    focus_on_editable_field_ = *content::Details<bool>(details).ptr();
-  }
-}
-
-void CefBrowserContentsDelegate::OnLoadEnd(CefRefPtr<CefFrame> frame,
-                                           const GURL& url,
-                                           int http_status_code) {
-  if (auto c = client()) {
-    if (auto handler = c->GetLoadHandler()) {
-      handler->OnLoadEnd(browser(), frame, http_status_code);
-    }
-  }
-}
-
-bool CefBrowserContentsDelegate::OnSetFocus(cef_focus_source_t source) {
-  // SetFocus() might be called while inside the OnSetFocus() callback. If
-  // so, don't re-enter the callback.
-  if (is_in_onsetfocus_)
-    return true;
-
-  if (auto c = client()) {
-    if (auto handler = c->GetFocusHandler()) {
-      is_in_onsetfocus_ = true;
-      bool handled = handler->OnSetFocus(browser(), source);
-      is_in_onsetfocus_ = false;
-
-      return handled;
-    }
-  }
-
-  return false;
-}
-
-CefRefPtr<CefClient> CefBrowserContentsDelegate::client() const {
-  if (auto b = browser()) {
-    return b->GetHost()->GetClient();
-  }
-  return nullptr;
-}
-
-CefRefPtr<CefBrowser> CefBrowserContentsDelegate::browser() const {
-  return browser_info_->browser();
-}
-
-CefBrowserPlatformDelegate* CefBrowserContentsDelegate::platform_delegate()
-    const {
-  auto browser = browser_info_->browser();
-  if (browser)
-    return browser->platform_delegate();
-  return nullptr;
-}
-
-void CefBrowserContentsDelegate::OnAddressChange(const GURL& url) {
-  if (auto c = client()) {
-    if (auto handler = c->GetDisplayHandler()) {
-      // On the handler of an address change.
-      handler->OnAddressChange(browser(), browser_info_->GetMainFrame(),
-                               url.spec());
-    }
-  }
-}
-
-void CefBrowserContentsDelegate::OnLoadStart(
-    CefRefPtr<CefFrame> frame,
-    ui::PageTransition transition_type) {
-  if (auto c = client()) {
-    if (auto handler = c->GetLoadHandler()) {
-      // On the handler that loading has started.
-      handler->OnLoadStart(browser(), frame,
-                           static_cast<cef_transition_type_t>(transition_type));
-    }
-  }
-}
-
-void CefBrowserContentsDelegate::OnLoadError(CefRefPtr<CefFrame> frame,
-                                             const GURL& url,
-                                             int error_code) {
-  if (auto c = client()) {
-    if (auto handler = c->GetLoadHandler()) {
-      auto navigation_lock = browser_info_->CreateNavigationLock();
-      // On the handler that loading has failed.
-      handler->OnLoadError(browser(), frame,
-                           static_cast<cef_errorcode_t>(error_code),
-                           net::ErrorToShortString(error_code), url.spec());
-    }
-  }
-}
-
-void CefBrowserContentsDelegate::OnTitleChange(const base::string16& title) {
-  if (auto c = client()) {
-    if (auto handler = c->GetDisplayHandler()) {
-      handler->OnTitleChange(browser(), title);
-    }
-  }
-}
-
-void CefBrowserContentsDelegate::OnFullscreenModeChange(bool fullscreen) {
-  if (fullscreen == is_fullscreen_)
-    return;
-
-  is_fullscreen_ = fullscreen;
-  OnStateChanged(State::kFullscreen);
-
-  if (auto c = client()) {
-    if (auto handler = c->GetDisplayHandler()) {
-      handler->OnFullscreenModeChange(browser(), fullscreen);
-    }
-  }
-}
-
-void CefBrowserContentsDelegate::OnStateChanged(State state_changed) {
-  for (auto& observer : observers_) {
-    observer.OnStateChanged(state_changed);
-  }
-}
--- a/libcef/browser/browser_contents_delegate.h
+++ b/libcef/browser/browser_contents_delegate.h
@@ -1,198 +0,0 @@
-// Copyright 2020 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.
-
-#ifndef CEF_LIBCEF_BROWSER_BROWSER_CONTENTS_DELEGATE_H_
-#define CEF_LIBCEF_BROWSER_BROWSER_CONTENTS_DELEGATE_H_
-#pragma once
-
-#include <memory>
-
-#include "libcef/browser/frame_host_impl.h"
-
-#include "base/observer_list.h"
-#include "content/public/browser/notification_observer.h"
-#include "content/public/browser/notification_registrar.h"
-#include "content/public/browser/web_contents_delegate.h"
-#include "content/public/browser/web_contents_observer.h"
-
-class CefBrowser;
-class CefBrowserInfo;
-class CefBrowserPlatformDelegate;
-class CefClient;
-
-// Flags that represent which states have changed.
-enum class CefBrowserContentsState : uint8_t {
-  kNone = 0,
-  kNavigation = (1 << 0),
-  kDocument = (1 << 1),
-  kFullscreen = (1 << 2),
-  kFocusedFrame = (1 << 3),
-};
-
-constexpr inline CefBrowserContentsState operator&(
-    CefBrowserContentsState lhs,
-    CefBrowserContentsState rhs) {
-  return static_cast<CefBrowserContentsState>(static_cast<int>(lhs) &
-                                              static_cast<int>(rhs));
-}
-
-constexpr inline CefBrowserContentsState operator|(
-    CefBrowserContentsState lhs,
-    CefBrowserContentsState rhs) {
-  return static_cast<CefBrowserContentsState>(static_cast<int>(lhs) |
-                                              static_cast<int>(rhs));
-}
-
-// Tracks state and executes client callbacks based on WebContents callbacks.
-// Includes functionality that is shared by the alloy and chrome runtimes.
-// Only accessed on the UI thread.
-class CefBrowserContentsDelegate : public content::WebContentsDelegate,
-                                   public content::WebContentsObserver,
-                                   public content::NotificationObserver {
- public:
-  using State = CefBrowserContentsState;
-
-  // Interface to implement for observers that wish to be informed of changes
-  // to the delegate. All methods will be called on the UI thread.
-  class Observer : public base::CheckedObserver {
-   public:
-    // Called after state has changed and before the associated CefClient
-    // callback is executed.
-    virtual void OnStateChanged(State state_changed) = 0;
-
-    // Called when the associated WebContents is destroyed.
-    virtual void OnWebContentsDestroyed(content::WebContents* web_contents) = 0;
-
-   protected:
-    ~Observer() override {}
-  };
-
-  explicit CefBrowserContentsDelegate(
-      scoped_refptr<CefBrowserInfo> browser_info);
-
-  void ObserveWebContents(content::WebContents* new_contents);
-
-  // Manage observer objects. The observer must either outlive this object or
-  // be removed before destruction.
-  void AddObserver(Observer* observer);
-  void RemoveObserver(Observer* observer);
-
-  // WebContentsDelegate methods:
-  content::WebContents* OpenURLFromTab(
-      content::WebContents* source,
-      const content::OpenURLParams& params) override;
-  void LoadingStateChanged(content::WebContents* source,
-                           bool to_different_document) override;
-  void UpdateTargetURL(content::WebContents* source, const GURL& url) override;
-  bool DidAddMessageToConsole(content::WebContents* source,
-                              blink::mojom::ConsoleMessageLevel log_level,
-                              const base::string16& message,
-                              int32_t line_no,
-                              const base::string16& source_id) override;
-  void DidNavigateMainFramePostCommit(
-      content::WebContents* web_contents) override;
-  void EnterFullscreenModeForTab(
-      content::RenderFrameHost* requesting_frame,
-      const blink::mojom::FullscreenOptions& options) override;
-  void ExitFullscreenModeForTab(content::WebContents* web_contents) override;
-  content::KeyboardEventProcessingResult PreHandleKeyboardEvent(
-      content::WebContents* source,
-      const content::NativeWebKeyboardEvent& event) override;
-  bool HandleKeyboardEvent(
-      content::WebContents* source,
-      const content::NativeWebKeyboardEvent& event) override;
-
-  // WebContentsObserver methods:
-  void RenderFrameCreated(content::RenderFrameHost* render_frame_host) override;
-  void RenderFrameHostChanged(content::RenderFrameHost* old_host,
-                              content::RenderFrameHost* new_host) override;
-  void RenderFrameDeleted(content::RenderFrameHost* render_frame_host) override;
-  void RenderViewCreated(content::RenderViewHost* render_view_host) override;
-  void RenderViewDeleted(content::RenderViewHost* render_view_host) override;
-  void RenderViewReady() override;
-  void RenderProcessGone(base::TerminationStatus status) override;
-  void OnFrameFocused(content::RenderFrameHost* render_frame_host) override;
-  void DocumentAvailableInMainFrame() override;
-  void LoadProgressChanged(double progress) override;
-  void DidStopLoading() override;
-  void DidFinishNavigation(
-      content::NavigationHandle* navigation_handle) override;
-  void DidFailLoad(content::RenderFrameHost* render_frame_host,
-                   const GURL& validated_url,
-                   int error_code) override;
-  bool OnMessageReceived(const IPC::Message& message,
-                         content::RenderFrameHost* render_frame_host) override;
-  void TitleWasSet(content::NavigationEntry* entry) override;
-  void PluginCrashed(const base::FilePath& plugin_path,
-                     base::ProcessId plugin_pid) override;
-  void DidUpdateFaviconURL(
-      content::RenderFrameHost* render_frame_host,
-      const std::vector<blink::mojom::FaviconURLPtr>& candidates) override;
-  void OnWebContentsFocused(
-      content::RenderWidgetHost* render_widget_host) override;
-  void WebContentsDestroyed() override;
-
-  // NotificationObserver methods.
-  void Observe(int type,
-               const content::NotificationSource& source,
-               const content::NotificationDetails& details) override;
-
-  // Accessors for state information. Changes will be signaled to
-  // Observer::OnStateChanged.
-  bool is_loading() const { return is_loading_; }
-  bool can_go_back() const { return can_go_back_; }
-  bool can_go_forward() const { return can_go_forward_; }
-  bool has_document() const { return has_document_; }
-  bool is_fullscreen() const { return is_fullscreen_; }
-  CefRefPtr<CefFrameHostImpl> focused_frame() const { return focused_frame_; }
-
-  // Helpers for executing client callbacks.
-  // TODO(cef): Make this private if/when possible.
-  void OnLoadEnd(CefRefPtr<CefFrame> frame,
-                 const GURL& url,
-                 int http_status_code);
-  bool OnSetFocus(cef_focus_source_t source);
-
- private:
-  CefRefPtr<CefClient> client() const;
-  CefRefPtr<CefBrowser> browser() const;
-  CefBrowserPlatformDelegate* platform_delegate() const;
-
-  // Helpers for executing client callbacks.
-  void OnAddressChange(const GURL& url);
-  void OnLoadStart(CefRefPtr<CefFrame> frame,
-                   ui::PageTransition transition_type);
-  void OnLoadError(CefRefPtr<CefFrame> frame, const GURL& url, int error_code);
-  void OnTitleChange(const base::string16& title);
-  void OnFullscreenModeChange(bool fullscreen);
-
-  void OnStateChanged(State state_changed);
-
-  scoped_refptr<CefBrowserInfo> browser_info_;
-
-  bool is_loading_ = false;
-  bool can_go_back_ = false;
-  bool can_go_forward_ = false;
-  bool has_document_ = false;
-  bool is_fullscreen_ = false;
-
-  // The currently focused frame, or nullptr if the main frame is focused.
-  CefRefPtr<CefFrameHostImpl> focused_frame_;
-
-  // True if currently in the OnSetFocus callback.
-  bool is_in_onsetfocus_ = false;
-
-  // Observers that want to be notified of changes to this object.
-  base::ObserverList<Observer> observers_;
-
-  // Used for managing notification subscriptions.
-  std::unique_ptr<content::NotificationRegistrar> registrar_;
-
-  // True if the focus is currently on an editable field on the page.
-  bool focus_on_editable_field_ = false;
-
-  DISALLOW_COPY_AND_ASSIGN(CefBrowserContentsDelegate);
-};
-
-#endif  // CEF_LIBCEF_BROWSER_BROWSER_CONTENTS_DELEGATE_H_
--- a/libcef/browser/browser_context.cc
+++ b/libcef/browser/browser_context.cc
@@ -7,20 +7,48 @@
 #include <map>
 #include <utility>

-#include "libcef/browser/iothread_state.h"
-#include "libcef/browser/media_router/media_router_manager.h"
+#include "libcef/browser/content_browser_client.h"
+#include "libcef/browser/context.h"
+#include "libcef/browser/download_manager_delegate.h"
+#include "libcef/browser/extensions/extension_system.h"
+#include "libcef/browser/prefs/browser_prefs.h"
 #include "libcef/browser/request_context_impl.h"
+#include "libcef/browser/ssl_host_state_delegate.h"
 #include "libcef/browser/thread_util.h"
 #include "libcef/common/cef_switches.h"
+#include "libcef/common/extensions/extensions_util.h"

+#include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/strings/string_util.h"
-#include "content/public/browser/browser_context.h"
+#include "chrome/browser/font_family_cache.h"
+#include "chrome/browser/plugins/chrome_plugin_service_filter.h"
+#include "chrome/browser/profiles/profile_key.h"
+#include "chrome/browser/ui/zoom/chrome_zoom_level_prefs.h"
+#include "chrome/common/pref_names.h"
+#include "components/content_settings/core/browser/host_content_settings_map.h"
+#include "components/guest_view/browser/guest_view_manager.h"
+#include "components/keyed_service/content/browser_context_dependency_manager.h"
+#include "components/keyed_service/core/simple_dependency_manager.h"
+#include "components/keyed_service/core/simple_key_map.h"
+#include "components/prefs/pref_service.h"
+#include "components/proxy_config/pref_proxy_config_tracker_impl.h"
+#include "components/user_prefs/user_prefs.h"
+#include "components/visitedlink/browser/visitedlink_event_listener.h"
+#include "components/visitedlink/browser/visitedlink_master.h"
+#include "components/zoom/zoom_event_manager.h"
 #include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/public/browser/download_manager.h"
 #include "content/public/browser/storage_partition.h"
+#include "extensions/browser/extension_protocols.h"
+#include "extensions/browser/process_manager.h"
+#include "extensions/common/constants.h"
+#include "net/proxy_resolution/proxy_config_service.h"
+#include "net/proxy_resolution/proxy_resolution_service.h"
+#include "services/network/public/mojom/cors_origin_pattern.mojom.h"

 using content::BrowserThread;

@@ -63,10 +91,10 @@ class ImplManager {
    return GetImplPos(impl) != all_.end();
  }

-  CefBrowserContext* GetImplFromIDs(int render_process_id,
-                                    int render_frame_id,
-                                    int frame_tree_node_id,
-                                    bool require_frame_match) {
+  CefBrowserContext* GetImplForIDs(int render_process_id,
+                                   int render_frame_id,
+                                   int frame_tree_node_id,
+                                   bool require_frame_match) {
    CEF_REQUIRE_UIT();
    for (const auto& context : all_) {
      if (context->IsAssociatedContext(render_process_id, render_frame_id,
@@ -78,15 +106,15 @@ class ImplManager {
    return nullptr;
  }

-  CefBrowserContext* GetImplFromBrowserContext(
-      const content::BrowserContext* context) {
+  CefBrowserContext* GetImplForContext(const content::BrowserContext* context) {
    CEF_REQUIRE_UIT();
    if (!context)
      return nullptr;

-    for (const auto& bc : all_) {
-      if (bc->AsBrowserContext() == context)
-        return bc;
+    Vector::iterator it = all_.begin();
+    for (; it != all_.end(); ++it) {
+      if (*it == context)
+        return *it;
    }
    return nullptr;
  }
@@ -95,11 +123,11 @@ class ImplManager {
    CEF_REQUIRE_UIT();
    DCHECK(!path.empty());
    DCHECK(IsValidImpl(impl));
-    DCHECK(GetImplFromPath(path) == nullptr);
+    DCHECK(GetImplForPath(path) == nullptr);
    map_.insert(std::make_pair(path, impl));
  }

-  CefBrowserContext* GetImplFromPath(const base::FilePath& path) {
+  CefBrowserContext* GetImplForPath(const base::FilePath& path) {
    CEF_REQUIRE_UIT();
    DCHECK(!path.empty());
    PathMap::const_iterator it = map_.find(path);
@@ -136,48 +164,68 @@ base::LazyInstance<ImplManager>::DestructorAtExit g_manager =
 base::LazyInstance<ImplManager>::Leaky g_manager = LAZY_INSTANCE_INITIALIZER;
 #endif

-CefBrowserContext* GetSelf(base::WeakPtr<CefBrowserContext> self) {
-  CEF_REQUIRE_UIT();
-  return self.get();
-}
-
 }  // namespace

+// Creates and manages VisitedLinkEventListener objects for each
+// CefBrowserContext sharing the same VisitedLinkMaster.
+class CefVisitedLinkListener : public visitedlink::VisitedLinkMaster::Listener {
+ public:
+  CefVisitedLinkListener() { DCHECK(listener_map_.empty()); }
+
+  void CreateListenerForContext(const CefBrowserContext* context) {
+    CEF_REQUIRE_UIT();
+    auto listener = std::make_unique<visitedlink::VisitedLinkEventListener>(
+        const_cast<CefBrowserContext*>(context));
+    listener_map_.insert(std::make_pair(context, std::move(listener)));
+  }
+
+  void RemoveListenerForContext(const CefBrowserContext* context) {
+    CEF_REQUIRE_UIT();
+    ListenerMap::iterator it = listener_map_.find(context);
+    DCHECK(it != listener_map_.end());
+    listener_map_.erase(it);
+  }
+
+  // visitedlink::VisitedLinkMaster::Listener methods.
+
+  void NewTable(base::ReadOnlySharedMemoryRegion* table_region) override {
+    CEF_REQUIRE_UIT();
+    ListenerMap::iterator it = listener_map_.begin();
+    for (; it != listener_map_.end(); ++it)
+      it->second->NewTable(table_region);
+  }
+
+  void Add(visitedlink::VisitedLinkCommon::Fingerprint fingerprint) override {
+    CEF_REQUIRE_UIT();
+    ListenerMap::iterator it = listener_map_.begin();
+    for (; it != listener_map_.end(); ++it)
+      it->second->Add(fingerprint);
+  }
+
+  void Reset(bool invalidate_hashes) override {
+    CEF_REQUIRE_UIT();
+    ListenerMap::iterator it = listener_map_.begin();
+    for (; it != listener_map_.end(); ++it)
+      it->second->Reset(invalidate_hashes);
+  }
+
+ private:
+  // Map of CefBrowserContext to the associated VisitedLinkEventListener.
+  typedef std::map<const CefBrowserContext*,
+                   std::unique_ptr<visitedlink::VisitedLinkEventListener>>
+      ListenerMap;
+  ListenerMap listener_map_;
+
+  DISALLOW_COPY_AND_ASSIGN(CefVisitedLinkListener);
+};
+
 CefBrowserContext::CefBrowserContext(const CefRequestContextSettings& settings)
-    : settings_(settings), weak_ptr_factory_(this) {
+    : settings_(settings) {
  g_manager.Get().AddImpl(this);
-  getter_ = base::BindRepeating(GetSelf, weak_ptr_factory_.GetWeakPtr());
 }

 CefBrowserContext::~CefBrowserContext() {
  CEF_REQUIRE_UIT();
-#if DCHECK_IS_ON()
-  DCHECK(is_shutdown_);
-#endif
-
-  if (iothread_state_) {
-    // Destruction of the CefIOThreadState will trigger destruction of all
-    // associated network requests.
-    content::BrowserThread::DeleteSoon(content::BrowserThread::IO, FROM_HERE,
-                                       iothread_state_.release());
-  }
-}
-
-void CefBrowserContext::Initialize() {
-  cache_path_ = base::FilePath(CefString(&settings_.cache_path));
-
-  if (!cache_path_.empty())
-    g_manager.Get().SetImplPath(this, cache_path_);
-
-  iothread_state_ = std::make_unique<CefIOThreadState>();
-}
-
-void CefBrowserContext::Shutdown() {
-  CEF_REQUIRE_UIT();
-
-#if DCHECK_IS_ON()
-  is_shutdown_ = true;
-#endif

  // No CefRequestContext should be referencing this object any longer.
  DCHECK(request_context_set_.empty());
@@ -185,8 +233,135 @@ void CefBrowserContext::Shutdown() {
  // Unregister the context first to avoid re-entrancy during shutdown.
  g_manager.Get().RemoveImpl(this, cache_path_);

-  // Destroy objects that may hold references to the MediaRouter.
-  media_router_manager_.reset();
+  // Send notifications to clean up objects associated with this Profile.
+  MaybeSendDestroyedNotification();
+
+  ChromePluginServiceFilter::GetInstance()->UnregisterProfile(this);
+
+  // Remove any BrowserContextKeyedServiceFactory associations. This must be
+  // called before the ProxyService owned by CefBrowserContext is destroyed.
+  // The SimpleDependencyManager should always be passed after the
+  // BrowserContextDependencyManager. This is because the KeyedService instances
+  // in the BrowserContextDependencyManager's dependency graph can depend on the
+  // ones in the SimpleDependencyManager's graph.
+  DependencyManager::PerformInterlockedTwoPhaseShutdown(
+      BrowserContextDependencyManager::GetInstance(), this,
+      SimpleDependencyManager::GetInstance(), key_.get());
+
+  key_.reset();
+  SimpleKeyMap::GetInstance()->Dissociate(this);
+
+  // Shuts down the storage partitions associated with this browser context.
+  // This must be called before the browser context is actually destroyed
+  // and before a clean-up task for its corresponding IO thread residents
+  // (e.g. ResourceContext) is posted, so that the classes that hung on
+  // StoragePartition can have time to do necessary cleanups on IO thread.
+  ShutdownStoragePartitions();
+
+  if (resource_context_.get()) {
+    // Destruction of the ResourceContext will trigger destruction of all
+    // associated network requests.
+    content::BrowserThread::DeleteSoon(content::BrowserThread::IO, FROM_HERE,
+                                       resource_context_.release());
+  }
+
+  visitedlink_listener_->RemoveListenerForContext(this);
+
+  // The FontFamilyCache references the ProxyService so delete it before the
+  // ProxyService is deleted.
+  SetUserData(&kFontFamilyCacheKey, nullptr);
+
+  pref_proxy_config_tracker_->DetachFromPrefService();
+
+  if (host_content_settings_map_)
+    host_content_settings_map_->ShutdownOnUIThread();
+
+  // Delete the download manager delegate here because otherwise we'll crash
+  // when it's accessed from the content::BrowserContext destructor.
+  if (download_manager_delegate_)
+    download_manager_delegate_.reset(nullptr);
+}
+
+void CefBrowserContext::Initialize() {
+  CefContext* context = CefContext::Get();
+
+  cache_path_ = base::FilePath(CefString(&settings_.cache_path));
+  if (!context->ValidateCachePath(cache_path_)) {
+    // Reset to in-memory storage.
+    CefString(&settings_.cache_path).clear();
+    cache_path_ = base::FilePath();
+  }
+
+  if (!cache_path_.empty())
+    g_manager.Get().SetImplPath(this, cache_path_);
+
+  if (settings_.accept_language_list.length == 0) {
+    // Use the global language list setting.
+    CefString(&settings_.accept_language_list) =
+        CefString(&context->settings().accept_language_list);
+  }
+
+  if (!!settings_.persist_session_cookies) {
+    set_should_persist_session_cookies(true);
+  }
+
+  key_ = std::make_unique<ProfileKey>(GetPath());
+  SimpleKeyMap::GetInstance()->Associate(this, key_.get());
+
+  // Initialize the PrefService object.
+  pref_service_ = browser_prefs::CreatePrefService(
+      this, cache_path_, !!settings_.persist_user_preferences);
+
+  content::BrowserContext::Initialize(this, GetPath());
+
+  resource_context_.reset(new CefResourceContext(IsOffTheRecord()));
+
+  // This must be called before creating any services to avoid hitting
+  // DependencyManager::AssertContextWasntDestroyed when creating/destroying
+  // multiple browser contexts (due to pointer address reuse).
+  BrowserContextDependencyManager::GetInstance()->CreateBrowserContextServices(
+      this);
+
+  const bool extensions_enabled = extensions::ExtensionsEnabled();
+  if (extensions_enabled) {
+    // Create the custom ExtensionSystem first because other KeyedServices
+    // depend on it.
+    extension_system_ = static_cast<extensions::CefExtensionSystem*>(
+        extensions::ExtensionSystem::Get(this));
+    extension_system_->InitForRegularProfile(true);
+
+    // Make sure the ProcessManager is created so that it receives extension
+    // load notifications. This is necessary for the proper initialization of
+    // background/event pages.
+    extensions::ProcessManager::Get(this);
+  }
+
+  // Initialize visited links management.
+  base::FilePath visited_link_path;
+  if (!cache_path_.empty())
+    visited_link_path = cache_path_.Append(FILE_PATH_LITERAL("Visited Links"));
+  visitedlink_listener_ = new CefVisitedLinkListener;
+  visitedlink_master_.reset(new visitedlink::VisitedLinkMaster(
+      visitedlink_listener_, this, !visited_link_path.empty(), false,
+      visited_link_path, 0));
+  visitedlink_listener_->CreateListenerForContext(this);
+  visitedlink_master_->Init();
+
+  // Initialize proxy configuration tracker.
+  pref_proxy_config_tracker_.reset(new PrefProxyConfigTrackerImpl(
+      GetPrefs(), base::CreateSingleThreadTaskRunner({BrowserThread::IO})));
+
+  // Spell checking support and possibly other subsystems retrieve the
+  // PrefService associated with a BrowserContext via UserPrefs::Get().
+  PrefService* pref_service = GetPrefs();
+  DCHECK(pref_service);
+  user_prefs::UserPrefs::Set(this, pref_service);
+  key_->SetPrefs(pref_service);
+
+  if (extensions_enabled)
+    extension_system_->Init();
+
+  ChromePluginServiceFilter::GetInstance()->RegisterProfile(this);
 }

 void CefBrowserContext::AddCefRequestContext(CefRequestContextImpl* context) {
@@ -198,35 +373,36 @@ void CefBrowserContext::RemoveCefRequestContext(
    CefRequestContextImpl* context) {
  CEF_REQUIRE_UIT();

+  if (extensions::ExtensionsEnabled()) {
+    extension_system()->OnRequestContextDeleted(context);
+  }
+
  request_context_set_.erase(context);

  // Delete ourselves when the reference count reaches zero.
-  if (request_context_set_.empty()) {
-    Shutdown();
+  if (request_context_set_.empty())
    delete this;
-  }
 }

 // static
-CefBrowserContext* CefBrowserContext::FromCachePath(
+CefBrowserContext* CefBrowserContext::GetForCachePath(
    const base::FilePath& cache_path) {
-  return g_manager.Get().GetImplFromPath(cache_path);
+  return g_manager.Get().GetImplForPath(cache_path);
 }

 // static
-CefBrowserContext* CefBrowserContext::FromIDs(int render_process_id,
-                                              int render_frame_id,
-                                              int frame_tree_node_id,
-                                              bool require_frame_match) {
-  return g_manager.Get().GetImplFromIDs(render_process_id, render_frame_id,
-                                        frame_tree_node_id,
-                                        require_frame_match);
+CefBrowserContext* CefBrowserContext::GetForIDs(int render_process_id,
+                                                int render_frame_id,
+                                                int frame_tree_node_id,
+                                                bool require_frame_match) {
+  return g_manager.Get().GetImplForIDs(render_process_id, render_frame_id,
+                                       frame_tree_node_id, require_frame_match);
 }

 // static
-CefBrowserContext* CefBrowserContext::FromBrowserContext(
-    const content::BrowserContext* context) {
-  return g_manager.Get().GetImplFromBrowserContext(context);
+CefBrowserContext* CefBrowserContext::GetForContext(
+    content::BrowserContext* context) {
+  return g_manager.Get().GetImplForContext(context);
 }

 // static
@@ -234,6 +410,194 @@ std::vector<CefBrowserContext*> CefBrowserContext::GetAll() {
  return g_manager.Get().GetAllImpl();
 }

+content::ResourceContext* CefBrowserContext::GetResourceContext() {
+  return resource_context_.get();
+}
+
+content::ClientHintsControllerDelegate*
+CefBrowserContext::GetClientHintsControllerDelegate() {
+  return nullptr;
+}
+
+void CefBrowserContext::SetCorsOriginAccessListForOrigin(
+    const url::Origin& source_origin,
+    std::vector<network::mojom::CorsOriginPatternPtr> allow_patterns,
+    std::vector<network::mojom::CorsOriginPatternPtr> block_patterns,
+    base::OnceClosure closure) {
+  // This method is called for Extension support.
+  base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, std::move(closure));
+}
+
+ChromeZoomLevelPrefs* CefBrowserContext::GetZoomLevelPrefs() {
+  return static_cast<ChromeZoomLevelPrefs*>(
+      GetStoragePartition(this, nullptr)->GetZoomLevelDelegate());
+}
+
+scoped_refptr<network::SharedURLLoaderFactory>
+CefBrowserContext::GetURLLoaderFactory() {
+  return GetDefaultStoragePartition(this)
+      ->GetURLLoaderFactoryForBrowserProcess();
+}
+
+base::FilePath CefBrowserContext::GetPath() {
+  return cache_path_;
+}
+
+base::FilePath CefBrowserContext::GetPath() const {
+  return cache_path_;
+}
+
+std::unique_ptr<content::ZoomLevelDelegate>
+CefBrowserContext::CreateZoomLevelDelegate(
+    const base::FilePath& partition_path) {
+  if (cache_path_.empty())
+    return std::unique_ptr<content::ZoomLevelDelegate>();
+
+  return base::WrapUnique(new ChromeZoomLevelPrefs(
+      GetPrefs(), cache_path_, partition_path,
+      zoom::ZoomEventManager::GetForBrowserContext(this)->GetWeakPtr()));
+}
+
+bool CefBrowserContext::IsOffTheRecord() const {
+  // CEF contexts are never flagged as off-the-record. It causes problems
+  // for the extension system.
+  return false;
+}
+
+content::DownloadManagerDelegate*
+CefBrowserContext::GetDownloadManagerDelegate() {
+  if (!download_manager_delegate_) {
+    content::DownloadManager* manager =
+        BrowserContext::GetDownloadManager(this);
+    download_manager_delegate_.reset(new CefDownloadManagerDelegate(manager));
+  }
+  return download_manager_delegate_.get();
+}
+
+content::BrowserPluginGuestManager* CefBrowserContext::GetGuestManager() {
+  DCHECK(extensions::ExtensionsEnabled());
+  return guest_view::GuestViewManager::FromBrowserContext(this);
+}
+
+storage::SpecialStoragePolicy* CefBrowserContext::GetSpecialStoragePolicy() {
+  return nullptr;
+}
+
+content::PushMessagingService* CefBrowserContext::GetPushMessagingService() {
+  return nullptr;
+}
+
+content::StorageNotificationService*
+CefBrowserContext::GetStorageNotificationService() {
+  return nullptr;
+}
+
+content::SSLHostStateDelegate* CefBrowserContext::GetSSLHostStateDelegate() {
+  if (!ssl_host_state_delegate_.get())
+    ssl_host_state_delegate_.reset(new CefSSLHostStateDelegate());
+  return ssl_host_state_delegate_.get();
+}
+
+content::PermissionControllerDelegate*
+CefBrowserContext::GetPermissionControllerDelegate() {
+  return nullptr;
+}
+
+content::BackgroundFetchDelegate*
+CefBrowserContext::GetBackgroundFetchDelegate() {
+  return nullptr;
+}
+
+content::BackgroundSyncController*
+CefBrowserContext::GetBackgroundSyncController() {
+  return nullptr;
+}
+
+content::BrowsingDataRemoverDelegate*
+CefBrowserContext::GetBrowsingDataRemoverDelegate() {
+  return nullptr;
+}
+
+PrefService* CefBrowserContext::GetPrefs() {
+  return pref_service_.get();
+}
+
+const PrefService* CefBrowserContext::GetPrefs() const {
+  return pref_service_.get();
+}
+
+ProfileKey* CefBrowserContext::GetProfileKey() const {
+  DCHECK(key_);
+  return key_.get();
+}
+
+policy::SchemaRegistryService*
+CefBrowserContext::GetPolicySchemaRegistryService() {
+  NOTREACHED();
+  return nullptr;
+}
+
+policy::UserCloudPolicyManager* CefBrowserContext::GetUserCloudPolicyManager() {
+  NOTREACHED();
+  return nullptr;
+}
+
+policy::ProfilePolicyConnector* CefBrowserContext::GetProfilePolicyConnector() {
+  NOTREACHED();
+  return nullptr;
+}
+
+const policy::ProfilePolicyConnector*
+CefBrowserContext::GetProfilePolicyConnector() const {
+  NOTREACHED();
+  return nullptr;
+}
+
+const CefRequestContextSettings& CefBrowserContext::GetSettings() const {
+  return settings_;
+}
+
+HostContentSettingsMap* CefBrowserContext::GetHostContentSettingsMap() {
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  if (!host_content_settings_map_.get()) {
+    // The |is_incognito_profile| and |is_guest_profile| arguments are
+    // intentionally set to false as they otherwise limit the types of values
+    // that can be stored in the settings map (for example, default values set
+    // via DefaultProvider::SetWebsiteSetting).
+    host_content_settings_map_ =
+        new HostContentSettingsMap(GetPrefs(), false, false, false);
+
+    // Change the default plugin policy.
+    const base::CommandLine* command_line =
+        base::CommandLine::ForCurrentProcess();
+    const std::string& plugin_policy_str =
+        command_line->GetSwitchValueASCII(switches::kPluginPolicy);
+    if (!plugin_policy_str.empty()) {
+      ContentSetting plugin_policy = CONTENT_SETTING_ALLOW;
+      if (base::LowerCaseEqualsASCII(plugin_policy_str,
+                                     switches::kPluginPolicy_Detect)) {
+        plugin_policy = CONTENT_SETTING_DETECT_IMPORTANT_CONTENT;
+      } else if (base::LowerCaseEqualsASCII(plugin_policy_str,
+                                            switches::kPluginPolicy_Block)) {
+        plugin_policy = CONTENT_SETTING_BLOCK;
+      }
+      host_content_settings_map_->SetDefaultContentSetting(
+          CONTENT_SETTINGS_TYPE_PLUGINS, plugin_policy);
+    }
+  }
+  return host_content_settings_map_.get();
+}
+
+void CefBrowserContext::AddVisitedURLs(const std::vector<GURL>& urls) {
+  visitedlink_master_->AddURLs(urls);
+}
+
+void CefBrowserContext::RebuildTable(
+    const scoped_refptr<URLEnumerator>& enumerator) {
+  // Called when visited links will not or cannot be loaded from disk.
+  enumerator->OnComplete(true);
+}
+
 void CefBrowserContext::OnRenderFrameCreated(
    CefRequestContextImpl* request_context,
    int render_process_id,
@@ -254,14 +618,15 @@ void CefBrowserContext::OnRenderFrameCreated(
    handler_map_.AddHandler(render_process_id, render_frame_id,
                            frame_tree_node_id, handler);

-    if (iothread_state_) {
+    if (resource_context_) {
      // Using base::Unretained() is safe because both this callback and
-      // possible deletion of |iothread_state_| will execute on the IO thread,
+      // possible deletion of |resource_context_| will execute on the IO thread,
      // and this callback will be executed first.
-      CEF_POST_TASK(CEF_IOT, base::Bind(&CefIOThreadState::AddHandler,
-                                        base::Unretained(iothread_state_.get()),
-                                        render_process_id, render_frame_id,
-                                        frame_tree_node_id, handler));
+      CEF_POST_TASK(CEF_IOT,
+                    base::Bind(&CefResourceContext::AddHandler,
+                               base::Unretained(resource_context_.get()),
+                               render_process_id, render_frame_id,
+                               frame_tree_node_id, handler));
    }
  }
 }
@@ -292,14 +657,15 @@ void CefBrowserContext::OnRenderFrameDeleted(
    handler_map_.RemoveHandler(render_process_id, render_frame_id,
                               frame_tree_node_id);

-    if (iothread_state_) {
+    if (resource_context_) {
      // Using base::Unretained() is safe because both this callback and
-      // possible deletion of |iothread_state_| will execute on the IO thread,
+      // possible deletion of |resource_context_| will execute on the IO thread,
      // and this callback will be executed first.
-      CEF_POST_TASK(CEF_IOT, base::Bind(&CefIOThreadState::RemoveHandler,
-                                        base::Unretained(iothread_state_.get()),
-                                        render_process_id, render_frame_id,
-                                        frame_tree_node_id));
+      CEF_POST_TASK(
+          CEF_IOT,
+          base::Bind(&CefResourceContext::RemoveHandler,
+                     base::Unretained(resource_context_.get()),
+                     render_process_id, render_frame_id, frame_tree_node_id));
    }
  }

@@ -401,81 +767,48 @@ void CefBrowserContext::ClearPluginLoadDecision(int render_process_id) {
 }

 void CefBrowserContext::RegisterSchemeHandlerFactory(
-    const CefString& scheme_name,
-    const CefString& domain_name,
+    const std::string& scheme_name,
+    const std::string& domain_name,
    CefRefPtr<CefSchemeHandlerFactory> factory) {
-  if (iothread_state_) {
+  if (resource_context_) {
    // Using base::Unretained() is safe because both this callback and possible
-    // deletion of |iothread_state_| will execute on the IO thread, and this
+    // deletion of |resource_context_| will execute on the IO thread, and this
    // callback will be executed first.
    CEF_POST_TASK(CEF_IOT,
-                  base::Bind(&CefIOThreadState::RegisterSchemeHandlerFactory,
-                             base::Unretained(iothread_state_.get()),
+                  base::Bind(&CefResourceContext::RegisterSchemeHandlerFactory,
+                             base::Unretained(resource_context_.get()),
                             scheme_name, domain_name, factory));
  }
 }

 void CefBrowserContext::ClearSchemeHandlerFactories() {
-  if (iothread_state_) {
+  if (resource_context_) {
    // Using base::Unretained() is safe because both this callback and possible
-    // deletion of |iothread_state_| will execute on the IO thread, and this
+    // deletion of |resource_context_| will execute on the IO thread, and this
    // callback will be executed first.
    CEF_POST_TASK(CEF_IOT,
-                  base::Bind(&CefIOThreadState::ClearSchemeHandlerFactories,
-                             base::Unretained(iothread_state_.get())));
+                  base::Bind(&CefResourceContext::ClearSchemeHandlerFactories,
+                             base::Unretained(resource_context_.get())));
  }
 }

-void CefBrowserContext::LoadExtension(
-    const CefString& root_directory,
-    CefRefPtr<CefDictionaryValue> manifest,
-    CefRefPtr<CefExtensionHandler> handler,
-    CefRefPtr<CefRequestContext> loader_context) {
-  NOTIMPLEMENTED();
-  if (handler)
-    handler->OnExtensionLoadFailed(ERR_ABORTED);
-}
-
-bool CefBrowserContext::GetExtensions(std::vector<CefString>& extension_ids) {
-  NOTIMPLEMENTED();
-  return false;
-}
-
-CefRefPtr<CefExtension> CefBrowserContext::GetExtension(
-    const CefString& extension_id) {
-  NOTIMPLEMENTED();
-  return nullptr;
-}
-
-bool CefBrowserContext::UnloadExtension(const CefString& extension_id) {
-  NOTIMPLEMENTED();
-  return false;
-}
-
-bool CefBrowserContext::IsPrintPreviewSupported() const {
-  return true;
-}
-
 network::mojom::NetworkContext* CefBrowserContext::GetNetworkContext() {
  CEF_REQUIRE_UIT();
-  auto browser_context = AsBrowserContext();
-  return browser_context->GetDefaultStoragePartition(browser_context)
-      ->GetNetworkContext();
+  return GetDefaultStoragePartition(this)->GetNetworkContext();
 }

-CefMediaRouterManager* CefBrowserContext::GetMediaRouterManager() {
+DownloadPrefs* CefBrowserContext::GetDownloadPrefs() {
  CEF_REQUIRE_UIT();
-  if (!media_router_manager_) {
-    media_router_manager_.reset(new CefMediaRouterManager(AsBrowserContext()));
+  if (!download_prefs_) {
+    download_prefs_.reset(new DownloadPrefs(this));
  }
-  return media_router_manager_.get();
+  return download_prefs_.get();
 }

-CefBrowserContext::CookieableSchemes CefBrowserContext::GetCookieableSchemes()
-    const {
+bool CefBrowserContext::IsPrintPreviewSupported() const {
  CEF_REQUIRE_UIT();
-  if (cookieable_schemes_)
-    return cookieable_schemes_;
+  if (!extensions::PrintPreviewEnabled())
+    return false;

-  return CefCookieManagerImpl::GetGlobalCookieableSchemes();
+  return !GetPrefs()->GetBoolean(prefs::kPrintPreviewDisabled);
 }
--- a/libcef/browser/browser_context.h
+++ b/libcef/browser/browser_context.h
@@ -7,17 +7,21 @@
 #pragma once

 #include <set>
-#include <vector>

 #include "include/cef_request_context_handler.h"
+#include "libcef/browser/chrome_profile_stub.h"
 #include "libcef/browser/request_context_handler_map.h"
+#include "libcef/browser/resource_context.h"

-#include "base/callback.h"
 #include "base/files/file_path.h"
-#include "base/memory/weak_ptr.h"
-#include "base/optional.h"
+#include "base/memory/ref_counted.h"
+#include "chrome/browser/download/download_prefs.h"
 #include "chrome/common/plugin.mojom.h"
-#include "services/network/public/mojom/network_context.mojom.h"
+#include "components/proxy_config/pref_proxy_config_tracker.h"
+#include "components/visitedlink/browser/visitedlink_delegate.h"
+#include "content/public/browser/browser_context.h"
+#include "content/public/browser/browser_thread.h"
+#include "content/public/browser/content_browser_client.h"
 #include "url/origin.h"

 /*
@@ -25,30 +29,31 @@
 //
 // WC = WebContents
 //  Content API representation of a browser. Created by BHI or the system (for
-//  popups) and owned by BHI. Keeps a pointer to the content::BrowserContext.
+//  popups) and owned by BHI. Keeps a pointer to BC.
 //
-// BHI = AlloyBrowserHostImpl
+// BHI = CefBrowserHostImpl
 //  Implements the CefBrowser and CefBrowserHost interfaces which are exposed
-//  to clients. References an RCI instance. Owns a WC. Lifespan is controlled
-//  by client references and CefBrowserInfoManager (until the browser has
-//  closed).
+//  to clients. References an RCI instance. Owns a WC. Life span is controlled
+//  by client references and CefContentBrowserClient.
 //
 // RCI = CefRequestContextImpl
 //  Implements the CefRequestContext interface which is exposed to clients.
-//  Creates or references a BC. Lifespan is controlled by client references and
-//  BrowserMainParts (for the global RCI).
+//  References the isolated BC.
 //
 // BC = CefBrowserContext
-//   Is/owns the content::BrowserContext which is the entry point from WC.
-//   Owns the IOTS and creates the SPI indirectly. Potentially shared by
-//   multiple RCI. Deletes itself when no longer needed by RCI.
+//   Entry point from WC when using an isolated RCI. Owns the RC and creates the
+//   SPI indirectly. Owned by CefBrowserMainParts for the global context or RCI
+//   for non-global contexts.
 //
 // SPI = content::StoragePartitionImpl
 //   Owns storage-related objects like Quota, IndexedDB, Cache, etc. Created by
-//   StoragePartitionImplMap::Get(). Life span is controlled indirectly by BC.
+//   StoragePartitionImplMap::Get(). Provides access to the URCG. Life span is
+//   controlled indirectly by BC.
 //
-// IOTS = CefIOThreadState
-//   Stores state for access on the IO thread. Life span is controlled by BC.
+// RC = CefResourceContext
+//   Acts as a bridge for resource loading. Network request life span is tied to
+//   this object. Must be destroyed before the associated URCG. Life span is
+//   controlled by BC.
 //
 //
 // Relationship diagram:
@@ -56,65 +61,141 @@
 //   own = ownership (std::unique_ptr)
 //   ptr = raw pointer
 //
-// BHI -ref-> RCI -ptr-> BC -own-> SPI, IOTS
-//                      ^
-// BHI -own-> WC -ptr--/
+//               CefBrowserMainParts
+//                       |
+//                      own
+//                       v
+// BHI -own-> WC -ptr-> BC -own-> SPI
+//
+// BHI -ref-> RCI -own-> BC -own-> RC
 //
 //
 // How shutdown works:
-// 1. AlloyBrowserHostImpl::DestroyBrowser is called on the UI thread after the
-//    browser is closed and deletes the WebContents.
-// 1. AlloyBrowserHostImpl is destroyed on any thread when the last reference
-//    is released.
+// 1. CefBrowserHostImpl is destroyed on any thread due to browser close,
+//    ref release, etc.
 // 2. CefRequestContextImpl is destroyed (possibly asynchronously) on the UI
-//    thread when the last reference is released.
-// 3. CefBrowserContext is destroyed on the UI thread when no longer needed
-//    by any CefRequestContextImpl (via RemoveCefRequestContext).
-// 4. CefIOThreadState is destroyed asynchronously on the IO thread after
-//    the owning CefBrowserContext is destroyed.
+//    thread due to CefBrowserHostImpl destruction, ref release, etc.
+// 3. CefBrowserContext is destroyed on the UI thread due to
+//    CefRequestContextImpl destruction or deletion in
+//    CefBrowserMainParts::PostMainMessageLoopRun().
+// 4. CefResourceContext is destroyed asynchronously on the IO thread due to
+//    CefBrowserContext destruction. This cancels/destroys any pending
+//    network requests.
 */

-namespace content {
-class BrowserContext;
+class CefDownloadManagerDelegate;
+class CefRequestContextImpl;
+class CefSSLHostStateDelegate;
+class CefVisitedLinkListener;
+class HostContentSettingsMap;
+class PrefService;
+
+namespace extensions {
+class CefExtensionSystem;
 }

-class CefMediaRouterManager;
-class CefRequestContextImpl;
-class CefIOThreadState;
-class Profile;
+namespace visitedlink {
+class VisitedLinkMaster;
+}

-// Main entry point for configuring behavior on a per-RequestContext basis. The
-// content::BrowserContext represented by this class is passed to
-// WebContents::Create in AlloyBrowserHostImpl::CreateInternal. Only accessed on
-// the UI thread unless otherwise indicated.
-class CefBrowserContext {
+// Main entry point for configuring behavior on a per-browser basis. An instance
+// of this class is passed to WebContents::Create in CefBrowserHostImpl::
+// CreateInternal. Only accessed on the UI thread unless otherwise indicated.
+class CefBrowserContext : public ChromeProfileStub,
+                          public visitedlink::VisitedLinkDelegate {
 public:
+  explicit CefBrowserContext(const CefRequestContextSettings& settings);
+
  // Returns the existing instance, if any, associated with the specified
  // |cache_path|.
-  static CefBrowserContext* FromCachePath(const base::FilePath& cache_path);
+  static CefBrowserContext* GetForCachePath(const base::FilePath& cache_path);

  // Returns the existing instance, if any, associated with the specified IDs.
  // See comments on IsAssociatedContext() for usage.
-  static CefBrowserContext* FromIDs(int render_process_id,
-                                    int render_frame_id,
-                                    int frame_tree_node_id,
-                                    bool require_frame_match);
+  static CefBrowserContext* GetForIDs(int render_process_id,
+                                      int render_frame_id,
+                                      int frame_tree_node_id,
+                                      bool require_frame_match);

  // Returns the underlying CefBrowserContext if any.
-  static CefBrowserContext* FromBrowserContext(
-      const content::BrowserContext* context);
+  static CefBrowserContext* GetForContext(content::BrowserContext* context);

  // Returns all existing CefBrowserContext.
  static std::vector<CefBrowserContext*> GetAll();

-  // Returns the content and chrome layer representations of the context.
-  virtual content::BrowserContext* AsBrowserContext() = 0;
-  virtual Profile* AsProfile() = 0;
+  // Must be called immediately after this object is created.
+  void Initialize();

-  // Called from CefRequestContextImpl to track associated objects. This
-  // object will delete itself when the count reaches zero.
+  // Track associated CefRequestContextImpl objects. This object will delete
+  // itself when the count reaches zero.
  void AddCefRequestContext(CefRequestContextImpl* context);
-  virtual void RemoveCefRequestContext(CefRequestContextImpl* context);
+  void RemoveCefRequestContext(CefRequestContextImpl* context);
+
+  // BrowserContext methods.
+  content::ResourceContext* GetResourceContext() override;
+  content::ClientHintsControllerDelegate* GetClientHintsControllerDelegate()
+      override;
+  void SetCorsOriginAccessListForOrigin(
+      const url::Origin& source_origin,
+      std::vector<network::mojom::CorsOriginPatternPtr> allow_patterns,
+      std::vector<network::mojom::CorsOriginPatternPtr> block_patterns,
+      base::OnceClosure closure) override;
+  base::FilePath GetPath() override;
+  base::FilePath GetPath() const override;
+  std::unique_ptr<content::ZoomLevelDelegate> CreateZoomLevelDelegate(
+      const base::FilePath& partition_path) override;
+  bool IsOffTheRecord() const override;
+  content::DownloadManagerDelegate* GetDownloadManagerDelegate() override;
+  content::BrowserPluginGuestManager* GetGuestManager() override;
+  storage::SpecialStoragePolicy* GetSpecialStoragePolicy() override;
+  content::PushMessagingService* GetPushMessagingService() override;
+  content::StorageNotificationService* GetStorageNotificationService() override;
+  content::SSLHostStateDelegate* GetSSLHostStateDelegate() override;
+  content::PermissionControllerDelegate* GetPermissionControllerDelegate()
+      override;
+  content::BackgroundFetchDelegate* GetBackgroundFetchDelegate() override;
+  content::BackgroundSyncController* GetBackgroundSyncController() override;
+  content::BrowsingDataRemoverDelegate* GetBrowsingDataRemoverDelegate()
+      override;
+
+  // Profile methods.
+  ChromeZoomLevelPrefs* GetZoomLevelPrefs() override;
+  scoped_refptr<network::SharedURLLoaderFactory> GetURLLoaderFactory() override;
+  PrefService* GetPrefs() override;
+  bool AllowsBrowserWindows() const override { return false; }
+  const PrefService* GetPrefs() const override;
+  ProfileKey* GetProfileKey() const override;
+  policy::SchemaRegistryService* GetPolicySchemaRegistryService() override;
+  policy::UserCloudPolicyManager* GetUserCloudPolicyManager() override;
+  policy::ProfilePolicyConnector* GetProfilePolicyConnector() override;
+  const policy::ProfilePolicyConnector* GetProfilePolicyConnector()
+      const override;
+
+  // Values checked in ProfileNetworkContextService::CreateNetworkContextParams
+  // when creating the NetworkContext.
+  bool ShouldRestoreOldSessionCookies() override {
+    return should_persist_session_cookies_;
+  }
+  bool ShouldPersistSessionCookies() override {
+    return should_persist_session_cookies_;
+  }
+  base::Optional<std::vector<std::string>> GetCookieableSchemes() override {
+    return cookieable_schemes_;
+  }
+
+  // visitedlink::VisitedLinkDelegate methods.
+  void RebuildTable(const scoped_refptr<URLEnumerator>& enumerator) override;
+
+  // Returns the settings associated with this object. Safe to call from any
+  // thread.
+  const CefRequestContextSettings& GetSettings() const;
+
+  // Settings for plugins and extensions.
+  HostContentSettingsMap* GetHostContentSettingsMap();
+
+  // Called from CefBrowserHostImpl::DidNavigateAnyFrame to update the table of
+  // visited links.
+  void AddVisitedURLs(const std::vector<GURL>& urls);

  // Called from CefRequestContextImpl::OnRenderFrameCreated.
  void OnRenderFrameCreated(CefRequestContextImpl* request_context,
@@ -170,73 +251,70 @@ class CefBrowserContext {
  void ClearPluginLoadDecision(int render_process_id);

  // Called from CefRequestContextImpl methods of the same name.
-  void RegisterSchemeHandlerFactory(const CefString& scheme_name,
-                                    const CefString& domain_name,
+  void RegisterSchemeHandlerFactory(const std::string& scheme_name,
+                                    const std::string& domain_name,
                                    CefRefPtr<CefSchemeHandlerFactory> factory);
  void ClearSchemeHandlerFactories();
-  // TODO(chrome-runtime): Make these extension methods pure virtual.
-  virtual void LoadExtension(const CefString& root_directory,
-                             CefRefPtr<CefDictionaryValue> manifest,
-                             CefRefPtr<CefExtensionHandler> handler,
-                             CefRefPtr<CefRequestContext> loader_context);
-  virtual bool GetExtensions(std::vector<CefString>& extension_ids);
-  virtual CefRefPtr<CefExtension> GetExtension(const CefString& extension_id);
-
-  // Called from CefExtensionImpl::Unload().
-  virtual bool UnloadExtension(const CefString& extension_id);
-
-  // Returns true if this context supports print preview.
-  virtual bool IsPrintPreviewSupported() const;

  network::mojom::NetworkContext* GetNetworkContext();

-  CefMediaRouterManager* GetMediaRouterManager();
-
-  using CookieableSchemes = base::Optional<std::vector<std::string>>;
-
-  // Returns the schemes associated with this context specifically, or the
-  // global configuration if unset.
-  CookieableSchemes GetCookieableSchemes() const;
-
-  // Set the schemes associated with this context specifically.
-  void set_cookieable_schemes(const CookieableSchemes& schemes) {
+  void set_should_persist_session_cookies(bool value) {
+    should_persist_session_cookies_ = value;
+  }
+  void set_cookieable_schemes(
+      base::Optional<std::vector<std::string>> schemes) {
    cookieable_schemes_ = schemes;
  }

-  // These accessors are safe to call from any thread because the values don't
-  // change during this object's lifespan.
-  const CefRequestContextSettings& settings() const { return settings_; }
-  base::FilePath cache_path() const { return cache_path_; }
-  CefIOThreadState* iothread_state() const { return iothread_state_.get(); }
+  CefResourceContext* resource_context() const {
+    return resource_context_.get();
+  }
+  extensions::CefExtensionSystem* extension_system() const {
+    return extension_system_;
+  }

-  // Used to hold a WeakPtr reference to this this object. The Getter returns
-  // nullptr if this object has already been destroyed.
-  using Getter = base::RepeatingCallback<CefBrowserContext*()>;
-  Getter getter() const { return getter_; }
+  // Called from DownloadPrefs::FromBrowserContext.
+  DownloadPrefs* GetDownloadPrefs();

- protected:
-  explicit CefBrowserContext(const CefRequestContextSettings& settings);
-  virtual ~CefBrowserContext();
-
-  // Will be called immediately after this object is created.
-  virtual void Initialize();
-
-  // Will be called immediately before this object is deleted.
-  virtual void Shutdown();
-
-  // Members initialized during construction or Initialize() are safe to access
-  // from any thread.
-  const CefRequestContextSettings settings_;
-  base::FilePath cache_path_;
+  // Returns true if this context supports print preview.
+  bool IsPrintPreviewSupported() const;

 private:
-  std::unique_ptr<CefIOThreadState> iothread_state_;
-  CookieableSchemes cookieable_schemes_;
-  std::unique_ptr<CefMediaRouterManager> media_router_manager_;
+  // Allow deletion via std::unique_ptr().
+  friend std::default_delete<CefBrowserContext>;
+
+  ~CefBrowserContext() override;
+
+  // Members initialized during construction are safe to access from any thread.
+  CefRequestContextSettings settings_;
+  base::FilePath cache_path_;

  // CefRequestContextImpl objects referencing this object.
  std::set<CefRequestContextImpl*> request_context_set_;

+  std::unique_ptr<PrefService> pref_service_;
+  std::unique_ptr<PrefProxyConfigTracker> pref_proxy_config_tracker_;
+
+  std::unique_ptr<CefDownloadManagerDelegate> download_manager_delegate_;
+  std::unique_ptr<CefSSLHostStateDelegate> ssl_host_state_delegate_;
+  scoped_refptr<HostContentSettingsMap> host_content_settings_map_;
+  std::unique_ptr<visitedlink::VisitedLinkMaster> visitedlink_master_;
+  // |visitedlink_listener_| is owned by visitedlink_master_.
+  CefVisitedLinkListener* visitedlink_listener_;
+  bool should_persist_session_cookies_ = false;
+  base::Optional<std::vector<std::string>> cookieable_schemes_;
+
+  std::unique_ptr<CefResourceContext> resource_context_;
+
+  // Owned by the KeyedService system.
+  extensions::CefExtensionSystem* extension_system_ = nullptr;
+
+  // The key to index KeyedService instances created by
+  // SimpleKeyedServiceFactory.
+  std::unique_ptr<ProfileKey> key_;
+
+  std::unique_ptr<DownloadPrefs> download_prefs_;
+
  // Map IDs to CefRequestContextHandler objects.
  CefRequestContextHandlerMap handler_map_;

@@ -260,13 +338,6 @@ class CefBrowserContext {
  typedef std::set<int> NodeIdSet;
  NodeIdSet node_id_set_;

-#if DCHECK_IS_ON()
-  bool is_shutdown_ = false;
-#endif
-
-  Getter getter_;
-  base::WeakPtrFactory<CefBrowserContext> weak_ptr_factory_;
-
  DISALLOW_COPY_AND_ASSIGN(CefBrowserContext);
 };

--- a/libcef/browser/browser_context_keyed_service_factories.cc
+++ b/libcef/browser/browser_context_keyed_service_factories.cc
@@ -6,7 +6,6 @@
 #include "libcef/common/extensions/extensions_util.h"

 #include "chrome/browser/content_settings/cookie_settings_factory.h"
-#include "chrome/browser/media/router/chrome_media_router_factory.h"
 #include "chrome/browser/plugins/plugin_prefs_factory.h"
 #include "chrome/browser/profiles/renderer_updater_factory.h"
 #include "chrome/browser/spellchecker/spellcheck_factory.h"
@@ -20,7 +19,6 @@ namespace cef {

 void EnsureBrowserContextKeyedServiceFactoriesBuilt() {
  CookieSettingsFactory::GetInstance();
-  media_router::ChromeMediaRouterFactory::GetInstance();
  PluginPrefsFactory::GetInstance();
  PrefsTabHelper::GetServiceInstance();
  RendererUpdaterFactory::GetInstance();
--- a/libcef/browser/browser_host_base.cc
+++ b/libcef/browser/browser_host_base.cc
@@ -1,789 +0,0 @@
-// Copyright 2020 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.
-
-#include "libcef/browser/browser_host_base.h"
-
-#include "libcef/browser/browser_info_manager.h"
-#include "libcef/browser/browser_platform_delegate.h"
-#include "libcef/browser/image_impl.h"
-#include "libcef/browser/navigation_entry_impl.h"
-#include "libcef/browser/net/scheme_handler.h"
-#include "libcef/browser/thread_util.h"
-
-#include "base/logging.h"
-#include "chrome/browser/spellchecker/spellcheck_factory.h"
-#include "chrome/browser/spellchecker/spellcheck_service.h"
-#include "components/favicon/core/favicon_url.h"
-#include "components/spellcheck/common/spellcheck_features.h"
-#include "content/public/browser/browser_context.h"
-#include "content/public/browser/download_manager.h"
-#include "content/public/browser/download_request_utils.h"
-#include "content/public/browser/navigation_entry.h"
-#include "ui/gfx/image/image_skia.h"
-
-#if defined(OS_MAC)
-#include "components/spellcheck/browser/spellcheck_platform.h"
-#endif
-
-namespace {
-
-// Associates a CefBrowserHostBase instance with a WebContents. This object will
-// be deleted automatically when the WebContents is destroyed.
-class WebContentsUserDataAdapter : public base::SupportsUserData::Data {
- public:
-  static void Register(CefRefPtr<CefBrowserHostBase> browser) {
-    new WebContentsUserDataAdapter(browser);
-  }
-
-  static CefRefPtr<CefBrowserHostBase> Get(
-      const content::WebContents* web_contents) {
-    WebContentsUserDataAdapter* adapter =
-        static_cast<WebContentsUserDataAdapter*>(
-            web_contents->GetUserData(UserDataKey()));
-    if (adapter)
-      return adapter->browser_;
-    return nullptr;
-  }
-
- private:
-  WebContentsUserDataAdapter(CefRefPtr<CefBrowserHostBase> browser)
-      : browser_(browser) {
-    auto web_contents = browser->GetWebContents();
-    DCHECK(web_contents);
-    web_contents->SetUserData(UserDataKey(), base::WrapUnique(this));
-  }
-
-  static void* UserDataKey() {
-    // We just need a unique constant. Use the address of a static that
-    // COMDAT folding won't touch in an optimizing linker.
-    static int data_key = 0;
-    return reinterpret_cast<void*>(&data_key);
-  }
-
-  CefRefPtr<CefBrowserHostBase> browser_;
-};
-
-}  // namespace
-
-// static
-CefRefPtr<CefBrowserHostBase> CefBrowserHostBase::GetBrowserForHost(
-    const content::RenderViewHost* host) {
-  DCHECK(host);
-  CEF_REQUIRE_UIT();
-  content::WebContents* web_contents = content::WebContents::FromRenderViewHost(
-      const_cast<content::RenderViewHost*>(host));
-  if (web_contents)
-    return GetBrowserForContents(web_contents);
-  return nullptr;
-}
-
-// static
-CefRefPtr<CefBrowserHostBase> CefBrowserHostBase::GetBrowserForHost(
-    const content::RenderFrameHost* host) {
-  DCHECK(host);
-  CEF_REQUIRE_UIT();
-  content::WebContents* web_contents =
-      content::WebContents::FromRenderFrameHost(
-          const_cast<content::RenderFrameHost*>(host));
-  if (web_contents)
-    return GetBrowserForContents(web_contents);
-  return nullptr;
-}
-
-// static
-CefRefPtr<CefBrowserHostBase> CefBrowserHostBase::GetBrowserForContents(
-    const content::WebContents* contents) {
-  DCHECK(contents);
-  CEF_REQUIRE_UIT();
-  return WebContentsUserDataAdapter::Get(contents);
-}
-
-// static
-CefRefPtr<CefBrowserHostBase> CefBrowserHostBase::GetBrowserForFrameTreeNode(
-    int frame_tree_node_id) {
-  // Use the thread-safe approach.
-  auto info =
-      CefBrowserInfoManager::GetInstance()->GetBrowserInfoForFrameTreeNode(
-          frame_tree_node_id);
-  if (info) {
-    auto browser = info->browser();
-    if (!browser) {
-      LOG(WARNING) << "Found browser id " << info->browser_id()
-                   << " but no browser object matching frame tree node id "
-                   << frame_tree_node_id;
-    }
-    return browser;
-  }
-
-  return nullptr;
-}
-
-// static
-CefRefPtr<CefBrowserHostBase> CefBrowserHostBase::GetBrowserForFrameRoute(
-    int render_process_id,
-    int render_routing_id) {
-  if (render_process_id == -1 || render_routing_id == MSG_ROUTING_NONE)
-    return nullptr;
-
-  if (CEF_CURRENTLY_ON_UIT()) {
-    // Use the non-thread-safe but potentially faster approach.
-    content::RenderFrameHost* render_frame_host =
-        content::RenderFrameHost::FromID(render_process_id, render_routing_id);
-    if (!render_frame_host)
-      return nullptr;
-    return GetBrowserForHost(render_frame_host);
-  } else {
-    // Use the thread-safe approach.
-    bool is_guest_view = false;
-    auto info =
-        CefBrowserInfoManager::GetInstance()->GetBrowserInfoForFrameRoute(
-            render_process_id, render_routing_id, &is_guest_view);
-    if (info && !is_guest_view) {
-      auto browser = info->browser();
-      if (!browser) {
-        LOG(WARNING) << "Found browser id " << info->browser_id()
-                     << " but no browser object matching frame process id "
-                     << render_process_id << " and routing id "
-                     << render_routing_id;
-      }
-      return browser;
-    }
-    return nullptr;
-  }
-}
-
-CefBrowserHostBase::CefBrowserHostBase(
-    const CefBrowserSettings& settings,
-    CefRefPtr<CefClient> client,
-    std::unique_ptr<CefBrowserPlatformDelegate> platform_delegate,
-    scoped_refptr<CefBrowserInfo> browser_info,
-    CefRefPtr<CefRequestContextImpl> request_context)
-    : settings_(settings),
-      client_(client),
-      platform_delegate_(std::move(platform_delegate)),
-      browser_info_(browser_info),
-      request_context_(request_context) {
-  CEF_REQUIRE_UIT();
-  DCHECK(!browser_info_->browser().get());
-  browser_info_->SetBrowser(this);
-
-  contents_delegate_ =
-      std::make_unique<CefBrowserContentsDelegate>(browser_info_);
-  contents_delegate_->AddObserver(this);
-}
-
-void CefBrowserHostBase::InitializeBrowser() {
-  CEF_REQUIRE_UIT();
-
-  // Associate the WebContents with this browser object.
-  DCHECK(GetWebContents());
-  WebContentsUserDataAdapter::Register(this);
-}
-
-void CefBrowserHostBase::DestroyBrowser() {
-  CEF_REQUIRE_UIT();
-
-  platform_delegate_.reset(nullptr);
-
-  contents_delegate_->RemoveObserver(this);
-  contents_delegate_->ObserveWebContents(nullptr);
-
-  CefBrowserInfoManager::GetInstance()->RemoveBrowserInfo(browser_info_);
-  browser_info_->SetBrowser(nullptr);
-}
-
-CefRefPtr<CefBrowser> CefBrowserHostBase::GetBrowser() {
-  return this;
-}
-
-CefRefPtr<CefClient> CefBrowserHostBase::GetClient() {
-  return client_;
-}
-
-CefRefPtr<CefRequestContext> CefBrowserHostBase::GetRequestContext() {
-  return request_context_;
-}
-
-void CefBrowserHostBase::StartDownload(const CefString& url) {
-  if (!CEF_CURRENTLY_ON_UIT()) {
-    CEF_POST_TASK(
-        CEF_UIT, base::BindOnce(&CefBrowserHostBase::StartDownload, this, url));
-    return;
-  }
-
-  GURL gurl = GURL(url.ToString());
-  if (gurl.is_empty() || !gurl.is_valid())
-    return;
-
-  auto web_contents = GetWebContents();
-  if (!web_contents)
-    return;
-
-  auto browser_context = web_contents->GetBrowserContext();
-  if (!browser_context)
-    return;
-
-  content::DownloadManager* manager =
-      content::BrowserContext::GetDownloadManager(browser_context);
-  if (!manager)
-    return;
-
-  std::unique_ptr<download::DownloadUrlParameters> params(
-      content::DownloadRequestUtils::CreateDownloadForWebContentsMainFrame(
-          web_contents, gurl, MISSING_TRAFFIC_ANNOTATION));
-  manager->DownloadUrl(std::move(params));
-}
-
-void CefBrowserHostBase::DownloadImage(
-    const CefString& image_url,
-    bool is_favicon,
-    uint32 max_image_size,
-    bool bypass_cache,
-    CefRefPtr<CefDownloadImageCallback> callback) {
-  if (!CEF_CURRENTLY_ON_UIT()) {
-    CEF_POST_TASK(
-        CEF_UIT,
-        base::BindOnce(&CefBrowserHostBase::DownloadImage, this, image_url,
-                       is_favicon, max_image_size, bypass_cache, callback));
-    return;
-  }
-
-  if (!callback)
-    return;
-
-  GURL gurl = GURL(image_url.ToString());
-  if (gurl.is_empty() || !gurl.is_valid())
-    return;
-
-  auto web_contents = GetWebContents();
-  if (!web_contents)
-    return;
-
-  web_contents->DownloadImage(
-      gurl, is_favicon, max_image_size,
-      max_image_size * gfx::ImageSkia::GetMaxSupportedScale(), bypass_cache,
-      base::BindOnce(
-          [](uint32 max_image_size,
-             CefRefPtr<CefDownloadImageCallback> callback, int id,
-             int http_status_code, const GURL& image_url,
-             const std::vector<SkBitmap>& bitmaps,
-             const std::vector<gfx::Size>& sizes) {
-            CEF_REQUIRE_UIT();
-
-            CefRefPtr<CefImageImpl> image_impl;
-
-            if (!bitmaps.empty()) {
-              image_impl = new CefImageImpl();
-              image_impl->AddBitmaps(max_image_size, bitmaps);
-            }
-
-            callback->OnDownloadImageFinished(
-                image_url.spec(), http_status_code, image_impl.get());
-          },
-          max_image_size, callback));
-}
-
-void CefBrowserHostBase::GetNavigationEntries(
-    CefRefPtr<CefNavigationEntryVisitor> visitor,
-    bool current_only) {
-  DCHECK(visitor.get());
-  if (!visitor.get())
-    return;
-
-  if (!CEF_CURRENTLY_ON_UIT()) {
-    CEF_POST_TASK(
-        CEF_UIT, base::BindOnce(&CefBrowserHostBase::GetNavigationEntries, this,
-                                visitor, current_only));
-    return;
-  }
-
-  auto web_contents = GetWebContents();
-  if (!web_contents)
-    return;
-
-  content::NavigationController& controller = web_contents->GetController();
-  const int total = controller.GetEntryCount();
-  const int current = controller.GetCurrentEntryIndex();
-
-  if (current_only) {
-    // Visit only the current entry.
-    CefRefPtr<CefNavigationEntryImpl> entry =
-        new CefNavigationEntryImpl(controller.GetEntryAtIndex(current));
-    visitor->Visit(entry.get(), true, current, total);
-    entry->Detach(nullptr);
-  } else {
-    // Visit all entries.
-    bool cont = true;
-    for (int i = 0; i < total && cont; ++i) {
-      CefRefPtr<CefNavigationEntryImpl> entry =
-          new CefNavigationEntryImpl(controller.GetEntryAtIndex(i));
-      cont = visitor->Visit(entry.get(), (i == current), i, total);
-      entry->Detach(nullptr);
-    }
-  }
-}
-
-CefRefPtr<CefNavigationEntry> CefBrowserHostBase::GetVisibleNavigationEntry() {
-  if (!CEF_CURRENTLY_ON_UIT()) {
-    NOTREACHED() << "called on invalid thread";
-    return nullptr;
-  }
-
-  content::NavigationEntry* entry = nullptr;
-  auto web_contents = GetWebContents();
-  if (web_contents)
-    entry = web_contents->GetController().GetVisibleEntry();
-
-  if (!entry)
-    return nullptr;
-
-  return new CefNavigationEntryImpl(entry);
-}
-
-void CefBrowserHostBase::ReplaceMisspelling(const CefString& word) {
-  if (!CEF_CURRENTLY_ON_UIT()) {
-    CEF_POST_TASK(
-        CEF_UIT,
-        base::BindOnce(&CefBrowserHostBase::ReplaceMisspelling, this, word));
-    return;
-  }
-
-  auto web_contents = GetWebContents();
-  if (web_contents)
-    web_contents->ReplaceMisspelling(word);
-}
-
-void CefBrowserHostBase::AddWordToDictionary(const CefString& word) {
-  if (!CEF_CURRENTLY_ON_UIT()) {
-    CEF_POST_TASK(
-        CEF_UIT,
-        base::BindOnce(&CefBrowserHostBase::AddWordToDictionary, this, word));
-    return;
-  }
-
-  auto web_contents = GetWebContents();
-  if (!web_contents)
-    return;
-
-  SpellcheckService* spellcheck = nullptr;
-  content::BrowserContext* browser_context = web_contents->GetBrowserContext();
-  if (browser_context) {
-    spellcheck = SpellcheckServiceFactory::GetForContext(browser_context);
-    if (spellcheck)
-      spellcheck->GetCustomDictionary()->AddWord(word);
-  }
-#if defined(OS_MAC)
-  if (spellcheck && spellcheck::UseBrowserSpellChecker()) {
-    spellcheck_platform::AddWord(spellcheck->platform_spell_checker(), word);
-  }
-#endif
-}
-
-void CefBrowserHostBase::SendKeyEvent(const CefKeyEvent& event) {
-  if (!CEF_CURRENTLY_ON_UIT()) {
-    CEF_POST_TASK(CEF_UIT, base::BindOnce(&CefBrowserHostBase::SendKeyEvent,
-                                          this, event));
-    return;
-  }
-
-  if (platform_delegate_)
-    platform_delegate_->SendKeyEvent(event);
-}
-
-void CefBrowserHostBase::SendMouseClickEvent(const CefMouseEvent& event,
-                                             MouseButtonType type,
-                                             bool mouseUp,
-                                             int clickCount) {
-  if (!CEF_CURRENTLY_ON_UIT()) {
-    CEF_POST_TASK(CEF_UIT,
-                  base::BindOnce(&CefBrowserHostBase::SendMouseClickEvent, this,
-                                 event, type, mouseUp, clickCount));
-    return;
-  }
-
-  if (platform_delegate_) {
-    platform_delegate_->SendMouseClickEvent(event, type, mouseUp, clickCount);
-  }
-}
-
-void CefBrowserHostBase::SendMouseMoveEvent(const CefMouseEvent& event,
-                                            bool mouseLeave) {
-  if (!CEF_CURRENTLY_ON_UIT()) {
-    CEF_POST_TASK(CEF_UIT,
-                  base::BindOnce(&CefBrowserHostBase::SendMouseMoveEvent, this,
-                                 event, mouseLeave));
-    return;
-  }
-
-  if (platform_delegate_) {
-    platform_delegate_->SendMouseMoveEvent(event, mouseLeave);
-  }
-}
-
-void CefBrowserHostBase::SendMouseWheelEvent(const CefMouseEvent& event,
-                                             int deltaX,
-                                             int deltaY) {
-  if (deltaX == 0 && deltaY == 0) {
-    // Nothing to do.
-    return;
-  }
-
-  if (!CEF_CURRENTLY_ON_UIT()) {
-    CEF_POST_TASK(CEF_UIT,
-                  base::BindOnce(&CefBrowserHostBase::SendMouseWheelEvent, this,
-                                 event, deltaX, deltaY));
-    return;
-  }
-
-  if (platform_delegate_) {
-    platform_delegate_->SendMouseWheelEvent(event, deltaX, deltaY);
-  }
-}
-
-CefRefPtr<CefBrowserHost> CefBrowserHostBase::GetHost() {
-  return this;
-}
-
-bool CefBrowserHostBase::CanGoBack() {
-  base::AutoLock lock_scope(state_lock_);
-  return can_go_back_;
-}
-
-void CefBrowserHostBase::GoBack() {
-  auto callback = base::BindOnce(&CefBrowserHostBase::GoBack, this);
-  if (!CEF_CURRENTLY_ON_UIT()) {
-    CEF_POST_TASK(CEF_UIT, std::move(callback));
-    return;
-  }
-
-  if (browser_info_->IsNavigationLocked(std::move(callback))) {
-    return;
-  }
-
-  auto wc = GetWebContents();
-  if (wc && wc->GetController().CanGoBack()) {
-    wc->GetController().GoBack();
-  }
-}
-
-bool CefBrowserHostBase::CanGoForward() {
-  base::AutoLock lock_scope(state_lock_);
-  return can_go_forward_;
-}
-
-void CefBrowserHostBase::GoForward() {
-  auto callback = base::BindOnce(&CefBrowserHostBase::GoForward, this);
-  if (!CEF_CURRENTLY_ON_UIT()) {
-    CEF_POST_TASK(CEF_UIT, std::move(callback));
-    return;
-  }
-
-  if (browser_info_->IsNavigationLocked(std::move(callback))) {
-    return;
-  }
-
-  auto wc = GetWebContents();
-  if (wc && wc->GetController().CanGoForward()) {
-    wc->GetController().GoForward();
-  }
-}
-
-bool CefBrowserHostBase::IsLoading() {
-  base::AutoLock lock_scope(state_lock_);
-  return is_loading_;
-}
-
-void CefBrowserHostBase::Reload() {
-  auto callback = base::BindOnce(&CefBrowserHostBase::Reload, this);
-  if (!CEF_CURRENTLY_ON_UIT()) {
-    CEF_POST_TASK(CEF_UIT, std::move(callback));
-    return;
-  }
-
-  if (browser_info_->IsNavigationLocked(std::move(callback))) {
-    return;
-  }
-
-  auto wc = GetWebContents();
-  if (wc) {
-    wc->GetController().Reload(content::ReloadType::NORMAL, true);
-  }
-}
-
-void CefBrowserHostBase::ReloadIgnoreCache() {
-  auto callback = base::BindOnce(&CefBrowserHostBase::ReloadIgnoreCache, this);
-  if (!CEF_CURRENTLY_ON_UIT()) {
-    CEF_POST_TASK(CEF_UIT, std::move(callback));
-    return;
-  }
-
-  if (browser_info_->IsNavigationLocked(std::move(callback))) {
-    return;
-  }
-
-  auto wc = GetWebContents();
-  if (wc) {
-    wc->GetController().Reload(content::ReloadType::BYPASSING_CACHE, true);
-  }
-}
-
-void CefBrowserHostBase::StopLoad() {
-  auto callback = base::BindOnce(&CefBrowserHostBase::StopLoad, this);
-  if (!CEF_CURRENTLY_ON_UIT()) {
-    CEF_POST_TASK(CEF_UIT, std::move(callback));
-    return;
-  }
-
-  if (browser_info_->IsNavigationLocked(std::move(callback))) {
-    return;
-  }
-
-  auto wc = GetWebContents();
-  if (wc) {
-    wc->Stop();
-  }
-}
-
-int CefBrowserHostBase::GetIdentifier() {
-  return browser_id();
-}
-
-bool CefBrowserHostBase::IsSame(CefRefPtr<CefBrowser> that) {
-  auto impl = static_cast<CefBrowserHostBase*>(that.get());
-  return (impl == this);
-}
-
-bool CefBrowserHostBase::HasDocument() {
-  base::AutoLock lock_scope(state_lock_);
-  return has_document_;
-}
-
-bool CefBrowserHostBase::IsPopup() {
-  return browser_info_->is_popup();
-}
-
-CefRefPtr<CefFrame> CefBrowserHostBase::GetMainFrame() {
-  return GetFrame(CefFrameHostImpl::kMainFrameId);
-}
-
-CefRefPtr<CefFrame> CefBrowserHostBase::GetFocusedFrame() {
-  return GetFrame(CefFrameHostImpl::kFocusedFrameId);
-}
-
-CefRefPtr<CefFrame> CefBrowserHostBase::GetFrame(int64 identifier) {
-  if (identifier == CefFrameHostImpl::kInvalidFrameId) {
-    return nullptr;
-  } else if (identifier == CefFrameHostImpl::kMainFrameId) {
-    return browser_info_->GetMainFrame();
-  } else if (identifier == CefFrameHostImpl::kFocusedFrameId) {
-    base::AutoLock lock_scope(state_lock_);
-    if (!focused_frame_) {
-      // The main frame is focused by default.
-      return browser_info_->GetMainFrame();
-    }
-    return focused_frame_;
-  }
-
-  return browser_info_->GetFrameForId(identifier);
-}
-
-CefRefPtr<CefFrame> CefBrowserHostBase::GetFrame(const CefString& name) {
-  for (const auto& frame : browser_info_->GetAllFrames()) {
-    if (frame->GetName() == name)
-      return frame;
-  }
-  return nullptr;
-}
-
-size_t CefBrowserHostBase::GetFrameCount() {
-  return browser_info_->GetAllFrames().size();
-}
-
-void CefBrowserHostBase::GetFrameIdentifiers(std::vector<int64>& identifiers) {
-  if (identifiers.size() > 0)
-    identifiers.clear();
-
-  const auto frames = browser_info_->GetAllFrames();
-  if (frames.empty())
-    return;
-
-  identifiers.reserve(frames.size());
-  for (const auto& frame : frames) {
-    identifiers.push_back(frame->GetIdentifier());
-  }
-}
-
-void CefBrowserHostBase::GetFrameNames(std::vector<CefString>& names) {
-  if (names.size() > 0)
-    names.clear();
-
-  const auto frames = browser_info_->GetAllFrames();
-  if (frames.empty())
-    return;
-
-  names.reserve(frames.size());
-  for (const auto& frame : frames) {
-    names.push_back(frame->GetName());
-  }
-}
-
-void CefBrowserHostBase::OnStateChanged(CefBrowserContentsState state_changed) {
-  // Make sure that CefBrowser state is consistent before the associated
-  // CefClient callback is executed.
-  base::AutoLock lock_scope(state_lock_);
-  if ((state_changed & CefBrowserContentsState::kNavigation) ==
-      CefBrowserContentsState::kNavigation) {
-    is_loading_ = contents_delegate_->is_loading();
-    can_go_back_ = contents_delegate_->can_go_back();
-    can_go_forward_ = contents_delegate_->can_go_forward();
-  }
-  if ((state_changed & CefBrowserContentsState::kDocument) ==
-      CefBrowserContentsState::kDocument) {
-    has_document_ = contents_delegate_->has_document();
-  }
-  if ((state_changed & CefBrowserContentsState::kFullscreen) ==
-      CefBrowserContentsState::kFullscreen) {
-    is_fullscreen_ = contents_delegate_->is_fullscreen();
-  }
-  if ((state_changed & CefBrowserContentsState::kFocusedFrame) ==
-      CefBrowserContentsState::kFocusedFrame) {
-    focused_frame_ = contents_delegate_->focused_frame();
-  }
-}
-
-void CefBrowserHostBase::OnWebContentsDestroyed(
-    content::WebContents* web_contents) {}
-
-CefRefPtr<CefFrame> CefBrowserHostBase::GetFrameForHost(
-    const content::RenderFrameHost* host) {
-  CEF_REQUIRE_UIT();
-  if (!host)
-    return nullptr;
-
-  return browser_info_->GetFrameForHost(host);
-}
-
-CefRefPtr<CefFrame> CefBrowserHostBase::GetFrameForFrameTreeNode(
-    int frame_tree_node_id) {
-  return browser_info_->GetFrameForFrameTreeNode(frame_tree_node_id, nullptr);
-}
-
-void CefBrowserHostBase::AddObserver(Observer* observer) {
-  CEF_REQUIRE_UIT();
-  observers_.AddObserver(observer);
-}
-
-void CefBrowserHostBase::RemoveObserver(Observer* observer) {
-  CEF_REQUIRE_UIT();
-  observers_.RemoveObserver(observer);
-}
-
-bool CefBrowserHostBase::HasObserver(Observer* observer) const {
-  CEF_REQUIRE_UIT();
-  return observers_.HasObserver(observer);
-}
-
-void CefBrowserHostBase::LoadMainFrameURL(
-    const content::OpenURLParams& params) {
-  if (!params.url.is_valid()) {
-    LOG(ERROR) << "Invalid URL: " << params.url.spec();
-    return;
-  }
-
-  auto callback =
-      base::BindOnce(&CefBrowserHostBase::LoadMainFrameURL, this, params);
-  if (!CEF_CURRENTLY_ON_UIT()) {
-    CEF_POST_TASK(CEF_UIT, std::move(callback));
-    return;
-  }
-
-  if (browser_info_->IsNavigationLocked(std::move(callback))) {
-    return;
-  }
-
-  if (Navigate(params)) {
-    OnSetFocus(FOCUS_SOURCE_NAVIGATION);
-  }
-}
-
-bool CefBrowserHostBase::Navigate(const content::OpenURLParams& params) {
-  CEF_REQUIRE_UIT();
-  auto web_contents = GetWebContents();
-  if (web_contents) {
-    web_contents->GetController().LoadURL(
-        params.url, params.referrer, params.transition, params.extra_headers);
-    return true;
-  }
-  return false;
-}
-
-void CefBrowserHostBase::OnDidFinishLoad(CefRefPtr<CefFrameHostImpl> frame,
-                                         const GURL& validated_url,
-                                         int http_status_code) {
-  frame->RefreshAttributes();
-
-  // Give internal scheme handlers an opportunity to update content.
-  scheme::DidFinishLoad(frame, validated_url);
-
-  contents_delegate_->OnLoadEnd(frame, validated_url, http_status_code);
-}
-
-void CefBrowserHostBase::ViewText(const std::string& text) {
-  if (!CEF_CURRENTLY_ON_UIT()) {
-    CEF_POST_TASK(CEF_UIT,
-                  base::BindOnce(&CefBrowserHostBase::ViewText, this, text));
-    return;
-  }
-
-  if (platform_delegate_)
-    platform_delegate_->ViewText(text);
-}
-
-bool CefBrowserHostBase::MaybeAllowNavigation(
-    content::RenderFrameHost* opener,
-    bool is_guest_view,
-    const content::OpenURLParams& params) {
-  return true;
-}
-
-void CefBrowserHostBase::OnAfterCreated() {
-  CEF_REQUIRE_UIT();
-  if (client_) {
-    if (auto handler = client_->GetLifeSpanHandler()) {
-      handler->OnAfterCreated(this);
-    }
-  }
-}
-
-void CefBrowserHostBase::OnBeforeClose() {
-  CEF_REQUIRE_UIT();
-  if (client_) {
-    if (auto handler = client_->GetLifeSpanHandler()) {
-      handler->OnBeforeClose(this);
-    }
-  }
-}
-
-void CefBrowserHostBase::OnBrowserDestroyed() {
-  CEF_REQUIRE_UIT();
-  for (auto& observer : observers_)
-    observer.OnBrowserDestroyed(this);
-}
-
-int CefBrowserHostBase::browser_id() const {
-  return browser_info_->browser_id();
-}
-
-content::WebContents* CefBrowserHostBase::GetWebContents() const {
-  CEF_REQUIRE_UIT();
-  return contents_delegate_->web_contents();
-}
-
-content::BrowserContext* CefBrowserHostBase::GetBrowserContext() const {
-  CEF_REQUIRE_UIT();
-  auto web_contents = GetWebContents();
-  if (web_contents)
-    return web_contents->GetBrowserContext();
-  return nullptr;
-}
--- a/libcef/browser/browser_host_base.h
+++ b/libcef/browser/browser_host_base.h
@@ -1,268 +0,0 @@
-// Copyright 2020 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.
-
-#ifndef CEF_LIBCEF_BROWSER_BROWSER_HOST_BASE_H_
-#define CEF_LIBCEF_BROWSER_BROWSER_HOST_BASE_H_
-#pragma once
-
-#include "include/cef_browser.h"
-#include "include/cef_client.h"
-#include "include/views/cef_browser_view.h"
-#include "libcef/browser/browser_contents_delegate.h"
-#include "libcef/browser/browser_info.h"
-#include "libcef/browser/browser_platform_delegate.h"
-#include "libcef/browser/frame_host_impl.h"
-#include "libcef/browser/request_context_impl.h"
-
-#include "base/observer_list.h"
-#include "base/synchronization/lock.h"
-#include "extensions/common/view_type.h"
-
-namespace extensions {
-class Extension;
-}
-
-// Parameters that are passed to the runtime-specific Create methods.
-struct CefBrowserCreateParams {
-  CefBrowserCreateParams() {}
-
-  // Copy constructor used with the chrome runtime only.
-  CefBrowserCreateParams(const CefBrowserCreateParams& that) {
-    operator=(that);
-  }
-  CefBrowserCreateParams& operator=(const CefBrowserCreateParams& that) {
-    // Not all parameters can be copied.
-    client = that.client;
-    url = that.url;
-    settings = that.settings;
-    request_context = that.request_context;
-    extra_info = that.extra_info;
-    return *this;
-  }
-
-  // Platform-specific window creation info. Will be nullptr when creating a
-  // views-hosted browser. Currently used with the alloy runtime only.
-  std::unique_ptr<CefWindowInfo> window_info;
-
-#if defined(USE_AURA)
-  // The BrowserView that will own a views-hosted browser. Will be nullptr for
-  // popup browsers (the BrowserView will be created later in that case).
-  // Currently used with the alloy runtime only.
-  CefRefPtr<CefBrowserView> browser_view;
-#endif
-
-  // Client implementation. May be nullptr.
-  CefRefPtr<CefClient> client;
-
-  // Initial URL to load. May be empty. If this is a valid extension URL then
-  // the browser will be created as an app view extension host.
-  GURL url;
-
-  // Browser settings.
-  CefBrowserSettings settings;
-
-  // Other browser that opened this DevTools browser. Will be nullptr for non-
-  // DevTools browsers. Currently used with the alloy runtime only.
-  CefRefPtr<CefBrowserHostBase> devtools_opener;
-
-  // Request context to use when creating the browser. If nullptr the global
-  // request context will be used.
-  CefRefPtr<CefRequestContext> request_context;
-
-  // Extra information that will be passed to
-  // CefRenderProcessHandler::OnBrowserCreated.
-  CefRefPtr<CefDictionaryValue> extra_info;
-
-  // Used when explicitly creating the browser as an extension host via
-  // ProcessManager::CreateBackgroundHost. Currently used with the alloy
-  // runtime only.
-  const extensions::Extension* extension = nullptr;
-  extensions::ViewType extension_host_type = extensions::VIEW_TYPE_INVALID;
-};
-
-// Base class for CefBrowserHost implementations. Includes functionality that is
-// shared by the alloy and chrome runtimes. All methods are thread-safe unless
-// otherwise indicated.
-class CefBrowserHostBase : public CefBrowserHost,
-                           public CefBrowser,
-                           public CefBrowserContentsDelegate::Observer {
- public:
-  // Interface to implement for observers that wish to be informed of changes
-  // to the CefBrowserHostBase. All methods will be called on the UI thread.
-  class Observer : public base::CheckedObserver {
-   public:
-    // Called before |browser| is destroyed. Any references to |browser| should
-    // be cleared when this method is called.
-    virtual void OnBrowserDestroyed(CefBrowserHostBase* browser) = 0;
-
-   protected:
-    virtual ~Observer() {}
-  };
-
-  // Returns the browser associated with the specified RenderViewHost.
-  static CefRefPtr<CefBrowserHostBase> GetBrowserForHost(
-      const content::RenderViewHost* host);
-  // Returns the browser associated with the specified RenderFrameHost.
-  static CefRefPtr<CefBrowserHostBase> GetBrowserForHost(
-      const content::RenderFrameHost* host);
-  // Returns the browser associated with the specified WebContents.
-  static CefRefPtr<CefBrowserHostBase> GetBrowserForContents(
-      const content::WebContents* contents);
-  // Returns the browser associated with the specified FrameTreeNode ID.
-  static CefRefPtr<CefBrowserHostBase> GetBrowserForFrameTreeNode(
-      int frame_tree_node_id);
-  // Returns the browser associated with the specified frame routing IDs.
-  static CefRefPtr<CefBrowserHostBase> GetBrowserForFrameRoute(
-      int render_process_id,
-      int render_routing_id);
-
-  CefBrowserHostBase(
-      const CefBrowserSettings& settings,
-      CefRefPtr<CefClient> client,
-      std::unique_ptr<CefBrowserPlatformDelegate> platform_delegate,
-      scoped_refptr<CefBrowserInfo> browser_info,
-      CefRefPtr<CefRequestContextImpl> request_context);
-
-  // Called on the UI thread after the associated WebContents is created.
-  virtual void InitializeBrowser();
-
-  // Called on the UI thread after the associated WebContents is destroyed.
-  // Also called from CefBrowserInfoManager::DestroyAllBrowsers if the browser
-  // was not properly shut down.
-  virtual void DestroyBrowser();
-
-  // CefBrowserHost methods:
-  CefRefPtr<CefBrowser> GetBrowser() override;
-  CefRefPtr<CefClient> GetClient() override;
-  CefRefPtr<CefRequestContext> GetRequestContext() override;
-  void StartDownload(const CefString& url) override;
-  void DownloadImage(const CefString& image_url,
-                     bool is_favicon,
-                     uint32 max_image_size,
-                     bool bypass_cache,
-                     CefRefPtr<CefDownloadImageCallback> callback) override;
-  void ReplaceMisspelling(const CefString& word) override;
-  void AddWordToDictionary(const CefString& word) override;
-  void SendKeyEvent(const CefKeyEvent& event) override;
-  void SendMouseClickEvent(const CefMouseEvent& event,
-                           MouseButtonType type,
-                           bool mouseUp,
-                           int clickCount) override;
-  void SendMouseMoveEvent(const CefMouseEvent& event, bool mouseLeave) override;
-  void SendMouseWheelEvent(const CefMouseEvent& event,
-                           int deltaX,
-                           int deltaY) override;
-  void GetNavigationEntries(CefRefPtr<CefNavigationEntryVisitor> visitor,
-                            bool current_only) override;
-  CefRefPtr<CefNavigationEntry> GetVisibleNavigationEntry() override;
-
-  // CefBrowser methods:
-  CefRefPtr<CefBrowserHost> GetHost() override;
-  bool CanGoBack() override;
-  void GoBack() override;
-  bool CanGoForward() override;
-  void GoForward() override;
-  bool IsLoading() override;
-  void Reload() override;
-  void ReloadIgnoreCache() override;
-  void StopLoad() override;
-  int GetIdentifier() override;
-  bool IsSame(CefRefPtr<CefBrowser> that) override;
-  bool HasDocument() override;
-  bool IsPopup() override;
-  CefRefPtr<CefFrame> GetMainFrame() override;
-  CefRefPtr<CefFrame> GetFocusedFrame() override;
-  CefRefPtr<CefFrame> GetFrame(int64 identifier) override;
-  CefRefPtr<CefFrame> GetFrame(const CefString& name) override;
-  size_t GetFrameCount() override;
-  void GetFrameIdentifiers(std::vector<int64>& identifiers) override;
-  void GetFrameNames(std::vector<CefString>& names) override;
-
-  // CefBrowserContentsDelegate::Observer methods:
-  void OnStateChanged(CefBrowserContentsState state_changed) override;
-  void OnWebContentsDestroyed(content::WebContents* web_contents) override;
-
-  // Returns the frame associated with the specified RenderFrameHost.
-  CefRefPtr<CefFrame> GetFrameForHost(const content::RenderFrameHost* host);
-
-  // Returns the frame associated with the specified FrameTreeNode ID.
-  CefRefPtr<CefFrame> GetFrameForFrameTreeNode(int frame_tree_node_id);
-
-  // Manage observer objects. The observer must either outlive this object or
-  // be removed before destruction. Must be called on the UI thread.
-  void AddObserver(Observer* observer);
-  void RemoveObserver(Observer* observer);
-  bool HasObserver(Observer* observer) const;
-
-  // Methods called from CefFrameHostImpl.
-  void LoadMainFrameURL(const content::OpenURLParams& params);
-  void OnDidFinishLoad(CefRefPtr<CefFrameHostImpl> frame,
-                       const GURL& validated_url,
-                       int http_status_code);
-  virtual void OnSetFocus(cef_focus_source_t source) = 0;
-  void ViewText(const std::string& text);
-
-  // Called from CefBrowserInfoManager::MaybeAllowNavigation.
-  virtual bool MaybeAllowNavigation(content::RenderFrameHost* opener,
-                                    bool is_guest_view,
-                                    const content::OpenURLParams& params);
-
-  // Helpers for executing client callbacks. Must be called on the UI thread.
-  void OnAfterCreated();
-  void OnBeforeClose();
-  void OnBrowserDestroyed();
-
-  // Thread-safe accessors.
-  const CefBrowserSettings& settings() const { return settings_; }
-  CefRefPtr<CefClient> client() const { return client_; }
-  scoped_refptr<CefBrowserInfo> browser_info() const { return browser_info_; }
-  int browser_id() const;
-  CefRefPtr<CefRequestContextImpl> request_context() const {
-    return request_context_;
-  }
-
-  // Accessors that must be called on the UI thread.
-  content::WebContents* GetWebContents() const;
-  content::BrowserContext* GetBrowserContext() const;
-  CefBrowserPlatformDelegate* platform_delegate() const {
-    return platform_delegate_.get();
-  }
-  CefBrowserContentsDelegate* contents_delegate() const {
-    return contents_delegate_.get();
-  }
-
- protected:
-  // Called from LoadMainFrameURL to perform the actual navigation.
-  virtual bool Navigate(const content::OpenURLParams& params);
-
-  // Thread-safe members.
-  CefBrowserSettings settings_;
-  CefRefPtr<CefClient> client_;
-  std::unique_ptr<CefBrowserPlatformDelegate> platform_delegate_;
-  scoped_refptr<CefBrowserInfo> browser_info_;
-  CefRefPtr<CefRequestContextImpl> request_context_;
-
-  // Only accessed on the UI thread.
-  std::unique_ptr<CefBrowserContentsDelegate> contents_delegate_;
-
-  // Observers that want to be notified of changes to this object.
-  // Only accessed on the UI thread.
-  base::ObserverList<Observer> observers_;
-
-  // Volatile state accessed from multiple threads. All access must be protected
-  // by |state_lock_|.
-  base::Lock state_lock_;
-  bool is_loading_ = false;
-  bool can_go_back_ = false;
-  bool can_go_forward_ = false;
-  bool has_document_ = false;
-  bool is_fullscreen_ = false;
-  CefRefPtr<CefFrameHostImpl> focused_frame_;
-
- private:
-  IMPLEMENT_REFCOUNTING(CefBrowserHostBase);
-  DISALLOW_COPY_AND_ASSIGN(CefBrowserHostBase);
-};
-
-#endif  // CEF_LIBCEF_BROWSER_BROWSER_HOST_BASE_H_
--- a/libcef/browser/browser_host_create.cc
+++ b/libcef/browser/browser_host_create.cc
@@ -1,144 +0,0 @@
-// Copyright (c) 2012 The Chromium Embedded Framework Authors.
-// Portions copyright (c) 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "include/cef_browser.h"
-#include "libcef/browser/alloy/alloy_browser_host_impl.h"
-#include "libcef/browser/chrome/chrome_browser_host_impl.h"
-#include "libcef/browser/context.h"
-#include "libcef/browser/thread_util.h"
-#include "libcef/features/runtime.h"
-
-namespace {
-
-class CreateBrowserHelper {
- public:
-  CreateBrowserHelper(const CefWindowInfo& windowInfo,
-                      CefRefPtr<CefClient> client,
-                      const CefString& url,
-                      const CefBrowserSettings& settings,
-                      CefRefPtr<CefDictionaryValue> extra_info,
-                      CefRefPtr<CefRequestContext> request_context)
-      : window_info_(windowInfo),
-        client_(client),
-        url_(url),
-        settings_(settings),
-        extra_info_(extra_info),
-        request_context_(request_context) {}
-
-  CefWindowInfo window_info_;
-  CefRefPtr<CefClient> client_;
-  CefString url_;
-  CefBrowserSettings settings_;
-  CefRefPtr<CefDictionaryValue> extra_info_;
-  CefRefPtr<CefRequestContext> request_context_;
-};
-
-}  // namespace
-
-// static
-bool CefBrowserHost::CreateBrowser(
-    const CefWindowInfo& windowInfo,
-    CefRefPtr<CefClient> client,
-    const CefString& url,
-    const CefBrowserSettings& settings,
-    CefRefPtr<CefDictionaryValue> extra_info,
-    CefRefPtr<CefRequestContext> request_context) {
-  // Verify that the context is in a valid state.
-  if (!CONTEXT_STATE_VALID()) {
-    NOTREACHED() << "context not valid";
-    return false;
-  }
-
-  // Verify that the settings structure is a valid size.
-  if (settings.size != sizeof(cef_browser_settings_t)) {
-    NOTREACHED() << "invalid CefBrowserSettings structure size";
-    return false;
-  }
-
-  // Verify windowless rendering requirements.
-  if (windowInfo.windowless_rendering_enabled &&
-      !client->GetRenderHandler().get()) {
-    NOTREACHED() << "CefRenderHandler implementation is required";
-    return false;
-  }
-
-  if (windowInfo.windowless_rendering_enabled &&
-      !CefContext::Get()->settings().windowless_rendering_enabled) {
-    LOG(ERROR) << "Creating a windowless browser without setting "
-                  "CefSettings.windowless_rendering_enabled may result in "
-                  "reduced performance or runtime errors.";
-  }
-
-  // Create the browser on the UI thread.
-  CreateBrowserHelper* helper = new CreateBrowserHelper(
-      windowInfo, client, url, settings, extra_info, request_context);
-  CEF_POST_TASK(CEF_UIT, base::BindOnce(
-                             [](CreateBrowserHelper* helper) {
-                               CefBrowserHost::CreateBrowserSync(
-                                   helper->window_info_, helper->client_,
-                                   helper->url_, helper->settings_,
-                                   helper->extra_info_,
-                                   helper->request_context_);
-                               delete helper;
-                             },
-                             helper));
-
-  return true;
-}
-
-// static
-CefRefPtr<CefBrowser> CefBrowserHost::CreateBrowserSync(
-    const CefWindowInfo& windowInfo,
-    CefRefPtr<CefClient> client,
-    const CefString& url,
-    const CefBrowserSettings& settings,
-    CefRefPtr<CefDictionaryValue> extra_info,
-    CefRefPtr<CefRequestContext> request_context) {
-  // Verify that the context is in a valid state.
-  if (!CONTEXT_STATE_VALID()) {
-    NOTREACHED() << "context not valid";
-    return nullptr;
-  }
-
-  // Verify that the settings structure is a valid size.
-  if (settings.size != sizeof(cef_browser_settings_t)) {
-    NOTREACHED() << "invalid CefBrowserSettings structure size";
-    return nullptr;
-  }
-
-  // Verify that this method is being called on the UI thread.
-  if (!CEF_CURRENTLY_ON_UIT()) {
-    NOTREACHED() << "called on invalid thread";
-    return nullptr;
-  }
-
-  // Verify windowless rendering requirements.
-  if (windowInfo.windowless_rendering_enabled &&
-      !client->GetRenderHandler().get()) {
-    NOTREACHED() << "CefRenderHandler implementation is required";
-    return nullptr;
-  }
-
-  CefBrowserCreateParams create_params;
-  create_params.window_info.reset(new CefWindowInfo(windowInfo));
-  create_params.client = client;
-  create_params.url = GURL(url.ToString());
-  if (!url.empty() && !create_params.url.is_valid() &&
-      !create_params.url.has_scheme()) {
-    std::string new_url = std::string("http://") + url.ToString();
-    create_params.url = GURL(new_url);
-  }
-  create_params.settings = settings;
-  create_params.extra_info = extra_info;
-  create_params.request_context = request_context;
-
-  if (cef::IsChromeRuntimeEnabled()) {
-    auto browser = ChromeBrowserHostImpl::Create(create_params);
-    return browser.get();
-  }
-
-  auto browser = AlloyBrowserHostImpl::Create(create_params);
-  return browser.get();
-}
--- a/libcef/browser/browser_host_impl.cc
+++ b/libcef/browser/browser_host_impl.cc
--- a/libcef/browser/alloy/alloy_browser_host_impl.h
+++ b/libcef/browser/alloy/alloy_browser_host_impl.h
@@ -3,8 +3,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.

-#ifndef CEF_LIBCEF_BROWSER_ALLOY_ALLOY_BROWSER_HOST_IMPL_H_
-#define CEF_LIBCEF_BROWSER_ALLOY_ALLOY_BROWSER_HOST_IMPL_H_
+#ifndef CEF_LIBCEF_BROWSER_BROWSER_HOST_IMPL_H_
+#define CEF_LIBCEF_BROWSER_BROWSER_HOST_IMPL_H_
 #pragma once

 #include <map>
@@ -14,7 +14,7 @@
 #include "include/cef_browser.h"
 #include "include/cef_client.h"
 #include "include/cef_frame.h"
-#include "libcef/browser/browser_host_base.h"
+#include "include/views/cef_browser_view.h"
 #include "libcef/browser/browser_info.h"
 #include "libcef/browser/file_dialog_manager.h"
 #include "libcef/browser/frame_host_impl.h"
@@ -22,36 +22,57 @@
 #include "libcef/browser/menu_manager.h"
 #include "libcef/browser/request_context_impl.h"

+#include "base/observer_list.h"
 #include "base/strings/string16.h"
 #include "base/synchronization/lock.h"
+#include "content/public/browser/notification_observer.h"
+#include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "extensions/common/view_type.h"

-class CefAudioCapturer;
+namespace content {
+struct DragEventSourceInfo;
+class RenderWidgetHostImpl;
+}  // namespace content
+
+namespace extensions {
+class Extension;
+class ExtensionHost;
+}  // namespace extensions
+
+#if defined(USE_AURA)
+namespace views {
+class Widget;
+}
+#endif  // defined(USE_AURA)
+
 class CefBrowserInfo;
-class CefDevToolsManager;
+class CefBrowserPlatformDelegate;
+class CefDevToolsFrontend;
 class SiteInstance;

-// CefBrowser implementation for the alloy runtime. Method calls are delegated
-// to the CefPlatformDelegate or the WebContents as appropriate. All methods are
-// thread-safe unless otherwise indicated.
+// Implementation of CefBrowser.
 //
 // WebContentsDelegate: Interface for handling WebContents delegations. There is
-// a one-to-one relationship between AlloyBrowserHostImpl and WebContents
+// a one-to-one relationship between CefBrowserHostImpl and WebContents
 // instances.
 //
 // WebContentsObserver: Interface for observing WebContents notifications and
 // IPC messages. There is a one-to-one relationship between WebContents and
 // RenderViewHost instances. IPC messages received by the RenderViewHost will be
 // forwarded to this WebContentsObserver implementation via WebContents. IPC
-// messages sent using AlloyBrowserHostImpl::Send() will be forwarded to the
+// messages sent using CefBrowserHostImpl::Send() will be forwarded to the
 // RenderViewHost (after posting to the UI thread if necessary). Use
 // WebContentsObserver::routing_id() when sending IPC messages.
-class AlloyBrowserHostImpl : public CefBrowserHostBase,
-                             public content::WebContentsDelegate,
-                             public content::WebContentsObserver {
+//
+// NotificationObserver: Interface for observing post-processed notifications.
+class CefBrowserHostImpl : public CefBrowserHost,
+                           public CefBrowser,
+                           public content::WebContentsDelegate,
+                           public content::WebContentsObserver,
+                           public content::NotificationObserver {
 public:
  // Used for handling the response to command messages.
  class CommandResponseHandler : public virtual CefBaseRefCounted {
@@ -59,36 +80,87 @@ class AlloyBrowserHostImpl : public CefBrowserHostBase,
    virtual void OnResponse(const std::string& response) = 0;
  };

-  ~AlloyBrowserHostImpl() override;
+  // Interface to implement for observers that wish to be informed of changes
+  // to the CefBrowserHostImpl. All methods will be called on the UI thread.
+  class Observer {
+   public:
+    // Called before |browser| is destroyed. Any references to |browser| should
+    // be cleared when this method is called.
+    virtual void OnBrowserDestroyed(CefBrowserHostImpl* browser) = 0;

-  // Create a new AlloyBrowserHostImpl instance with owned WebContents.
-  static CefRefPtr<AlloyBrowserHostImpl> Create(
-      CefBrowserCreateParams& create_params);
+   protected:
+    virtual ~Observer() {}
+  };
+
+  ~CefBrowserHostImpl() override;
+
+  struct CreateParams {
+    // Platform-specific window creation info. Will be nullptr when creating a
+    // views-hosted browser.
+    std::unique_ptr<CefWindowInfo> window_info;
+
+#if defined(USE_AURA)
+    // The BrowserView that will own a views-hosted browser. Will be nullptr for
+    // popup browsers (the BrowserView will be created later in that case).
+    CefRefPtr<CefBrowserView> browser_view;
+#endif
+
+    // Client implementation. May be nullptr.
+    CefRefPtr<CefClient> client;
+
+    // Initial URL to load. May be empty. If this is a valid extension URL then
+    // the browser will be created as an app view extension host.
+    GURL url;
+
+    // Browser settings.
+    CefBrowserSettings settings;
+
+    // Other browser that opened this DevTools browser. Will be nullptr for non-
+    // DevTools browsers.
+    CefRefPtr<CefBrowserHostImpl> devtools_opener;
+
+    // Request context to use when creating the browser. If nullptr the global
+    // request context will be used.
+    CefRefPtr<CefRequestContext> request_context;
+
+    CefRefPtr<CefDictionaryValue> extra_info;
+
+    // Used when explicitly creating the browser as an extension host via
+    // ProcessManager::CreateBackgroundHost.
+    const extensions::Extension* extension = nullptr;
+    extensions::ViewType extension_host_type = extensions::VIEW_TYPE_INVALID;
+  };
+
+  // Create a new CefBrowserHostImpl instance.
+  static CefRefPtr<CefBrowserHostImpl> Create(CreateParams& create_params);

  // Returns the browser associated with the specified RenderViewHost.
-  static CefRefPtr<AlloyBrowserHostImpl> GetBrowserForHost(
+  static CefRefPtr<CefBrowserHostImpl> GetBrowserForHost(
      const content::RenderViewHost* host);
  // Returns the browser associated with the specified RenderFrameHost.
-  static CefRefPtr<AlloyBrowserHostImpl> GetBrowserForHost(
+  static CefRefPtr<CefBrowserHostImpl> GetBrowserForHost(
      const content::RenderFrameHost* host);
  // Returns the browser associated with the specified WebContents.
-  static CefRefPtr<AlloyBrowserHostImpl> GetBrowserForContents(
+  static CefRefPtr<CefBrowserHostImpl> GetBrowserForContents(
      const content::WebContents* contents);
  // Returns the browser associated with the specified FrameTreeNode ID.
-  static CefRefPtr<AlloyBrowserHostImpl> GetBrowserForFrameTreeNode(
+  static CefRefPtr<CefBrowserHostImpl> GetBrowserForFrameTreeNode(
      int frame_tree_node_id);
  // Returns the browser associated with the specified frame routing IDs.
-  static CefRefPtr<AlloyBrowserHostImpl> GetBrowserForFrameRoute(
+  static CefRefPtr<CefBrowserHostImpl> GetBrowserForFrameRoute(
      int render_process_id,
      int render_routing_id);

  // CefBrowserHost methods.
+  CefRefPtr<CefBrowser> GetBrowser() override;
  void CloseBrowser(bool force_close) override;
  bool TryCloseBrowser() override;
  void SetFocus(bool focus) override;
  CefWindowHandle GetWindowHandle() override;
  CefWindowHandle GetOpenerWindowHandle() override;
  bool HasView() override;
+  CefRefPtr<CefClient> GetClient() override;
+  CefRefPtr<CefRequestContext> GetRequestContext() override;
  double GetZoomLevel() override;
  void SetZoomLevel(double zoomLevel) override;
  void RunFileDialog(FileDialogMode mode,
@@ -97,6 +169,12 @@ class AlloyBrowserHostImpl : public CefBrowserHostBase,
                     const std::vector<CefString>& accept_filters,
                     int selected_accept_filter,
                     CefRefPtr<CefRunFileDialogCallback> callback) override;
+  void StartDownload(const CefString& url) override;
+  void DownloadImage(const CefString& image_url,
+                     bool is_favicon,
+                     uint32 max_image_size,
+                     bool bypass_cache,
+                     CefRefPtr<CefDownloadImageCallback> callback) override;
  void Print() override;
  void PrintToPDF(const CefString& path,
                  const CefPdfPrintSettings& settings,
@@ -113,18 +191,27 @@ class AlloyBrowserHostImpl : public CefBrowserHostBase,
                    const CefPoint& inspect_element_at) override;
  void CloseDevTools() override;
  bool HasDevTools() override;
-  bool SendDevToolsMessage(const void* message, size_t message_size) override;
-  int ExecuteDevToolsMethod(int message_id,
-                            const CefString& method,
-                            CefRefPtr<CefDictionaryValue> params) override;
-  CefRefPtr<CefRegistration> AddDevToolsMessageObserver(
-      CefRefPtr<CefDevToolsMessageObserver> observer) override;
+  void GetNavigationEntries(CefRefPtr<CefNavigationEntryVisitor> visitor,
+                            bool current_only) override;
+  void SetMouseCursorChangeDisabled(bool disabled) override;
+  bool IsMouseCursorChangeDisabled() override;
  bool IsWindowRenderingDisabled() override;
+  void ReplaceMisspelling(const CefString& word) override;
+  void AddWordToDictionary(const CefString& word) override;
  void WasResized() override;
  void WasHidden(bool hidden) override;
  void NotifyScreenInfoChanged() override;
  void Invalidate(PaintElementType type) override;
  void SendExternalBeginFrame() override;
+  void SendKeyEvent(const CefKeyEvent& event) override;
+  void SendMouseClickEvent(const CefMouseEvent& event,
+                           MouseButtonType type,
+                           bool mouseUp,
+                           int clickCount) override;
+  void SendMouseMoveEvent(const CefMouseEvent& event, bool mouseLeave) override;
+  void SendMouseWheelEvent(const CefMouseEvent& event,
+                           int deltaX,
+                           int deltaY) override;
  void SendTouchEvent(const CefTouchEvent& event) override;
  void SendFocusEvent(bool setFocus) override;
  void SendCaptureLostEvent() override;
@@ -151,6 +238,7 @@ class AlloyBrowserHostImpl : public CefBrowserHostBase,
  void DragSourceEndedAt(int x, int y, DragOperationsMask op) override;
  void SetAudioMuted(bool mute) override;
  bool IsAudioMuted() override;
+  CefRefPtr<CefNavigationEntry> GetVisibleNavigationEntry() override;
  void SetAccessibilityState(cef_state_t accessibility_state) override;
  void SetAutoResizeEnabled(bool enabled,
                            const CefSize& min_size,
@@ -158,12 +246,37 @@ class AlloyBrowserHostImpl : public CefBrowserHostBase,
  CefRefPtr<CefExtension> GetExtension() override;
  bool IsBackgroundHost() override;

+  // CefBrowser methods.
+  CefRefPtr<CefBrowserHost> GetHost() override;
+  bool CanGoBack() override;
+  void GoBack() override;
+  bool CanGoForward() override;
+  void GoForward() override;
+  bool IsLoading() override;
+  void Reload() override;
+  void ReloadIgnoreCache() override;
+  void StopLoad() override;
+  int GetIdentifier() override;
+  bool IsSame(CefRefPtr<CefBrowser> that) override;
+  bool IsPopup() override;
+  bool HasDocument() override;
+  CefRefPtr<CefFrame> GetMainFrame() override;
+  CefRefPtr<CefFrame> GetFocusedFrame() override;
+  CefRefPtr<CefFrame> GetFrame(int64 identifier) override;
+  CefRefPtr<CefFrame> GetFrame(const CefString& name) override;
+  size_t GetFrameCount() override;
+  void GetFrameIdentifiers(std::vector<int64>& identifiers) override;
+  void GetFrameNames(std::vector<CefString>& names) override;
+
  // Returns true if windowless rendering is enabled.
  bool IsWindowless() const;

  // Returns true if this browser is views-hosted.
  bool IsViewsHosted() const;

+  // Returns true if this browser supports print preview.
+  bool IsPrintPreviewSupported() const;
+
  // Returns true if this browser supports picture-in-picture.
  bool IsPictureInPictureSupported() const;

@@ -172,7 +285,7 @@ class AlloyBrowserHostImpl : public CefBrowserHostBase,

  // Destroy the browser members. This method should only be called after the
  // native browser window is not longer processing messages.
-  void DestroyBrowser() override;
+  void DestroyBrowser();

  // Cancel display of the context menu, if any.
  void CancelContextMenu();
@@ -187,39 +300,71 @@ class AlloyBrowserHostImpl : public CefBrowserHostBase,
  CefRefPtr<CefBrowserView> GetBrowserView() const;
 #endif

-  bool MaybeAllowNavigation(content::RenderFrameHost* opener,
-                            bool is_guest_view,
-                            const content::OpenURLParams& params) override;
+  // Returns the frame associated with the specified RenderFrameHost.
+  CefRefPtr<CefFrame> GetFrameForHost(const content::RenderFrameHost* host);
+
+  // Returns the frame associated with the specified FrameTreeNode ID.
+  CefRefPtr<CefFrame> GetFrameForFrameTreeNode(int frame_tree_node_id);
+
+  // Load the specified URL in the main frame.
+  void LoadMainFrameURL(const std::string& url,
+                        const content::Referrer& referrer,
+                        ui::PageTransition transition,
+                        const std::string& extra_headers);
+
+  // Called from CefFrameHostImpl.
+  void OnFrameFocused(CefRefPtr<CefFrameHostImpl> frame);
+  void OnDidFinishLoad(CefRefPtr<CefFrameHostImpl> frame,
+                       const GURL& validated_url,
+                       int http_status_code);
+
+  // Open the specified text in the default text editor.
+  void ViewText(const std::string& text);

  // Convert from view coordinates to screen coordinates. Potential display
  // scaling will be applied to the result.
  gfx::Point GetScreenPoint(const gfx::Point& view) const;

  void StartDragging(const content::DropData& drop_data,
-                     blink::DragOperationsMask allowed_ops,
+                     blink::WebDragOperationsMask allowed_ops,
                     const gfx::ImageSkia& image,
                     const gfx::Vector2d& image_offset,
-                     const blink::mojom::DragEventSourceInfo& event_info,
+                     const content::DragEventSourceInfo& event_info,
                     content::RenderWidgetHostImpl* source_rwh);
-  void UpdateDragCursor(blink::DragOperation operation);
+  void UpdateDragCursor(blink::WebDragOperation operation);

  // Thread safe accessors.
+  const CefBrowserSettings& settings() const { return settings_; }
  SkColor GetBackgroundColor() const;
+  CefRefPtr<CefClient> client() const { return client_; }
+  scoped_refptr<CefBrowserInfo> browser_info() const { return browser_info_; }
+  int browser_id() const;
+  CefRefPtr<CefRequestContextImpl> request_context() const {
+    return request_context_;
+  }

  // Accessors that must be called on the UI thread.
-  extensions::ExtensionHost* GetExtensionHost() const;
+  content::BrowserContext* GetBrowserContext();
+  extensions::ExtensionHost* extension_host() const { return extension_host_; }

-  void OnSetFocus(cef_focus_source_t source) override;
+  void OnSetFocus(cef_focus_source_t source);

  // Run the file chooser dialog specified by |params|. Only a single dialog may
  // be pending at any given time. |callback| will be executed asynchronously
  // after the dialog is dismissed or if another dialog is already pending.
-  void RunFileChooser(const CefFileDialogRunner::FileChooserParams& params,
-                      CefFileDialogRunner::RunFileChooserCallback callback);
+  void RunFileChooser(
+      const CefFileDialogRunner::FileChooserParams& params,
+      const CefFileDialogRunner::RunFileChooserCallback& callback);

  bool HandleContextMenu(content::WebContents* web_contents,
                         const content::ContextMenuParams& params);

+  // Returns the WebContents most likely to handle an action. If extensions are
+  // enabled and this browser has a full-page guest (for example, a full-page
+  // PDF viewer extension) then the guest's WebContents will be returned.
+  // Otherwise, the browser's WebContents will be returned.
+  content::WebContents* GetActionableWebContents() const;
+
  enum DestructionState {
    DESTRUCTION_STATE_NONE = 0,
    DESTRUCTION_STATE_PENDING,
@@ -235,13 +380,14 @@ class AlloyBrowserHostImpl : public CefBrowserHostBase,
  bool ShouldTransferNavigation(bool is_main_frame_navigation) override;
  void AddNewContents(content::WebContents* source,
                      std::unique_ptr<content::WebContents> new_contents,
-                      const GURL& target_url,
                      WindowOpenDisposition disposition,
                      const gfx::Rect& initial_rect,
                      bool user_gesture,
                      bool* was_blocked) override;
  void LoadingStateChanged(content::WebContents* source,
                           bool to_different_document) override;
+  void LoadProgressChanged(content::WebContents* source,
+                           double progress) override;
  void CloseContents(content::WebContents* source) override;
  void UpdateTargetURL(content::WebContents* source, const GURL& url) override;
  bool DidAddMessageToConsole(content::WebContents* source,
@@ -253,6 +399,7 @@ class AlloyBrowserHostImpl : public CefBrowserHostBase,
                         bool proceed,
                         bool* proceed_to_fire_unload) override;
  bool TakeFocus(content::WebContents* source, bool reverse) override;
+
  bool HandleContextMenu(content::RenderFrameHost* render_frame_host,
                         const content::ContextMenuParams& params) override;
  content::KeyboardEventProcessingResult PreHandleKeyboardEvent(
@@ -265,7 +412,7 @@ class AlloyBrowserHostImpl : public CefBrowserHostBase,
                             const blink::WebGestureEvent& event) override;
  bool CanDragEnter(content::WebContents* source,
                    const content::DropData& data,
-                    blink::DragOperationsMask operations_allowed) override;
+                    blink::WebDragOperationsMask operations_allowed) override;
  void GetCustomWebContentsView(
      content::WebContents* web_contents,
      const GURL& target_url,
@@ -284,11 +431,12 @@ class AlloyBrowserHostImpl : public CefBrowserHostBase,
  content::JavaScriptDialogManager* GetJavaScriptDialogManager(
      content::WebContents* source) override;
  void RunFileChooser(content::RenderFrameHost* render_frame_host,
-                      scoped_refptr<content::FileSelectListener> listener,
+                      std::unique_ptr<content::FileSelectListener> listener,
                      const blink::mojom::FileChooserParams& params) override;
  bool EmbedsFullscreenWidget() override;
  void EnterFullscreenModeForTab(
-      content::RenderFrameHost* requesting_frame,
+      content::WebContents* web_contents,
+      const GURL& origin,
      const blink::mojom::FullscreenOptions& options) override;
  void ExitFullscreenModeForTab(content::WebContents* web_contents) override;
  bool IsFullscreenForTabOrPending(
@@ -312,7 +460,7 @@ class AlloyBrowserHostImpl : public CefBrowserHostBase,
  bool CheckMediaAccessPermission(content::RenderFrameHost* render_frame_host,
                                  const GURL& security_origin,
                                  blink::mojom::MediaStreamType type) override;
-  bool IsNeverComposited(content::WebContents* web_contents) override;
+  bool IsNeverVisible(content::WebContents* web_contents) override;
  content::PictureInPictureResult EnterPictureInPicture(
      content::WebContents* web_contents,
      const viz::SurfaceId& surface_id,
@@ -321,72 +469,179 @@ class AlloyBrowserHostImpl : public CefBrowserHostBase,

  // content::WebContentsObserver methods.
  using content::WebContentsObserver::BeforeUnloadFired;
+  void RenderFrameCreated(content::RenderFrameHost* render_frame_host) override;
+  void RenderFrameHostChanged(content::RenderFrameHost* old_host,
+                              content::RenderFrameHost* new_host) override;
+  void RenderFrameDeleted(content::RenderFrameHost* render_frame_host) override;
  void RenderViewCreated(content::RenderViewHost* render_view_host) override;
+  void RenderViewDeleted(content::RenderViewHost* render_view_host) override;
  void RenderViewReady() override;
+  void RenderProcessGone(base::TerminationStatus status) override;
  void DidFinishNavigation(
      content::NavigationHandle* navigation_handle) override;
-  void OnAudioStateChanged(bool audible) override;
+  void DidStopLoading() override;
+  void DocumentAvailableInMainFrame() override;
+  void DidFailLoad(content::RenderFrameHost* render_frame_host,
+                   const GURL& validated_url,
+                   int error_code,
+                   const base::string16& error_description) override;
+  void TitleWasSet(content::NavigationEntry* entry) override;
+  void PluginCrashed(const base::FilePath& plugin_path,
+                     base::ProcessId plugin_pid) override;
+  void DidUpdateFaviconURL(
+      const std::vector<content::FaviconURL>& candidates) override;
+  bool OnMessageReceived(const IPC::Message& message) override;
+  bool OnMessageReceived(const IPC::Message& message,
+                         content::RenderFrameHost* render_frame_host) override;
  void AccessibilityEventReceived(
      const content::AXEventNotificationDetails& content_event_bundle) override;
  void AccessibilityLocationChangesReceived(
      const std::vector<content::AXLocationChangeNotificationDetails>& locData)
      override;
-  void WebContentsDestroyed() override;
+
+  void OnWebContentsFocused(
+      content::RenderWidgetHost* render_widget_host) override;
+
+  // Manage observer objects. The observer must either outlive this object or
+  // remove itself before destruction. These methods can only be called on the
+  // UI thread.
+  void AddObserver(Observer* observer);
+  void RemoveObserver(Observer* observer);
+  bool HasObserver(Observer* observer) const;
+  class NavigationLock final {
+   private:
+    friend class CefBrowserHostImpl;
+    friend std::unique_ptr<NavigationLock>::deleter_type;
+
+    explicit NavigationLock(CefRefPtr<CefBrowserHostImpl> browser);
+    ~NavigationLock();
+
+    CefRefPtr<CefBrowserHostImpl> browser_;
+  };
+
+  // Block navigation-related events on NavigationLock life span.
+  std::unique_ptr<NavigationLock> CreateNavigationLock();

 private:
-  friend class CefBrowserPlatformDelegateAlloy;
+  class DevToolsWebContentsObserver;

-  static CefRefPtr<AlloyBrowserHostImpl> CreateInternal(
+  static CefRefPtr<CefBrowserHostImpl> CreateInternal(
      const CefBrowserSettings& settings,
      CefRefPtr<CefClient> client,
      content::WebContents* web_contents,
      bool own_web_contents,
      scoped_refptr<CefBrowserInfo> browser_info,
-      CefRefPtr<AlloyBrowserHostImpl> opener,
+      CefRefPtr<CefBrowserHostImpl> opener,
      bool is_devtools_popup,
      CefRefPtr<CefRequestContextImpl> request_context,
      std::unique_ptr<CefBrowserPlatformDelegate> platform_delegate,
      CefRefPtr<CefExtension> extension);

-  AlloyBrowserHostImpl(
+  // content::NotificationObserver methods.
+  void Observe(int type,
+               const content::NotificationSource& source,
+               const content::NotificationDetails& details) override;
+
+  CefBrowserHostImpl(
      const CefBrowserSettings& settings,
      CefRefPtr<CefClient> client,
      content::WebContents* web_contents,
      scoped_refptr<CefBrowserInfo> browser_info,
-      CefRefPtr<AlloyBrowserHostImpl> opener,
+      CefRefPtr<CefBrowserHostImpl> opener,
      CefRefPtr<CefRequestContextImpl> request_context,
      std::unique_ptr<CefBrowserPlatformDelegate> platform_delegate,
      CefRefPtr<CefExtension> extension);

+  void set_owned_web_contents(content::WebContents* owned_contents);
+
  // Give the platform delegate an opportunity to create the host window.
  bool CreateHostWindow();

+  // Create/delete the host for extensions.
+  void CreateExtensionHost(const extensions::Extension* extension,
+                           content::BrowserContext* browser_context,
+                           content::WebContents* host_contents,
+                           const GURL& url,
+                           extensions::ViewType host_type);
+  void DestroyExtensionHost();
+  void OnExtensionHostDeleted();
+
+  // Returns true if navigation actions are currently locked.
+  bool navigation_locked() const;
+  // Action to be executed once the navigation lock is released.
+  void set_pending_navigation_action(base::OnceClosure action);
+
+  void OnAddressChange(const GURL& url);
+  void OnLoadStart(CefRefPtr<CefFrame> frame,
+                   ui::PageTransition transition_type);
+  void OnLoadError(CefRefPtr<CefFrame> frame, const GURL& url, int error_code);
+  void OnLoadEnd(CefRefPtr<CefFrame> frame,
+                 const GURL& url,
+                 int http_status_code);
+  void OnFullscreenModeChange(bool fullscreen);
+  void OnTitleChange(const base::string16& title);
+
+  void OnDevToolsWebContentsDestroyed();
+
  // Create the CefFileDialogManager if it doesn't already exist.
  void EnsureFileDialogManager();

-  void StartAudioCapturer();
-  void OnRecentlyAudibleTimerFired();
-
-  bool EnsureDevToolsManager();
-  void InitializeDevToolsRegistrationOnUIThread(
-      CefRefPtr<CefRegistration> registration);
-
-  void SetFocusInternal(bool focus);
+  void ConfigureAutoResize();

+  CefBrowserSettings settings_;
+  CefRefPtr<CefClient> client_;
+  scoped_refptr<CefBrowserInfo> browser_info_;
  CefWindowHandle opener_;
+  CefRefPtr<CefRequestContextImpl> request_context_;
+  std::unique_ptr<CefBrowserPlatformDelegate> platform_delegate_;
  const bool is_windowless_;
  const bool is_views_hosted_;
-  CefWindowHandle host_window_handle_ = kNullWindowHandle;
-  CefRefPtr<CefExtension> extension_;
-  bool is_background_host_ = false;
+  CefWindowHandle host_window_handle_;
+
+  // Non-nullptr if this object owns the WebContents. Will be nullptr for popup
+  // browsers between the calls to WebContentsCreated() and AddNewContents(),
+  // and may never be set if the parent browser is destroyed during popup
+  // creation.
+  std::unique_ptr<content::WebContents> owned_web_contents_;
+
+  // Volatile state information. All access must be protected by the state lock.
+  base::Lock state_lock_;
+  bool is_loading_;
+  bool can_go_back_;
+  bool can_go_forward_;
+  bool has_document_;
+  bool is_fullscreen_;
+
+  // The currently focused frame, or nullptr if the main frame is focused.
+  CefRefPtr<CefFrameHostImpl> focused_frame_;

  // Represents the current browser destruction state. Only accessed on the UI
  // thread.
-  DestructionState destruction_state_ = DESTRUCTION_STATE_NONE;
+  DestructionState destruction_state_;
+
+  // Navigation will not occur while |navigation_lock_count_| > 0.
+  // |pending_navigation_action_| will be executed when the lock is released.
+  // Only accessed on the UI thread.
+  int navigation_lock_count_ = 0;
+  base::OnceClosure pending_navigation_action_;

  // True if the OS window hosting the browser has been destroyed. Only accessed
  // on the UI thread.
-  bool window_destroyed_ = false;
+  bool window_destroyed_;
+
+  // True if currently in the OnSetFocus callback. Only accessed on the UI
+  // thread.
+  bool is_in_onsetfocus_;
+
+  // True if the focus is currently on an editable field on the page. Only
+  // accessed on the UI thread.
+  bool focus_on_editable_field_;
+
+  // True if mouse cursor change is disabled.
+  bool mouse_cursor_change_disabled_;
+
+  // Used for managing notification subscriptions.
+  std::unique_ptr<content::NotificationRegistrar> registrar_;

  // Used for creating and managing file dialogs.
  std::unique_ptr<CefFileDialogManager> file_dialog_manager_;
@@ -397,16 +652,31 @@ class AlloyBrowserHostImpl : public CefBrowserHostBase,
  // Used for creating and managing context menus.
  std::unique_ptr<CefMenuManager> menu_manager_;

-  // Used for creating and managing DevTools instances.
-  std::unique_ptr<CefDevToolsManager> devtools_manager_;
+  // Track the lifespan of the frontend WebContents associated with this
+  // browser.
+  std::unique_ptr<DevToolsWebContentsObserver> devtools_observer_;
+  // CefDevToolsFrontend will delete itself when the frontend WebContents is
+  // destroyed.
+  CefDevToolsFrontend* devtools_frontend_;

-  // Used for capturing audio for CefAudioHandler.
-  std::unique_ptr<CefAudioCapturer> audio_capturer_;
+  // Observers that want to be notified of changes to this object.
+  base::ObserverList<Observer>::Unchecked observers_;

-  // Timer for determining when "recently audible" transitions to false. This
-  // starts running when a tab stops being audible, and is canceled if it starts
-  // being audible again before it fires.
-  base::OneShotTimer recently_audible_timer_;
+  // Used to provide unique incremental IDs for each find request.
+  int find_request_id_counter_ = 0;
+
+  // Used when the browser is hosting an extension.
+  extensions::ExtensionHost* extension_host_ = nullptr;
+  CefRefPtr<CefExtension> extension_;
+  bool is_background_host_ = false;
+
+  // Used with auto-resize.
+  bool auto_resize_enabled_ = false;
+  gfx::Size auto_resize_min_;
+  gfx::Size auto_resize_max_;
+
+  IMPLEMENT_REFCOUNTING(CefBrowserHostImpl);
+  DISALLOW_COPY_AND_ASSIGN(CefBrowserHostImpl);
 };

-#endif  // CEF_LIBCEF_BROWSER_ALLOY_ALLOY_BROWSER_HOST_IMPL_H_
+#endif  // CEF_LIBCEF_BROWSER_BROWSER_HOST_IMPL_H_
--- a/libcef/browser/browser_info.cc
+++ b/libcef/browser/browser_info.cc
@@ -4,13 +4,13 @@

 #include "libcef/browser/browser_info.h"

-#include "libcef/browser/browser_host_base.h"
+#include "libcef/browser/browser_host_impl.h"
 #include "libcef/browser/thread_util.h"
 #include "libcef/common/values_impl.h"

 #include "base/logging.h"
-#include "content/browser/renderer_host/frame_tree_node.h"
-#include "content/browser/renderer_host/render_frame_host_impl.h"
+#include "content/browser/frame_host/frame_tree_node.h"
+#include "content/browser/frame_host/render_frame_host_impl.h"
 #include "content/public/browser/render_process_host.h"
 #include "ipc/ipc_message.h"

@@ -34,12 +34,12 @@ CefBrowserInfo::CefBrowserInfo(int browser_id,

 CefBrowserInfo::~CefBrowserInfo() {}

-CefRefPtr<CefBrowserHostBase> CefBrowserInfo::browser() const {
+CefRefPtr<CefBrowserHostImpl> CefBrowserInfo::browser() const {
  base::AutoLock lock_scope(lock_);
  return browser_;
 }

-void CefBrowserInfo::SetBrowser(CefRefPtr<CefBrowserHostBase> browser) {
+void CefBrowserInfo::SetBrowser(CefRefPtr<CefBrowserHostImpl> browser) {
  base::AutoLock lock_scope(lock_);
  browser_ = browser;

@@ -297,37 +297,6 @@ CefBrowserInfo::FrameHostList CefBrowserInfo::GetAllFrames() const {
  return frames;
 }

-CefBrowserInfo::NavigationLock::NavigationLock() : weak_ptr_factory_(this) {}
-
-CefBrowserInfo::NavigationLock::~NavigationLock() {
-  CEF_REQUIRE_UIT();
-  if (pending_action_) {
-    CEF_POST_TASK(CEF_UIT, std::move(pending_action_));
-  }
-}
-
-scoped_refptr<CefBrowserInfo::NavigationLock>
-CefBrowserInfo::CreateNavigationLock() {
-  CEF_REQUIRE_UIT();
-  scoped_refptr<NavigationLock> lock;
-  if (!navigation_lock_) {
-    lock = new NavigationLock();
-    navigation_lock_ = lock->weak_ptr_factory_.GetWeakPtr();
-  } else {
-    lock = navigation_lock_.get();
-  }
-  return lock;
-}
-
-bool CefBrowserInfo::IsNavigationLocked(base::OnceClosure pending_action) {
-  CEF_REQUIRE_UIT();
-  if (navigation_lock_) {
-    navigation_lock_->pending_action_ = std::move(pending_action);
-    return true;
-  }
-  return false;
-}
-
 void CefBrowserInfo::MaybeUpdateFrameTreeNodeIdMap(FrameInfo* info) {
  lock_.AssertAcquired();

--- a/libcef/browser/browser_info.h
+++ b/libcef/browser/browser_info.h
@@ -12,10 +12,8 @@
 #include "include/internal/cef_ptr.h"
 #include "libcef/common/values_impl.h"

-#include "base/callback.h"
 #include "base/containers/unique_ptr_adapters.h"
 #include "base/memory/ref_counted.h"
-#include "base/memory/weak_ptr.h"
 #include "base/synchronization/lock.h"
 #include "base/values.h"

@@ -23,12 +21,12 @@ namespace content {
 class RenderFrameHost;
 }

-class CefBrowserHostBase;
+class CefBrowserHostImpl;
 class CefFrameHostImpl;

 // CefBrowserInfo is used to associate a browser ID and render view/process
-// IDs with a particular CefBrowserHostBase. Render view/process IDs may change
-// during the lifetime of a single CefBrowserHostBase.
+// IDs with a particular CefBrowserHostImpl. Render view/process IDs may change
+// during the lifetime of a single CefBrowserHostImpl.
 //
 // CefBrowserInfo objects are managed by CefBrowserInfoManager and should not be
 // created directly.
@@ -46,24 +44,23 @@ class CefBrowserInfo : public base::RefCountedThreadSafe<CefBrowserInfo> {

  // May return NULL if the browser has not yet been created or if the browser
  // has been destroyed.
-  CefRefPtr<CefBrowserHostBase> browser() const;
+  CefRefPtr<CefBrowserHostImpl> browser() const;

-  // Set or clear the browser. Called from CefBrowserHostBase InitializeBrowser
+  // Set or clear the browser. Called from the CefBrowserHostImpl constructor
  // (to set) and DestroyBrowser (to clear).
-  void SetBrowser(CefRefPtr<CefBrowserHostBase> browser);
+  void SetBrowser(CefRefPtr<CefBrowserHostImpl> browser);

  // Ensure that a frame record exists for |host|. Called for the main frame
  // when the RenderView is created, or for a sub-frame when the associated
  // RenderFrame is created in the renderer process.
-  // Called from CefBrowserContentsDelegate::RenderFrameCreated (is_guest_view =
-  // false) or CefMimeHandlerViewGuestDelegate::OnGuestAttached (is_guest_view =
-  // true).
+  // Called from CefBrowserHostImpl::RenderFrameCreated (is_guest_view = false)
+  // or CefMimeHandlerViewGuestDelegate::OnGuestAttached (is_guest_view = true).
  void MaybeCreateFrame(content::RenderFrameHost* host, bool is_guest_view);

  // Remove the frame record for |host|. Called for the main frame when the
  // RenderView is destroyed, or for a sub-frame when the associated RenderFrame
  // is destroyed in the renderer process.
-  // Called from CefBrowserContentsDelegate::RenderFrameDeleted or
+  // Called from CefBrowserHostImpl::FrameDeleted or
  // CefMimeHandlerViewGuestDelegate::OnGuestDetached.
  void RemoveFrame(content::RenderFrameHost* host);

@@ -124,28 +121,6 @@ class CefBrowserInfo : public base::RefCountedThreadSafe<CefBrowserInfo> {
  typedef std::set<CefRefPtr<CefFrameHostImpl>> FrameHostList;
  FrameHostList GetAllFrames() const;

-  class NavigationLock final : public base::RefCounted<NavigationLock> {
-   private:
-    friend class CefBrowserInfo;
-    friend class base::RefCounted<NavigationLock>;
-
-    NavigationLock();
-    ~NavigationLock();
-
-    base::OnceClosure pending_action_;
-    base::WeakPtrFactory<NavigationLock> weak_ptr_factory_;
-  };
-
-  // Block navigation actions on NavigationLock life span. Must be called on the
-  // UI thread.
-  scoped_refptr<NavigationLock> CreateNavigationLock();
-
-  // Returns true if navigation actions are currently blocked. If this method
-  // returns true the most recent |pending_action| will be executed on the UI
-  // thread once the navigation lock is released. Must be called on the UI
-  // thread.
-  bool IsNavigationLocked(base::OnceClosure pending_action);
-
 private:
  friend class base::RefCountedThreadSafe<CefBrowserInfo>;

@@ -176,15 +151,11 @@ class CefBrowserInfo : public base::RefCountedThreadSafe<CefBrowserInfo> {
  bool is_windowless_;
  CefRefPtr<CefDictionaryValue> extra_info_;

-  // Navigation will be blocked while |navigation_lock_| exists.
-  // Only accessed on the UI thread.
-  base::WeakPtr<NavigationLock> navigation_lock_;
-
  mutable base::Lock lock_;

  // The below members must be protected by |lock_|.

-  CefRefPtr<CefBrowserHostBase> browser_;
+  CefRefPtr<CefBrowserHostImpl> browser_;

  // Owner of FrameInfo structs.
  typedef std::set<std::unique_ptr<FrameInfo>, base::UniquePtrComparator>
--- a/libcef/browser/browser_info_manager.cc
+++ b/libcef/browser/browser_info_manager.cc
@@ -6,30 +6,23 @@

 #include <utility>

-#include "libcef/browser/browser_host_base.h"
+#include "libcef/browser/browser_host_impl.h"
 #include "libcef/browser/browser_platform_delegate.h"
 #include "libcef/browser/extensions/browser_extensions_util.h"
 #include "libcef/browser/thread_util.h"
 #include "libcef/common/cef_messages.h"
-#include "libcef/common/cef_switches.h"
 #include "libcef/common/extensions/extensions_util.h"
 #include "libcef/common/values_impl.h"
-#include "libcef/features/runtime_checks.h"

-#include "base/command_line.h"
 #include "base/logging.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/child_process_host.h"
-#include "content/public/common/url_constants.h"

 namespace {

-// Timeout delay for new browser info responses.
-const int64_t kNewBrowserInfoResponseTimeoutMs = 2000;
-
 void TranslatePopupFeatures(const blink::mojom::WindowFeatures& webKitFeatures,
                            CefPopupFeatures& features) {
  features.x = static_cast<int>(webKitFeatures.x);
@@ -51,7 +44,7 @@ CefBrowserInfoManager* g_info_manager = nullptr;

 }  // namespace

-CefBrowserInfoManager::CefBrowserInfoManager() {
+CefBrowserInfoManager::CefBrowserInfoManager() : next_browser_id_(0) {
  DCHECK(!g_info_manager);
  g_info_manager = this;
 }
@@ -93,11 +86,10 @@ scoped_refptr<CefBrowserInfo> CefBrowserInfoManager::CreatePopupBrowserInfo(
      new CefBrowserInfo(++next_browser_id_, true, is_windowless, extra_info);
  browser_info_list_.push_back(browser_info);

-  // Continue any pending NewBrowserInfo request.
+  // Continue any pending NewBrowserInfo requests.
  auto it = pending_new_browser_info_map_.find(frame_id);
  if (it != pending_new_browser_info_map_.end()) {
-    SendNewBrowserInfoResponse(render_process_id, browser_info,
-                               false /* is_guest_view */,
+    SendNewBrowserInfoResponse(render_process_id, browser_info, false,
                               it->second->reply_msg);
    pending_new_browser_info_map_.erase(it);
  }
@@ -117,13 +109,26 @@ bool CefBrowserInfoManager::CanCreateWindow(
    bool* no_javascript_access) {
  CEF_REQUIRE_UIT();

-  content::OpenURLParams params(target_url, referrer, disposition,
-                                ui::PAGE_TRANSITION_LINK,
-                                /*is_renderer_initiated=*/true);
-  params.user_gesture = user_gesture;
+  bool is_guest_view = false;
+  CefRefPtr<CefBrowserHostImpl> browser =
+      extensions::GetOwnerBrowserForHost(opener, &is_guest_view);
+  DCHECK(browser.get());
+  if (!browser.get()) {
+    // Cancel the popup.
+    return false;
+  }
+
+  if (is_guest_view) {
+    content::OpenURLParams params(target_url, referrer, disposition,
+                                  ui::PAGE_TRANSITION_LINK, true);
+    params.user_gesture = user_gesture;
+
+    // Pass navigation to the owner browser.
+    CEF_POST_TASK(
+        CEF_UIT,
+        base::Bind(base::IgnoreResult(&CefBrowserHostImpl::OpenURLFromTab),
+                   browser.get(), nullptr, params));

-  CefRefPtr<CefBrowserHostBase> browser;
-  if (!MaybeAllowNavigation(opener, params, browser) || !browser) {
    // Cancel the popup.
    return false;
  }
@@ -134,7 +139,7 @@ bool CefBrowserInfoManager::CanCreateWindow(
  std::unique_ptr<CefWindowInfo> window_info(new CefWindowInfo);

 #if defined(OS_WIN)
-  window_info->SetAsPopup(nullptr, CefString());
+  window_info->SetAsPopup(NULL, CefString());
 #endif

  auto pending_popup = std::make_unique<CefBrowserInfoManager::PendingPopup>();
@@ -157,7 +162,7 @@ bool CefBrowserInfoManager::CanCreateWindow(
      CefPopupFeatures cef_features;
      TranslatePopupFeatures(features, cef_features);

-#if (defined(OS_WIN) || defined(OS_MAC))
+#if (defined(OS_WIN) || defined(OS_MACOSX))
      // Default to the size from the popup features.
      if (cef_features.xSet)
        window_info->x = cef_features.x;
@@ -180,9 +185,9 @@ bool CefBrowserInfoManager::CanCreateWindow(
  }

  if (allow) {
-    CefBrowserCreateParams create_params;
+    CefBrowserHostImpl::CreateParams create_params;

-    if (!browser->HasView())
+    if (!browser->IsViewsHosted())
      create_params.window_info = std::move(window_info);

    create_params.settings = pending_popup->settings;
@@ -213,7 +218,6 @@ void CefBrowserInfoManager::GetCustomWebContentsView(
    content::WebContentsView** view,
    content::RenderViewHostDelegateView** delegate_view) {
  CEF_REQUIRE_UIT();
-  REQUIRE_ALLOY_RUNTIME();

  std::unique_ptr<CefBrowserInfoManager::PendingPopup> pending_popup =
      PopPendingPopup(CefBrowserInfoManager::PendingPopup::CAN_CREATE_WINDOW,
@@ -242,15 +246,10 @@ void CefBrowserInfoManager::WebContentsCreated(
    CefRefPtr<CefDictionaryValue>& extra_info) {
  CEF_REQUIRE_UIT();

-  // GET_CUSTOM_WEB_CONTENTS_VIEW is only used with the alloy runtime.
-  const auto previous_step =
-      cef::IsAlloyRuntimeEnabled()
-          ? CefBrowserInfoManager::PendingPopup::GET_CUSTOM_WEB_CONTENTS_VIEW
-          : CefBrowserInfoManager::PendingPopup::CAN_CREATE_WINDOW;
-
  std::unique_ptr<CefBrowserInfoManager::PendingPopup> pending_popup =
-      PopPendingPopup(previous_step, opener_render_process_id,
-                      opener_render_routing_id, target_url);
+      PopPendingPopup(
+          CefBrowserInfoManager::PendingPopup::GET_CUSTOM_WEB_CONTENTS_VIEW,
+          opener_render_process_id, opener_render_routing_id, target_url);
  DCHECK(pending_popup.get());
  DCHECK(pending_popup->platform_delegate.get());

@@ -288,27 +287,13 @@ void CefBrowserInfoManager::OnGetNewBrowserInfo(int render_process_id,
  DCHECK(pending_new_browser_info_map_.find(frame_id) ==
         pending_new_browser_info_map_.end());

-  const int timeout_id = ++next_timeout_id_;
-
  // Queue the request.
  std::unique_ptr<PendingNewBrowserInfo> pending(new PendingNewBrowserInfo());
  pending->render_process_id = render_process_id;
  pending->render_routing_id = render_routing_id;
-  pending->timeout_id = timeout_id;
  pending->reply_msg = reply_msg;
  pending_new_browser_info_map_.insert(
      std::make_pair(frame_id, std::move(pending)));
-
-  // Register a timeout for the pending response so that the renderer process
-  // doesn't hang forever.
-  if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kDisableNewBrowserInfoTimeout)) {
-    CEF_POST_DELAYED_TASK(
-        CEF_UIT,
-        base::BindOnce(&CefBrowserInfoManager::TimeoutNewBrowserInfoResponse,
-                       frame_id, timeout_id),
-        kNewBrowserInfoResponseTimeoutMs);
-  }
 }

 void CefBrowserInfoManager::RemoveBrowserInfo(
@@ -338,7 +323,7 @@ void CefBrowserInfoManager::DestroyAllBrowsers() {
  if (!list.empty()) {
    BrowserInfoList::iterator it = list.begin();
    for (; it != list.end(); ++it) {
-      CefRefPtr<CefBrowserHostBase> browser = (*it)->browser();
+      CefRefPtr<CefBrowserHostImpl> browser = (*it)->browser();
      DCHECK(browser.get());
      if (browser.get()) {
        // DestroyBrowser will call RemoveBrowserInfo.
@@ -364,28 +349,6 @@ CefBrowserInfoManager::GetBrowserInfoForFrameRoute(int render_process_id,
  return GetBrowserInfo(render_process_id, render_routing_id, is_guest_view);
 }

-bool CefBrowserInfoManager::MaybeAllowNavigation(
-    content::RenderFrameHost* opener,
-    const content::OpenURLParams& params,
-    CefRefPtr<CefBrowserHostBase>& browser_out) const {
-  CEF_REQUIRE_UIT();
-
-  bool is_guest_view = false;
-  auto browser = extensions::GetOwnerBrowserForHost(opener, &is_guest_view);
-  if (!browser) {
-    // Print preview uses a modal dialog where we don't own the WebContents.
-    // Allow that navigation to proceed.
-    return true;
-  }
-
-  if (!browser->MaybeAllowNavigation(opener, is_guest_view, params)) {
-    return false;
-  }
-
-  browser_out = browser;
-  return true;
-}
-
 scoped_refptr<CefBrowserInfo>
 CefBrowserInfoManager::GetBrowserInfoForFrameTreeNode(int frame_tree_node_id,
                                                      bool* is_guest_view) {
@@ -535,52 +498,19 @@ void CefBrowserInfoManager::SendNewBrowserInfoResponse(
  }

  CefProcessHostMsg_GetNewBrowserInfo_Params params;
+  params.browser_id = browser_info->browser_id();
+  params.is_windowless = browser_info->is_windowless();
+  params.is_popup = browser_info->is_popup();
  params.is_guest_view = is_guest_view;

-  if (browser_info) {
-    params.browser_id = browser_info->browser_id();
-    params.is_windowless = browser_info->is_windowless();
-    params.is_popup = browser_info->is_popup();
-
-    auto extra_info = browser_info->extra_info();
-    if (extra_info) {
-      auto extra_info_impl =
-          static_cast<CefDictionaryValueImpl*>(extra_info.get());
-      auto extra_info_value = extra_info_impl->CopyValue();
-      extra_info_value->Swap(&params.extra_info);
-    }
-  } else {
-    // The new browser info response has timed out.
-    params.browser_id = -1;
+  auto extra_info = browser_info->extra_info();
+  if (extra_info) {
+    auto extra_info_impl =
+        static_cast<CefDictionaryValueImpl*>(extra_info.get());
+    auto extra_info_value = extra_info_impl->CopyValue();
+    extra_info_value->Swap(&params.extra_info);
  }

  CefProcessHostMsg_GetNewBrowserInfo::WriteReplyParams(reply_msg, params);
  host->Send(reply_msg);
 }
-
-// static
-void CefBrowserInfoManager::TimeoutNewBrowserInfoResponse(int64_t frame_id,
-                                                          int timeout_id) {
-  if (!g_info_manager)
-    return;
-
-  base::AutoLock lock_scope(g_info_manager->browser_info_lock_);
-
-  // Continue the NewBrowserInfo request if it's still pending.
-  auto it = g_info_manager->pending_new_browser_info_map_.find(frame_id);
-  if (it != g_info_manager->pending_new_browser_info_map_.end()) {
-    const auto& pending_info = it->second;
-    // Don't accidentally timeout a new request for the same frame.
-    if (pending_info->timeout_id != timeout_id)
-      return;
-
-    LOG(ERROR) << "Timeout of new browser info response for frame process id "
-               << pending_info->render_process_id << " and routing id "
-               << pending_info->render_routing_id;
-
-    SendNewBrowserInfoResponse(pending_info->render_process_id, nullptr,
-                               false /* is_guest_view */,
-                               pending_info->reply_msg);
-    g_info_manager->pending_new_browser_info_map_.erase(it);
-  }
-}
--- a/libcef/browser/browser_info_manager.h
+++ b/libcef/browser/browser_info_manager.h
@@ -25,7 +25,6 @@ struct WebWindowFeatures;
 }

 namespace content {
-struct OpenURLParams;
 struct Referrer;
 class RenderFrameHost;
 class RenderViewHostDelegateView;
@@ -37,7 +36,6 @@ namespace IPC {
 class Message;
 }

-class CefBrowserHostBase;
 class CefBrowserPlatformDelegate;

 // Singleton object for managing BrowserInfo instances.
@@ -49,14 +47,14 @@ class CefBrowserInfoManager : public content::RenderProcessHostObserver {
  // Returns this singleton instance of this class.
  static CefBrowserInfoManager* GetInstance();

-  // Called immediately before a new CefBrowserHost implementation is created
+  // Called from CefBrowserHostImpl::Create when a new browser is being created
  // directly. In this case |is_popup| will be true only for DevTools browsers.
  scoped_refptr<CefBrowserInfo> CreateBrowserInfo(
      bool is_popup,
      bool is_windowless,
      CefRefPtr<CefDictionaryValue> extra_info);

-  // Called from WebContentsDelegate::WebContentsCreated when a new browser is
+  // Called from CefBrowserHostImpl::WebContentsCreated when a new browser is
  // being created for a traditional popup (e.g. window.open() or targeted
  // link). If any OnGetNewBrowserInfo requests are pending for the popup the
  // response will be sent when this method is called.
@@ -65,7 +63,7 @@ class CefBrowserInfoManager : public content::RenderProcessHostObserver {
      bool is_windowless,
      CefRefPtr<CefDictionaryValue> extra_info);

-  // Called from ContentBrowserClient::CanCreateWindow. See comments on
+  // Called from CefContentBrowserClient::CanCreateWindow. See comments on
  // PendingPopup for more information.
  bool CanCreateWindow(content::RenderFrameHost* opener,
                       const GURL& target_url,
@@ -77,8 +75,8 @@ class CefBrowserInfoManager : public content::RenderProcessHostObserver {
                       bool opener_suppressed,
                       bool* no_javascript_access);

-  // Called from WebContentsDelegate::GetCustomWebContentsView (alloy runtime
-  // only). See comments on PendingPopup for more information.
+  // Called from CefBrowserHostImpl::GetCustomWebContentsView. See comments on
+  // PendingPopup for more information.
  void GetCustomWebContentsView(
      const GURL& target_url,
      int opener_render_process_id,
@@ -86,7 +84,7 @@ class CefBrowserInfoManager : public content::RenderProcessHostObserver {
      content::WebContentsView** view,
      content::RenderViewHostDelegateView** delegate_view);

-  // Called from WebContentsDelegate::WebContentsCreated. See comments on
+  // Called from CefBrowserHostImpl::WebContentsCreated. See comments on
  // PendingPopup for more information.
  void WebContentsCreated(
      const GURL& target_url,
@@ -108,7 +106,7 @@ class CefBrowserInfoManager : public content::RenderProcessHostObserver {
                           int render_routing_id,
                           IPC::Message* reply_msg);

-  // Called from CefBrowserHostBase::DestroyBrowser() when a browser is
+  // Called from CefBrowserHostImpl::DestroyBrowser() when a browser is
  // destroyed.
  void RemoveBrowserInfo(scoped_refptr<CefBrowserInfo> browser_info);

@@ -117,7 +115,7 @@ class CefBrowserInfoManager : public content::RenderProcessHostObserver {

  // Returns the CefBrowserInfo matching the specified IDs or nullptr if no
  // match is found. It is allowed to add new callers of this method but
-  // consider using CefBrowserHostBase::GetBrowserForFrameRoute() or
+  // consider using CefBrowserHostImpl::GetBrowserForFrameRoute() or
  // extensions::GetOwnerBrowserForFrameRoute() instead. If |is_guest_view| is
  // non-nullptr it will be set to true if the IDs match a guest view associated
  // with the returned browser info instead of the browser itself.
@@ -128,7 +126,7 @@ class CefBrowserInfoManager : public content::RenderProcessHostObserver {

  // Returns the CefBrowserInfo matching the specified ID or nullptr if no match
  // is found. It is allowed to add new callers of this method but consider
-  // using CefBrowserHostBase::GetBrowserForFrameTreeNode() instead. If
+  // using CefBrowserHostImpl::GetBrowserForFrameTreeNode() instead. If
  // |is_guest_view| is non-nullptr it will be set to true if the IDs match a
  // guest view associated with the returned browser info instead of the browser
  // itself.
@@ -140,29 +138,21 @@ class CefBrowserInfoManager : public content::RenderProcessHostObserver {
  typedef std::list<scoped_refptr<CefBrowserInfo>> BrowserInfoList;
  BrowserInfoList GetBrowserInfoList();

-  // Returns true if the navigation should be allowed to proceed, or false if
-  // the navigation will instead be sent via OpenURLFromTab. If allowed,
-  // |browser| will be set to the target browser if any.
-  bool MaybeAllowNavigation(content::RenderFrameHost* opener,
-                            const content::OpenURLParams& params,
-                            CefRefPtr<CefBrowserHostBase>& browser) const;
-
 private:
  // RenderProcessHostObserver methods:
  void RenderProcessHostDestroyed(content::RenderProcessHost* host) override;

  // Store state information about pending popups. Call order is:
-  // - CanCreateWindow (UIT):
+  // - CefContentBrowserClient::CanCreateWindow (UIT)
  //   Provides an opportunity to cancel the popup (calls OnBeforePopup) and
  //   creates the new platform delegate for the popup. If the popup owner is
  //   an extension guest view then the popup is canceled and
-  //   WebContentsDelegate::OpenURLFromTab is called via the
-  //   CefBrowserHostBase::MaybeAllowNavigation implementation.
+  //   CefBrowserHostImpl::OpenURLFromTab is called.
  // And then the following calls may occur at the same time:
-  // - GetCustomWebContentsView (UIT) (alloy runtime only):
+  // - CefBrowserHostImpl::GetCustomWebContentsView (UIT)
  //   Creates the OSR views for windowless popups.
-  // - WebContentsCreated (UIT):
-  //   Creates the CefBrowserHost representation for the popup.
+  // - CefBrowserHostImpl::WebContentsCreated (UIT)
+  //   Creates the CefBrowserHostImpl representation for the popup.
  // - CefBrowserMessageFilter::OnGetNewBrowserInfo (IOT)
  //   Passes information about the popup to the renderer process.
  struct PendingPopup {
@@ -211,14 +201,10 @@ class CefBrowserInfoManager : public content::RenderProcessHostObserver {
      bool is_guest_view,
      IPC::Message* reply_msg);

-  // Time out a response if it's still pending.
-  static void TimeoutNewBrowserInfoResponse(int64_t frame_id, int timeout_id);
-
  // Pending request for OnGetNewBrowserInfo.
  struct PendingNewBrowserInfo {
    int render_process_id;
    int render_routing_id;
-    int timeout_id;
    IPC::Message* reply_msg;
  };

@@ -227,7 +213,7 @@ class CefBrowserInfoManager : public content::RenderProcessHostObserver {
  // Access to the below members must be protected by |browser_info_lock_|.

  BrowserInfoList browser_info_list_;
-  int next_browser_id_ = 0;
+  int next_browser_id_;

  // Map of frame ID to info.
  using PendingNewBrowserInfoMap =
@@ -238,8 +224,6 @@ class CefBrowserInfoManager : public content::RenderProcessHostObserver {
  using PendingPopupList = std::vector<std::unique_ptr<PendingPopup>>;
  PendingPopupList pending_popup_list_;

-  int next_timeout_id_ = 0;
-
  DISALLOW_COPY_AND_ASSIGN(CefBrowserInfoManager);
 };

--- a/libcef/browser/alloy/alloy_browser_main.cc
+++ b/libcef/browser/alloy/alloy_browser_main.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.

-#include "libcef/browser/alloy/alloy_browser_main.h"
+#include "libcef/browser/browser_main.h"

 #include <stdint.h>

@@ -10,6 +10,7 @@

 #include "libcef/browser/browser_context.h"
 #include "libcef/browser/browser_context_keyed_service_factories.h"
+#include "libcef/browser/content_browser_client.h"
 #include "libcef/browser/context.h"
 #include "libcef/browser/devtools/devtools_manager_delegate.h"
 #include "libcef/browser/extensions/extension_system_factory.h"
@@ -18,25 +19,24 @@
 #include "libcef/browser/printing/constrained_window_views_client.h"
 #include "libcef/browser/printing/printing_message_filter.h"
 #include "libcef/browser/thread_util.h"
-#include "libcef/common/app_manager.h"
 #include "libcef/common/extensions/extensions_client.h"
 #include "libcef/common/extensions/extensions_util.h"
 #include "libcef/common/net/net_resource_provider.h"

 #include "base/bind.h"
+#include "base/message_loop/message_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/task/post_task.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/media/router/chrome_media_router_factory.h"
 #include "chrome/browser/net/system_network_context_manager.h"
 #include "chrome/browser/plugins/plugin_finder.h"
 #include "components/constrained_window/constrained_window_views.h"
 #include "content/public/browser/gpu_data_manager.h"
-#include "content/public/browser/network_service_instance.h"
-#include "content/public/common/result_codes.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/constants.h"
 #include "net/base/net_module.h"
+#include "services/service_manager/embedder/result_codes.h"
+#include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/resource/resource_bundle.h"

 #if defined(USE_AURA) && defined(USE_X11)
@@ -50,15 +50,12 @@
 #include "ui/wm/core/wm_state.h"

 #if defined(OS_WIN)
-#include "chrome/browser/chrome_browser_main_win.h"
-#include "chrome/browser/win/parental_controls.h"
-#include "components/os_crypt/os_crypt.h"
 #include "ui/base/cursor/cursor_loader_win.h"
 #endif
 #endif  // defined(USE_AURA)

 #if defined(TOOLKIT_VIEWS)
-#if defined(OS_MAC)
+#if defined(OS_MACOSX)
 #include "chrome/browser/ui/views/chrome_layout_provider.h"
 #include "chrome/browser/ui/views/chrome_views_delegate.h"
 #else
@@ -74,25 +71,30 @@
 #include "libcef/browser/printing/print_dialog_linux.h"
 #endif

-AlloyBrowserMainParts::AlloyBrowserMainParts(
-    const content::MainFunctionParams& parameters)
-    : BrowserMainParts(), devtools_delegate_(nullptr) {}
+#if defined(OS_MACOSX)
+#include "chrome/browser/browser_process.h"
+#include "components/os_crypt/os_crypt.h"
+#endif

-AlloyBrowserMainParts::~AlloyBrowserMainParts() {
+CefBrowserMainParts::CefBrowserMainParts(
+    const content::MainFunctionParams& parameters)
+    : BrowserMainParts(), devtools_delegate_(NULL) {}
+
+CefBrowserMainParts::~CefBrowserMainParts() {
  constrained_window::SetConstrainedWindowViewsClient(nullptr);
 }

-int AlloyBrowserMainParts::PreEarlyInitialization() {
+int CefBrowserMainParts::PreEarlyInitialization() {
 #if defined(USE_AURA) && defined(OS_LINUX)
  // TODO(linux): Consider using a real input method or
  // views::LinuxUI::SetInstance.
  ui::InitializeInputMethodForTesting();
 #endif

-  return content::RESULT_CODE_NORMAL_EXIT;
+  return service_manager::RESULT_CODE_NORMAL_EXIT;
 }

-void AlloyBrowserMainParts::ToolkitInitialized() {
+void CefBrowserMainParts::ToolkitInitialized() {
  SetConstrainedWindowViewsClient(CreateCefConstrainedWindowViewsClient());
 #if defined(USE_AURA)
  CHECK(aura::Env::GetInstance());
@@ -101,12 +103,12 @@ void AlloyBrowserMainParts::ToolkitInitialized() {

 #if defined(OS_WIN)
  ui::CursorLoaderWin::SetCursorResourceModule(
-      CefAppManager::Get()->GetResourceDllName());
+      CefContentBrowserClient::Get()->GetResourceDllName());
 #endif
 #endif  // defined(USE_AURA)

 #if defined(TOOLKIT_VIEWS)
-#if defined(OS_MAC)
+#if defined(OS_MACOSX)
  views_delegate_ = std::make_unique<ChromeViewsDelegate>();
  layout_provider_ = ChromeLayoutProvider::CreateLayoutProvider();
 #else
@@ -115,27 +117,20 @@ void AlloyBrowserMainParts::ToolkitInitialized() {
 #endif  // defined(TOOLKIT_VIEWS)
 }

-void AlloyBrowserMainParts::PreMainMessageLoopStart() {
+void CefBrowserMainParts::PreMainMessageLoopStart() {
 #if defined(USE_AURA) && defined(USE_X11)
  ui::TouchFactory::SetTouchDeviceListFromCommandLine();
 #endif

-#if defined(OS_WIN)
+#if defined(OS_MACOSX)
  // Initialize the OSCrypt.
  PrefService* local_state = g_browser_process->local_state();
  DCHECK(local_state);
-  bool os_crypt_init = OSCrypt::Init(local_state);
-  DCHECK(os_crypt_init);
-
-  // installer_util references strings that are normally compiled into
-  // setup.exe.  In Chrome, these strings are in the locale files.
-  ChromeBrowserMainPartsWin::SetupInstallerUtilStrings();
-#endif  // defined(OS_WIN)
-
-  media_router::ChromeMediaRouterFactory::DoPlatformInit();
+  OSCrypt::Init(local_state);
+#endif
 }

-void AlloyBrowserMainParts::PostMainMessageLoopStart() {
+void CefBrowserMainParts::PostMainMessageLoopStart() {
 #if defined(OS_LINUX)
  printing::PrintingContextLinux::SetCreatePrintDialogFunction(
      &CefPrintDialogLinux::CreatePrintDialog);
@@ -144,7 +139,7 @@ void AlloyBrowserMainParts::PostMainMessageLoopStart() {
 #endif
 }

-int AlloyBrowserMainParts::PreCreateThreads() {
+int CefBrowserMainParts::PreCreateThreads() {
 #if defined(OS_WIN)
  PlatformInitialize();
 #endif
@@ -159,11 +154,13 @@ int AlloyBrowserMainParts::PreCreateThreads() {
  return 0;
 }

-void AlloyBrowserMainParts::PreMainMessageLoopRun() {
+void CefBrowserMainParts::PreMainMessageLoopRun() {
 #if defined(USE_AURA)
  display::Screen::SetScreenInstance(views::CreateDesktopScreen());
 #endif

+  ui::MaterialDesignController::Initialize();
+
  if (extensions::ExtensionsEnabled()) {
    // Initialize extension global objects before creating the global
    // BrowserContext.
@@ -193,47 +190,41 @@ void AlloyBrowserMainParts::PreMainMessageLoopRun() {
       base::TaskShutdownBehavior::BLOCK_SHUTDOWN, base::MayBlock()});

  CefRequestContextSettings settings;
-  CefContext::Get()->PopulateGlobalRequestContextSettings(&settings);
+  CefContext::Get()->PopulateRequestContextSettings(&settings);

  // Create the global RequestContext.
  global_request_context_ =
      CefRequestContextImpl::CreateGlobalRequestContext(settings);
-  auto browser_context =
-      global_request_context_->GetBrowserContext()->AsBrowserContext();
+  CefBrowserContext* browser_context = static_cast<CefBrowserContext*>(
+      global_request_context_->GetBrowserContext());

  CefDevToolsManagerDelegate::StartHttpHandler(browser_context);

-#if defined(OS_WIN)
-  // Windows parental controls calls can be slow, so we do an early init here
-  // that calculates this value off of the UI thread.
-  InitializeWinParentalControls();
-#endif
-
  // Triggers initialization of the singleton instance on UI thread.
  PluginFinder::GetInstance()->Init();

  scheme::RegisterWebUIControllerFactory();
 }

-void AlloyBrowserMainParts::PostMainMessageLoopRun() {
+void CefBrowserMainParts::PostMainMessageLoopRun() {
  // NOTE: Destroy objects in reverse order of creation.
  CefDevToolsManagerDelegate::StopHttpHandler();

  // There should be no additional references to the global CefRequestContext
  // during shutdown. Did you forget to release a CefBrowser reference?
  DCHECK(global_request_context_->HasOneRef());
-  global_request_context_ = nullptr;
+  global_request_context_ = NULL;
 }

-void AlloyBrowserMainParts::PostDestroyThreads() {
+void CefBrowserMainParts::PostDestroyThreads() {
  if (extensions::ExtensionsEnabled()) {
-    extensions::ExtensionsBrowserClient::Set(nullptr);
+    extensions::ExtensionsBrowserClient::Set(NULL);
    extensions_browser_client_.reset();
  }

 #if defined(TOOLKIT_VIEWS)
  views_delegate_.reset();
-#if defined(OS_MAC)
+#if defined(OS_MACOSX)
  layout_provider_.reset();
 #endif
 #endif  // defined(TOOLKIT_VIEWS)
--- a/libcef/browser/alloy/alloy_browser_main.h
+++ b/libcef/browser/alloy/alloy_browser_main.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.

-#ifndef CEF_LIBCEF_BROWSER_ALLOY_ALLOY_BROWSER_MAIN_H_
-#define CEF_LIBCEF_BROWSER_ALLOY_ALLOY_BROWSER_MAIN_H_
+#ifndef CEF_LIBCEF_BROWSER_BROWSER_MAIN_H_
+#define CEF_LIBCEF_BROWSER_BROWSER_MAIN_H_
 #pragma once

 #include "libcef/browser/request_context_impl.h"
@@ -32,18 +32,18 @@ class WMState;
 #if defined(TOOLKIT_VIEWS)
 namespace views {
 class ViewsDelegate;
-#if defined(OS_MAC)
+#if defined(OS_MACOSX)
 class LayoutProvider;
 #endif
-}  // namespace views
+}
 #endif  // defined(TOOLKIT_VIEWS)

 class CefDevToolsDelegate;

-class AlloyBrowserMainParts : public content::BrowserMainParts {
+class CefBrowserMainParts : public content::BrowserMainParts {
 public:
-  explicit AlloyBrowserMainParts(const content::MainFunctionParams& parameters);
-  ~AlloyBrowserMainParts() override;
+  explicit CefBrowserMainParts(const content::MainFunctionParams& parameters);
+  ~CefBrowserMainParts() override;

  int PreEarlyInitialization() override;
  void ToolkitInitialized() override;
@@ -96,12 +96,12 @@ class AlloyBrowserMainParts : public content::BrowserMainParts {

 #if defined(TOOLKIT_VIEWS)
  std::unique_ptr<views::ViewsDelegate> views_delegate_;
-#if defined(OS_MAC)
+#if defined(OS_MACOSX)
  std::unique_ptr<views::LayoutProvider> layout_provider_;
 #endif
 #endif  // defined(TOOLKIT_VIEWS)

-  DISALLOW_COPY_AND_ASSIGN(AlloyBrowserMainParts);
+  DISALLOW_COPY_AND_ASSIGN(CefBrowserMainParts);
 };

-#endif  // CEF_LIBCEF_BROWSER_ALLOY_ALLOY_BROWSER_MAIN_H_
+#endif  // CEF_LIBCEF_BROWSER_BROWSER_MAIN_H_
--- a/libcef/browser/alloy/alloy_browser_main_win.cc
+++ b/libcef/browser/alloy/alloy_browser_main_win.cc
@@ -6,15 +6,15 @@
 #include <commctrl.h>
 #include <windows.h>

-#include "libcef/browser/alloy/alloy_browser_main.h"
+#include "libcef/browser/browser_main.h"

 #include "base/logging.h"

-void AlloyBrowserMainParts::PlatformInitialize() {
+void CefBrowserMainParts::PlatformInitialize() {
  HRESULT res;

  // Initialize common controls.
-  res = CoInitialize(nullptr);
+  res = CoInitialize(NULL);
  DCHECK(SUCCEEDED(res));
  INITCOMMONCONTROLSEX InitCtrlEx;
  InitCtrlEx.dwSize = sizeof(INITCOMMONCONTROLSEX);
@@ -22,6 +22,6 @@ void AlloyBrowserMainParts::PlatformInitialize() {
  InitCommonControlsEx(&InitCtrlEx);

  // Start COM stuff.
-  res = OleInitialize(nullptr);
+  res = OleInitialize(NULL);
  DCHECK(SUCCEEDED(res));
 }
--- a/libcef/browser/browser_message_filter.cc
+++ b/libcef/browser/browser_message_filter.cc
@@ -7,8 +7,8 @@

 #include "libcef/browser/browser_info_manager.h"
 #include "libcef/browser/origin_whitelist_impl.h"
-#include "libcef/common/app_manager.h"
 #include "libcef/common/cef_messages.h"
+#include "libcef/common/content_client.h"
 #include "libcef/common/values_impl.h"

 #include "base/bind.h"
@@ -42,6 +42,18 @@ bool CefBrowserMessageFilter::OnMessageReceived(const IPC::Message& message) {
 void CefBrowserMessageFilter::OnGetNewRenderThreadInfo(
    CefProcessHostMsg_GetNewRenderThreadInfo_Params* params) {
  GetCrossOriginWhitelistEntries(&params->cross_origin_whitelist_entries);
+
+  CefRefPtr<CefApp> app = CefContentClient::Get()->application();
+  if (app.get()) {
+    CefRefPtr<CefBrowserProcessHandler> handler =
+        app->GetBrowserProcessHandler();
+    if (handler.get()) {
+      CefRefPtr<CefListValueImpl> listValuePtr(
+          new CefListValueImpl(&params->extra_info, false, false));
+      handler->OnRenderProcessThreadCreated(listValuePtr.get());
+      listValuePtr->Detach(NULL);
+    }
+  }
 }

 void CefBrowserMessageFilter::OnGetNewBrowserInfo(int render_frame_routing_id,
--- a/libcef/browser/browser_message_loop.cc
+++ b/libcef/browser/browser_message_loop.cc
@@ -3,13 +3,14 @@
 // be found in the LICENSE file.

 #include "libcef/browser/browser_message_loop.h"
-#include "libcef/common/app_manager.h"
+#include "libcef/browser/context.h"
+#include "libcef/common/content_client.h"

 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_pump.h"
 #include "base/message_loop/message_pump_for_ui.h"

-#if defined(OS_MAC)
+#if defined(OS_MACOSX)
 #include "base/mac/scoped_nsautorelease_pool.h"
 #include "base/message_loop/message_pump_mac.h"
 #endif
@@ -29,21 +30,15 @@ class MessagePumpExternal : public base::MessagePumpForUI {
  void Run(Delegate* delegate) override {
    base::TimeTicks start = base::TimeTicks::Now();
    while (true) {
-#if defined(OS_MAC)
+#if defined(OS_MACOSX)
      base::mac::ScopedNSAutoreleasePool autorelease_pool;
 #endif

-      base::TimeTicks next_run_time;  // is_null()
-      const bool has_more_work = DirectRunWork(delegate, &next_run_time);
+      const bool has_more_work = DirectRunWork(delegate);
      if (!has_more_work)
        break;

-      if (next_run_time.is_null()) {
-        // We have more work that should run immediately.
-        next_run_time = base::TimeTicks::Now();
-      }
-
-      const base::TimeDelta& delta = next_run_time - start;
+      const base::TimeDelta& delta = base::TimeTicks::Now() - start;
      if (delta.InSecondsF() > max_time_slice_)
        break;
    }
@@ -59,33 +54,26 @@ class MessagePumpExternal : public base::MessagePumpForUI {
  }

 private:
-  static bool DirectRunWork(Delegate* delegate,
-                            base::TimeTicks* next_run_time) {
-    bool more_immediate_work = false;
-    bool more_idle_work = false;
-    bool more_delayed_work = false;
+  bool DirectRunWork(Delegate* delegate) {
+    bool did_work = false;
+    bool did_delayed_work = false;
+    bool did_idle_work = false;

-    Delegate::NextWorkInfo next_work_info = delegate->DoWork();
+    // Perform work & delayed work.
+    // If no work was found, then perform idle work.

-    // is_immediate() returns true if the next task is ready right away.
-    more_immediate_work = next_work_info.is_immediate();
-    if (!more_immediate_work) {
-      // Check the next PendingTask's |delayed_run_time|.
-      // is_max() returns true if there are no more immediate nor delayed tasks.
-      more_delayed_work = !next_work_info.delayed_run_time.is_max();
-      if (more_delayed_work) {
-        // The only remaining work that we know about is the PendingTask.
-        // Consider the run time for that task in the time slice calculation.
-        *next_run_time = next_work_info.delayed_run_time;
-      }
+    did_work = delegate->DoWork();
+
+    // We are using an external timer, so we don't have any action based on the
+    // returned next delayed work time.
+    base::TimeTicks next_time;
+    did_delayed_work = delegate->DoDelayedWork(&next_time);
+
+    if (!did_work && !did_delayed_work) {
+      did_idle_work = delegate->DoIdleWork();
    }

-    if (!more_immediate_work && !more_delayed_work) {
-      // DoIdleWork() returns true if idle work was all done.
-      more_idle_work = !delegate->DoIdleWork();
-    }
-
-    return more_immediate_work || more_idle_work || more_delayed_work;
+    return did_work || did_delayed_work || did_idle_work;
  }

  const float max_time_slice_;
@@ -93,7 +81,7 @@ class MessagePumpExternal : public base::MessagePumpForUI {
 };

 CefRefPtr<CefBrowserProcessHandler> GetBrowserProcessHandler() {
-  CefRefPtr<CefApp> app = CefAppManager::Get()->GetApplication();
+  CefRefPtr<CefApp> app = CefContentClient::Get()->application();
  if (app)
    return app->GetBrowserProcessHandler();
  return nullptr;
@@ -108,7 +96,7 @@ std::unique_ptr<base::MessagePump> MessagePumpFactoryForUI() {
      return std::make_unique<MessagePumpExternal>(0.01f, handler);
  }

-#if defined(OS_MAC)
+#if defined(OS_MACOSX)
  return base::MessagePumpMac::Create();
 #else
  return std::make_unique<base::MessagePumpForUI>();
@@ -117,6 +105,9 @@ std::unique_ptr<base::MessagePump> MessagePumpFactoryForUI() {

 }  // namespace

-void InitExternalMessagePumpFactoryForUI() {
-  base::MessagePump::OverrideMessagePumpForUIFactory(MessagePumpFactoryForUI);
+void InitMessagePumpFactoryForUI() {
+  const CefSettings& settings = CefContext::Get()->settings();
+  if (settings.external_message_pump) {
+    base::MessagePump::OverrideMessagePumpForUIFactory(MessagePumpFactoryForUI);
+  }
 }
--- a/libcef/browser/browser_message_loop.h
+++ b/libcef/browser/browser_message_loop.h
@@ -5,6 +5,6 @@
 #ifndef CEF_LIBCEF_BROWSER_BROWSER_MESSAGE_LOOP_H_
 #define CEF_LIBCEF_BROWSER_BROWSER_MESSAGE_LOOP_H_

-void InitExternalMessagePumpFactoryForUI();
+void InitMessagePumpFactoryForUI();

 #endif  // CEF_LIBCEF_BROWSER_BROWSER_MESSAGE_LOOP_H_
--- a/libcef/browser/browser_platform_delegate.cc
+++ b/libcef/browser/browser_platform_delegate.cc
@@ -4,23 +4,22 @@

 #include "libcef/browser/browser_platform_delegate.h"

-#include "libcef/browser/alloy/alloy_browser_host_impl.h"
+#include "libcef/browser/browser_host_impl.h"
+#include "libcef/browser/osr/browser_platform_delegate_osr.h"
+#include "libcef/browser/web_contents_dialog_helper.h"
+#include "libcef/common/extensions/extensions_util.h"

 #include "base/logging.h"
+#include "content/browser/renderer_host/render_widget_host_impl.h"
+#include "content/public/browser/render_view_host.h"
+#include "content/public/browser/render_widget_host.h"

-CefBrowserPlatformDelegate::CefBrowserPlatformDelegate() = default;
+CefBrowserPlatformDelegate::CefBrowserPlatformDelegate() : browser_(nullptr) {}

 CefBrowserPlatformDelegate::~CefBrowserPlatformDelegate() {
  DCHECK(!browser_);
 }

-content::WebContents* CefBrowserPlatformDelegate::CreateWebContents(
-    CefBrowserCreateParams& create_params,
-    bool& own_web_contents) {
-  NOTREACHED();
-  return nullptr;
-}
-
 void CefBrowserPlatformDelegate::CreateViewForWebContents(
    content::WebContentsView** view,
    content::RenderViewHostDelegateView** delegate_view) {
@@ -28,72 +27,32 @@ void CefBrowserPlatformDelegate::CreateViewForWebContents(
 }

 void CefBrowserPlatformDelegate::WebContentsCreated(
-    content::WebContents* web_contents,
-    bool owned) {
-  // We should not have a browser at this point.
-  DCHECK(!browser_);
-
-  DCHECK(!web_contents_);
-  web_contents_ = web_contents;
-}
-
-void CefBrowserPlatformDelegate::AddNewContents(
-    content::WebContents* source,
-    std::unique_ptr<content::WebContents> new_contents,
-    const GURL& target_url,
-    WindowOpenDisposition disposition,
-    const gfx::Rect& initial_rect,
-    bool user_gesture,
-    bool* was_blocked) {
-  NOTREACHED();
-}
-
-void CefBrowserPlatformDelegate::WebContentsDestroyed(
-    content::WebContents* web_contents) {
-  DCHECK(web_contents_ && web_contents_ == web_contents);
-  web_contents_ = nullptr;
-}
-
-bool CefBrowserPlatformDelegate::ShouldTransferNavigation(
-    bool is_main_frame_navigation) {
-  return true;
-}
+    content::WebContents* web_contents) {}

 void CefBrowserPlatformDelegate::RenderViewCreated(
-    content::RenderViewHost* render_view_host) {}
-
-void CefBrowserPlatformDelegate::RenderViewReady() {}
-
-void CefBrowserPlatformDelegate::BrowserCreated(CefBrowserHostBase* browser) {
-  // We should have an associated WebContents at this point.
-  DCHECK(web_contents_);
+    content::RenderViewHost* render_view_host) {
+  // Indicate that the view has an external parent (namely us). This changes the
+  // default view behavior in some cases (e.g. focus handling on Linux).
+  if (!IsViewsHosted() && render_view_host->GetWidget()->GetView())
+    render_view_host->GetWidget()->GetView()->SetHasExternalParent(true);
+}

+void CefBrowserPlatformDelegate::BrowserCreated(CefBrowserHostImpl* browser) {
  DCHECK(!browser_);
  DCHECK(browser);
  browser_ = browser;
-}

-void CefBrowserPlatformDelegate::CreateExtensionHost(
-    const extensions::Extension* extension,
-    const GURL& url,
-    extensions::ViewType host_type) {
-  NOTREACHED();
-}
-
-extensions::ExtensionHost* CefBrowserPlatformDelegate::GetExtensionHost()
-    const {
-  NOTREACHED();
-  return nullptr;
+  if (browser_->IsPrintPreviewSupported()) {
+    web_contents_dialog_helper_.reset(
+        new CefWebContentsDialogHelper(browser_->web_contents(), this));
+  }
 }

 void CefBrowserPlatformDelegate::NotifyBrowserCreated() {}

 void CefBrowserPlatformDelegate::NotifyBrowserDestroyed() {}

-void CefBrowserPlatformDelegate::BrowserDestroyed(CefBrowserHostBase* browser) {
-  // WebContentsDestroyed should already be called.
-  DCHECK(!web_contents_);
-
+void CefBrowserPlatformDelegate::BrowserDestroyed(CefBrowserHostImpl* browser) {
  DCHECK(browser_ && browser_ == browser);
  browser_ = nullptr;
 }
@@ -107,11 +66,6 @@ void CefBrowserPlatformDelegate::CloseHostWindow() {
  NOTREACHED();
 }

-CefWindowHandle CefBrowserPlatformDelegate::GetHostWindowHandle() const {
-  NOTREACHED();
-  return kNullWindowHandle;
-}
-
 #if defined(USE_AURA)
 views::Widget* CefBrowserPlatformDelegate::GetWindowWidget() const {
  NOTREACHED();
@@ -132,117 +86,37 @@ void CefBrowserPlatformDelegate::PopupWebContentsCreated(
    bool is_devtools) {}

 void CefBrowserPlatformDelegate::PopupBrowserCreated(
-    CefBrowserHostBase* new_browser,
+    CefBrowserHostImpl* new_browser,
    bool is_devtools) {}

-SkColor CefBrowserPlatformDelegate::GetBackgroundColor() const {
-  NOTREACHED();
-  return SkColor();
-}
-
-void CefBrowserPlatformDelegate::WasResized() {
-  NOTREACHED();
-}
-
-void CefBrowserPlatformDelegate::SendKeyEvent(const CefKeyEvent& event) {
-  NOTIMPLEMENTED();
-}
-
-void CefBrowserPlatformDelegate::SendMouseClickEvent(
-    const CefMouseEvent& event,
-    CefBrowserHost::MouseButtonType type,
-    bool mouseUp,
-    int clickCount) {
-  NOTIMPLEMENTED();
-}
-
-void CefBrowserPlatformDelegate::SendMouseMoveEvent(const CefMouseEvent& event,
-                                                    bool mouseLeave) {
-  NOTIMPLEMENTED();
-}
-
-void CefBrowserPlatformDelegate::SendMouseWheelEvent(const CefMouseEvent& event,
-                                                     int deltaX,
-                                                     int deltaY) {
-  NOTIMPLEMENTED();
-}
-
-void CefBrowserPlatformDelegate::SendTouchEvent(const CefTouchEvent& event) {
-  NOTIMPLEMENTED();
-}
-
-void CefBrowserPlatformDelegate::SendFocusEvent(bool setFocus) {
-  NOTIMPLEMENTED();
-}
-
 void CefBrowserPlatformDelegate::SendCaptureLostEvent() {
-  NOTIMPLEMENTED();
+  content::RenderWidgetHostImpl* widget = content::RenderWidgetHostImpl::From(
+      browser_->web_contents()->GetRenderViewHost()->GetWidget());
+  if (widget)
+    widget->LostCapture();
 }

-#if defined(OS_WIN) || (defined(OS_POSIX) && !defined(OS_MAC))
-void CefBrowserPlatformDelegate::NotifyMoveOrResizeStarted() {}
+#if defined(OS_WIN) || (defined(OS_POSIX) && !defined(OS_MACOSX))
+void CefBrowserPlatformDelegate::NotifyMoveOrResizeStarted() {
+  // Dismiss any existing popups.
+  content::RenderViewHost* host = browser_->web_contents()->GetRenderViewHost();
+  if (host)
+    host->NotifyMoveOrResizeStarted();
+}

 void CefBrowserPlatformDelegate::SizeTo(int width, int height) {}
 #endif

-gfx::Point CefBrowserPlatformDelegate::GetScreenPoint(
-    const gfx::Point& view) const {
-  NOTREACHED();
-  return gfx::Point();
-}
-
-void CefBrowserPlatformDelegate::ViewText(const std::string& text) {
-  NOTIMPLEMENTED();
-}
-
-bool CefBrowserPlatformDelegate::HandleKeyboardEvent(
-    const content::NativeWebKeyboardEvent& event) {
-  NOTREACHED();
-  return false;
-}
-
-bool CefBrowserPlatformDelegate::PreHandleGestureEvent(
-    content::WebContents* source,
-    const blink::WebGestureEvent& event) {
-  return false;
-}
-
-bool CefBrowserPlatformDelegate::IsNeverComposited(
-    content::WebContents* web_contents) {
-  return false;
-}
-
-CefEventHandle CefBrowserPlatformDelegate::GetEventHandle(
-    const content::NativeWebKeyboardEvent& event) const {
-  NOTREACHED();
-  return kNullEventHandle;
-}
-
 std::unique_ptr<CefFileDialogRunner>
 CefBrowserPlatformDelegate::CreateFileDialogRunner() {
-  NOTIMPLEMENTED();
  return nullptr;
 }

 std::unique_ptr<CefJavaScriptDialogRunner>
 CefBrowserPlatformDelegate::CreateJavaScriptDialogRunner() {
-  NOTIMPLEMENTED();
  return nullptr;
 }

-std::unique_ptr<CefMenuRunner> CefBrowserPlatformDelegate::CreateMenuRunner() {
-  NOTIMPLEMENTED();
-  return nullptr;
-}
-
-bool CefBrowserPlatformDelegate::IsWindowless() const {
-  return false;
-}
-
-bool CefBrowserPlatformDelegate::IsViewsHosted() const {
-  return false;
-}
-
 void CefBrowserPlatformDelegate::WasHidden(bool hidden) {
  NOTREACHED();
 }
@@ -309,16 +183,16 @@ void CefBrowserPlatformDelegate::DragTargetDrop(const CefMouseEvent& event) {

 void CefBrowserPlatformDelegate::StartDragging(
    const content::DropData& drop_data,
-    blink::DragOperationsMask allowed_ops,
+    blink::WebDragOperationsMask allowed_ops,
    const gfx::ImageSkia& image,
    const gfx::Vector2d& image_offset,
-    const blink::mojom::DragEventSourceInfo& event_info,
+    const content::DragEventSourceInfo& event_info,
    content::RenderWidgetHostImpl* source_rwh) {
  NOTREACHED();
 }

 void CefBrowserPlatformDelegate::UpdateDragCursor(
-    blink::DragOperation operation) {
+    blink::WebDragOperation operation) {
  NOTREACHED();
 }

@@ -354,72 +228,41 @@ gfx::Size CefBrowserPlatformDelegate::GetMaximumDialogSize() {
  return gfx::Size();
 }

-void CefBrowserPlatformDelegate::SetAutoResizeEnabled(bool enabled,
-                                                      const CefSize& min_size,
-                                                      const CefSize& max_size) {
-  NOTIMPLEMENTED();
-}
+base::RepeatingClosure CefBrowserPlatformDelegate::GetBoundsChangedCallback() {
+  if (web_contents_dialog_helper_) {
+    return web_contents_dialog_helper_->GetBoundsChangedCallback();
+  }

-void CefBrowserPlatformDelegate::SetAccessibilityState(
-    cef_state_t accessibility_state) {
-  NOTIMPLEMENTED();
-}
-
-bool CefBrowserPlatformDelegate::IsPrintPreviewSupported() const {
-  return true;
-}
-
-void CefBrowserPlatformDelegate::Print() {
-  NOTIMPLEMENTED();
-}
-
-void CefBrowserPlatformDelegate::PrintToPDF(
-    const CefString& path,
-    const CefPdfPrintSettings& settings,
-    CefRefPtr<CefPdfPrintCallback> callback) {
-  NOTIMPLEMENTED();
-}
-
-void CefBrowserPlatformDelegate::Find(int identifier,
-                                      const CefString& searchText,
-                                      bool forward,
-                                      bool matchCase,
-                                      bool findNext) {
-  NOTIMPLEMENTED();
-}
-
-void CefBrowserPlatformDelegate::StopFinding(bool clearSelection) {
-  NOTIMPLEMENTED();
+  return base::RepeatingClosure();
 }

 // static
-int CefBrowserPlatformDelegate::TranslateWebEventModifiers(
-    uint32 cef_modifiers) {
-  int result = 0;
+int CefBrowserPlatformDelegate::TranslateModifiers(uint32 cef_modifiers) {
+  int webkit_modifiers = 0;
  // Set modifiers based on key state.
  if (cef_modifiers & EVENTFLAG_SHIFT_DOWN)
-    result |= blink::WebInputEvent::kShiftKey;
+    webkit_modifiers |= blink::WebInputEvent::kShiftKey;
  if (cef_modifiers & EVENTFLAG_CONTROL_DOWN)
-    result |= blink::WebInputEvent::kControlKey;
+    webkit_modifiers |= blink::WebInputEvent::kControlKey;
  if (cef_modifiers & EVENTFLAG_ALT_DOWN)
-    result |= blink::WebInputEvent::kAltKey;
+    webkit_modifiers |= blink::WebInputEvent::kAltKey;
  if (cef_modifiers & EVENTFLAG_COMMAND_DOWN)
-    result |= blink::WebInputEvent::kMetaKey;
+    webkit_modifiers |= blink::WebInputEvent::kMetaKey;
  if (cef_modifiers & EVENTFLAG_LEFT_MOUSE_BUTTON)
-    result |= blink::WebInputEvent::kLeftButtonDown;
+    webkit_modifiers |= blink::WebInputEvent::kLeftButtonDown;
  if (cef_modifiers & EVENTFLAG_MIDDLE_MOUSE_BUTTON)
-    result |= blink::WebInputEvent::kMiddleButtonDown;
+    webkit_modifiers |= blink::WebInputEvent::kMiddleButtonDown;
  if (cef_modifiers & EVENTFLAG_RIGHT_MOUSE_BUTTON)
-    result |= blink::WebInputEvent::kRightButtonDown;
+    webkit_modifiers |= blink::WebInputEvent::kRightButtonDown;
  if (cef_modifiers & EVENTFLAG_CAPS_LOCK_ON)
-    result |= blink::WebInputEvent::kCapsLockOn;
+    webkit_modifiers |= blink::WebInputEvent::kCapsLockOn;
  if (cef_modifiers & EVENTFLAG_NUM_LOCK_ON)
-    result |= blink::WebInputEvent::kNumLockOn;
+    webkit_modifiers |= blink::WebInputEvent::kNumLockOn;
  if (cef_modifiers & EVENTFLAG_IS_LEFT)
-    result |= blink::WebInputEvent::kIsLeft;
+    webkit_modifiers |= blink::WebInputEvent::kIsLeft;
  if (cef_modifiers & EVENTFLAG_IS_RIGHT)
-    result |= blink::WebInputEvent::kIsRight;
+    webkit_modifiers |= blink::WebInputEvent::kIsRight;
  if (cef_modifiers & EVENTFLAG_IS_KEY_PAD)
-    result |= blink::WebInputEvent::kIsKeyPad;
-  return result;
+    webkit_modifiers |= blink::WebInputEvent::kIsKeyPad;
+  return webkit_modifiers;
 }
--- a/libcef/browser/browser_platform_delegate.h
+++ b/libcef/browser/browser_platform_delegate.h
@@ -13,18 +13,12 @@
 #include "include/cef_drag_data.h"
 #include "include/internal/cef_types.h"
 #include "include/views/cef_browser_view.h"
+#include "libcef/browser/browser_host_impl.h"

 #include "base/callback_forward.h"
-#include "extensions/common/view_type.h"
-#include "third_party/blink/public/common/page/drag_operation.h"
-#include "third_party/blink/public/mojom/page/drag.mojom-forward.h"
-#include "third_party/skia/include/core/SkColor.h"
-#include "ui/base/window_open_disposition.h"
-
-class GURL;
+#include "content/public/browser/web_contents.h"

 namespace blink {
-class WebGestureEvent;
 class WebMouseEvent;
 class WebMouseWheelEvent;
 class WebInputEvent;
@@ -32,41 +26,23 @@ class WebTouchEvent;
 }  // namespace blink

 namespace content {
-struct AXEventNotificationDetails;
-struct AXLocationChangeNotificationDetails;
-struct DropData;
 struct NativeWebKeyboardEvent;
 class RenderViewHost;
 class RenderViewHostDelegateView;
-class RenderWidgetHostImpl;
-class WebContents;
 class WebContentsView;
 }  // namespace content

-namespace extensions {
-class Extension;
-class ExtensionHost;
-}  // namespace extensions
-
-namespace gfx {
-class ImageSkia;
-class Point;
-class Rect;
-class Size;
-class Vector2d;
-}  // namespace gfx
-
 #if defined(USE_AURA)
 namespace views {
 class Widget;
 }
 #endif

-struct CefBrowserCreateParams;
-class CefBrowserHostBase;
+class CefBrowserInfo;
 class CefFileDialogRunner;
 class CefJavaScriptDialogRunner;
 class CefMenuRunner;
+class CefWebContentsDialogHelper;

 // Provides platform-specific implementations of browser functionality. All
 // methods are called on the browser process UI thread unless otherwise
@@ -76,14 +52,7 @@ class CefBrowserPlatformDelegate {
  // Create a new CefBrowserPlatformDelegate instance. May be called on multiple
  // threads.
  static std::unique_ptr<CefBrowserPlatformDelegate> Create(
-      const CefBrowserCreateParams& create_params);
-
-  // Called from AlloyBrowserHostImpl::Create.
-  // Wait for the call to WebContentsCreated(owned=true) before taking ownership
-  // of the resulting WebContents object.
-  virtual content::WebContents* CreateWebContents(
-      CefBrowserCreateParams& create_params,
-      bool& own_web_contents);
+      CefBrowserHostImpl::CreateParams& create_params);

  // Called to create the view objects for a new WebContents. Will only be
  // called a single time per instance. May be called on multiple threads. Only
@@ -92,51 +61,17 @@ class CefBrowserPlatformDelegate {
      content::WebContentsView** view,
      content::RenderViewHostDelegateView** delegate_view);

-  // Called after the WebContents for a browser has been created. |owned| will
-  // be true if |web_contents| was created via CreateWebContents() and we should
-  // take ownership. This will also be called for popup WebContents created
-  // indirectly by Chromium. Will only be called a single time per instance.
-  virtual void WebContentsCreated(content::WebContents* web_contents,
-                                  bool owned);
-
-  // Called when Chromium is ready to hand over ownership of a popup
-  // WebContents. WebContentsCreated(owned=false) will be called first for
-  // |new_contents|. Will only be called a single time per instance. See also
-  // the WebContentsDelegate documentation.
-  virtual void AddNewContents(
-      content::WebContents* source,
-      std::unique_ptr<content::WebContents> new_contents,
-      const GURL& target_url,
-      WindowOpenDisposition disposition,
-      const gfx::Rect& initial_rect,
-      bool user_gesture,
-      bool* was_blocked);
-
-  // Called when the WebContents is destroyed. This will be called before
-  // BrowserDestroyed(). Will only be called a single time per instance.
-  virtual void WebContentsDestroyed(content::WebContents* web_contents);
-
-  // See WebContentsDelegate documentation.
-  virtual bool ShouldTransferNavigation(bool is_main_frame_navigation);
+  // Called after the WebContents for the browser is created. Will only be
+  // called a single time per instance.
+  virtual void WebContentsCreated(content::WebContents* web_contents);

  // Called after the RenderViewHost is created.
  virtual void RenderViewCreated(content::RenderViewHost* render_view_host);

-  // See WebContentsObserver documentation.
-  virtual void RenderViewReady();
-
-  // Called after the owning AlloyBrowserHostImpl is created. Will only be
-  // called a single time per instance. Do not send any client notifications
-  // from this method.
-  virtual void BrowserCreated(CefBrowserHostBase* browser);
-
-  // Called from AlloyBrowserHostImpl::Create.
-  virtual void CreateExtensionHost(const extensions::Extension* extension,
-                                   const GURL& url,
-                                   extensions::ViewType host_type);
-
-  // Returns the current extension host.
-  virtual extensions::ExtensionHost* GetExtensionHost() const;
+  // Called after the owning CefBrowserHostImpl is created. Will only be called
+  // a single time per instance. Do not send any client notifications from this
+  // method.
+  virtual void BrowserCreated(CefBrowserHostImpl* browser);

  // Send any notifications related to browser creation. Called after
  // BrowserCreated().
@@ -146,11 +81,11 @@ class CefBrowserPlatformDelegate {
  // BrowserDestroyed().
  virtual void NotifyBrowserDestroyed();

-  // Called before the owning AlloyBrowserHostImpl is destroyed. Will only be
-  // called a single time per instance. All references to the
-  // AlloyBrowserHostImpl and WebContents should be cleared when this method is
-  // called. Do not send any client notifications from this method.
-  virtual void BrowserDestroyed(CefBrowserHostBase* browser);
+  // Called before the owning CefBrowserHostImpl is destroyed. Will only be
+  // called a single time per instance. All references to the CefBrowserHostImpl
+  // and WebContents should be cleared when this method is called. Do not send
+  // any client notifications from this method.
+  virtual void BrowserDestroyed(CefBrowserHostImpl* browser);

  // Create the window that hosts the browser. Will only be called a single time
  // per instance. Only used with windowed rendering.
@@ -165,7 +100,7 @@ class CefBrowserPlatformDelegate {
  // rendering this will return the most immediate parent window handle. For
  // windowless rendering this will return the parent window handle specified by
  // the client, which may be NULL. May be called on multiple threads.
-  virtual CefWindowHandle GetHostWindowHandle() const;
+  virtual CefWindowHandle GetHostWindowHandle() const = 0;

 #if defined(USE_AURA)
  // Returns the Widget owner for the browser window. Only used with windowed
@@ -178,7 +113,7 @@ class CefBrowserPlatformDelegate {
 #endif

  // Called after the WebContents have been created for a new popup browser
-  // parented to this browser but before the AlloyBrowserHostImpl is created for
+  // parented to this browser but before the CefBrowserHostImpl is created for
  // the popup. |is_devtools| will be true if the popup will host DevTools. This
  // method will be called before WebContentsCreated() is called on
  // |new_platform_delegate|. Do not make the new browser visible in this
@@ -190,13 +125,13 @@ class CefBrowserPlatformDelegate {
      CefBrowserPlatformDelegate* new_platform_delegate,
      bool is_devtools);

-  // Called after the AlloyBrowserHostImpl is created for a new popup browser
+  // Called after the CefBrowserHostImpl is created for a new popup browser
  // parented to this browser. |is_devtools| will be true if the popup will host
  // DevTools. This method will be called immediately after
  // CefLifeSpanHandler::OnAfterCreated() for the popup browser. It is safe to
  // make the new browser visible in this callback (for example, add the browser
  // to a window and show it).
-  virtual void PopupBrowserCreated(CefBrowserHostBase* new_browser,
+  virtual void PopupBrowserCreated(CefBrowserHostImpl* new_browser,
                                   bool is_devtools);

  // Returns the background color for the browser. The alpha component will be
@@ -204,31 +139,30 @@ class CefBrowserPlatformDelegate {
  // fully opaque). SK_AlphaOPAQUE will always be returned for windowed
  // browsers. SK_ColorTRANSPARENT may be returned for windowless browsers to
  // enable transparency.
-  virtual SkColor GetBackgroundColor() const;
+  virtual SkColor GetBackgroundColor() const = 0;
+
+  virtual bool CanUseSharedTexture() const = 0;
+  virtual bool CanUseExternalBeginFrame() const = 0;

  // Notify the window that it was resized.
-  virtual void WasResized();
+  virtual void WasResized() = 0;

  // Send input events.
-  virtual void SendKeyEvent(const CefKeyEvent& event);
-  virtual void SendMouseClickEvent(const CefMouseEvent& event,
-                                   CefBrowserHost::MouseButtonType type,
-                                   bool mouseUp,
-                                   int clickCount);
-  virtual void SendMouseMoveEvent(const CefMouseEvent& event, bool mouseLeave);
-  virtual void SendMouseWheelEvent(const CefMouseEvent& event,
-                                   int deltaX,
-                                   int deltaY);
-  virtual void SendTouchEvent(const CefTouchEvent& event);
+  virtual void SendKeyEvent(const content::NativeWebKeyboardEvent& event) = 0;
+  virtual void SendMouseEvent(const blink::WebMouseEvent& event) = 0;
+  virtual void SendMouseWheelEvent(const blink::WebMouseWheelEvent& event) = 0;
+
+  // Send touch events.
+  virtual void SendTouchEvent(const CefTouchEvent& event) = 0;

  // Send focus event. The browser's WebContents may be NULL when this method is
  // called.
-  virtual void SendFocusEvent(bool setFocus);
+  virtual void SendFocusEvent(bool setFocus) = 0;

  // Send capture lost event.
  virtual void SendCaptureLostEvent();

-#if defined(OS_WIN) || (defined(OS_POSIX) && !defined(OS_MAC))
+#if defined(OS_WIN) || (defined(OS_POSIX) && !defined(OS_MACOSX))
  // The window hosting the browser is about to be moved or resized. Only used
  // on Windows and Linux.
  virtual void NotifyMoveOrResizeStarted();
@@ -240,29 +174,38 @@ class CefBrowserPlatformDelegate {

  // Convert from view coordinates to screen coordinates. Potential display
  // scaling will be applied to the result.
-  virtual gfx::Point GetScreenPoint(const gfx::Point& view) const;
+  virtual gfx::Point GetScreenPoint(const gfx::Point& view) const = 0;

  // Open the specified text in the default text editor.
-  virtual void ViewText(const std::string& text);
+  virtual void ViewText(const std::string& text) = 0;

  // Forward the keyboard event to the application or frame window to allow
  // processing of shortcut keys.
  virtual bool HandleKeyboardEvent(
-      const content::NativeWebKeyboardEvent& event);
-
-  // See WebContentsDelegate documentation.
-  virtual bool PreHandleGestureEvent(content::WebContents* source,
-                                     const blink::WebGestureEvent& event);
-
-  // See WebContentsDelegate documentation.
-  virtual bool IsNeverComposited(content::WebContents* web_contents);
+      const content::NativeWebKeyboardEvent& event) = 0;

  // Invoke platform specific handling for the external protocol.
  static void HandleExternalProtocol(const GURL& url);

+  // Translate CEF events to Chromium/Blink events.
+  virtual void TranslateKeyEvent(content::NativeWebKeyboardEvent& result,
+                                 const CefKeyEvent& key_event) const = 0;
+  virtual void TranslateClickEvent(blink::WebMouseEvent& result,
+                                   const CefMouseEvent& mouse_event,
+                                   CefBrowserHost::MouseButtonType type,
+                                   bool mouseUp,
+                                   int clickCount) const = 0;
+  virtual void TranslateMoveEvent(blink::WebMouseEvent& result,
+                                  const CefMouseEvent& mouse_event,
+                                  bool mouseLeave) const = 0;
+  virtual void TranslateWheelEvent(blink::WebMouseWheelEvent& result,
+                                   const CefMouseEvent& mouse_event,
+                                   int deltaX,
+                                   int deltaY) const = 0;
+
  // Returns the OS event handle, if any, associated with |event|.
  virtual CefEventHandle GetEventHandle(
-      const content::NativeWebKeyboardEvent& event) const;
+      const content::NativeWebKeyboardEvent& event) const = 0;

  // Create the platform-specific file dialog runner.
  virtual std::unique_ptr<CefFileDialogRunner> CreateFileDialogRunner();
@@ -272,15 +215,15 @@ class CefBrowserPlatformDelegate {
  CreateJavaScriptDialogRunner();

  // Create the platform-specific menu runner.
-  virtual std::unique_ptr<CefMenuRunner> CreateMenuRunner();
+  virtual std::unique_ptr<CefMenuRunner> CreateMenuRunner() = 0;

  // Returns true if this delegate implements windowless rendering. May be
  // called on multiple threads.
-  virtual bool IsWindowless() const;
+  virtual bool IsWindowless() const = 0;

  // Returns true if this delegate implements views-hosted browser handling. May
  // be called on multiple threads.
-  virtual bool IsViewsHosted() const;
+  virtual bool IsViewsHosted() const = 0;

  // Notify the browser that it was hidden. Only used with windowless rendering.
  virtual void WasHidden(bool hidden);
@@ -292,7 +235,6 @@ class CefBrowserPlatformDelegate {
  // Invalidate the view. Only used with windowless rendering.
  virtual void Invalidate(cef_paint_element_type_t type);

-  // Send the external begin frame message. Only used with windowless rendering.
  virtual void SendExternalBeginFrame();

  // Set the windowless frame rate. Only used with windowless rendering.
@@ -320,14 +262,13 @@ class CefBrowserPlatformDelegate {
                                  cef_drag_operations_mask_t allowed_ops);
  virtual void DragTargetDragLeave();
  virtual void DragTargetDrop(const CefMouseEvent& event);
-  virtual void StartDragging(
-      const content::DropData& drop_data,
-      blink::DragOperationsMask allowed_ops,
-      const gfx::ImageSkia& image,
-      const gfx::Vector2d& image_offset,
-      const blink::mojom::DragEventSourceInfo& event_info,
-      content::RenderWidgetHostImpl* source_rwh);
-  virtual void UpdateDragCursor(blink::DragOperation operation);
+  virtual void StartDragging(const content::DropData& drop_data,
+                             blink::WebDragOperationsMask allowed_ops,
+                             const gfx::ImageSkia& image,
+                             const gfx::Vector2d& image_offset,
+                             const content::DragEventSourceInfo& event_info,
+                             content::RenderWidgetHostImpl* source_rwh);
+  virtual void UpdateDragCursor(blink::WebDragOperation operation);
  virtual void DragSourceEndedAt(int x, int y, cef_drag_operations_mask_t op);
  virtual void DragSourceSystemDragEnded();
  virtual void AccessibilityEventReceived(
@@ -337,23 +278,6 @@ class CefBrowserPlatformDelegate {
  virtual gfx::Point GetDialogPosition(const gfx::Size& size);
  virtual gfx::Size GetMaximumDialogSize();

-  // See CefBrowserHost documentation.
-  virtual void SetAutoResizeEnabled(bool enabled,
-                                    const CefSize& min_size,
-                                    const CefSize& max_size);
-  virtual void SetAccessibilityState(cef_state_t accessibility_state);
-  virtual bool IsPrintPreviewSupported() const;
-  virtual void Print();
-  virtual void PrintToPDF(const CefString& path,
-                          const CefPdfPrintSettings& settings,
-                          CefRefPtr<CefPdfPrintCallback> callback);
-  virtual void Find(int identifier,
-                    const CefString& searchText,
-                    bool forward,
-                    bool matchCase,
-                    bool findNext);
-  virtual void StopFinding(bool clearSelection);
-
 protected:
  // Allow deletion via scoped_ptr only.
  friend std::default_delete<CefBrowserPlatformDelegate>;
@@ -361,11 +285,15 @@ class CefBrowserPlatformDelegate {
  CefBrowserPlatformDelegate();
  virtual ~CefBrowserPlatformDelegate();

-  static int TranslateWebEventModifiers(uint32 cef_modifiers);
+  base::RepeatingClosure GetBoundsChangedCallback();

-  // Not owned by this object.
-  content::WebContents* web_contents_ = nullptr;
-  CefBrowserHostBase* browser_ = nullptr;
+  static int TranslateModifiers(uint32 cef_modifiers);
+
+  CefBrowserHostImpl* browser_;  // Not owned by this object.
+
+ private:
+  // Used for the print preview dialog.
+  std::unique_ptr<CefWebContentsDialogHelper> web_contents_dialog_helper_;

  DISALLOW_COPY_AND_ASSIGN(CefBrowserPlatformDelegate);
 };
--- a/libcef/browser/browser_platform_delegate_create.cc
+++ b/libcef/browser/browser_platform_delegate_create.cc
@@ -11,15 +11,12 @@
 #include "base/memory/ptr_util.h"
 #include "build/build_config.h"

-#include "libcef/browser/browser_host_base.h"
-#include "libcef/browser/chrome/browser_platform_delegate_chrome.h"
 #include "libcef/browser/extensions/browser_platform_delegate_background.h"
-#include "libcef/features/runtime_checks.h"

 #if defined(OS_WIN)
 #include "libcef/browser/native/browser_platform_delegate_native_win.h"
 #include "libcef/browser/osr/browser_platform_delegate_osr_win.h"
-#elif defined(OS_MAC)
+#elif defined(OS_MACOSX)
 #include "libcef/browser/native/browser_platform_delegate_native_mac.h"
 #include "libcef/browser/osr/browser_platform_delegate_osr_mac.h"
 #elif defined(OS_LINUX)
@@ -37,32 +34,33 @@ namespace {

 std::unique_ptr<CefBrowserPlatformDelegateNative> CreateNativeDelegate(
    const CefWindowInfo& window_info,
-    SkColor background_color) {
+    SkColor background_color,
+    bool use_shared_texture,
+    bool use_external_begin_frame) {
 #if defined(OS_WIN)
  return std::make_unique<CefBrowserPlatformDelegateNativeWin>(
-      window_info, background_color);
-#elif defined(OS_MAC)
+      window_info, background_color, use_shared_texture,
+      use_external_begin_frame);
+#elif defined(OS_MACOSX)
  return std::make_unique<CefBrowserPlatformDelegateNativeMac>(
      window_info, background_color);
 #elif defined(OS_LINUX)
  return std::make_unique<CefBrowserPlatformDelegateNativeLinux>(
-      window_info, background_color);
+      window_info, background_color, use_external_begin_frame);
 #endif
 }

 std::unique_ptr<CefBrowserPlatformDelegateOsr> CreateOSRDelegate(
-    std::unique_ptr<CefBrowserPlatformDelegateNative> native_delegate,
-    bool use_shared_texture,
-    bool use_external_begin_frame) {
+    std::unique_ptr<CefBrowserPlatformDelegateNative> native_delegate) {
 #if defined(OS_WIN)
  return std::make_unique<CefBrowserPlatformDelegateOsrWin>(
-      std::move(native_delegate), use_shared_texture, use_external_begin_frame);
-#elif defined(OS_MAC)
+      std::move(native_delegate));
+#elif defined(OS_MACOSX)
  return std::make_unique<CefBrowserPlatformDelegateOsrMac>(
      std::move(native_delegate));
 #elif defined(OS_LINUX)
  return std::make_unique<CefBrowserPlatformDelegateOsrLinux>(
-      std::move(native_delegate), use_external_begin_frame);
+      std::move(native_delegate));
 #endif
 }

@@ -70,7 +68,7 @@ std::unique_ptr<CefBrowserPlatformDelegateOsr> CreateOSRDelegate(

 // static
 std::unique_ptr<CefBrowserPlatformDelegate> CefBrowserPlatformDelegate::Create(
-    const CefBrowserCreateParams& create_params) {
+    CefBrowserHostImpl::CreateParams& create_params) {
  const bool is_windowless =
      create_params.window_info &&
      create_params.window_info->windowless_rendering_enabled &&
@@ -78,38 +76,31 @@ std::unique_ptr<CefBrowserPlatformDelegate> CefBrowserPlatformDelegate::Create(
  const SkColor background_color = CefContext::Get()->GetBackgroundColor(
      &create_params.settings, is_windowless ? STATE_ENABLED : STATE_DISABLED);

-  if (cef::IsChromeRuntimeEnabled()) {
-    // CefWindowInfo is not used in this case.
-    std::unique_ptr<CefBrowserPlatformDelegateNative> native_delegate =
-        CreateNativeDelegate(CefWindowInfo(), background_color);
-    return std::make_unique<CefBrowserPlatformDelegateChrome>(
-        std::move(native_delegate));
+  bool use_shared_texture = false;
+  bool use_external_begin_frame = false;
+
+  if (is_windowless) {
+    use_shared_texture = create_params.window_info &&
+                         create_params.window_info->shared_texture_enabled;
+
+    use_external_begin_frame =
+        create_params.window_info &&
+        create_params.window_info->external_begin_frame_enabled;
  }

  if (create_params.window_info) {
    std::unique_ptr<CefBrowserPlatformDelegateNative> native_delegate =
-        CreateNativeDelegate(*create_params.window_info.get(),
-                             background_color);
-    if (is_windowless) {
-      REQUIRE_ALLOY_RUNTIME();
-
-      const bool use_shared_texture =
-          create_params.window_info &&
-          create_params.window_info->shared_texture_enabled;
-
-      const bool use_external_begin_frame =
-          create_params.window_info &&
-          create_params.window_info->external_begin_frame_enabled;
-
-      return CreateOSRDelegate(std::move(native_delegate), use_shared_texture,
-                               use_external_begin_frame);
-    }
+        CreateNativeDelegate(*create_params.window_info.get(), background_color,
+                             use_shared_texture, use_external_begin_frame);
+    if (is_windowless)
+      return CreateOSRDelegate(std::move(native_delegate));
    return std::move(native_delegate);
  } else if (create_params.extension_host_type ==
             extensions::VIEW_TYPE_EXTENSION_BACKGROUND_PAGE) {
    // Creating a background extension host without a window.
    std::unique_ptr<CefBrowserPlatformDelegateNative> native_delegate =
-        CreateNativeDelegate(CefWindowInfo(), background_color);
+        CreateNativeDelegate(CefWindowInfo(), background_color,
+                             use_shared_texture, use_external_begin_frame);
    return std::make_unique<CefBrowserPlatformDelegateBackground>(
        std::move(native_delegate));
  }
@@ -117,7 +108,8 @@ std::unique_ptr<CefBrowserPlatformDelegate> CefBrowserPlatformDelegate::Create(
  else {
    // CefWindowInfo is not used in this case.
    std::unique_ptr<CefBrowserPlatformDelegateNative> native_delegate =
-        CreateNativeDelegate(CefWindowInfo(), background_color);
+        CreateNativeDelegate(CefWindowInfo(), background_color,
+                             use_shared_texture, use_external_begin_frame);
    return std::make_unique<CefBrowserPlatformDelegateViews>(
        std::move(native_delegate),
        static_cast<CefBrowserViewImpl*>(create_params.browser_view.get()));
--- a/libcef/browser/browser_util.cc
+++ b/libcef/browser/browser_util.cc
@@ -11,16 +11,16 @@ namespace browser_util {
 bool GetCefKeyEvent(const content::NativeWebKeyboardEvent& event,
                    CefKeyEvent& cef_event) {
  switch (event.GetType()) {
-    case blink::WebKeyboardEvent::Type::kRawKeyDown:
+    case blink::WebKeyboardEvent::kRawKeyDown:
      cef_event.type = KEYEVENT_RAWKEYDOWN;
      break;
-    case blink::WebKeyboardEvent::Type::kKeyDown:
+    case blink::WebKeyboardEvent::kKeyDown:
      cef_event.type = KEYEVENT_KEYDOWN;
      break;
-    case blink::WebKeyboardEvent::Type::kKeyUp:
+    case blink::WebKeyboardEvent::kKeyUp:
      cef_event.type = KEYEVENT_KEYUP;
      break;
-    case blink::WebKeyboardEvent::Type::kChar:
+    case blink::WebKeyboardEvent::kChar:
      cef_event.type = KEYEVENT_CHAR;
      break;
    default:
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Marshall Greenblatt	ecefb59aa8	Add missing current_view_bounds_ member (see issue #2733 )	2020-02-22 12:31:41 -05:00
Marshall Greenblatt	b05ffc446b	Fix OSR surface sizing on browser resize (fixes issue #2733 ). This includes the following changes: - Update usage of surface IDs to match the Aura implementation from the RWHVAura/Window classes. - Batch CefBrowserHost::WasResized calls to avoid excessive/unnecessary calls to SynchronizeVisualProperties. - Cache the results of CefRenderHandler::GetViewRect after resize and make RWHVOSR::GetViewBounds the source of truth for all size calculations. - Fix bounds calculations in CefVideoConsumerOSR with GPU enabled. Known issues: - The size passed to OnPaint may be off by 1 pixel in cases where the device scale factor is not 1 and does not divide evenly into the pixel size. This is due to the inexact conversion from integer pixel size to integer logical size for GetViewRect.	2020-02-21 15:03:26 -05:00
Marshall Greenblatt	90301bdb7f	Fix race between OpenInputStreamWrapper Open and Cancel (fixes issue #2843 )	2020-01-29 17:37:53 -05:00
Marshall Greenblatt	febbb4adb7	cefsimple: Fix sizing of popup windows with --use-views (see issue #2854 )	2020-01-27 20:39:16 -05:00
Marshall Greenblatt	5dd41fd1c1	Update to Chromium version 79.0.3945.130	2020-01-27 18:47:49 -05:00
Marshall Greenblatt	5ee40133ac	Linux: Fix crashes on main window close (fixes issue #2831 ) Call DesktopWindowTreeHostPlatform::Close after destroying CEF's X11 window so that objects owned by the WindowTreeHost (Compositor, X11Window, etc) are properly cleaned up.	2020-01-27 17:43:35 -05:00
Marshall Greenblatt	1d805e5357	macOS: Disable toolchain prompt for tests (see issue #2692 )	2020-01-27 17:43:09 -05:00
Marshall Greenblatt	fc9ef34529	Linux: Add CEF_INSTALL_SYSROOT env variable for calling install-sysroot.py (see issue #1990 )	2020-01-16 15:22:03 +01:00
Marshall Greenblatt	f3796e2964	Fix crash due to NULL frame during navigation (fixes issue #2772 )	2020-01-16 11:21:29 +01:00
Marshall Greenblatt	a5bf6d5484	Fix potential crash in OpenInputStreamWrapper::Open (fixes issue #2808 )	2020-01-15 16:47:16 +01:00
Marshall Greenblatt	f272726527	Windows: cmake: Add VS2019 version 16.4	2020-01-14 16:22:56 +01:00
Marshall Greenblatt	d2449e563c	Fix tarfile issues by using GNU_FORMAT with Python 3.8 (see issue #2856 )	2020-01-14 11:19:45 +01:00
Marshall Greenblatt	50b44dcfea	fix_style: Add Python 3 support (see issue #2856 )	2020-01-13 21:45:22 +01:00
Marshall Greenblatt	cb2b46f6d7	crash_server: Add Python 3 support (see issue #2856 )	2020-01-13 21:45:14 +01:00
Marshall Greenblatt	1dbdf7b9cb	gn_args: Fix representation of int-type GN_DEFINES values (see issue #2856 )	2020-01-13 17:02:15 +01:00
Marshall Greenblatt	71efeca335	gn_args: Fix Python 3 AttributeError: 'module' object has no attribute 'exc_clear' (see issue #2856 )	2020-01-13 17:02:14 +01:00
Marshall Greenblatt	cc2fc7eaff	Use explicit check for python version (see issue #2856 )	2020-01-13 17:02:14 +01:00
Marshall Greenblatt	f527bf312c	build: Add Python 3 support (see issue #2856 )	2020-01-13 17:02:14 +01:00
Marshall Greenblatt	f24e1caec9	gclient_hook: Add Python 3 support (see issue #2856 )	2020-01-13 17:02:14 +01:00
Marshall Greenblatt	6dbe2b782f	Fix Python 2 TypeError: write() argument 1 must be unicode, not str (see issue #2856 )	2020-01-13 17:02:14 +01:00
Marshall Greenblatt	716121c74a	make_distrib: Add Python 3 support (see issue #2856 )	2020-01-13 17:02:14 +01:00
Marshall Greenblatt	29cbaf7e21	Fix incorrectly translated types in capi header comments (see issue #2856 )	2020-01-13 17:02:14 +01:00
Marshall Greenblatt	ca65ff02c4	translator: Add Python 3 support (see issue #2856 ) This also fixes incorrect translation of types in capi header comments.	2020-01-13 17:02:14 +01:00
Marshall Greenblatt	b06a408e7f	cef_version: Add Python 3 support (see issue #2856 )	2020-01-13 17:02:14 +01:00
Marshall Greenblatt	5eeb26cb76	patch_updater: Add Python 3 support (see issue #2856 )	2020-01-13 17:02:14 +01:00
Marshall Greenblatt	70c5db44d1	patcher: Add Python 3 support (see issue #2856 )	2020-01-13 17:02:14 +01:00
Marshall Greenblatt	d2de1468d8	gn_args: Add Python 3 support (see issue #2856 )	2020-01-13 17:02:14 +01:00
Marshall Greenblatt	497033bd8a	cefbuilds: Add Python 3 support (see issue #2856 )	2020-01-13 17:02:10 +01:00
Yong Li	7ec49fabd5	Remove possibly incorrect CHECK in ProxyURLLoaderFactory::MaybeDestroySelf() See also commit #81064faa.	2020-01-08 17:11:24 +02:00
Andrei Kurushin	8c1ac9dc42	Fix OSR popup view mouse wheel double event (fixes issue #2547 )	2020-01-08 17:02:22 +02:00
Marshall Greenblatt	b3bb1273fe	Update to Chromium version 79.0.3945.117	2020-01-08 16:36:27 +02:00
Riku Palomäki	fae3bd1f16	Ignore OSR paint events on hidden views (fixes issue #2817 )	2020-01-08 14:41:27 +02:00
Riku Palomäki	a86d586b9f	Fix routing of OSR input events inside iframes (fixes issue #2789 ) Mouse events need to be routed to the correct view and CefRenderWidgetHostViewOSR::TransformPointToCoordSpaceForView needs to be properly implemented for RenderWidgetHostInputEventRouter::DispatchTouchscreenGestureEvent to transform event position in the target widget.	2020-01-08 14:41:20 +02:00
elad bahar	767a901be2	Fix OSR rendering recovery after GPU process crash (fixes issue #2827 )	2020-01-08 12:33:57 +00:00
Marshall Greenblatt	d3604dea82	Windows: Build the double_conversion target as C++17 (fixes issue #2819 ) This works around a bug in the Visual C++ standard library where the std::is_integral templates are exported instead of inlined when building with C++14. See also https://bugs.llvm.org/show_bug.cgi?id=42027.	2020-01-07 15:11:25 +02:00
Marshall Greenblatt	a5342ed51c	Only create Documents\Downloads dir if necessary (fixes issue #2841 )	2020-01-06 17:00:01 +02:00
Marshall Greenblatt	de7b51479e	Fix crash when loading a file URL if using CefCookieAccessFilter (fixes issue #2818 )	2020-01-06 14:48:11 +02:00
Marshall Greenblatt	3455686ac7	Fix crash when running with --disable-extensions (fixes issue #2852 )	2020-01-06 14:21:30 +02:00
Marshall Greenblatt	cded9f4db3	Update copyright year	2020-01-06 12:05:16 +02:00
Marshall Greenblatt	e866a07123	Update to Chromium version 79.0.3945.88	2019-12-31 19:50:39 +02:00
Marshall Greenblatt	ba025c621c	Windows: Fix ImportError: No module named win32file (see https://crbug.com/1033106 )	2019-12-31 18:50:40 +02:00
Andy Tzeng	6ef19fd061	Check for non-empty string before writing to logger (fixes issue #2825 )	2019-12-31 17:49:27 +02:00
Marshall Greenblatt	e8680c0482	Convert usage and tests to the new CefResourceHandler API (see issue #2622 ) Limited test coverage for the old API is still available by passing the `--test-old-resource-api` command-line flag to ceftests.	2019-12-31 16:52:52 +02:00
Marshall Greenblatt	c10886dc25	Fix shutdown crash in InitNetworkContext with multi-threaded message loop (fixes issue #2703 )	2019-11-26 16:30:53 -05:00
Riku Palomäki	76da0744f0	Fix OSR scrolling by passing our compositor to the fling scheduler (fixes issue #2745 )	2019-11-26 14:05:53 -05:00
Riku Palomäki	d12e990737	Fix crash when resizing an OSR browser window (fixes issue #2614 ) (cherry picked from commit `feffedbae9`)	2019-11-26 14:05:47 -05:00
Masako Toda	0b5365f822	Pass the raw size of pixel data instead of valid area (fixes issue #2733 )	2019-11-26 13:30:50 -05:00
Marshall Greenblatt	f4d74643b0	Fix potential OSR crash due to uninitialized host_display_client_ (see issue #2811 )	2019-11-26 13:30:44 -05:00
Marshall Greenblatt	eb5fe4ee13	Update to Chromium version 79.0.3945.36	2019-11-19 19:17:53 -05:00