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
813 changed files with 7000 additions and 18359 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")
@@ -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,46 +370,9 @@ 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/audio_capturer.cc",
-    "libcef/browser/audio_capturer.h",
    "libcef/browser/browser_context.cc",
    "libcef/browser/browser_context.h",
    "libcef/browser/browser_context_keyed_service_factories.cc",
@@ -443,14 +407,10 @@ static_library("libcef_static") {
    "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",
@@ -513,16 +473,6 @@ static_library("libcef_static") {
    "libcef/browser/javascript_dialog_manager.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",
@@ -737,6 +687,8 @@ 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",
@@ -746,6 +698,17 @@ static_library("libcef_static") {
    "libcef/renderer/url_loader_throttle_provider_impl.h",
    "libcef/renderer/v8_impl.cc",
    "libcef/renderer/v8_impl.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 += [
@@ -774,8 +737,6 @@ static_library("libcef_static") {
    ":cef_make_headers",
    ":cef_service_manifests",

-    ":libcef_static_unittested",
-
    # Generate API bindings for extensions.
    # TODO(cef): Enable if/when CEF exposes its own Mojo APIs. See
    # libcef/common/extensions/api/README.txt for details.
@@ -813,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",
@@ -845,6 +807,7 @@ static_library("libcef_static") {
    "//media",
    "//media/blink",
    "//net",
+    "//net:net_with_v8",
    "//pdf",
    "//ppapi/buildflags",
    "//printing/buildflags",
@@ -859,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",
@@ -878,7 +841,7 @@ static_library("libcef_static") {
  ]

  if (is_win) {
-    sources += includes_win + [
+    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",
@@ -923,7 +886,7 @@ 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/menu_runner_linux.cc",
@@ -955,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",
@@ -986,7 +949,7 @@ static_library("libcef_static") {
    ]

    deps += [
-      "//components/crash/core/app",
+      "//components/crash/content/app",
      "//components/crash/content/browser",
    ]
  }
@@ -1118,8 +1081,8 @@ 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) {
@@ -1135,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.
@@ -1169,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 +
@@ -1237,6 +1193,7 @@ source_set("cef_content_browser_overlay_manifest") {

 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",
  ]

@@ -1347,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",
@@ -1360,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",
@@ -1417,16 +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_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",
  ]
@@ -1435,17 +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: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",
  ]
@@ -1488,15 +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/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",
@@ -1525,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",
  ]
 }

@@ -1611,6 +1537,7 @@ 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" ]
@@ -1645,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",
      ]
    }
  }
@@ -1683,8 +1607,8 @@ 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 +
@@ -1727,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 +
@@ -1739,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
@@ -1950,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 +
@@ -1964,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 +
@@ -2023,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
@@ -2033,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 +
@@ -2100,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 +
@@ -2169,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 +
@@ -2188,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

@@ -2208,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

@@ -2262,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

@@ -2276,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.
@@ -2296,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) {
@@ -2327,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/83.0.4103.106',
-  'depot_tools_checkout': 'fc5e103221'
+  'chromium_checkout': 'refs/tags/79.0.3945.130'
 }
--- a/CHROMIUM_UPDATE.txt
+++ b/CHROMIUM_UPDATE.txt
@@ -57,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/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,11 +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/devtools_message_unittest.cc',
      'tests/ceftests/dialog_unittest.cc',
      'tests/ceftests/display_unittest.cc',
      'tests/ceftests/dom_unittest.cc',
@@ -567,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',
--- a/cmake/cef_variables.cmake.in
+++ b/cmake/cef_variables.cmake.in
@@ -218,6 +218,7 @@ if(OS_LINUX)
    libcef.so
    libEGL.so
    libGLESv2.so
+    natives_blob.bin
    snapshot_blob.bin
    v8_context_snapshot.bin
    swiftshader
@@ -480,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,7 +178,7 @@ 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_MACOSX)
 #include "include/base/internal/cef_atomicops_mac.h"
--- a/include/base/cef_build.h
+++ b/include/base/cef_build.h
@@ -95,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
@@ -144,9 +144,9 @@

 // 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

 #elif defined(USING_CHROMIUM_INCLUDES)
--- 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=6cb00a0fa3631a46903abb3a783f315895511db2$
+// $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
--- 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_media_router_capi.h
+++ b/include/capi/cef_media_router_capi.h
@@ -1,355 +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=9d5077fdb3fe7fa0ff1141f839988ac821eba4bf$
-//
-
-#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 true (1) if this sink is valid.
-  ///
-  int(CEF_CALLBACK* is_valid)(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 is valid.
-  ///
-  int(CEF_CALLBACK* is_valid)(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=14cf03e02d8ca3416e65f756470afd8185c7bc78$
+// $hash=3bc4225f43428d8a3a24dcac1830dafac18b0caf$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_PARSER_CAPI_H_
@@ -140,16 +140,6 @@ 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
--- 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_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/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 "385d8af3c6da76f123f3aa292d3a3308ef456297"
+#define CEF_API_HASH_UNIVERSAL "3ad9591f7024619a1e2fd796c7ad51ae3a34abbb"
 #if defined(OS_WIN)
-#define CEF_API_HASH_PLATFORM "4bb528b0bb076ed5177d6581cfca12dd7b2fee04"
+#define CEF_API_HASH_PLATFORM "3b8e38ae40c1a930227c6277c39dbc24081ccec1"
 #elif defined(OS_MACOSX)
-#define CEF_API_HASH_PLATFORM "f6580fc0858f3580b7d25e1d094dd0a336132522"
+#define CEF_API_HASH_PLATFORM "4a77f1908fabccdb01a2d3bdbede5ca09fbaa394"
 #elif defined(OS_LINUX)
-#define CEF_API_HASH_PLATFORM "83f3053840abba3b83e43ade58230f10b48591dd"
+#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_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_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
--- a/include/cef_browser_process_handler.h
+++ b/include/cef_browser_process_handler.h
@@ -84,7 +84,7 @@ class CefBrowserProcessHandler : public virtual CefBaseRefCounted {
  // 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
--- 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_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,332 +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 true if this sink is valid.
-  ///
-  /*--cef()--*/
-  virtual bool IsValid() = 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 is valid.
-  ///
-  /*--cef()--*/
-  virtual bool IsValid() = 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,16 +133,6 @@ 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
--- 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
@@ -65,7 +65,7 @@ class CefRenderHandler : public virtual CefBaseRefCounted {
  ///
  /*--cef()--*/
  virtual CefRefPtr<CefAccessibilityHandler> GetAccessibilityHandler() {
-    return nullptr;
+    return NULL;
  }

  ///
--- a/include/cef_render_process_handler.h
+++ b/include/cef_render_process_handler.h
@@ -93,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_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/internal/cef_types.h
+++ b/include/internal/cef_types.h
@@ -170,25 +170,23 @@ 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;

@@ -229,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;

@@ -337,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;
@@ -433,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;

@@ -730,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.
 ///
@@ -810,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;

 ///
@@ -1146,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,

@@ -1199,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.
  ///
@@ -1814,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;

 ///
@@ -2272,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;

 ///
@@ -2338,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;

 ///
@@ -2464,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.
@@ -2961,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
@@ -2996,199 +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;
-
 #ifdef __cplusplus
 }
 #endif
--- a/include/internal/cef_types_wrappers.h
+++ b/include/internal/cef_types_wrappers.h
@@ -743,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,
@@ -760,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);
  }
 };

@@ -851,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;
  }
 };

@@ -871,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;
  }
 };

@@ -944,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;
  }
 };

@@ -960,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_window_delegate.h
+++ b/include/views/cef_window_delegate.h
@@ -75,7 +75,7 @@ class CefWindowDelegate : public CefPanelDelegate {
  virtual CefRefPtr<CefWindow> GetParentWindow(CefRefPtr<CefWindow> window,
                                               bool* is_menu,
                                               bool* can_activate_menu) {
-    return nullptr;
+    return NULL;
  }

  ///
--- a/libcef/browser/audio_capturer.cc
+++ b/libcef/browser/audio_capturer.cc
@@ -1,125 +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/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), false /* initially_muted */);
-          },
-          base::Passed(&client)));
-}
-
-}  // namespace
-
-CefAudioCapturer::CefAudioCapturer(const CefAudioParameters& params,
-                                   CefRefPtr<CefBrowserHostImpl> 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);
-
-  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 CefBrowserHostImpl;
-
-class CefAudioCapturer : public media::AudioCapturerSource::CaptureCallback {
- public:
-  CefAudioCapturer(const CefAudioParameters& params,
-                   CefRefPtr<CefBrowserHostImpl> 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<CefBrowserHostImpl> 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_context.cc
+++ b/libcef/browser/browser_context.cc
@@ -8,9 +8,9 @@
 #include <utility>

 #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/media_router/media_router_manager.h"
 #include "libcef/browser/prefs/browser_prefs.h"
 #include "libcef/browser/request_context_impl.h"
 #include "libcef/browser/ssl_host_state_delegate.h"
@@ -37,7 +37,7 @@
 #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/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"
@@ -47,6 +47,7 @@
 #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;
@@ -163,16 +164,11 @@ 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 VisitedLinkWriter.
-class CefVisitedLinkListener : public visitedlink::VisitedLinkWriter::Listener {
+// CefBrowserContext sharing the same VisitedLinkMaster.
+class CefVisitedLinkListener : public visitedlink::VisitedLinkMaster::Listener {
 public:
  CefVisitedLinkListener() { DCHECK(listener_map_.empty()); }

@@ -190,7 +186,7 @@ class CefVisitedLinkListener : public visitedlink::VisitedLinkWriter::Listener {
    listener_map_.erase(it);
  }

-  // visitedlink::VisitedLinkWriter::Listener methods.
+  // visitedlink::VisitedLinkMaster::Listener methods.

  void NewTable(base::ReadOnlySharedMemoryRegion* table_region) override {
    CEF_REQUIRE_UIT();
@@ -224,9 +220,8 @@ class CefVisitedLinkListener : public visitedlink::VisitedLinkWriter::Listener {
 };

 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() {
@@ -238,9 +233,6 @@ CefBrowserContext::~CefBrowserContext() {
  // 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();

@@ -291,23 +283,36 @@ CefBrowserContext::~CefBrowserContext() {
 }

 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>(cache_path_);
+  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, cache_path_);
+  content::BrowserContext::Initialize(this, GetPath());

  resource_context_.reset(new CefResourceContext(IsOffTheRecord()));

@@ -336,7 +341,7 @@ void CefBrowserContext::Initialize() {
  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_master_.reset(new visitedlink::VisitedLinkMaster(
      visitedlink_listener_, this, !visited_link_path.empty(), false,
      visited_link_path, 0));
  visitedlink_listener_->CreateListenerForContext(this);
@@ -577,7 +582,7 @@ HostContentSettingsMap* CefBrowserContext::GetHostContentSettingsMap() {
        plugin_policy = CONTENT_SETTING_BLOCK;
      }
      host_content_settings_map_->SetDefaultContentSetting(
-          ContentSettingsType::PLUGINS, plugin_policy);
+          CONTENT_SETTINGS_TYPE_PLUGINS, plugin_policy);
    }
  }
  return host_content_settings_map_.get();
@@ -807,11 +812,3 @@ bool CefBrowserContext::IsPrintPreviewSupported() const {

  return !GetPrefs()->GetBoolean(prefs::kPrintPreviewDisabled);
 }
-
-CefMediaRouterManager* CefBrowserContext::GetMediaRouterManager() {
-  CEF_REQUIRE_UIT();
-  if (!media_router_manager_) {
-    media_router_manager_.reset(new CefMediaRouterManager(this));
-  }
-  return media_router_manager_.get();
-}
--- a/libcef/browser/browser_context.h
+++ b/libcef/browser/browser_context.h
@@ -13,10 +13,8 @@
 #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/ref_counted.h"
-#include "base/memory/weak_ptr.h"
 #include "chrome/browser/download/download_prefs.h"
 #include "chrome/common/plugin.mojom.h"
 #include "components/proxy_config/pref_proxy_config_tracker.h"
@@ -86,7 +84,6 @@
 */

 class CefDownloadManagerDelegate;
-class CefMediaRouterManager;
 class CefRequestContextImpl;
 class CefSSLHostStateDelegate;
 class CefVisitedLinkListener;
@@ -98,7 +95,7 @@ class CefExtensionSystem;
 }

 namespace visitedlink {
-class VisitedLinkWriter;
+class VisitedLinkMaster;
 }

 // Main entry point for configuring behavior on a per-browser basis. An instance
@@ -282,13 +279,6 @@ class CefBrowserContext : public ChromeProfileStub,
  // Returns true if this context supports print preview.
  bool IsPrintPreviewSupported() const;

-  CefMediaRouterManager* GetMediaRouterManager();
-
-  // Returns the BrowserContext, or nullptr if the BrowserContext has already
-  // been destroyed.
-  using Getter = base::RepeatingCallback<CefBrowserContext*()>;
-  Getter getter() const { return getter_; }
-
 private:
  // Allow deletion via std::unique_ptr().
  friend std::default_delete<CefBrowserContext>;
@@ -296,7 +286,7 @@ class CefBrowserContext : public ChromeProfileStub,
  ~CefBrowserContext() override;

  // Members initialized during construction are safe to access from any thread.
-  const CefRequestContextSettings settings_;
+  CefRequestContextSettings settings_;
  base::FilePath cache_path_;

  // CefRequestContextImpl objects referencing this object.
@@ -308,7 +298,7 @@ class CefBrowserContext : public ChromeProfileStub,
  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::VisitedLinkWriter> visitedlink_master_;
+  std::unique_ptr<visitedlink::VisitedLinkMaster> visitedlink_master_;
  // |visitedlink_listener_| is owned by visitedlink_master_.
  CefVisitedLinkListener* visitedlink_listener_;
  bool should_persist_session_cookies_ = false;
@@ -325,8 +315,6 @@ class CefBrowserContext : public ChromeProfileStub,

  std::unique_ptr<DownloadPrefs> download_prefs_;

-  std::unique_ptr<CefMediaRouterManager> media_router_manager_;
-
  // Map IDs to CefRequestContextHandler objects.
  CefRequestContextHandlerMap handler_map_;

@@ -350,9 +338,6 @@ class CefBrowserContext : public ChromeProfileStub,
  typedef std::set<int> NodeIdSet;
  NodeIdSet node_id_set_;

-  Getter getter_;
-  base::WeakPtrFactory<CefBrowserContext> weak_ptr_factory_;
-
  DISALLOW_COPY_AND_ASSIGN(CefBrowserContext);
 };

--- a/libcef/browser/browser_host_impl.cc
+++ b/libcef/browser/browser_host_impl.cc
@@ -8,7 +8,6 @@
 #include <string>
 #include <utility>

-#include "libcef/browser/audio_capturer.h"
 #include "libcef/browser/browser_context.h"
 #include "libcef/browser/browser_info.h"
 #include "libcef/browser/browser_info_manager.h"
@@ -16,7 +15,8 @@
 #include "libcef/browser/browser_util.h"
 #include "libcef/browser/content_browser_client.h"
 #include "libcef/browser/context.h"
-#include "libcef/browser/devtools/devtools_manager.h"
+#include "libcef/browser/devtools/devtools_frontend.h"
+#include "libcef/browser/devtools/devtools_manager_delegate.h"
 #include "libcef/browser/extensions/browser_extensions_util.h"
 #include "libcef/browser/extensions/extension_background_host.h"
 #include "libcef/browser/extensions/extension_system.h"
@@ -47,8 +47,6 @@
 #include "chrome/browser/spellchecker/spellcheck_factory.h"
 #include "chrome/browser/spellchecker/spellcheck_service.h"
 #include "chrome/browser/ui/prefs/prefs_tab_helper.h"
-#include "components/favicon/core/favicon_url.h"
-#include "components/spellcheck/common/spellcheck_features.h"
 #include "components/zoom/zoom_controller.h"
 #include "content/browser/gpu/compositor_util.h"
 #include "content/browser/web_contents/web_contents_impl.h"
@@ -71,6 +69,7 @@
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host.h"
 #include "content/public/browser/web_contents.h"
+#include "content/public/common/favicon_url.h"
 #include "extensions/browser/process_manager.h"
 #include "net/base/net_errors.h"
 #include "third_party/blink/public/mojom/frame/find_in_page.mojom.h"
@@ -194,9 +193,6 @@ void OnDownloadImage(uint32 max_image_size,
                                    image_impl.get());
 }

-static constexpr base::TimeDelta kRecentlyAudibleTimeout =
-    base::TimeDelta::FromSeconds(2);
-
 }  // namespace

 // CefBrowserHost static methods.
@@ -385,8 +381,7 @@ CefRefPtr<CefBrowserHostImpl> CefBrowserHostImpl::Create(
                                 create_params.extension_host_type);
  } else if (!create_params.url.is_empty()) {
    browser->LoadMainFrameURL(create_params.url.spec(), content::Referrer(),
-                              CefFrameHostImpl::kPageTransitionExplicit,
-                              std::string());
+                              ui::PAGE_TRANSITION_TYPED, std::string());
  }

  return browser.get();
@@ -551,6 +546,26 @@ CefRefPtr<CefBrowserHostImpl> CefBrowserHostImpl::GetBrowserForFrameRoute(
 // CefBrowserHostImpl methods.
 // -----------------------------------------------------------------------------

+// WebContentsObserver that will be notified when the frontend WebContents is
+// destroyed so that the inspected browser can clear its DevTools references.
+class CefBrowserHostImpl::DevToolsWebContentsObserver
+    : public content::WebContentsObserver {
+ public:
+  DevToolsWebContentsObserver(CefBrowserHostImpl* browser,
+                              content::WebContents* frontend_web_contents)
+      : WebContentsObserver(frontend_web_contents), browser_(browser) {}
+
+  // WebContentsObserver methods:
+  void WebContentsDestroyed() override {
+    browser_->OnDevToolsWebContentsDestroyed();
+  }
+
+ private:
+  CefBrowserHostImpl* browser_;
+
+  DISALLOW_COPY_AND_ASSIGN(DevToolsWebContentsObserver);
+};
+
 CefBrowserHostImpl::~CefBrowserHostImpl() {}

 CefRefPtr<CefBrowser> CefBrowserHostImpl::GetBrowser() {
@@ -576,7 +591,7 @@ void CefBrowserHostImpl::CloseBrowser(bool force_close) {
    }

    content::WebContents* contents = web_contents();
-    if (contents && contents->NeedToFireBeforeUnloadOrUnload()) {
+    if (contents && contents->NeedToFireBeforeUnload()) {
      // Will result in a call to BeforeUnloadFired() and, if the close isn't
      // canceled, CloseContents().
      contents->DispatchBeforeUnload(false /* auto_cancel */);
@@ -748,9 +763,8 @@ void CefBrowserHostImpl::DownloadImage(
    return;

  web_contents()->DownloadImage(
-      gurl, is_favicon, max_image_size,
-      max_image_size * gfx::ImageSkia::GetMaxSupportedScale(), bypass_cache,
-      base::BindOnce(OnDownloadImage, max_image_size, callback));
+      gurl, is_favicon, max_image_size * gfx::ImageSkia::GetMaxSupportedScale(),
+      bypass_cache, base::BindOnce(OnDownloadImage, max_image_size, callback));
 }

 void CefBrowserHostImpl::Print() {
@@ -843,29 +857,39 @@ void CefBrowserHostImpl::ShowDevTools(const CefWindowInfo& windowInfo,
                                      CefRefPtr<CefClient> client,
                                      const CefBrowserSettings& settings,
                                      const CefPoint& inspect_element_at) {
-  if (!CEF_CURRENTLY_ON_UIT()) {
+  if (CEF_CURRENTLY_ON_UIT()) {
+    if (!web_contents())
+      return;
+
+    if (devtools_frontend_) {
+      if (!inspect_element_at.IsEmpty()) {
+        devtools_frontend_->InspectElementAt(inspect_element_at.x,
+                                             inspect_element_at.y);
+      }
+      devtools_frontend_->Focus();
+      return;
+    }
+
+    devtools_frontend_ = CefDevToolsFrontend::Show(
+        this, windowInfo, client, settings, inspect_element_at);
+    devtools_observer_.reset(new DevToolsWebContentsObserver(
+        this, devtools_frontend_->frontend_browser()->web_contents()));
+  } else {
    ShowDevToolsHelper* helper = new ShowDevToolsHelper(
        this, windowInfo, client, settings, inspect_element_at);
    CEF_POST_TASK(CEF_UIT, base::BindOnce(ShowDevToolsWithHelper, helper));
-    return;
  }
-
-  if (!EnsureDevToolsManager())
-    return;
-  devtools_manager_->ShowDevTools(windowInfo, client, settings,
-                                  inspect_element_at);
 }

 void CefBrowserHostImpl::CloseDevTools() {
-  if (!CEF_CURRENTLY_ON_UIT()) {
+  if (CEF_CURRENTLY_ON_UIT()) {
+    if (!devtools_frontend_)
+      return;
+    devtools_frontend_->Close();
+  } else {
    CEF_POST_TASK(CEF_UIT,
                  base::BindOnce(&CefBrowserHostImpl::CloseDevTools, this));
-    return;
  }
-
-  if (!devtools_manager_)
-    return;
-  devtools_manager_->CloseDevTools();
 }

 bool CefBrowserHostImpl::HasDevTools() {
@@ -874,84 +898,7 @@ bool CefBrowserHostImpl::HasDevTools() {
    return false;
  }

-  if (!devtools_manager_)
-    return false;
-  return devtools_manager_->HasDevTools();
-}
-
-bool CefBrowserHostImpl::SendDevToolsMessage(const void* message,
-                                             size_t message_size) {
-  if (!message || message_size == 0)
-    return false;
-
-  if (!CEF_CURRENTLY_ON_UIT()) {
-    std::string message_str(static_cast<const char*>(message), message_size);
-    CEF_POST_TASK(
-        CEF_UIT,
-        base::BindOnce(
-            [](CefRefPtr<CefBrowserHostImpl> self, std::string message_str) {
-              self->SendDevToolsMessage(message_str.data(), message_str.size());
-            },
-            CefRefPtr<CefBrowserHostImpl>(this), std::move(message_str)));
-    return false;
-  }
-
-  if (!EnsureDevToolsManager())
-    return false;
-  return devtools_manager_->SendDevToolsMessage(message, message_size);
-}
-
-int CefBrowserHostImpl::ExecuteDevToolsMethod(
-    int message_id,
-    const CefString& method,
-    CefRefPtr<CefDictionaryValue> params) {
-  if (!CEF_CURRENTLY_ON_UIT()) {
-    CEF_POST_TASK(
-        CEF_UIT, base::BindOnce(base::IgnoreResult(
-                                    &CefBrowserHostImpl::ExecuteDevToolsMethod),
-                                this, message_id, method, params));
-    return 0;
-  }
-
-  if (!EnsureDevToolsManager())
-    return 0;
-  return devtools_manager_->ExecuteDevToolsMethod(message_id, method, params);
-}
-
-CefRefPtr<CefRegistration> CefBrowserHostImpl::AddDevToolsMessageObserver(
-    CefRefPtr<CefDevToolsMessageObserver> observer) {
-  if (!observer)
-    return nullptr;
-  auto registration = CefDevToolsManager::CreateRegistration(observer);
-  InitializeDevToolsRegistrationOnUIThread(registration);
-  return registration.get();
-}
-
-bool CefBrowserHostImpl::EnsureDevToolsManager() {
-  CEF_REQUIRE_UIT();
-  if (!web_contents())
-    return false;
-
-  if (!devtools_manager_) {
-    devtools_manager_.reset(new CefDevToolsManager(this));
-  }
-  return true;
-}
-
-void CefBrowserHostImpl::InitializeDevToolsRegistrationOnUIThread(
-    CefRefPtr<CefRegistration> registration) {
-  if (!CEF_CURRENTLY_ON_UIT()) {
-    CEF_POST_TASK(
-        CEF_UIT,
-        base::BindOnce(
-            &CefBrowserHostImpl::InitializeDevToolsRegistrationOnUIThread, this,
-            registration));
-    return;
-  }
-
-  if (!EnsureDevToolsManager())
-    return;
-  devtools_manager_->InitializeRegistrationOnUIThread(registration);
+  return (devtools_frontend_ != nullptr);
 }

 void CefBrowserHostImpl::GetNavigationEntries(
@@ -980,7 +927,7 @@ void CefBrowserHostImpl::GetNavigationEntries(
    CefRefPtr<CefNavigationEntryImpl> entry =
        new CefNavigationEntryImpl(controller.GetEntryAtIndex(current));
    visitor->Visit(entry.get(), true, current, total);
-    entry->Detach(nullptr);
+    entry->Detach(NULL);
  } else {
    // Visit all entries.
    bool cont = true;
@@ -988,7 +935,7 @@ void CefBrowserHostImpl::GetNavigationEntries(
      CefRefPtr<CefNavigationEntryImpl> entry =
          new CefNavigationEntryImpl(controller.GetEntryAtIndex(i));
      cont = visitor->Visit(entry.get(), (i == current), i, total);
-      entry->Detach(nullptr);
+      entry->Detach(NULL);
    }
  }
 }
@@ -1107,18 +1054,16 @@ void CefBrowserHostImpl::AddWordToDictionary(const CefString& word) {
  if (!web_contents())
    return;

-  SpellcheckService* spellcheck = nullptr;
  content::BrowserContext* browser_context =
      web_contents()->GetBrowserContext();
  if (browser_context) {
-    spellcheck = SpellcheckServiceFactory::GetForContext(browser_context);
+    SpellcheckService* spellcheck =
+        SpellcheckServiceFactory::GetForContext(browser_context);
    if (spellcheck)
      spellcheck->GetCustomDictionary()->AddWord(word);
  }
 #if defined(OS_MACOSX)
-  if (spellcheck && spellcheck::UseBrowserSpellChecker()) {
-    spellcheck_platform::AddWord(spellcheck->platform_spell_checker(), word);
-  }
+  spellcheck_platform::AddWord(word);
 #endif
 }

@@ -1218,7 +1163,11 @@ void CefBrowserHostImpl::SendKeyEvent(const CefKeyEvent& event) {
  if (!web_contents() || !platform_delegate_)
    return;

-  platform_delegate_->SendKeyEvent(event);
+  content::NativeWebKeyboardEvent web_event(blink::WebInputEvent::kUndefined,
+                                            blink::WebInputEvent::kNoModifiers,
+                                            ui::EventTimeForNow());
+  platform_delegate_->TranslateKeyEvent(web_event, event);
+  platform_delegate_->SendKeyEvent(web_event);
 }

 void CefBrowserHostImpl::SendMouseClickEvent(const CefMouseEvent& event,
@@ -1235,7 +1184,10 @@ void CefBrowserHostImpl::SendMouseClickEvent(const CefMouseEvent& event,
  if (!web_contents() || !platform_delegate_)
    return;

-  platform_delegate_->SendMouseClickEvent(event, type, mouseUp, clickCount);
+  blink::WebMouseEvent web_event;
+  platform_delegate_->TranslateClickEvent(web_event, event, type, mouseUp,
+                                          clickCount);
+  platform_delegate_->SendMouseEvent(web_event);
 }

 void CefBrowserHostImpl::SendMouseMoveEvent(const CefMouseEvent& event,
@@ -1250,7 +1202,9 @@ void CefBrowserHostImpl::SendMouseMoveEvent(const CefMouseEvent& event,
  if (!web_contents() || !platform_delegate_)
    return;

-  platform_delegate_->SendMouseMoveEvent(event, mouseLeave);
+  blink::WebMouseEvent web_event;
+  platform_delegate_->TranslateMoveEvent(web_event, event, mouseLeave);
+  platform_delegate_->SendMouseEvent(web_event);
 }

 void CefBrowserHostImpl::SendMouseWheelEvent(const CefMouseEvent& event,
@@ -1271,7 +1225,9 @@ void CefBrowserHostImpl::SendMouseWheelEvent(const CefMouseEvent& event,
  if (!web_contents() || !platform_delegate_)
    return;

-  platform_delegate_->SendMouseWheelEvent(event, deltaX, deltaY);
+  blink::WebMouseWheelEvent web_event;
+  platform_delegate_->TranslateWheelEvent(web_event, event, deltaX, deltaY);
+  platform_delegate_->SendMouseWheelEvent(web_event);
 }

 void CefBrowserHostImpl::SendFocusEvent(bool setFocus) {
@@ -1598,25 +1554,19 @@ void CefBrowserHostImpl::DestroyBrowser() {
  // Disassociate the platform delegate from this browser.
  platform_delegate_->BrowserDestroyed(this);

-  registrar_.reset(nullptr);
-  content::WebContentsObserver::Observe(nullptr);
+  registrar_.reset(NULL);
+  content::WebContentsObserver::Observe(NULL);
  if (owned_web_contents_)
-    owned_web_contents_.reset(nullptr);
+    owned_web_contents_.reset(NULL);

  // Delete objects created by the platform delegate that may be referenced by
  // the WebContents.
-  file_dialog_manager_.reset(nullptr);
-  javascript_dialog_manager_.reset(nullptr);
-  menu_manager_.reset(nullptr);
-
-  // Delete the audio capturer
-  recently_audible_timer_.Stop();
-  audio_capturer_.reset(nullptr);
-
-  devtools_manager_.reset(nullptr);
+  file_dialog_manager_.reset(NULL);
+  javascript_dialog_manager_.reset(NULL);
+  menu_manager_.reset(NULL);

  // Delete the platform delegate.
-  platform_delegate_.reset(nullptr);
+  platform_delegate_.reset(NULL);

  CefBrowserInfoManager::GetInstance()->RemoveBrowserInfo(browser_info_);
  browser_info_->SetBrowser(nullptr);
@@ -1700,6 +1650,30 @@ void CefBrowserHostImpl::LoadMainFrameURL(const std::string& url,
  }
 }

+void CefBrowserHostImpl::OnFrameFocused(CefRefPtr<CefFrameHostImpl> frame) {
+  DCHECK(frame);
+
+  CefRefPtr<CefFrameHostImpl> previous_frame;
+  {
+    base::AutoLock lock_scope(state_lock_);
+    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);
+  }
+}
+
 void CefBrowserHostImpl::OnDidFinishLoad(CefRefPtr<CefFrameHostImpl> frame,
                                         const GURL& validated_url,
                                         int http_status_code) {
@@ -1767,9 +1741,9 @@ void CefBrowserHostImpl::OnSetFocus(cef_focus_source_t source) {

 void CefBrowserHostImpl::RunFileChooser(
    const CefFileDialogRunner::FileChooserParams& params,
-    CefFileDialogRunner::RunFileChooserCallback callback) {
+    const CefFileDialogRunner::RunFileChooserCallback& callback) {
  EnsureFileDialogManager();
-  file_dialog_manager_->RunFileChooser(params, std::move(callback));
+  file_dialog_manager_->RunFileChooser(params, callback);
 }

 bool CefBrowserHostImpl::EmbedsFullscreenWidget() {
@@ -2145,7 +2119,8 @@ void CefBrowserHostImpl::LoadingStateChanged(content::WebContents* source,
  }
 }

-void CefBrowserHostImpl::LoadProgressChanged(double progress) {
+void CefBrowserHostImpl::LoadProgressChanged(content::WebContents* source,
+                                             double progress) {
  if (client_.get()) {
    CefRefPtr<CefDisplayHandler> handler = client_->GetDisplayHandler();
    if (handler.get()) {
@@ -2526,9 +2501,9 @@ bool CefBrowserHostImpl::CheckMediaAccessPermission(
  return command_line->HasSwitch(switches::kEnableMediaStream);
 }

-bool CefBrowserHostImpl::IsNeverComposited(content::WebContents* web_contents) {
+bool CefBrowserHostImpl::IsNeverVisible(content::WebContents* web_contents) {
  if (extension_host_)
-    return extension_host_->IsNeverComposited(web_contents);
+    return extension_host_->IsNeverVisible(web_contents);
  return false;
 }

@@ -2703,24 +2678,17 @@ void CefBrowserHostImpl::DidStopLoading() {
 }

 void CefBrowserHostImpl::DocumentAvailableInMainFrame() {
-  {
-    base::AutoLock lock_scope(state_lock_);
-    has_document_ = true;
-  }
-
-  if (client_) {
-    CefRefPtr<CefRequestHandler> handler = client_->GetRequestHandler();
-    if (handler)
-      handler->OnDocumentAvailableInMainFrame(this);
-  }
+  base::AutoLock lock_scope(state_lock_);
+  has_document_ = true;
 }

 void CefBrowserHostImpl::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.
+    int error_code,
+    const base::string16& error_description) {
+  // 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);
@@ -2746,14 +2714,15 @@ void CefBrowserHostImpl::PluginCrashed(const base::FilePath& plugin_path,
 }

 void CefBrowserHostImpl::DidUpdateFaviconURL(
-    const std::vector<blink::mojom::FaviconURLPtr>& candidates) {
+    const std::vector<content::FaviconURL>& candidates) {
  if (client_.get()) {
    CefRefPtr<CefDisplayHandler> handler = client_->GetDisplayHandler();
    if (handler.get()) {
      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());
+      std::vector<content::FaviconURL>::const_iterator it = candidates.begin();
+      for (; it != candidates.end(); ++it) {
+        if (it->icon_type == content::FaviconURL::IconType::kFavicon)
+          icon_urls.push_back(it->icon_url.spec());
      }
      if (!icon_urls.empty())
        handler->OnFaviconURLChange(this, icon_urls);
@@ -2761,25 +2730,6 @@ void CefBrowserHostImpl::DidUpdateFaviconURL(
  }
 }

-void CefBrowserHostImpl::OnAudioStateChanged(bool audible) {
-  if (audible) {
-    recently_audible_timer_.Stop();
-    StartAudioCapturer();
-  } else if (audio_capturer_) {
-    // If you have a media playing that has a short quiet moment, web_contents
-    // will immediately switch to non-audible state. We don't want to stop
-    // audio stream so quickly, let's give the stream some time to resume
-    // playing.
-    recently_audible_timer_.Start(
-        FROM_HERE, kRecentlyAudibleTimeout,
-        base::BindOnce(&CefBrowserHostImpl::OnRecentlyAudibleTimerFired, this));
-  }
-}
-
-void CefBrowserHostImpl::OnRecentlyAudibleTimerFired() {
-  audio_capturer_.reset();
-}
-
 bool CefBrowserHostImpl::OnMessageReceived(const IPC::Message& message) {
  // Handle the cursor message here if mouse cursor change is disabled instead
  // of propegating the message to the normal handler.
@@ -2801,34 +2751,6 @@ bool CefBrowserHostImpl::OnMessageReceived(
  return false;
 }

-void CefBrowserHostImpl::OnFrameFocused(
-    content::RenderFrameHost* render_frame_host) {
-  CefRefPtr<CefFrameHostImpl> frame =
-      static_cast<CefFrameHostImpl*>(GetFrameForHost(render_frame_host).get());
-  if (!frame || frame->IsFocused())
-    return;
-
-  CefRefPtr<CefFrameHostImpl> previous_frame;
-  {
-    base::AutoLock lock_scope(state_lock_);
-    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);
-  }
-}
-
 void CefBrowserHostImpl::AccessibilityEventReceived(
    const content::AXEventNotificationDetails& content_event_bundle) {
  // Only needed in windowless mode.
@@ -2875,25 +2797,6 @@ bool CefBrowserHostImpl::HasObserver(Observer* observer) const {
  return observers_.HasObserver(observer);
 }

-void CefBrowserHostImpl::StartAudioCapturer() {
-  if (!client_.get() || audio_capturer_)
-    return;
-
-  CefRefPtr<CefAudioHandler> audio_handler = client_->GetAudioHandler();
-  if (!audio_handler.get())
-    return;
-
-  CefAudioParameters params;
-  params.channel_layout = CEF_CHANNEL_LAYOUT_STEREO;
-  params.sample_rate = media::AudioParameters::kAudioCDSampleRate;
-  params.frames_per_buffer = 1024;
-
-  if (!audio_handler->GetAudioParameters(this, params))
-    return;
-
-  audio_capturer_.reset(new CefAudioCapturer(params, this, audio_handler));
-}
-
 CefBrowserHostImpl::NavigationLock::NavigationLock(
    CefRefPtr<CefBrowserHostImpl> browser)
    : browser_(browser) {
@@ -2965,6 +2868,18 @@ CefBrowserHostImpl::CefBrowserHostImpl(
      platform_delegate_(std::move(platform_delegate)),
      is_windowless_(platform_delegate_->IsWindowless()),
      is_views_hosted_(platform_delegate_->IsViewsHosted()),
+      host_window_handle_(kNullWindowHandle),
+      is_loading_(false),
+      can_go_back_(false),
+      can_go_forward_(false),
+      has_document_(false),
+      is_fullscreen_(false),
+      destruction_state_(DESTRUCTION_STATE_NONE),
+      window_destroyed_(false),
+      is_in_onsetfocus_(false),
+      focus_on_editable_field_(false),
+      mouse_cursor_change_disabled_(false),
+      devtools_frontend_(NULL),
      extension_(extension) {
  if (opener.get() && !platform_delegate_->IsViewsHosted()) {
    // GetOpenerWindowHandle() only returns a value for non-views-hosted
@@ -3175,6 +3090,11 @@ void CefBrowserHostImpl::OnTitleChange(const base::string16& title) {
  }
 }

+void CefBrowserHostImpl::OnDevToolsWebContentsDestroyed() {
+  devtools_observer_.reset();
+  devtools_frontend_ = NULL;
+}
+
 void CefBrowserHostImpl::EnsureFileDialogManager() {
  CEF_REQUIRE_UIT();
  if (!file_dialog_manager_.get() && platform_delegate_) {
--- a/libcef/browser/browser_host_impl.h
+++ b/libcef/browser/browser_host_impl.h
@@ -48,10 +48,9 @@ class Widget;
 }
 #endif  // defined(USE_AURA)

-class CefAudioCapturer;
 class CefBrowserInfo;
 class CefBrowserPlatformDelegate;
-class CefDevToolsManager;
+class CefDevToolsFrontend;
 class SiteInstance;

 // Implementation of CefBrowser.
@@ -192,12 +191,6 @@ class CefBrowserHostImpl : public CefBrowserHost,
                    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;
@@ -320,6 +313,7 @@ class CefBrowserHostImpl : public CefBrowserHost,
                        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);
@@ -358,8 +352,9 @@ class CefBrowserHostImpl : public CefBrowserHost,
  // 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);
@@ -391,7 +386,8 @@ class CefBrowserHostImpl : public CefBrowserHost,
                      bool* was_blocked) override;
  void LoadingStateChanged(content::WebContents* source,
                           bool to_different_document) override;
-  void LoadProgressChanged(double progress) 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,
@@ -464,7 +460,7 @@ class CefBrowserHostImpl : public CefBrowserHost,
  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,
@@ -487,17 +483,16 @@ class CefBrowserHostImpl : public CefBrowserHost,
  void DocumentAvailableInMainFrame() override;
  void DidFailLoad(content::RenderFrameHost* render_frame_host,
                   const GURL& validated_url,
-                   int error_code) override;
+                   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<blink::mojom::FaviconURLPtr>& candidates) override;
-  void OnAudioStateChanged(bool audible) override;
+      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 OnFrameFocused(content::RenderFrameHost* render_frame_host) override;
  void AccessibilityEventReceived(
      const content::AXEventNotificationDetails& content_event_bundle) override;
  void AccessibilityLocationChangesReceived(
@@ -513,7 +508,6 @@ class CefBrowserHostImpl : public CefBrowserHost,
  void AddObserver(Observer* observer);
  void RemoveObserver(Observer* observer);
  bool HasObserver(Observer* observer) const;
-
  class NavigationLock final {
   private:
    friend class CefBrowserHostImpl;
@@ -529,6 +523,8 @@ class CefBrowserHostImpl : public CefBrowserHost,
  std::unique_ptr<NavigationLock> CreateNavigationLock();

 private:
+  class DevToolsWebContentsObserver;
+
  static CefRefPtr<CefBrowserHostImpl> CreateInternal(
      const CefBrowserSettings& settings,
      CefRefPtr<CefClient> client,
@@ -585,19 +581,13 @@ class CefBrowserHostImpl : public CefBrowserHost,
  void OnFullscreenModeChange(bool fullscreen);
  void OnTitleChange(const base::string16& title);

+  void OnDevToolsWebContentsDestroyed();
+
  // Create the CefFileDialogManager if it doesn't already exist.
  void EnsureFileDialogManager();

  void ConfigureAutoResize();

-  void StartAudioCapturer();
-
-  void OnRecentlyAudibleTimerFired();
-
-  bool EnsureDevToolsManager();
-  void InitializeDevToolsRegistrationOnUIThread(
-      CefRefPtr<CefRegistration> registration);
-
  CefBrowserSettings settings_;
  CefRefPtr<CefClient> client_;
  scoped_refptr<CefBrowserInfo> browser_info_;
@@ -606,7 +596,7 @@ class CefBrowserHostImpl : public CefBrowserHost,
  std::unique_ptr<CefBrowserPlatformDelegate> platform_delegate_;
  const bool is_windowless_;
  const bool is_views_hosted_;
-  CefWindowHandle host_window_handle_ = kNullWindowHandle;
+  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(),
@@ -616,18 +606,18 @@ class CefBrowserHostImpl : public CefBrowserHost,

  // Volatile state information. All access must be protected by the 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;
+  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.
@@ -637,18 +627,18 @@ class CefBrowserHostImpl : public CefBrowserHost,

  // 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_ = false;
+  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_ = false;
+  bool focus_on_editable_field_;

  // True if mouse cursor change is disabled.
-  bool mouse_cursor_change_disabled_ = false;
+  bool mouse_cursor_change_disabled_;

  // Used for managing notification subscriptions.
  std::unique_ptr<content::NotificationRegistrar> registrar_;
@@ -662,8 +652,12 @@ class CefBrowserHostImpl : public CefBrowserHost,
  // 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_;

  // Observers that want to be notified of changes to this object.
  base::ObserverList<Observer>::Unchecked observers_;
@@ -676,14 +670,6 @@ class CefBrowserHostImpl : public CefBrowserHost,
  CefRefPtr<CefExtension> extension_;
  bool is_background_host_ = false;

-  // Used for capturing audio for CefAudioHandler.
-  std::unique_ptr<CefAudioCapturer> audio_capturer_;
-
-  // 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 with auto-resize.
  bool auto_resize_enabled_ = false;
  gfx::Size auto_resize_min_;
--- a/libcef/browser/browser_info_manager.cc
+++ b/libcef/browser/browser_info_manager.cc
@@ -11,11 +11,9 @@
 #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 "base/command_line.h"
 #include "base/logging.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/render_frame_host.h"
@@ -25,9 +23,6 @@

 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);
@@ -49,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;
 }
@@ -91,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);
  }
@@ -145,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>();
@@ -293,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(
@@ -518,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
@@ -201,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;
  };

@@ -217,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 =
@@ -228,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/browser_main.cc
+++ b/libcef/browser/browser_main.cc
@@ -32,11 +32,11 @@
 #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 "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,9 +50,6 @@
 #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)
@@ -74,9 +71,14 @@
 #include "libcef/browser/printing/print_dialog_linux.h"
 #endif

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

 CefBrowserMainParts::~CefBrowserMainParts() {
  constrained_window::SetConstrainedWindowViewsClient(nullptr);
@@ -120,17 +122,12 @@ void CefBrowserMainParts::PreMainMessageLoopStart() {
  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)
+  OSCrypt::Init(local_state);
+#endif
 }

 void CefBrowserMainParts::PostMainMessageLoopStart() {
@@ -162,6 +159,8 @@ void CefBrowserMainParts::PreMainMessageLoopRun() {
  display::Screen::SetScreenInstance(views::CreateDesktopScreen());
 #endif

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

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

  // Create the global RequestContext.
  global_request_context_ =
@@ -201,12 +200,6 @@ void CefBrowserMainParts::PreMainMessageLoopRun() {

  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();

@@ -220,12 +213,12 @@ void CefBrowserMainParts::PostMainMessageLoopRun() {
  // 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 CefBrowserMainParts::PostDestroyThreads() {
  if (extensions::ExtensionsEnabled()) {
-    extensions::ExtensionsBrowserClient::Set(nullptr);
+    extensions::ExtensionsBrowserClient::Set(NULL);
    extensions_browser_client_.reset();
  }

--- a/libcef/browser/browser_main_win.cc
+++ b/libcef/browser/browser_main_win.cc
@@ -14,7 +14,7 @@ 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 CefBrowserMainParts::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
@@ -51,7 +51,7 @@ void CefBrowserMessageFilter::OnGetNewRenderThreadInfo(
      CefRefPtr<CefListValueImpl> listValuePtr(
          new CefListValueImpl(&params->extra_info, false, false));
      handler->OnRenderProcessThreadCreated(listValuePtr.get());
-      listValuePtr->Detach(nullptr);
+      listValuePtr->Detach(NULL);
    }
  }
 }
--- a/libcef/browser/browser_message_loop.cc
+++ b/libcef/browser/browser_message_loop.cc
@@ -34,17 +34,11 @@ class MessagePumpExternal : public base::MessagePumpForUI {
      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;
    }
@@ -60,31 +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) {
-      // DoIdleWork() returns true if idle work was all done.
-      more_idle_work = !delegate->DoIdleWork();
+    did_work = delegate->DoWork();

-      // 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 && !more_idle_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;
-      }
+    // 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();
    }

-    return more_immediate_work || more_idle_work || more_delayed_work;
+    return did_work || did_delayed_work || did_idle_work;
  }

  const float max_time_slice_;
--- a/libcef/browser/browser_platform_delegate.cc
+++ b/libcef/browser/browser_platform_delegate.cc
@@ -14,7 +14,7 @@
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host.h"

-CefBrowserPlatformDelegate::CefBrowserPlatformDelegate() {}
+CefBrowserPlatformDelegate::CefBrowserPlatformDelegate() : browser_(nullptr) {}

 CefBrowserPlatformDelegate::~CefBrowserPlatformDelegate() {
  DCHECK(!browser_);
@@ -237,33 +237,32 @@ base::RepeatingClosure CefBrowserPlatformDelegate::GetBoundsChangedCallback() {
 }

 // 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
@@ -148,16 +148,11 @@ class CefBrowserPlatformDelegate {
  virtual void WasResized() = 0;

  // Send input events.
-  virtual void SendKeyEvent(const CefKeyEvent& event) = 0;
-  virtual void SendMouseClickEvent(const CefMouseEvent& event,
-                                   CefBrowserHost::MouseButtonType type,
-                                   bool mouseUp,
-                                   int clickCount) = 0;
-  virtual void SendMouseMoveEvent(const CefMouseEvent& event,
-                                  bool mouseLeave) = 0;
-  virtual void SendMouseWheelEvent(const CefMouseEvent& event,
-                                   int deltaX,
-                                   int deltaY) = 0;
+  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
@@ -192,6 +187,22 @@ class CefBrowserPlatformDelegate {
  // 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 = 0;
@@ -276,9 +287,9 @@ class CefBrowserPlatformDelegate {

  base::RepeatingClosure GetBoundsChangedCallback();

-  static int TranslateWebEventModifiers(uint32 cef_modifiers);
+  static int TranslateModifiers(uint32 cef_modifiers);

-  CefBrowserHostImpl* browser_ = nullptr;  // Not owned by this object.
+  CefBrowserHostImpl* browser_;  // Not owned by this object.

 private:
  // Used for the print preview dialog.
--- a/libcef/browser/chrome_browser_process_stub.cc
+++ b/libcef/browser/chrome_browser_process_stub.cc
@@ -72,8 +72,8 @@ void ChromeBrowserProcessStub::Shutdown() {
  // this might cause a nested message loop to run, and we don't want pending
  // tasks to run once teardown has started.
  print_job_manager_->Shutdown();
-  print_job_manager_.reset(nullptr);
-  print_preview_dialog_controller_ = nullptr;
+  print_job_manager_.reset(NULL);
+  print_preview_dialog_controller_ = NULL;

  profile_manager_.reset();
  event_router_forwarder_ = nullptr;
@@ -119,17 +119,17 @@ void ChromeBrowserProcessStub::FlushLocalStateAndReply(
 metrics_services_manager::MetricsServicesManager*
 ChromeBrowserProcessStub::GetMetricsServicesManager() {
  NOTREACHED();
-  return nullptr;
+  return NULL;
 }

 metrics::MetricsService* ChromeBrowserProcessStub::metrics_service() {
  NOTREACHED();
-  return nullptr;
+  return NULL;
 }

 rappor::RapporServiceImpl* ChromeBrowserProcessStub::rappor_service() {
  // Called from PluginInfoHostImpl::ReportMetrics.
-  return nullptr;
+  return NULL;
 }

 SystemNetworkContextManager*
@@ -141,12 +141,12 @@ ChromeBrowserProcessStub::system_network_context_manager() {
 network::NetworkQualityTracker*
 ChromeBrowserProcessStub::network_quality_tracker() {
  NOTREACHED();
-  return nullptr;
+  return NULL;
 }

 WatchDogThread* ChromeBrowserProcessStub::watchdog_thread() {
  NOTREACHED();
-  return nullptr;
+  return NULL;
 }

 ProfileManager* ChromeBrowserProcessStub::profile_manager() {
@@ -157,17 +157,13 @@ ProfileManager* ChromeBrowserProcessStub::profile_manager() {
 PrefService* ChromeBrowserProcessStub::local_state() {
  DCHECK(initialized_);
  if (!local_state_) {
-    // Use a location that is shared by all request contexts.
    const CefSettings& settings = CefContext::Get()->settings();
-    const base::FilePath& root_cache_path =
-        base::FilePath(CefString(&settings.root_cache_path));
+    const base::FilePath& cache_path =
+        base::FilePath(CefString(&settings.cache_path));

    // Used for very early NetworkService initialization.
-    // Always persist preferences for this PrefService if possible because it
-    // contains the cookie encryption key on Windows.
-    local_state_ =
-        browser_prefs::CreatePrefService(nullptr /* profile */, root_cache_path,
-                                         true /* persist_user_preferences */);
+    local_state_ = browser_prefs::CreatePrefService(
+        nullptr, cache_path, !!settings.persist_user_preferences);
  }
  return local_state_.get();
 }
@@ -175,17 +171,17 @@ PrefService* ChromeBrowserProcessStub::local_state() {
 scoped_refptr<network::SharedURLLoaderFactory>
 ChromeBrowserProcessStub::shared_url_loader_factory() {
  NOTREACHED();
-  return nullptr;
+  return NULL;
 }

 variations::VariationsService* ChromeBrowserProcessStub::variations_service() {
  NOTREACHED();
-  return nullptr;
+  return NULL;
 }

 BrowserProcessPlatformPart* ChromeBrowserProcessStub::platform_part() {
  NOTREACHED();
-  return nullptr;
+  return NULL;
 }

 extensions::EventRouterForwarder*
@@ -196,13 +192,13 @@ ChromeBrowserProcessStub::extension_event_router_forwarder() {

 NotificationUIManager* ChromeBrowserProcessStub::notification_ui_manager() {
  NOTREACHED();
-  return nullptr;
+  return NULL;
 }

 NotificationPlatformBridge*
 ChromeBrowserProcessStub::notification_platform_bridge() {
  NOTREACHED();
-  return nullptr;
+  return NULL;
 }

 policy::ChromeBrowserPolicyConnector*
@@ -220,12 +216,12 @@ policy::PolicyService* ChromeBrowserProcessStub::policy_service() {

 IconManager* ChromeBrowserProcessStub::icon_manager() {
  NOTREACHED();
-  return nullptr;
+  return NULL;
 }

 GpuModeManager* ChromeBrowserProcessStub::gpu_mode_manager() {
  NOTREACHED();
-  return nullptr;
+  return NULL;
 }

 void ChromeBrowserProcessStub::CreateDevToolsProtocolHandler() {
@@ -267,7 +263,7 @@ ChromeBrowserProcessStub::background_printing_manager() {
 IntranetRedirectDetector*
 ChromeBrowserProcessStub::intranet_redirect_detector() {
  NOTREACHED();
-  return nullptr;
+  return NULL;
 }

 const std::string& ChromeBrowserProcessStub::GetApplicationLocale() {
@@ -281,17 +277,17 @@ void ChromeBrowserProcessStub::SetApplicationLocale(const std::string& locale) {

 DownloadStatusUpdater* ChromeBrowserProcessStub::download_status_updater() {
  NOTREACHED();
-  return nullptr;
+  return NULL;
 }

 DownloadRequestLimiter* ChromeBrowserProcessStub::download_request_limiter() {
  NOTREACHED();
-  return nullptr;
+  return NULL;
 }

 BackgroundModeManager* ChromeBrowserProcessStub::background_mode_manager() {
  NOTREACHED();
-  return nullptr;
+  return NULL;
 }

 void ChromeBrowserProcessStub::set_background_mode_manager_for_test(
@@ -301,35 +297,35 @@ void ChromeBrowserProcessStub::set_background_mode_manager_for_test(

 StatusTray* ChromeBrowserProcessStub::status_tray() {
  NOTREACHED();
-  return nullptr;
+  return NULL;
 }

 safe_browsing::SafeBrowsingService*
 ChromeBrowserProcessStub::safe_browsing_service() {
-  return nullptr;
+  return NULL;
 }

 safe_browsing::ClientSideDetectionService*
 ChromeBrowserProcessStub::safe_browsing_detection_service() {
  NOTREACHED();
-  return nullptr;
+  return NULL;
 }

 subresource_filter::RulesetService*
 ChromeBrowserProcessStub::subresource_filter_ruleset_service() {
  NOTREACHED();
-  return nullptr;
+  return NULL;
 }

 optimization_guide::OptimizationGuideService*
 ChromeBrowserProcessStub::optimization_guide_service() {
  NOTREACHED();
-  return nullptr;
+  return NULL;
 }

 StartupData* ChromeBrowserProcessStub::startup_data() {
  NOTREACHED();
-  return nullptr;
+  return NULL;
 }

 #if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
@@ -339,43 +335,38 @@ void ChromeBrowserProcessStub::StartAutoupdateTimer() {}
 component_updater::ComponentUpdateService*
 ChromeBrowserProcessStub::component_updater() {
  NOTREACHED();
-  return nullptr;
+  return NULL;
 }

 MediaFileSystemRegistry*
 ChromeBrowserProcessStub::media_file_system_registry() {
  NOTREACHED();
-  return nullptr;
+  return NULL;
 }

 WebRtcLogUploader* ChromeBrowserProcessStub::webrtc_log_uploader() {
  NOTREACHED();
-  return nullptr;
+  return NULL;
 }

 network_time::NetworkTimeTracker*
 ChromeBrowserProcessStub::network_time_tracker() {
  NOTREACHED();
-  return nullptr;
+  return NULL;
 }

 gcm::GCMDriver* ChromeBrowserProcessStub::gcm_driver() {
  NOTREACHED();
-  return nullptr;
+  return NULL;
 }

 resource_coordinator::TabManager* ChromeBrowserProcessStub::GetTabManager() {
  NOTREACHED();
-  return nullptr;
+  return NULL;
 }

 resource_coordinator::ResourceCoordinatorParts*
 ChromeBrowserProcessStub::resource_coordinator_parts() {
  NOTREACHED();
-  return nullptr;
-}
-
-BuildState* ChromeBrowserProcessStub::GetBuildState() {
-  NOTREACHED();
-  return nullptr;
+  return NULL;
 }
--- a/libcef/browser/chrome_browser_process_stub.h
+++ b/libcef/browser/chrome_browser_process_stub.h
@@ -98,7 +98,6 @@ class ChromeBrowserProcessStub : public BrowserProcess {
  resource_coordinator::TabManager* GetTabManager() override;
  resource_coordinator::ResourceCoordinatorParts* resource_coordinator_parts()
      override;
-  BuildState* GetBuildState() override;

 private:
  bool initialized_;
--- a/libcef/browser/chrome_profile_stub.cc
+++ b/libcef/browser/chrome_profile_stub.cc
@@ -5,35 +5,9 @@

 #include "libcef/browser/chrome_profile_stub.h"

-#include "components/variations/variations_client.h"
-#include "components/variations/variations_http_header_provider.h"
 #include "content/public/browser/resource_context.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 IsIncognito() const override {
-    return browser_context_->IsOffTheRecord();
-  }
-
-  std::string GetVariationsHeader() const override {
-    return variations::VariationsHttpHeaderProvider::GetInstance()
-        ->GetClientDataHeader(false /* is_signed_in */);
-  }
-
- private:
-  content::BrowserContext* browser_context_;
-};
-
-}  // namespace
-
 ChromeProfileStub::ChromeProfileStub() {}

 ChromeProfileStub::~ChromeProfileStub() {}
@@ -46,12 +20,6 @@ bool ChromeProfileStub::IsOffTheRecord() const {
  return false;
 }

-variations::VariationsClient* ChromeProfileStub::GetVariationsClient() {
-  if (!variations_client_)
-    variations_client_ = std::make_unique<CefVariationsClient>(this);
-  return variations_client_.get();
-}
-
 scoped_refptr<base::SequencedTaskRunner> ChromeProfileStub::GetIOTaskRunner() {
  NOTREACHED();
  return scoped_refptr<base::SequencedTaskRunner>();
@@ -68,7 +36,7 @@ Profile::ProfileType ChromeProfileStub::GetProfileType() const {

 Profile* ChromeProfileStub::GetOffTheRecordProfile() {
  NOTREACHED();
-  return nullptr;
+  return NULL;
 }

 void ChromeProfileStub::DestroyOffTheRecordProfile() {
@@ -102,12 +70,12 @@ bool ChromeProfileStub::IsLegacySupervised() const {
 ExtensionSpecialStoragePolicy*
 ChromeProfileStub::GetExtensionSpecialStoragePolicy() {
  NOTREACHED();
-  return nullptr;
+  return NULL;
 }

 PrefService* ChromeProfileStub::GetOffTheRecordPrefs() {
  NOTREACHED();
-  return nullptr;
+  return NULL;
 }

 bool ChromeProfileStub::IsSameProfile(Profile* profile) {
--- a/libcef/browser/chrome_profile_stub.h
+++ b/libcef/browser/chrome_profile_stub.h
@@ -22,7 +22,6 @@ class ChromeProfileStub : public Profile {
  // Profile methods.
  bool IsOffTheRecord() override;
  bool IsOffTheRecord() const override;
-  variations::VariationsClient* GetVariationsClient() override;
  scoped_refptr<base::SequencedTaskRunner> GetIOTaskRunner() override;
  std::string GetProfileUserName() const override;
  ProfileType GetProfileType() const override;
@@ -49,8 +48,6 @@ class ChromeProfileStub : public Profile {
  void SetCreationTimeForTesting(base::Time creation_time) override;

 private:
-  std::unique_ptr<variations::VariationsClient> variations_client_;
-
  DISALLOW_COPY_AND_ASSIGN(ChromeProfileStub);
 };

--- a/libcef/browser/content_browser_client.cc
+++ b/libcef/browser/content_browser_client.cc
@@ -39,6 +39,7 @@
 #include "libcef/common/net/scheme_registration.h"
 #include "libcef/common/request_impl.h"
 #include "libcef/common/service_manifests/cef_content_browser_overlay_manifest.h"
+#include "libcef/common/service_manifests/cef_content_renderer_overlay_manifest.h"

 #include "base/base_switches.h"
 #include "base/command_line.h"
@@ -77,6 +78,7 @@
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_ppapi_host.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/public/browser/child_process_security_policy.h"
 #include "content/public/browser/client_certificate_delegate.h"
 #include "content/public/browser/navigation_handle.h"
 #include "content/public/browser/overlay_window.h"
@@ -101,7 +103,7 @@
 #include "extensions/browser/extensions_browser_client.h"
 #include "extensions/browser/guest_view/extensions_guest_view_message_filter.h"
 #include "extensions/browser/guest_view/web_view/web_view_guest.h"
-#include "extensions/browser/url_loader_factory_manager.h"
+#include "extensions/browser/io_thread_extension_message_filter.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/switches.h"
 #include "mojo/public/cpp/bindings/remote.h"
@@ -115,8 +117,6 @@
 #include "services/service_manager/public/mojom/connector.mojom.h"
 #include "services/service_manager/sandbox/switches.h"
 #include "storage/browser/quota/quota_settings.h"
-#include "third_party/blink/public/mojom/insecure_input/insecure_input_service.mojom.h"
-#include "third_party/blink/public/mojom/prerender/prerender.mojom.h"
 #include "third_party/blink/public/web/web_window_features.h"
 #include "third_party/widevine/cdm/buildflags.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -131,25 +131,20 @@
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
 #include "base/debug/leak_annotations.h"
 #include "chrome/common/chrome_paths.h"
+#include "components/crash/content/app/breakpad_linux.h"
 #include "components/crash/content/browser/crash_handler_host_linux.h"
-#include "components/crash/core/app/breakpad_linux.h"
 #include "content/public/common/content_descriptors.h"
 #endif

 #if defined(OS_MACOSX)
-#include "net/ssl/client_cert_store_mac.h"
+#include "services/audio/public/mojom/constants.mojom.h"
 #include "services/video_capture/public/mojom/constants.mojom.h"
 #endif

 #if defined(OS_WIN)
-#include "net/ssl/client_cert_store_win.h"
 #include "sandbox/win/src/sandbox_policy.h"
 #endif

-#if defined(USE_NSS_CERTS)
-#include "net/ssl/client_cert_store_nss.h"
-#endif
-
 #if BUILDFLAG(HAS_SPELLCHECK_PANEL)
 #include "chrome/browser/spellchecker/spell_check_panel_host_impl.h"
 #endif
@@ -158,19 +153,18 @@ namespace {

 class CefQuotaCallbackImpl : public CefRequestCallback {
 public:
-  using CallbackType = content::QuotaPermissionContext::PermissionCallback;
-
-  explicit CefQuotaCallbackImpl(CallbackType callback)
-      : callback_(std::move(callback)) {}
+  explicit CefQuotaCallbackImpl(
+      const content::QuotaPermissionContext::PermissionCallback& callback)
+      : callback_(callback) {}

  ~CefQuotaCallbackImpl() {
    if (!callback_.is_null()) {
      // The callback is still pending. Cancel it now.
      if (CEF_CURRENTLY_ON_IOT()) {
-        RunNow(std::move(callback_), false);
+        RunNow(callback_, false);
      } else {
-        CEF_POST_TASK(CEF_IOT, base::BindOnce(&CefQuotaCallbackImpl::RunNow,
-                                              std::move(callback_), false));
+        CEF_POST_TASK(CEF_IOT, base::Bind(&CefQuotaCallbackImpl::RunNow,
+                                          callback_, false));
      }
    }
  }
@@ -178,28 +172,31 @@ class CefQuotaCallbackImpl : public CefRequestCallback {
  void Continue(bool allow) override {
    if (CEF_CURRENTLY_ON_IOT()) {
      if (!callback_.is_null()) {
-        RunNow(std::move(callback_), allow);
+        RunNow(callback_, allow);
+        callback_.Reset();
      }
    } else {
-      CEF_POST_TASK(CEF_IOT, base::BindOnce(&CefQuotaCallbackImpl::Continue,
-                                            this, allow));
+      CEF_POST_TASK(CEF_IOT,
+                    base::Bind(&CefQuotaCallbackImpl::Continue, this, allow));
    }
  }

  void Cancel() override { Continue(false); }

-  CallbackType Disconnect() WARN_UNUSED_RESULT { return std::move(callback_); }
+  void Disconnect() { callback_.Reset(); }

 private:
-  static void RunNow(CallbackType callback, bool allow) {
+  static void RunNow(
+      const content::QuotaPermissionContext::PermissionCallback& callback,
+      bool allow) {
    CEF_REQUIRE_IOT();
-    std::move(callback).Run(
+    callback.Run(
        allow ? content::QuotaPermissionContext::QUOTA_PERMISSION_RESPONSE_ALLOW
              : content::QuotaPermissionContext::
                    QUOTA_PERMISSION_RESPONSE_DISALLOW);
  }

-  CallbackType callback_;
+  content::QuotaPermissionContext::PermissionCallback callback_;

  IMPLEMENT_REFCOUNTING(CefQuotaCallbackImpl);
  DISALLOW_COPY_AND_ASSIGN(CefQuotaCallbackImpl);
@@ -207,22 +204,21 @@ class CefQuotaCallbackImpl : public CefRequestCallback {

 class CefAllowCertificateErrorCallbackImpl : public CefRequestCallback {
 public:
-  typedef base::OnceCallback<void(content::CertificateRequestResultType)>
+  typedef base::Callback<void(content::CertificateRequestResultType)>
      CallbackType;

-  explicit CefAllowCertificateErrorCallbackImpl(CallbackType callback)
-      : callback_(std::move(callback)) {}
+  explicit CefAllowCertificateErrorCallbackImpl(const CallbackType& callback)
+      : callback_(callback) {}

  ~CefAllowCertificateErrorCallbackImpl() {
    if (!callback_.is_null()) {
      // The callback is still pending. Cancel it now.
      if (CEF_CURRENTLY_ON_UIT()) {
-        RunNow(std::move(callback_), false);
+        RunNow(callback_, false);
      } else {
-        CEF_POST_TASK(
-            CEF_UIT,
-            base::BindOnce(&CefAllowCertificateErrorCallbackImpl::RunNow,
-                           std::move(callback_), false));
+        CEF_POST_TASK(CEF_UIT,
+                      base::Bind(&CefAllowCertificateErrorCallbackImpl::RunNow,
+                                 callback_, false));
      }
    }
  }
@@ -230,7 +226,8 @@ class CefAllowCertificateErrorCallbackImpl : public CefRequestCallback {
  void Continue(bool allow) override {
    if (CEF_CURRENTLY_ON_UIT()) {
      if (!callback_.is_null()) {
-        RunNow(std::move(callback_), allow);
+        RunNow(callback_, allow);
+        callback_.Reset();
      }
    } else {
      CEF_POST_TASK(CEF_UIT,
@@ -241,14 +238,13 @@ class CefAllowCertificateErrorCallbackImpl : public CefRequestCallback {

  void Cancel() override { Continue(false); }

-  CallbackType Disconnect() WARN_UNUSED_RESULT { return std::move(callback_); }
+  void Disconnect() { callback_.Reset(); }

 private:
-  static void RunNow(CallbackType callback, bool allow) {
+  static void RunNow(const CallbackType& callback, bool allow) {
    CEF_REQUIRE_UIT();
-    std::move(callback).Run(
-        allow ? content::CERTIFICATE_REQUEST_RESULT_TYPE_CONTINUE
-              : content::CERTIFICATE_REQUEST_RESULT_TYPE_CANCEL);
+    callback.Run(allow ? content::CERTIFICATE_REQUEST_RESULT_TYPE_CONTINUE
+                       : content::CERTIFICATE_REQUEST_RESULT_TYPE_CANCEL);
  }

  CallbackType callback_;
@@ -268,7 +264,7 @@ class CefSelectClientCertificateCallbackImpl
    // If Select has not been called, call it with NULL to continue without any
    // client certificate.
    if (delegate_)
-      DoSelect(nullptr);
+      DoSelect(NULL);
  }

  void Select(CefRefPtr<CefX509Certificate> cert) override {
@@ -281,10 +277,9 @@ class CefSelectClientCertificateCallbackImpl
    if (CEF_CURRENTLY_ON_UIT()) {
      RunNow(std::move(delegate_), cert);
    } else {
-      CEF_POST_TASK(
-          CEF_UIT,
-          base::BindOnce(&CefSelectClientCertificateCallbackImpl::RunNow,
-                         std::move(delegate_), cert));
+      CEF_POST_TASK(CEF_UIT,
+                    base::Bind(&CefSelectClientCertificateCallbackImpl::RunNow,
+                               base::Passed(std::move(delegate_)), cert));
    }
  }

@@ -296,9 +291,9 @@ class CefSelectClientCertificateCallbackImpl
    if (cert) {
      CefX509CertificateImpl* certImpl =
          static_cast<CefX509CertificateImpl*>(cert.get());
-      certImpl->AcquirePrivateKey(base::BindOnce(
-          &CefSelectClientCertificateCallbackImpl::RunWithPrivateKey,
-          std::move(delegate), cert));
+      certImpl->AcquirePrivateKey(
+          base::Bind(&CefSelectClientCertificateCallbackImpl::RunWithPrivateKey,
+                     base::Passed(std::move(delegate)), cert));
      return;
    }

@@ -334,11 +329,11 @@ class CefQuotaPermissionContext : public content::QuotaPermissionContext {
  // The callback will be dispatched on the IO thread.
  void RequestQuotaPermission(const content::StorageQuotaParams& params,
                              int render_process_id,
-                              PermissionCallback callback) override {
+                              const PermissionCallback& callback) override {
    if (params.storage_type != blink::mojom::StorageType::kPersistent) {
      // To match Chrome behavior we only support requesting quota with this
      // interface for Persistent storage type.
-      std::move(callback).Run(QUOTA_PERMISSION_RESPONSE_DISALLOW);
+      callback.Run(QUOTA_PERMISSION_RESPONSE_DISALLOW);
      return;
    }

@@ -353,22 +348,19 @@ class CefQuotaPermissionContext : public content::QuotaPermissionContext {
        CefRefPtr<CefRequestHandler> handler = client->GetRequestHandler();
        if (handler.get()) {
          CefRefPtr<CefQuotaCallbackImpl> callbackImpl(
-              new CefQuotaCallbackImpl(std::move(callback)));
+              new CefQuotaCallbackImpl(callback));
          handled = handler->OnQuotaRequest(
              browser.get(), params.origin_url.spec(), params.requested_size,
              callbackImpl.get());
-          if (!handled) {
-            // May return nullptr if the client has already executed the
-            // callback.
-            callback = callbackImpl->Disconnect();
-          }
+          if (!handled)
+            callbackImpl->Disconnect();
        }
      }
    }

-    if (!handled && !callback.is_null()) {
+    if (!handled) {
      // Disallow the request by default.
-      std::move(callback).Run(QUOTA_PERMISSION_RESPONSE_DISALLOW);
+      callback.Run(QUOTA_PERMISSION_RESPONSE_DISALLOW);
    }
  }

@@ -401,7 +393,7 @@ int GetCrashSignalFD(const base::CommandLine& command_line) {

  // Extensions have the same process type as renderers.
  if (command_line.HasSwitch(extensions::switches::kExtensionProcess)) {
-    static breakpad::CrashHandlerHostLinux* crash_handler = nullptr;
+    static breakpad::CrashHandlerHostLinux* crash_handler = NULL;
    if (!crash_handler)
      crash_handler = CreateCrashHandlerHost("extension");
    return crash_handler->GetDeathSignalSocket();
@@ -411,21 +403,21 @@ int GetCrashSignalFD(const base::CommandLine& command_line) {
      command_line.GetSwitchValueASCII(switches::kProcessType);

  if (process_type == switches::kRendererProcess) {
-    static breakpad::CrashHandlerHostLinux* crash_handler = nullptr;
+    static breakpad::CrashHandlerHostLinux* crash_handler = NULL;
    if (!crash_handler)
      crash_handler = CreateCrashHandlerHost(process_type);
    return crash_handler->GetDeathSignalSocket();
  }

  if (process_type == switches::kPpapiPluginProcess) {
-    static breakpad::CrashHandlerHostLinux* crash_handler = nullptr;
+    static breakpad::CrashHandlerHostLinux* crash_handler = NULL;
    if (!crash_handler)
      crash_handler = CreateCrashHandlerHost(process_type);
    return crash_handler->GetDeathSignalSocket();
  }

  if (process_type == switches::kGpuProcess) {
-    static breakpad::CrashHandlerHostLinux* crash_handler = nullptr;
+    static breakpad::CrashHandlerHostLinux* crash_handler = NULL;
    if (!crash_handler)
      crash_handler = CreateCrashHandlerHost(process_type);
    return crash_handler->GetDeathSignalSocket();
@@ -507,34 +499,9 @@ void BindPluginInfoHost(
      std::move(receiver));
 }

-base::FilePath GetRootCachePath() {
-  // The CefContext::ValidateCachePath method enforces the requirement that all
-  // cache_path values be either equal to or a child of root_cache_path.
-  return base::FilePath(
-      CefString(&CefContext::Get()->settings().root_cache_path));
-}
-
-// Register BrowserInterfaceBroker's GetInterface() handler callbacks for
-// chrome-specific document-scoped interfaces.
-// Stub implementations to silence "Empty binder for interface
-// blink.mojom.[Name] for the frame/document scope" errors.
-// Based on chrome/browser/chrome_browser_interface_binders.cc.
-void PopulateChromeFrameBinders(
-    service_manager::BinderMapWithContext<content::RenderFrameHost*>* map) {
-  map->Add<blink::mojom::InsecureInputService>(base::BindRepeating(
-      [](content::RenderFrameHost* frame_host,
-         mojo::PendingReceiver<blink::mojom::InsecureInputService> receiver) {
-      }));
-
-  map->Add<blink::mojom::PrerenderProcessor>(base::BindRepeating(
-      [](content::RenderFrameHost* frame_host,
-         mojo::PendingReceiver<blink::mojom::PrerenderProcessor> receiver) {}));
-}
-
 }  // namespace

-CefContentBrowserClient::CefContentBrowserClient()
-    : browser_main_parts_(nullptr) {
+CefContentBrowserClient::CefContentBrowserClient() : browser_main_parts_(NULL) {
  plugin_service_filter_.reset(new CefPluginServiceFilter);
  content::PluginServiceImpl::GetInstance()->SetFilter(
      plugin_service_filter_.get());
@@ -567,6 +534,7 @@ void CefContentBrowserClient::RenderProcessWillLaunch(

  if (extensions::ExtensionsEnabled()) {
    host->AddFilter(new extensions::ExtensionMessageFilter(id, profile));
+    host->AddFilter(new extensions::IOThreadExtensionMessageFilter());
    host->AddFilter(
        new extensions::ExtensionsGuestViewMessageFilter(id, profile));
  }
@@ -626,17 +594,6 @@ bool CefContentBrowserClient::DoesSiteRequireDedicatedProcess(
  return extension != nullptr;
 }

-void CefContentBrowserClient::OverrideURLLoaderFactoryParams(
-    content::BrowserContext* browser_context,
-    const url::Origin& origin,
-    bool is_for_isolated_world,
-    network::mojom::URLLoaderFactoryParams* factory_params) {
-  if (extensions::ExtensionsEnabled()) {
-    extensions::URLLoaderFactoryManager::OverrideURLLoaderFactoryParams(
-        browser_context, origin, is_for_isolated_world, factory_params);
-  }
-}
-
 void CefContentBrowserClient::GetAdditionalWebUISchemes(
    std::vector<std::string>* additional_schemes) {
  // Any schemes listed here are treated as WebUI schemes but do not get WebUI
@@ -755,6 +712,8 @@ base::Optional<service_manager::Manifest>
 CefContentBrowserClient::GetServiceManifestOverlay(base::StringPiece name) {
  if (name == content::mojom::kBrowserServiceName) {
    return GetCefContentBrowserOverlayManifest();
+  } else if (name == content::mojom::kRendererServiceName) {
+    return GetCefContentRendererOverlayManifest();
  }

  return base::nullopt;
@@ -876,11 +835,23 @@ void CefContentBrowserClient::AppendExtraCommandLineSwitches(
      CefRefPtr<CefCommandLineImpl> commandLinePtr(
          new CefCommandLineImpl(command_line, false, false));
      handler->OnBeforeChildProcessLaunch(commandLinePtr.get());
-      commandLinePtr->Detach(nullptr);
+      commandLinePtr->Detach(NULL);
    }
  }
 }

+void CefContentBrowserClient::AdjustUtilityServiceProcessCommandLine(
+    const service_manager::Identity& identity,
+    base::CommandLine* command_line) {
+#if defined(OS_MACOSX)
+  // On Mac, the video-capture and audio services require a CFRunLoop, provided
+  // by a UI message loop, to run AVFoundation and CoreAudio code.
+  // See https://crbug.com/834581
+  if (identity.name() == audio::mojom::kServiceName)
+    command_line->AppendSwitch(switches::kMessageLoopTypeUi);
+#endif
+}
+
 std::string CefContentBrowserClient::GetApplicationLocale() {
  return g_browser_process->GetApplicationLocale();
 }
@@ -910,6 +881,16 @@ CefContentBrowserClient::CreateQuotaPermissionContext() {
  return new CefQuotaPermissionContext();
 }

+void CefContentBrowserClient::GetQuotaSettings(
+    content::BrowserContext* context,
+    content::StoragePartition* partition,
+    base::OnceCallback<void(base::Optional<storage::QuotaSettings>)> callback) {
+  const base::FilePath& cache_path = partition->GetPath();
+  storage::GetNominalDynamicSettings(
+      cache_path, cache_path.empty() /* is_incognito */,
+      storage::GetDefaultDiskInfoHelper(), std::move(callback));
+}
+
 content::MediaObserver* CefContentBrowserClient::GetMediaObserver() {
  return CefMediaCaptureDevicesDispatcher::GetInstance();
 }
@@ -921,7 +902,7 @@ CefContentBrowserClient::CreateSpeechRecognitionManagerDelegate() {
  if (command_line->HasSwitch(switches::kEnableSpeechInput))
    return new CefSpeechRecognitionManagerDelegate();

-  return nullptr;
+  return NULL;
 }

 content::GeneratedCodeCacheSettings
@@ -942,14 +923,15 @@ void CefContentBrowserClient::AllowCertificateError(
    const GURL& request_url,
    bool is_main_frame_request,
    bool strict_enforcement,
-    base::OnceCallback<void(content::CertificateRequestResultType)> callback) {
+    const base::Callback<void(content::CertificateRequestResultType)>&
+        callback) {
  CEF_REQUIRE_UIT();

  if (!is_main_frame_request) {
    // A sub-resource has a certificate error. The user doesn't really
    // have a context for making the right decision, so block the request
    // hard.
-    std::move(callback).Run(content::CERTIFICATE_REQUEST_RESULT_TYPE_CANCEL);
+    callback.Run(content::CERTIFICATE_REQUEST_RESULT_TYPE_CANCEL);
    return;
  }

@@ -967,17 +949,14 @@ void CefContentBrowserClient::AllowCertificateError(
  CefRefPtr<CefSSLInfo> cef_ssl_info = new CefSSLInfoImpl(ssl_info);

  CefRefPtr<CefAllowCertificateErrorCallbackImpl> callbackImpl(
-      new CefAllowCertificateErrorCallbackImpl(std::move(callback)));
+      new CefAllowCertificateErrorCallbackImpl(callback));

  bool proceed = handler->OnCertificateError(
      browser.get(), static_cast<cef_errorcode_t>(cert_error),
      request_url.spec(), cef_ssl_info, callbackImpl.get());
  if (!proceed) {
-    // |callback| may be null if the user executed it despite returning false.
-    callback = callbackImpl->Disconnect();
-    if (!callback.is_null()) {
-      std::move(callback).Run(content::CERTIFICATE_REQUEST_RESULT_TYPE_CANCEL);
-    }
+    callbackImpl->Disconnect();
+    callback.Run(content::CERTIFICATE_REQUEST_RESULT_TYPE_CANCEL);
  }
 }

@@ -1125,13 +1104,16 @@ CefContentBrowserClient::CreateURLLoaderThrottles(
      request.resource_type, frame_tree_node_id));

  Profile* profile = Profile::FromBrowserContext(browser_context);
+  bool is_off_the_record = profile->IsOffTheRecord();

  chrome::mojom::DynamicParams dynamic_params = {
      profile->GetPrefs()->GetBoolean(prefs::kForceGoogleSafeSearch),
      profile->GetPrefs()->GetInteger(prefs::kForceYouTubeRestrict),
-      profile->GetPrefs()->GetString(prefs::kAllowedDomainsForApps)};
-  result.push_back(
-      std::make_unique<GoogleURLLoaderThrottle>(std::move(dynamic_params)));
+      profile->GetPrefs()->GetString(prefs::kAllowedDomainsForApps),
+      variations::VariationsHttpHeaderProvider::GetInstance()
+          ->GetClientDataHeader(false /* is_signed_in */)};
+  result.push_back(std::make_unique<GoogleURLLoaderThrottle>(
+      is_off_the_record, std::move(dynamic_params)));

  return result;
 }
@@ -1181,19 +1163,11 @@ void CefContentBrowserClient::ExposeInterfacesToRenderer(

 std::unique_ptr<net::ClientCertStore>
 CefContentBrowserClient::CreateClientCertStore(
-    content::BrowserContext* browser_context) {
-  // Match the logic in ProfileNetworkContextService::CreateClientCertStore.
-#if defined(USE_NSS_CERTS)
-  // TODO: Add support for client implementation of crypto password dialog.
-  return std::unique_ptr<net::ClientCertStore>(new net::ClientCertStoreNSS(
-      net::ClientCertStoreNSS::PasswordDelegateFactory()));
-#elif defined(OS_WIN)
-  return std::unique_ptr<net::ClientCertStore>(new net::ClientCertStoreWin());
-#elif defined(OS_MACOSX)
-  return std::unique_ptr<net::ClientCertStore>(new net::ClientCertStoreMac());
-#else
-#error Unknown platform.
-#endif
+    content::ResourceContext* resource_context) {
+  if (!resource_context)
+    return nullptr;
+  return static_cast<CefResourceContext*>(resource_context)
+      ->CreateClientCertStore();
 }

 std::unique_ptr<content::LoginDelegate>
@@ -1282,13 +1256,10 @@ bool CefContentBrowserClient::WillCreateURLLoaderFactory(
    int render_process_id,
    URLLoaderFactoryType type,
    const url::Origin& request_initiator,
-    base::Optional<int64_t> navigation_id,
    mojo::PendingReceiver<network::mojom::URLLoaderFactory>* factory_receiver,
    mojo::PendingRemote<network::mojom::TrustedURLLoaderHeaderClient>*
        header_client,
-    bool* bypass_redirect_checks,
-    bool* disable_secure_dns,
-    network::mojom::URLLoaderFactoryOverridePtr* factory_override) {
+    bool* bypass_redirect_checks) {
  auto request_handler = net_service::CreateInterceptedRequestHandler(
      browser_context, frame, render_process_id,
      type == URLLoaderFactoryType::kNavigation,
@@ -1334,7 +1305,10 @@ CefContentBrowserClient::GetNetworkContextsParentDirectory() {
  base::PathService::Get(chrome::DIR_USER_DATA, &user_data_path);
  DCHECK(!user_data_path.empty());

-  const auto& root_cache_path = GetRootCachePath();
+  // The CefContext::ValidateCachePath method enforces the requirement that all
+  // cache_path values be either equal to or a child of root_cache_path.
+  const base::FilePath& root_cache_path =
+      base::FilePath(CefString(&CefContext::Get()->settings().root_cache_path));

  // root_cache_path may sometimes be empty or a child of user_data_path, so
  // only return the one path in that case.
@@ -1347,14 +1321,14 @@ CefContentBrowserClient::GetNetworkContextsParentDirectory() {

 bool CefContentBrowserClient::HandleExternalProtocol(
    const GURL& url,
-    base::OnceCallback<content::WebContents*()> web_contents_getter,
+    base::Callback<content::WebContents*(void)> web_contents_getter,
    int child_id,
    content::NavigationUIData* navigation_data,
    bool is_main_frame,
    ui::PageTransition page_transition,
    bool has_user_gesture,
    const base::Optional<url::Origin>& initiating_origin,
-    mojo::PendingRemote<network::mojom::URLLoaderFactory>* out_factory) {
+    network::mojom::URLLoaderFactoryPtr* out_factory) {
  // Call the other HandleExternalProtocol variant.
  return false;
 }
@@ -1364,34 +1338,32 @@ bool CefContentBrowserClient::HandleExternalProtocol(
    int frame_tree_node_id,
    content::NavigationUIData* navigation_data,
    const network::ResourceRequest& resource_request,
-    mojo::PendingRemote<network::mojom::URLLoaderFactory>* out_factory) {
-  mojo::PendingReceiver<network::mojom::URLLoaderFactory> receiver =
-      out_factory->InitWithNewPipeAndPassReceiver();
+    network::mojom::URLLoaderFactoryPtr* out_factory) {
+  auto request = mojo::MakeRequest(out_factory);
  // CefBrowserPlatformDelegate::HandleExternalProtocol may be called if
  // nothing handles the request.
  if (CEF_CURRENTLY_ON_IOT()) {
    auto request_handler = net_service::CreateInterceptedRequestHandler(
        web_contents_getter, frame_tree_node_id, resource_request);
    net_service::ProxyURLLoaderFactory::CreateProxy(
-        web_contents_getter, std::move(receiver), std::move(request_handler));
+        web_contents_getter, std::move(request), std::move(request_handler));
  } else {
    auto request_handler = net_service::CreateInterceptedRequestHandler(
        web_contents_getter, frame_tree_node_id, resource_request);
-    CEF_POST_TASK(
-        CEF_IOT,
-        base::BindOnce(
-            [](mojo::PendingReceiver<network::mojom::URLLoaderFactory> receiver,
-               std::unique_ptr<net_service::InterceptedRequestHandler>
-                   request_handler,
-               content::WebContents::Getter web_contents_getter) {
-              // Manages its own lifetime.
+    CEF_POST_TASK(CEF_IOT,
+                  base::BindOnce(
+                      [](network::mojom::URLLoaderFactoryRequest request,
+                         std::unique_ptr<net_service::InterceptedRequestHandler>
+                             request_handler,
+                         content::WebContents::Getter web_contents_getter) {
+                        // Manages its own lifetime.

-              net_service::ProxyURLLoaderFactory::CreateProxy(
-                  web_contents_getter, std::move(receiver),
-                  std::move(request_handler));
-            },
-            std::move(receiver), std::move(request_handler),
-            std::move(web_contents_getter)));
+                        net_service::ProxyURLLoaderFactory::CreateProxy(
+                            web_contents_getter, std::move(request),
+                            std::move(request_handler));
+                      },
+                      std::move(request), std::move(request_handler),
+                      std::move(web_contents_getter)));
  }
  return true;
 }
@@ -1408,40 +1380,6 @@ CefContentBrowserClient::CreateWindowForPictureInPicture(
  return content::OverlayWindow::Create(controller);
 }

-void CefContentBrowserClient::RegisterBrowserInterfaceBindersForFrame(
-    content::RenderFrameHost* render_frame_host,
-    service_manager::BinderMapWithContext<content::RenderFrameHost*>* map) {
-  PopulateChromeFrameBinders(map);
-
-  if (!extensions::ExtensionsEnabled())
-    return;
-
-  content::WebContents* web_contents =
-      content::WebContents::FromRenderFrameHost(render_frame_host);
-  if (!web_contents)
-    return;
-
-  const GURL& site = render_frame_host->GetSiteInstance()->GetSiteURL();
-  if (!site.SchemeIs(extensions::kExtensionScheme))
-    return;
-
-  content::BrowserContext* browser_context =
-      render_frame_host->GetProcess()->GetBrowserContext();
-  auto* extension = extensions::ExtensionRegistry::Get(browser_context)
-                        ->enabled_extensions()
-                        .GetByID(site.host());
-  if (!extension)
-    return;
-  extensions::ExtensionsBrowserClient::Get()
-      ->RegisterBrowserInterfaceBindersForFrame(map, render_frame_host,
-                                                extension);
-}
-
-base::FilePath
-CefContentBrowserClient::GetSandboxedStorageServiceDataDirectory() {
-  return GetRootCachePath();
-}
-
 std::string CefContentBrowserClient::GetProduct() {
  // Match the logic in chrome_content_browser_client.cc GetProduct().
  return ::GetProduct();
@@ -1480,6 +1418,16 @@ CefContentBrowserClient::GetPluginMimeTypesWithExternalHandlers(
  return mime_types;
 }

+void CefContentBrowserClient::RegisterCustomScheme(const std::string& scheme) {
+  // Register as a Web-safe scheme so that requests for the scheme from a
+  // render process will be allowed in resource_dispatcher_host_impl.cc
+  // ShouldServiceRequest.
+  content::ChildProcessSecurityPolicy* policy =
+      content::ChildProcessSecurityPolicy::GetInstance();
+  if (!policy->IsWebSafeScheme(scheme))
+    policy->RegisterWebSafeScheme(scheme);
+}
+
 CefRefPtr<CefRequestContextImpl> CefContentBrowserClient::request_context()
    const {
  return browser_main_parts_->request_context();
--- a/libcef/browser/content_browser_client.h
+++ b/libcef/browser/content_browser_client.h
@@ -46,11 +46,6 @@ class CefContentBrowserClient : public content::ContentBrowserClient {
                               const GURL& effective_url) override;
  bool DoesSiteRequireDedicatedProcess(content::BrowserContext* browser_context,
                                       const GURL& effective_site_url) override;
-  void OverrideURLLoaderFactoryParams(
-      content::BrowserContext* browser_context,
-      const url::Origin& origin,
-      bool is_for_isolated_world,
-      network::mojom::URLLoaderFactoryParams* factory_params) override;
  void GetAdditionalWebUISchemes(
      std::vector<std::string>* additional_schemes) override;
  void GetAdditionalViewSourceSchemes(
@@ -68,12 +63,20 @@ class CefContentBrowserClient : public content::ContentBrowserClient {
      base::StringPiece name) override;
  void AppendExtraCommandLineSwitches(base::CommandLine* command_line,
                                      int child_process_id) override;
+  void AdjustUtilityServiceProcessCommandLine(
+      const service_manager::Identity& identity,
+      base::CommandLine* command_line) override;
  std::string GetApplicationLocale() override;
  scoped_refptr<network::SharedURLLoaderFactory>
  GetSystemSharedURLLoaderFactory() override;
  network::mojom::NetworkContext* GetSystemNetworkContext() override;
  scoped_refptr<content::QuotaPermissionContext> CreateQuotaPermissionContext()
      override;
+  void GetQuotaSettings(
+      content::BrowserContext* context,
+      content::StoragePartition* partition,
+      base::OnceCallback<void(base::Optional<storage::QuotaSettings>)> callback)
+      override;
  content::MediaObserver* GetMediaObserver() override;
  content::SpeechRecognitionManagerDelegate*
  CreateSpeechRecognitionManagerDelegate() override;
@@ -86,8 +89,8 @@ class CefContentBrowserClient : public content::ContentBrowserClient {
      const GURL& request_url,
      bool is_main_frame_request,
      bool strict_enforcement,
-      base::OnceCallback<void(content::CertificateRequestResultType)> callback)
-      override;
+      const base::Callback<void(content::CertificateRequestResultType)>&
+          callback) override;
  base::OnceClosure SelectClientCertificate(
      content::WebContents* web_contents,
      net::SSLCertRequestInfo* cert_request_info,
@@ -141,7 +144,7 @@ class CefContentBrowserClient : public content::ContentBrowserClient {
      blink::AssociatedInterfaceRegistry* associated_registry,
      content::RenderProcessHost* render_process_host) override;
  std::unique_ptr<net::ClientCertStore> CreateClientCertStore(
-      content::BrowserContext* browser_context) override;
+      content::ResourceContext* resource_context) override;
  std::unique_ptr<content::LoginDelegate> CreateLoginDelegate(
      const net::AuthChallengeInfo& auth_info,
      content::WebContents* web_contents,
@@ -164,13 +167,10 @@ class CefContentBrowserClient : public content::ContentBrowserClient {
      int render_process_id,
      URLLoaderFactoryType type,
      const url::Origin& request_initiator,
-      base::Optional<int64_t> navigation_id,
      mojo::PendingReceiver<network::mojom::URLLoaderFactory>* factory_receiver,
      mojo::PendingRemote<network::mojom::TrustedURLLoaderHeaderClient>*
          header_client,
-      bool* bypass_redirect_checks,
-      bool* disable_secure_dns,
-      network::mojom::URLLoaderFactoryOverridePtr* factory_override) override;
+      bool* bypass_redirect_checks) override;
  void OnNetworkServiceCreated(
      network::mojom::NetworkService* network_service) override;
  mojo::Remote<network::mojom::NetworkContext> CreateNetworkContext(
@@ -180,29 +180,23 @@ class CefContentBrowserClient : public content::ContentBrowserClient {
  std::vector<base::FilePath> GetNetworkContextsParentDirectory() override;
  bool HandleExternalProtocol(
      const GURL& url,
-      base::OnceCallback<content::WebContents*()> web_contents_getter,
+      base::Callback<content::WebContents*(void)> web_contents_getter,
      int child_id,
      content::NavigationUIData* navigation_data,
      bool is_main_frame,
      ui::PageTransition page_transition,
      bool has_user_gesture,
      const base::Optional<url::Origin>& initiating_origin,
-      mojo::PendingRemote<network::mojom::URLLoaderFactory>* out_factory)
-      override;
+      network::mojom::URLLoaderFactoryPtr* out_factory) override;
  bool HandleExternalProtocol(
      content::WebContents::Getter web_contents_getter,
      int frame_tree_node_id,
      content::NavigationUIData* navigation_data,
      const network::ResourceRequest& request,
-      mojo::PendingRemote<network::mojom::URLLoaderFactory>* out_factory)
-      override;
+      network::mojom::URLLoaderFactoryPtr* out_factory) override;
  std::unique_ptr<content::OverlayWindow> CreateWindowForPictureInPicture(
      content::PictureInPictureWindowController* controller) override;
-  void RegisterBrowserInterfaceBindersForFrame(
-      content::RenderFrameHost* render_frame_host,
-      service_manager::BinderMapWithContext<content::RenderFrameHost*>* map)
-      override;
-  base::FilePath GetSandboxedStorageServiceDataDirectory() override;
+
  std::string GetProduct() override;
  std::string GetChromeProduct() override;
  std::string GetUserAgent() override;
@@ -210,6 +204,9 @@ class CefContentBrowserClient : public content::ContentBrowserClient {
  base::flat_set<std::string> GetPluginMimeTypesWithExternalHandlers(
      content::BrowserContext* browser_context) override;

+  // Perform browser process registration for the custom scheme.
+  void RegisterCustomScheme(const std::string& scheme);
+
  CefRefPtr<CefRequestContextImpl> request_context() const;
  CefDevToolsDelegate* devtools_delegate() const;

--- a/libcef/browser/context.cc
+++ b/libcef/browser/context.cc
@@ -37,19 +37,19 @@
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/chrome_elf/chrome_elf_main.h"
 #include "chrome/install_static/initialize_from_primary_module.h"
-#include "components/crash/core/app/crashpad.h"
+#include "components/crash/content/app/crashpad.h"
 #include "content/public/app/sandbox_helper_win.h"
 #include "sandbox/win/src/sandbox_types.h"
 #endif

 #if defined(OS_MACOSX) || defined(OS_WIN)
-#include "components/crash/core/app/crash_switches.h"
+#include "components/crash/content/app/crash_switches.h"
 #include "third_party/crashpad/crashpad/handler/handler_main.h"
 #endif

 namespace {

-CefContext* g_context = nullptr;
+CefContext* g_context = NULL;

 #if DCHECK_IS_ON()
 // When the process terminates check if CefShutdown() has been called.
@@ -97,12 +97,12 @@ void InitCrashReporter() {

 #if defined(OS_MACOSX) || defined(OS_WIN)

-// Based on components/crash/core/app/run_as_crashpad_handler_win.cc
+// Based on components/crash/content/app/run_as_crashpad_handler_win.cc
 // Remove the "--type=crashpad-handler" command-line flag that will otherwise
 // confuse the crashpad handler.
 // Chrome uses an embedded crashpad handler on Windows only and imports this
 // function via the existing "run_as_crashpad_handler" target defined in
-// components/crash/core/app/BUILD.gn. CEF uses an embedded handler on both
+// components/crash/content/app/BUILD.gn. CEF uses an embedded handler on both
 // Windows and macOS so we define the function here instead of using the
 // existing target (because we can't use that target on macOS).
 int RunAsCrashpadHandler(const base::CommandLine& command_line) {
@@ -160,85 +160,6 @@ bool GetColor(const cef_color_t cef_in, bool is_windowless, SkColor* sk_out) {
  return true;
 }

-// Convert |path_str| to a normalized FilePath.
-base::FilePath NormalizePath(const cef_string_t& path_str,
-                             const char* name,
-                             bool* has_error = nullptr) {
-  if (has_error)
-    *has_error = false;
-
-  base::FilePath path = base::FilePath(CefString(&path_str));
-  if (path.EndsWithSeparator()) {
-    // Remove the trailing separator because it will interfere with future
-    // equality checks.
-    path = path.StripTrailingSeparators();
-  }
-
-  if (!path.empty() && !path.IsAbsolute()) {
-    LOG(ERROR) << "The " << name << " directory (" << path.value()
-               << ") is not an absolute path. Defaulting to empty.";
-    if (has_error)
-      *has_error = true;
-    path = base::FilePath();
-  }
-
-  return path;
-}
-
-void SetPath(cef_string_t& path_str, const base::FilePath& path) {
-#if defined(OS_WIN)
-  CefString(&path_str).FromWString(path.value());
-#else
-  CefString(&path_str).FromString(path.value());
-#endif
-}
-
-// Convert |path_str| to a normalized FilePath and update the |path_str| value.
-base::FilePath NormalizePathAndSet(cef_string_t& path_str, const char* name) {
-  const base::FilePath& path = NormalizePath(path_str, name);
-  SetPath(path_str, path);
-  return path;
-}
-
-// Verify that |cache_path| is valid and create it if necessary.
-bool ValidateCachePath(const base::FilePath& cache_path,
-                       const base::FilePath& root_cache_path) {
-  if (cache_path.empty())
-    return true;
-
-  if (!root_cache_path.empty() && root_cache_path != cache_path &&
-      !root_cache_path.IsParent(cache_path)) {
-    LOG(ERROR) << "The cache_path directory (" << cache_path.value()
-               << ") is not a child of the root_cache_path directory ("
-               << root_cache_path.value() << ")";
-    return false;
-  }
-
-  base::ThreadRestrictions::ScopedAllowIO allow_io;
-  if (!base::DirectoryExists(cache_path) &&
-      !base::CreateDirectory(cache_path)) {
-    LOG(ERROR) << "The cache_path directory (" << cache_path.value()
-               << ") could not be created.";
-    return false;
-  }
-
-  return true;
-}
-
-// Like NormalizePathAndSet but with additional checks specific to the
-// cache_path value.
-base::FilePath NormalizeCachePathAndSet(cef_string_t& path_str,
-                                        const base::FilePath& root_cache_path) {
-  bool has_error = false;
-  base::FilePath path = NormalizePath(path_str, "cache_path", &has_error);
-  if (has_error || !ValidateCachePath(path, root_cache_path)) {
-    LOG(ERROR) << "The cache_path is invalid. Defaulting to in-memory storage.";
-    path = base::FilePath();
-  }
-  SetPath(path_str, path);
-  return path;
-}
-
 }  // namespace

 int CefExecuteProcess(const CefMainArgs& args,
@@ -280,7 +201,7 @@ int CefExecuteProcess(const CefMainArgs& args,
 // Execute the secondary process.
 #if defined(OS_WIN)
  sandbox::SandboxInterfaceInfo sandbox_info = {0};
-  if (windows_sandbox_info == nullptr) {
+  if (windows_sandbox_info == NULL) {
    content::InitializeSandboxInfo(&sandbox_info);
    windows_sandbox_info = &sandbox_info;
  }
@@ -349,7 +270,7 @@ void CefShutdown() {

  // Delete the global context object.
  delete g_context;
-  g_context = nullptr;
+  g_context = NULL;
 }

 void CefDoMessageLoopWork() {
@@ -449,22 +370,17 @@ bool CefContext::Initialize(const CefMainArgs& args,
  SignalChromeElf();
 #endif

-  const base::FilePath& root_cache_path =
-      NormalizePathAndSet(settings_.root_cache_path, "root_cache_path");
-  const base::FilePath& cache_path =
-      NormalizeCachePathAndSet(settings_.cache_path, root_cache_path);
-  if (root_cache_path.empty() && !cache_path.empty()) {
-    CefString(&settings_.root_cache_path) = cache_path.value();
+  base::FilePath cache_path = base::FilePath(CefString(&settings_.cache_path));
+  if (!ValidateCachePath(cache_path)) {
+    // Reset to in-memory storage.
+    CefString(&settings_.cache_path).clear();
+    cache_path = base::FilePath();
+  }
+  const base::FilePath& root_cache_path =
+      base::FilePath(CefString(&settings_.root_cache_path));
+  if (root_cache_path.empty() && !cache_path.empty()) {
+    CefString(&settings_.root_cache_path) = CefString(&settings_.cache_path);
  }
-
-  // All other paths that need to be normalized.
-  NormalizePathAndSet(settings_.browser_subprocess_path,
-                      "browser_subprocess_path");
-  NormalizePathAndSet(settings_.framework_dir_path, "framework_dir_path");
-  NormalizePathAndSet(settings_.main_bundle_path, "main_bundle_path");
-  NormalizePathAndSet(settings_.user_data_path, "user_data_path");
-  NormalizePathAndSet(settings_.resources_dir_path, "resources_dir_path");
-  NormalizePathAndSet(settings_.locales_dir_path, "locales_dir_path");

  main_delegate_.reset(new CefMainDelegate(application));
  browser_info_manager_.reset(new CefBrowserInfoManager);
@@ -475,7 +391,8 @@ bool CefContext::Initialize(const CefMainArgs& args,
  content::ContentMainParams params(main_delegate_.get());
 #if defined(OS_WIN)
  sandbox::SandboxInterfaceInfo sandbox_info = {0};
-  if (windows_sandbox_info == nullptr) {
+  if (windows_sandbox_info == NULL) {
+    content::InitializeSandboxInfo(&sandbox_info);
    windows_sandbox_info = &sandbox_info;
    settings_.no_sandbox = true;
  }
@@ -564,7 +481,7 @@ void CefContext::Shutdown() {
    FinalizeShutdown();
  } else {
    // Finish shutdown on the current thread, which should be the UI thread.
-    FinishShutdownOnUIThread(nullptr);
+    FinishShutdownOnUIThread(NULL);

    FinalizeShutdown();
  }
@@ -596,20 +513,17 @@ SkColor CefContext::GetBackgroundColor(
 CefTraceSubscriber* CefContext::GetTraceSubscriber() {
  CEF_REQUIRE_UIT();
  if (shutting_down_)
-    return nullptr;
+    return NULL;
  if (!trace_subscriber_.get())
    trace_subscriber_.reset(new CefTraceSubscriber());
  return trace_subscriber_.get();
 }

-void CefContext::PopulateGlobalRequestContextSettings(
+void CefContext::PopulateRequestContextSettings(
    CefRequestContextSettings* settings) {
  CefRefPtr<CefCommandLine> command_line =
      CefCommandLine::GetGlobalCommandLine();
-
-  // This value was already normalized in Initialize.
  CefString(&settings->cache_path) = CefString(&settings_.cache_path);
-
  settings->persist_session_cookies =
      settings_.persist_session_cookies ||
      command_line->HasSwitch(switches::kPersistSessionCookies);
@@ -623,17 +537,29 @@ void CefContext::PopulateGlobalRequestContextSettings(
      CefString(&settings_.accept_language_list);
 }

-void CefContext::NormalizeRequestContextSettings(
-    CefRequestContextSettings* settings) {
-  // The |root_cache_path| value was already normalized in Initialize.
-  const base::FilePath& root_cache_path = CefString(&settings_.root_cache_path);
-  NormalizeCachePathAndSet(settings->cache_path, root_cache_path);
+bool CefContext::ValidateCachePath(const base::FilePath& cache_path) {
+  if (cache_path.empty())
+    return true;

-  if (settings->accept_language_list.length == 0) {
-    // Use the global language list setting.
-    CefString(&settings->accept_language_list) =
-        CefString(&settings_.accept_language_list);
+  const base::FilePath& root_cache_path =
+      base::FilePath(CefString(&settings_.root_cache_path));
+  if (!root_cache_path.empty() && root_cache_path != cache_path &&
+      !root_cache_path.IsParent(cache_path)) {
+    LOG(ERROR) << "The cache_path directory (" << cache_path.value()
+               << ") is not a child of the root_cache_path directory ("
+               << root_cache_path.value() << ")";
+    return false;
  }
+
+  base::ThreadRestrictions::ScopedAllowIO allow_io;
+  if (!base::DirectoryExists(cache_path) &&
+      !base::CreateDirectory(cache_path)) {
+    LOG(ERROR) << "The cache_path directory (" << cache_path.value()
+               << ") could not be created.";
+    return false;
+  }
+
+  return true;
 }

 void CefContext::AddObserver(Observer* observer) {
@@ -681,7 +607,7 @@ void CefContext::FinishShutdownOnUIThread(
    observer.OnContextDestroyed();

  if (trace_subscriber_.get())
-    trace_subscriber_.reset(nullptr);
+    trace_subscriber_.reset(NULL);

  static_cast<ChromeBrowserProcessStub*>(g_browser_process)->Shutdown();

@@ -705,11 +631,11 @@ void CefContext::FinalizeShutdown() {
  // Shut down the content runner.
  service_manager::MainShutdown(*sm_main_params_);

-  browser_info_manager_.reset(nullptr);
-  sm_main_params_.reset(nullptr);
-  sm_main_delegate_.reset(nullptr);
-  main_delegate_.reset(nullptr);
+  browser_info_manager_.reset(NULL);
+  sm_main_params_.reset(NULL);
+  sm_main_delegate_.reset(NULL);
+  main_delegate_.reset(NULL);

  delete g_browser_process;
-  g_browser_process = nullptr;
+  g_browser_process = NULL;
 }
--- a/libcef/browser/context.h
+++ b/libcef/browser/context.h
@@ -87,11 +87,10 @@ class CefContext {

  // Populate request context settings for the global system context based on
  // CefSettings and command-line flags.
-  void PopulateGlobalRequestContextSettings(
-      CefRequestContextSettings* settings);
+  void PopulateRequestContextSettings(CefRequestContextSettings* settings);

-  // Normalize and validate request context settings for user-created contexts.
-  void NormalizeRequestContextSettings(CefRequestContextSettings* settings);
+  // Verify that |cache_path| is valid and create it if necessary.
+  bool ValidateCachePath(const base::FilePath& cache_path);

  // Manage observer objects. The observer must either outlive this object or
  // remove itself before destruction. These methods can only be called on the
--- a/libcef/browser/context_menu_params_impl.cc
+++ b/libcef/browser/context_menu_params_impl.cc
@@ -10,7 +10,7 @@ CefContextMenuParamsImpl::CefContextMenuParamsImpl(
    content::ContextMenuParams* value)
    : CefValueBase<CefContextMenuParams, content::ContextMenuParams>(
          value,
-          nullptr,
+          NULL,
          kOwnerNoDelete,
          true,
          new CefValueControllerNonThreadSafe()) {
@@ -38,7 +38,7 @@ CefContextMenuParamsImpl::TypeFlags CefContextMenuParamsImpl::GetTypeFlags() {
    type_flags |= CM_TYPEFLAG_FRAME;
  if (!params.link_url.is_empty())
    type_flags |= CM_TYPEFLAG_LINK;
-  if (params.media_type != blink::ContextMenuDataMediaType::kNone)
+  if (params.media_type != blink::WebContextMenuData::kMediaTypeNone)
    type_flags |= CM_TYPEFLAG_MEDIA;
  if (!params.selection_text.empty())
    type_flags |= CM_TYPEFLAG_SELECTION;
--- a/libcef/browser/context_menu_params_impl.h
+++ b/libcef/browser/context_menu_params_impl.h
@@ -9,7 +9,7 @@
 #include "include/cef_context_menu_handler.h"
 #include "libcef/common/value_base.h"

-#include "content/public/browser/context_menu_params.h"
+#include "content/public/common/context_menu_params.h"

 // CefContextMenuParams implementation. This class is not thread safe.
 class CefContextMenuParamsImpl
--- a/libcef/browser/devtools/devtools_controller.cc
+++ b/libcef/browser/devtools/devtools_controller.cc
@@ -1,137 +0,0 @@
-// Copyright (c) 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/devtools/devtools_controller.h"
-
-#include "libcef/browser/devtools/devtools_util.h"
-#include "libcef/browser/thread_util.h"
-
-#include "base/json/json_reader.h"
-#include "base/json/json_writer.h"
-#include "content/public/browser/devtools_agent_host.h"
-
-CefDevToolsController::CefDevToolsController(
-    content::WebContents* inspected_contents)
-    : inspected_contents_(inspected_contents), weak_ptr_factory_(this) {
-  DCHECK(inspected_contents_);
-}
-
-CefDevToolsController::~CefDevToolsController() {
-  if (agent_host_) {
-    agent_host_->DetachClient(this);
-    AgentHostClosed(agent_host_.get());
-  }
-
-  for (auto& observer : observers_) {
-    observer.OnDevToolsControllerDestroyed();
-  }
-}
-
-bool CefDevToolsController::SendDevToolsMessage(
-    const base::StringPiece& message) {
-  CEF_REQUIRE_UIT();
-  if (!EnsureAgentHost())
-    return false;
-
-  agent_host_->DispatchProtocolMessage(
-      this, base::as_bytes(base::make_span(message)));
-  return true;
-}
-
-int CefDevToolsController::ExecuteDevToolsMethod(
-    int suggested_message_id,
-    const std::string& method,
-    const base::DictionaryValue* params) {
-  CEF_REQUIRE_UIT();
-  if (!EnsureAgentHost())
-    return 0;
-
-  // Message IDs must always be increasing and unique.
-  int message_id = suggested_message_id;
-  if (message_id < next_message_id_)
-    message_id = next_message_id_++;
-  else
-    next_message_id_ = message_id + 1;
-
-  base::DictionaryValue message;
-  message.SetIntKey("id", message_id);
-  message.SetStringKey("method", method);
-  if (params)
-    message.SetKey("params", params->Clone());
-
-  std::string protocol_message;
-  if (!base::JSONWriter::Write(message, &protocol_message))
-    return 0;
-
-  agent_host_->DispatchProtocolMessage(
-      this, base::as_bytes(base::make_span(protocol_message)));
-  return message_id;
-}
-
-void CefDevToolsController::AgentHostClosed(
-    content::DevToolsAgentHost* agent_host) {
-  DCHECK(agent_host == agent_host_.get());
-  agent_host_ = nullptr;
-  for (auto& observer : observers_) {
-    observer.OnDevToolsAgentDetached();
-  }
-}
-
-void CefDevToolsController::AddObserver(Observer* observer) {
-  CEF_REQUIRE_UIT();
-  observers_.AddObserver(observer);
-}
-
-void CefDevToolsController::RemoveObserver(Observer* observer) {
-  CEF_REQUIRE_UIT();
-  observers_.RemoveObserver(observer);
-}
-
-void CefDevToolsController::DispatchProtocolMessage(
-    content::DevToolsAgentHost* agent_host,
-    base::span<const uint8_t> message) {
-  if (!observers_.might_have_observers())
-    return;
-
-  base::StringPiece str_message(reinterpret_cast<const char*>(message.data()),
-                                message.size());
-  if (!devtools_util::ProtocolParser::IsValidMessage(str_message)) {
-    LOG(WARNING) << "Invalid message: " << str_message.substr(0, 100);
-    return;
-  }
-
-  devtools_util::ProtocolParser parser;
-
-  for (auto& observer : observers_) {
-    if (observer.OnDevToolsMessage(str_message)) {
-      continue;
-    }
-
-    // Only perform parsing a single time.
-    if (parser.Initialize(str_message) && parser.IsFailure()) {
-      LOG(WARNING) << "Failed to parse message: " << str_message.substr(0, 100);
-    }
-
-    if (parser.IsEvent()) {
-      observer.OnDevToolsEvent(parser.method_, parser.params_);
-    } else if (parser.IsResult()) {
-      observer.OnDevToolsMethodResult(parser.message_id_, parser.success_,
-                                      parser.params_);
-    }
-  }
-}
-
-bool CefDevToolsController::EnsureAgentHost() {
-  if (!agent_host_) {
-    agent_host_ =
-        content::DevToolsAgentHost::GetOrCreateFor(inspected_contents_);
-    if (agent_host_) {
-      agent_host_->AttachClient(this);
-      for (auto& observer : observers_) {
-        observer.OnDevToolsAgentAttached();
-      }
-    }
-  }
-  return !!agent_host_;
-}
--- a/libcef/browser/devtools/devtools_controller.h
+++ b/libcef/browser/devtools/devtools_controller.h
@@ -1,79 +0,0 @@
-// Copyright (c) 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_DEVTOOLS_DEVTOOLS_CONTROLLER_H_
-#define CEF_LIBCEF_BROWSER_DEVTOOLS_DEVTOOLS_CONTROLLER_H_
-
-#include <memory>
-
-#include "content/public/browser/devtools_agent_host_client.h"
-
-#include "base/containers/span.h"
-#include "base/memory/scoped_refptr.h"
-#include "base/memory/weak_ptr.h"
-#include "base/observer_list.h"
-#include "base/values.h"
-
-namespace content {
-class WebContents;
-}
-
-class CefDevToolsController : public content::DevToolsAgentHostClient {
- public:
-  class Observer : public base::CheckedObserver {
-   public:
-    // See CefDevToolsMessageObserver documentation.
-    virtual bool OnDevToolsMessage(const base::StringPiece& message) = 0;
-    virtual void OnDevToolsMethodResult(int message_id,
-                                        bool success,
-                                        const base::StringPiece& result) = 0;
-    virtual void OnDevToolsEvent(const base::StringPiece& method,
-                                 const base::StringPiece& params) = 0;
-    virtual void OnDevToolsAgentAttached() = 0;
-    virtual void OnDevToolsAgentDetached() = 0;
-
-    virtual void OnDevToolsControllerDestroyed() = 0;
-
-   protected:
-    ~Observer() override {}
-  };
-
-  // |inspected_contents| will outlive this object.
-  explicit CefDevToolsController(content::WebContents* inspected_contents);
-  ~CefDevToolsController() override;
-
-  // See CefBrowserHost methods of the same name for documentation.
-  bool SendDevToolsMessage(const base::StringPiece& message);
-  int ExecuteDevToolsMethod(int message_id,
-                            const std::string& method,
-                            const base::DictionaryValue* params);
-
-  // |observer| must outlive this object or be removed.
-  void AddObserver(Observer* observer);
-  void RemoveObserver(Observer* observer);
-
-  base::WeakPtr<CefDevToolsController> GetWeakPtr() {
-    return weak_ptr_factory_.GetWeakPtr();
-  }
-
- private:
-  // content::DevToolsAgentHostClient implementation:
-  void AgentHostClosed(content::DevToolsAgentHost* agent_host) override;
-  void DispatchProtocolMessage(content::DevToolsAgentHost* agent_host,
-                               base::span<const uint8_t> message) override;
-
-  bool EnsureAgentHost();
-
-  content::WebContents* const inspected_contents_;
-  scoped_refptr<content::DevToolsAgentHost> agent_host_;
-  int next_message_id_ = 1;
-
-  base::ObserverList<Observer> observers_;
-
-  base::WeakPtrFactory<CefDevToolsController> weak_ptr_factory_;
-
-  DISALLOW_COPY_AND_ASSIGN(CefDevToolsController);
-};
-
-#endif  // CEF_LIBCEF_BROWSER_DEVTOOLS_DEVTOOLS_CONTROLLER_H_
--- a/libcef/browser/devtools/devtools_file_manager.cc
+++ b/libcef/browser/devtools/devtools_file_manager.cc
@@ -154,13 +154,12 @@ void CefDevToolsFileManager::FileSavedAs(const std::string& url,
  base::Value url_value(url);
  base::Value file_system_path_value(file_system_path);
  CallClientFunction("DevToolsAPI.savedURL", &url_value,
-                     &file_system_path_value, nullptr);
+                     &file_system_path_value, NULL);
 }

 void CefDevToolsFileManager::CanceledFileSaveAs(const std::string& url) {
  base::Value url_value(url);
-  CallClientFunction("DevToolsAPI.canceledSaveURL", &url_value, nullptr,
-                     nullptr);
+  CallClientFunction("DevToolsAPI.canceledSaveURL", &url_value, NULL, NULL);
 }

 void CefDevToolsFileManager::Append(const std::string& url,
@@ -176,7 +175,7 @@ void CefDevToolsFileManager::Append(const std::string& url,

 void CefDevToolsFileManager::AppendedTo(const std::string& url) {
  base::Value url_value(url);
-  CallClientFunction("DevToolsAPI.appendedToURL", &url_value, nullptr, nullptr);
+  CallClientFunction("DevToolsAPI.appendedToURL", &url_value, NULL, NULL);
 }

 void CefDevToolsFileManager::CallClientFunction(
--- a/libcef/browser/devtools/devtools_frontend.cc
+++ b/libcef/browser/devtools/devtools_frontend.cc
@@ -6,18 +6,13 @@

 #include <stddef.h>

-#include <iomanip>
 #include <utility>

 #include "libcef/browser/browser_context.h"
-#include "libcef/browser/content_browser_client.h"
 #include "libcef/browser/devtools/devtools_manager_delegate.h"
 #include "libcef/browser/net/devtools_scheme_handler.h"
-#include "libcef/common/cef_switches.h"

 #include "base/base64.h"
-#include "base/command_line.h"
-#include "base/files/file_util.h"
 #include "base/guid.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
@@ -50,16 +45,10 @@
 #include "net/base/net_errors.h"
 #include "net/http/http_response_headers.h"
 #include "net/traffic_annotation/network_traffic_annotation.h"
+#include "services/network/public/cpp/resource_response.h"
 #include "services/network/public/cpp/simple_url_loader.h"
 #include "services/network/public/cpp/simple_url_loader_stream_consumer.h"
 #include "services/network/public/mojom/url_response_head.mojom.h"
-#include "storage/browser/file_system/native_file_util.h"
-
-#if defined(OS_WIN)
-#include <windows.h>
-#elif defined(OS_POSIX)
-#include <time.h>
-#endif

 namespace {

@@ -70,20 +59,9 @@ static std::string GetFrontendURL() {
 }

 std::unique_ptr<base::DictionaryValue> BuildObjectForResponse(
-    const net::HttpResponseHeaders* rh,
-    bool success,
-    int net_error) {
+    const net::HttpResponseHeaders* rh) {
  auto response = std::make_unique<base::DictionaryValue>();
-  int responseCode = 200;
-  if (rh) {
-    responseCode = rh->response_code();
-  } else if (!success) {
-    // In case of no headers, assume file:// URL and failed to load
-    responseCode = 404;
-  }
-  response->SetInteger("statusCode", responseCode);
-  response->SetInteger("netError", net_error);
-  response->SetString("netErrorName", net::ErrorToString(net_error));
+  response->SetInteger("statusCode", rh ? rh->response_code() : 200);

  auto headers = std::make_unique<base::DictionaryValue>();
  size_t iterator = 0;
@@ -98,71 +76,6 @@ std::unique_ptr<base::DictionaryValue> BuildObjectForResponse(
  return response;
 }

-const int kMaxLogLineLength = 1024;
-
-void WriteTimestamp(std::stringstream& stream) {
-#if defined(OS_WIN)
-  SYSTEMTIME local_time;
-  GetLocalTime(&local_time);
-  stream << std::setfill('0') << std::setw(2) << local_time.wMonth
-         << std::setw(2) << local_time.wDay << '/' << std::setw(2)
-         << local_time.wHour << std::setw(2) << local_time.wMinute
-         << std::setw(2) << local_time.wSecond << '.' << std::setw(3)
-         << local_time.wMilliseconds;
-#elif defined(OS_POSIX)
-  timeval tv;
-  gettimeofday(&tv, nullptr);
-  time_t t = tv.tv_sec;
-  struct tm local_time;
-  localtime_r(&t, &local_time);
-  struct tm* tm_time = &local_time;
-  stream << std::setfill('0') << std::setw(2) << 1 + tm_time->tm_mon
-         << std::setw(2) << tm_time->tm_mday << '/' << std::setw(2)
-         << tm_time->tm_hour << std::setw(2) << tm_time->tm_min << std::setw(2)
-         << tm_time->tm_sec << '.' << std::setw(6) << tv.tv_usec;
-#else
-#error Unsupported platform
-#endif
-}
-
-void LogProtocolMessage(const base::FilePath& log_file,
-                        ProtocolMessageType type,
-                        std::string to_log) {
-  // Track if logging has failed, in which case we don't keep trying.
-  static bool log_error = false;
-  if (log_error)
-    return;
-
-  if (storage::NativeFileUtil::EnsureFileExists(log_file, nullptr) !=
-      base::File::FILE_OK) {
-    LOG(ERROR) << "Failed to create file " << log_file.value();
-    log_error = true;
-    return;
-  }
-
-  std::string type_label;
-  switch (type) {
-    case ProtocolMessageType::METHOD:
-      type_label = "METHOD";
-      break;
-    case ProtocolMessageType::RESULT:
-      type_label = "RESULT";
-      break;
-    case ProtocolMessageType::EVENT:
-      type_label = "EVENT";
-      break;
-  }
-
-  std::stringstream stream;
-  WriteTimestamp(stream);
-  stream << ": " << type_label << ": " << to_log << "\n";
-  const std::string& str = stream.str();
-  if (!base::AppendToFile(log_file, str.c_str(), str.size())) {
-    LOG(ERROR) << "Failed to write file " << log_file.value();
-    log_error = true;
-  }
-}
-
 }  // namespace

 class CefDevToolsFrontend::NetworkResourceLoader
@@ -209,8 +122,7 @@ class CefDevToolsFrontend::NetworkResourceLoader
  }

  void OnComplete(bool success) override {
-    auto response = BuildObjectForResponse(response_headers_.get(), success,
-                                           loader_->NetError());
+    auto response = BuildObjectForResponse(response_headers_.get());
    bindings_->SendMessageAck(request_id_, response.get());

    bindings_->loaders_.erase(bindings_->loaders_.find(this));
@@ -233,12 +145,11 @@ const size_t kMaxMessageChunkSize = IPC::Channel::kMaximumMessageSize / 4;

 // static
 CefDevToolsFrontend* CefDevToolsFrontend::Show(
-    CefBrowserHostImpl* inspected_browser,
+    CefRefPtr<CefBrowserHostImpl> inspected_browser,
    const CefWindowInfo& windowInfo,
    CefRefPtr<CefClient> client,
    const CefBrowserSettings& settings,
-    const CefPoint& inspect_element_at,
-    base::OnceClosure frontend_destroyed_callback) {
+    const CefPoint& inspect_element_at) {
  CefBrowserSettings new_settings = settings;
  if (!windowInfo.windowless_rendering_enabled &&
      CefColorGetA(new_settings.background_color) != SK_AlphaOPAQUE) {
@@ -265,8 +176,7 @@ CefDevToolsFrontend* CefDevToolsFrontend::Show(
  // destroyed.
  CefDevToolsFrontend* devtools_frontend = new CefDevToolsFrontend(
      static_cast<CefBrowserHostImpl*>(frontend_browser.get()),
-      inspected_contents, inspect_element_at,
-      std::move(frontend_destroyed_callback));
+      inspected_contents, inspect_element_at);

  // Need to load the URL after creating the DevTools objects.
  frontend_browser->GetMainFrame()->LoadURL(GetFrontendURL());
@@ -295,23 +205,23 @@ void CefDevToolsFrontend::Close() {
                            frontend_browser_.get(), true));
 }

+void CefDevToolsFrontend::DisconnectFromTarget() {
+  if (!agent_host_)
+    return;
+  agent_host_->DetachClient(this);
+  agent_host_ = NULL;
+}
+
 CefDevToolsFrontend::CefDevToolsFrontend(
-    CefBrowserHostImpl* frontend_browser,
+    CefRefPtr<CefBrowserHostImpl> frontend_browser,
    content::WebContents* inspected_contents,
-    const CefPoint& inspect_element_at,
-    base::OnceClosure frontend_destroyed_callback)
+    const CefPoint& inspect_element_at)
    : content::WebContentsObserver(frontend_browser->web_contents()),
      frontend_browser_(frontend_browser),
      inspected_contents_(inspected_contents),
      inspect_element_at_(inspect_element_at),
-      frontend_destroyed_callback_(std::move(frontend_destroyed_callback)),
-      file_manager_(frontend_browser, GetPrefs()),
-      protocol_log_file_(
-          base::CommandLine::ForCurrentProcess()->GetSwitchValuePath(
-              switches::kDevToolsProtocolLogFile)),
-      weak_factory_(this) {
-  DCHECK(!frontend_destroyed_callback_.is_null());
-}
+      file_manager_(frontend_browser.get(), GetPrefs()),
+      weak_factory_(this) {}

 CefDevToolsFrontend::~CefDevToolsFrontend() {}

@@ -358,15 +268,14 @@ void CefDevToolsFrontend::WebContentsDestroyed() {
    agent_host_->DetachClient(this);
    agent_host_ = nullptr;
  }
-  std::move(frontend_destroyed_callback_).Run();
  delete this;
 }

 void CefDevToolsFrontend::HandleMessageFromDevToolsFrontend(
    const std::string& message) {
  std::string method;
-  base::ListValue* params = nullptr;
-  base::DictionaryValue* dict = nullptr;
+  base::ListValue* params = NULL;
+  base::DictionaryValue* dict = NULL;
  base::Optional<base::Value> parsed_message = base::JSONReader::Read(message);
  if (!parsed_message || !parsed_message->GetAsDictionary(&dict) ||
      !dict->GetString("method", &method)) {
@@ -380,11 +289,7 @@ void CefDevToolsFrontend::HandleMessageFromDevToolsFrontend(
    std::string protocol_message;
    if (!agent_host_ || !params->GetString(0, &protocol_message))
      return;
-    if (ProtocolLoggingEnabled()) {
-      LogProtocolMessage(ProtocolMessageType::METHOD, protocol_message);
-    }
-    agent_host_->DispatchProtocolMessage(
-        this, base::as_bytes(base::make_span(protocol_message)));
+    agent_host_->DispatchProtocolMessage(this, protocol_message);
  } else if (method == "loadCompleted") {
    web_contents()->GetMainFrame()->ExecuteJavaScriptForTests(
        base::ASCIIToUTF16("DevToolsAPI.setUseSoftMenu(true);"),
@@ -403,7 +308,6 @@ void CefDevToolsFrontend::HandleMessageFromDevToolsFrontend(
    if (!gurl.is_valid()) {
      base::DictionaryValue response;
      response.SetInteger("statusCode", 404);
-      response.SetBoolean("urlValid", false);
      SendMessageAck(request_id, &response);
      return;
    }
@@ -440,7 +344,7 @@ void CefDevToolsFrontend::HandleMessageFromDevToolsFrontend(
    // TODO(caseq): this preserves behavior of URLFetcher-based
    // implementation. We really need to pass proper first party origin from
    // the front-end.
-    resource_request->site_for_cookies = net::SiteForCookies::FromUrl(gurl);
+    resource_request->site_for_cookies = gurl;
    resource_request->headers.AddHeadersFromString(headers);

    std::unique_ptr<network::mojom::URLLoaderFactory> file_url_loader_factory;
@@ -531,20 +435,10 @@ void CefDevToolsFrontend::HandleMessageFromDevToolsFrontend(

 void CefDevToolsFrontend::DispatchProtocolMessage(
    content::DevToolsAgentHost* agent_host,
-    base::span<const uint8_t> message) {
-  base::StringPiece str_message(reinterpret_cast<const char*>(message.data()),
-                                message.size());
-  if (ProtocolLoggingEnabled()) {
-    // Quick check to avoid parsing the JSON object. Events begin with a
-    // "method" value whereas method results begin with an "id" value.
-    LogProtocolMessage(str_message.starts_with("{\"method\":")
-                           ? ProtocolMessageType::EVENT
-                           : ProtocolMessageType::RESULT,
-                       str_message);
-  }
-  if (str_message.length() < kMaxMessageChunkSize) {
+    const std::string& message) {
+  if (message.length() < kMaxMessageChunkSize) {
    std::string param;
-    base::EscapeJSONString(str_message, true, &param);
+    base::EscapeJSONString(message, true, &param);
    std::string code = "DevToolsAPI.dispatchMessage(" + param + ");";
    base::string16 javascript = base::UTF8ToUTF16(code);
    web_contents()->GetMainFrame()->ExecuteJavaScriptForTests(
@@ -552,11 +446,10 @@ void CefDevToolsFrontend::DispatchProtocolMessage(
    return;
  }

-  size_t total_size = str_message.length();
-  for (size_t pos = 0; pos < str_message.length();
-       pos += kMaxMessageChunkSize) {
+  size_t total_size = message.length();
+  for (size_t pos = 0; pos < message.length(); pos += kMaxMessageChunkSize) {
    std::string param;
-    base::EscapeJSONString(str_message.substr(pos, kMaxMessageChunkSize), true,
+    base::EscapeJSONString(message.substr(pos, kMaxMessageChunkSize), true,
                           &param);
    std::string code = "DevToolsAPI.dispatchMessageChunk(" + param + "," +
                       std::to_string(pos ? 0 : total_size) + ");";
@@ -595,23 +488,6 @@ void CefDevToolsFrontend::SendMessageAck(int request_id,
  CallClientFunction("DevToolsAPI.embedderMessageAck", &id_value, arg, nullptr);
 }

-bool CefDevToolsFrontend::ProtocolLoggingEnabled() const {
-  return !protocol_log_file_.empty();
-}
-
-void CefDevToolsFrontend::LogProtocolMessage(ProtocolMessageType type,
-                                             const base::StringPiece& message) {
-  DCHECK(ProtocolLoggingEnabled());
-
-  std::string to_log = message.substr(0, kMaxLogLineLength).as_string();
-
-  // Execute in an ordered context that allows blocking.
-  auto task_runner = CefContentBrowserClient::Get()->background_task_runner();
-  task_runner->PostTask(
-      FROM_HERE, base::BindOnce(::LogProtocolMessage, protocol_log_file_, type,
-                                std::move(to_log)));
-}
-
 void CefDevToolsFrontend::AgentHostClosed(
    content::DevToolsAgentHost* agent_host) {
  DCHECK(agent_host == agent_host_.get());
--- a/libcef/browser/devtools/devtools_frontend.h
+++ b/libcef/browser/devtools/devtools_frontend.h
@@ -11,7 +11,6 @@
 #include "libcef/browser/devtools/devtools_file_manager.h"

 #include "base/compiler_specific.h"
-#include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
@@ -32,44 +31,42 @@ class WebContents;

 class PrefService;

-enum class ProtocolMessageType {
-  METHOD,
-  RESULT,
-  EVENT,
-};
-
 class CefDevToolsFrontend : public content::WebContentsObserver,
                            public content::DevToolsAgentHostClient {
 public:
  static CefDevToolsFrontend* Show(
-      CefBrowserHostImpl* inspected_browser,
+      CefRefPtr<CefBrowserHostImpl> inspected_browser,
      const CefWindowInfo& windowInfo,
      CefRefPtr<CefClient> client,
      const CefBrowserSettings& settings,
-      const CefPoint& inspect_element_at,
-      base::OnceClosure frontend_destroyed_callback);
+      const CefPoint& inspect_element_at);

  void Activate();
  void Focus();
  void InspectElementAt(int x, int y);
  void Close();

+  void DisconnectFromTarget();
+
  void CallClientFunction(const std::string& function_name,
                          const base::Value* arg1,
                          const base::Value* arg2,
                          const base::Value* arg3);

+  CefRefPtr<CefBrowserHostImpl> frontend_browser() const {
+    return frontend_browser_;
+  }
+
 private:
-  CefDevToolsFrontend(CefBrowserHostImpl* frontend_browser,
+  CefDevToolsFrontend(CefRefPtr<CefBrowserHostImpl> frontend_browser,
                      content::WebContents* inspected_contents,
-                      const CefPoint& inspect_element_at,
-                      base::OnceClosure destroyed_callback);
+                      const CefPoint& inspect_element_at);
  ~CefDevToolsFrontend() override;

  // content::DevToolsAgentHostClient implementation.
  void AgentHostClosed(content::DevToolsAgentHost* agent_host) override;
  void DispatchProtocolMessage(content::DevToolsAgentHost* agent_host,
-                               base::span<const uint8_t> message) override;
+                               const std::string& message) override;
  void HandleMessageFromDevToolsFrontend(const std::string& message);

 private:
@@ -81,17 +78,12 @@ class CefDevToolsFrontend : public content::WebContentsObserver,

  void SendMessageAck(int request_id, const base::Value* arg1);

-  bool ProtocolLoggingEnabled() const;
-  void LogProtocolMessage(ProtocolMessageType type,
-                          const base::StringPiece& message);
-
  PrefService* GetPrefs() const;

  CefRefPtr<CefBrowserHostImpl> frontend_browser_;
  content::WebContents* inspected_contents_;
  scoped_refptr<content::DevToolsAgentHost> agent_host_;
  CefPoint inspect_element_at_;
-  base::OnceClosure frontend_destroyed_callback_;
  std::unique_ptr<content::DevToolsFrontendHost> frontend_host_;

  class NetworkResourceLoader;
@@ -101,9 +93,6 @@ class CefDevToolsFrontend : public content::WebContentsObserver,
  using ExtensionsAPIs = std::map<std::string, std::string>;
  ExtensionsAPIs extensions_api_;
  CefDevToolsFileManager file_manager_;
-
-  const base::FilePath protocol_log_file_;
-
  base::WeakPtrFactory<CefDevToolsFrontend> weak_factory_;

  DISALLOW_COPY_AND_ASSIGN(CefDevToolsFrontend);
--- a/libcef/browser/devtools/devtools_manager.cc
+++ b/libcef/browser/devtools/devtools_manager.cc
@@ -1,200 +0,0 @@
-// Copyright (c) 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/devtools/devtools_manager.h"
-
-#include "libcef/browser/devtools/devtools_controller.h"
-#include "libcef/browser/devtools/devtools_frontend.h"
-
-#include "content/public/browser/web_contents.h"
-
-namespace {
-
-// May be created on any thread but will be destroyed on the UI thread.
-class CefDevToolsRegistrationImpl : public CefRegistration,
-                                    public CefDevToolsController::Observer {
- public:
-  explicit CefDevToolsRegistrationImpl(
-      CefRefPtr<CefDevToolsMessageObserver> observer)
-      : observer_(observer) {
-    DCHECK(observer_);
-  }
-
-  ~CefDevToolsRegistrationImpl() override {
-    CEF_REQUIRE_UIT();
-
-    // May be null if OnDevToolsControllerDestroyed was called.
-    if (!controller_)
-      return;
-
-    controller_->RemoveObserver(this);
-  }
-
-  void Initialize(CefBrowserHostImpl* browser,
-                  base::WeakPtr<CefDevToolsController> controller) {
-    CEF_REQUIRE_UIT();
-    DCHECK(browser && controller);
-    DCHECK(!browser_ && !controller_);
-    browser_ = browser;
-    controller_ = controller;
-
-    controller_->AddObserver(this);
-  }
-
- private:
-  // CefDevToolsController::Observer methods:
-  bool OnDevToolsMessage(const base::StringPiece& message) override {
-    CEF_REQUIRE_UIT();
-    return observer_->OnDevToolsMessage(browser_, message.data(),
-                                        message.size());
-  }
-
-  void OnDevToolsMethodResult(int message_id,
-                              bool success,
-                              const base::StringPiece& result) override {
-    CEF_REQUIRE_UIT();
-    observer_->OnDevToolsMethodResult(browser_, message_id, success,
-                                      result.data(), result.size());
-  }
-
-  void OnDevToolsEvent(const base::StringPiece& method,
-                       const base::StringPiece& params) override {
-    CEF_REQUIRE_UIT();
-    observer_->OnDevToolsEvent(browser_, method.as_string(), params.data(),
-                               params.size());
-  }
-
-  void OnDevToolsAgentAttached() override {
-    CEF_REQUIRE_UIT();
-    observer_->OnDevToolsAgentAttached(browser_);
-  }
-
-  void OnDevToolsAgentDetached() override {
-    CEF_REQUIRE_UIT();
-    observer_->OnDevToolsAgentDetached(browser_);
-  }
-
-  void OnDevToolsControllerDestroyed() override {
-    CEF_REQUIRE_UIT();
-    browser_ = nullptr;
-    controller_.reset();
-  }
-
-  CefRefPtr<CefDevToolsMessageObserver> observer_;
-
-  CefBrowserHostImpl* browser_ = nullptr;
-  base::WeakPtr<CefDevToolsController> controller_;
-
-  IMPLEMENT_REFCOUNTING_DELETE_ON_UIT(CefDevToolsRegistrationImpl);
-  DISALLOW_COPY_AND_ASSIGN(CefDevToolsRegistrationImpl);
-};
-
-}  // namespace
-
-CefDevToolsManager::CefDevToolsManager(CefBrowserHostImpl* inspected_browser)
-    : inspected_browser_(inspected_browser), weak_ptr_factory_(this) {
-  CEF_REQUIRE_UIT();
-}
-
-CefDevToolsManager::~CefDevToolsManager() {
-  CEF_REQUIRE_UIT();
-}
-
-void CefDevToolsManager::ShowDevTools(const CefWindowInfo& windowInfo,
-                                      CefRefPtr<CefClient> client,
-                                      const CefBrowserSettings& settings,
-                                      const CefPoint& inspect_element_at) {
-  CEF_REQUIRE_UIT();
-  if (devtools_frontend_) {
-    if (!inspect_element_at.IsEmpty()) {
-      devtools_frontend_->InspectElementAt(inspect_element_at.x,
-                                           inspect_element_at.y);
-    }
-    devtools_frontend_->Focus();
-    return;
-  }
-
-  devtools_frontend_ = CefDevToolsFrontend::Show(
-      inspected_browser_, windowInfo, client, settings, inspect_element_at,
-      base::BindOnce(&CefDevToolsManager::OnFrontEndDestroyed,
-                     weak_ptr_factory_.GetWeakPtr()));
-}
-
-void CefDevToolsManager::CloseDevTools() {
-  CEF_REQUIRE_UIT();
-  if (!devtools_frontend_)
-    return;
-  devtools_frontend_->Close();
-}
-
-bool CefDevToolsManager::HasDevTools() {
-  CEF_REQUIRE_UIT();
-  return !!devtools_frontend_;
-}
-
-bool CefDevToolsManager::SendDevToolsMessage(const void* message,
-                                             size_t message_size) {
-  CEF_REQUIRE_UIT();
-  if (!message || message_size == 0)
-    return false;
-
-  if (!EnsureController())
-    return false;
-
-  return devtools_controller_->SendDevToolsMessage(
-      base::StringPiece(static_cast<const char*>(message), message_size));
-}
-
-int CefDevToolsManager::ExecuteDevToolsMethod(
-    int message_id,
-    const CefString& method,
-    CefRefPtr<CefDictionaryValue> params) {
-  CEF_REQUIRE_UIT();
-  if (method.empty())
-    return 0;
-
-  if (!EnsureController())
-    return 0;
-
-  if (params && params->IsValid()) {
-    CefDictionaryValueImpl* impl =
-        static_cast<CefDictionaryValueImpl*>(params.get());
-    CefValueController::AutoLock lock_scope(impl->controller());
-    return devtools_controller_->ExecuteDevToolsMethod(message_id, method,
-                                                       impl->GetValueUnsafe());
-  } else {
-    return devtools_controller_->ExecuteDevToolsMethod(message_id, method,
-                                                       nullptr);
-  }
-}
-
-// static
-CefRefPtr<CefRegistration> CefDevToolsManager::CreateRegistration(
-    CefRefPtr<CefDevToolsMessageObserver> observer) {
-  DCHECK(observer);
-  return new CefDevToolsRegistrationImpl(observer);
-}
-
-void CefDevToolsManager::InitializeRegistrationOnUIThread(
-    CefRefPtr<CefRegistration> registration) {
-  CEF_REQUIRE_UIT();
-
-  if (!EnsureController())
-    return;
-
-  static_cast<CefDevToolsRegistrationImpl*>(registration.get())
-      ->Initialize(inspected_browser_, devtools_controller_->GetWeakPtr());
-}
-
-void CefDevToolsManager::OnFrontEndDestroyed() {
-  devtools_frontend_ = nullptr;
-}
-
-bool CefDevToolsManager::EnsureController() {
-  if (!devtools_controller_) {
-    devtools_controller_.reset(
-        new CefDevToolsController(inspected_browser_->web_contents()));
-  }
-  return true;
-}
--- a/libcef/browser/devtools/devtools_manager.h
+++ b/libcef/browser/devtools/devtools_manager.h
@@ -1,69 +0,0 @@
-// Copyright (c) 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_DEVTOOLS_DEVTOOLS_MANAGER_H_
-#define CEF_LIBCEF_BROWSER_DEVTOOLS_DEVTOOLS_MANAGER_H_
-#pragma once
-
-#include "include/cef_browser.h"
-
-#include "base/memory/weak_ptr.h"
-
-class CefBrowserHostImpl;
-class CefDevToolsController;
-class CefDevToolsFrontend;
-
-namespace content {
-class WebContents;
-}
-
-// Manages DevTools instances. Methods must be called on the UI thread unless
-// otherwise indicated.
-class CefDevToolsManager {
- public:
-  // |inspected_browser| will outlive this object.
-  explicit CefDevToolsManager(CefBrowserHostImpl* inspected_browser);
-  ~CefDevToolsManager();
-
-  // See CefBrowserHost methods of the same name for documentation.
-  void ShowDevTools(const CefWindowInfo& windowInfo,
-                    CefRefPtr<CefClient> client,
-                    const CefBrowserSettings& settings,
-                    const CefPoint& inspect_element_at);
-  void CloseDevTools();
-  bool HasDevTools();
-  bool SendDevToolsMessage(const void* message, size_t message_size);
-  int ExecuteDevToolsMethod(int message_id,
-                            const CefString& method,
-                            CefRefPtr<CefDictionaryValue> param);
-
-  // These methods are used to implement
-  // CefBrowserHost::AddDevToolsMessageObserver. CreateRegistration is safe to
-  // call on any thread. InitializeRegistrationOnUIThread should be called
-  // immediately afterwards on the UI thread.
-  static CefRefPtr<CefRegistration> CreateRegistration(
-      CefRefPtr<CefDevToolsMessageObserver> observer);
-  void InitializeRegistrationOnUIThread(
-      CefRefPtr<CefRegistration> registration);
-
- private:
-  void OnFrontEndDestroyed();
-
-  bool EnsureController();
-
-  CefBrowserHostImpl* const inspected_browser_;
-
-  // CefDevToolsFrontend will delete itself when the frontend WebContents is
-  // destroyed.
-  CefDevToolsFrontend* devtools_frontend_ = nullptr;
-
-  // Used for sending DevTools protocol messages without an active frontend.
-  std::unique_ptr<CefDevToolsController> devtools_controller_;
-
-  base::WeakPtrFactory<CefDevToolsManager> weak_ptr_factory_;
-
-  DISALLOW_COPY_AND_ASSIGN(CefDevToolsManager);
-};
-
-#endif  // CEF_LIBCEF_BROWSER_DEVTOOLS_DEVTOOLS_MANAGER_H_
--- a/libcef/browser/devtools/devtools_util.cc
+++ b/libcef/browser/devtools/devtools_util.cc
@@ -1,131 +0,0 @@
-// Copyright (c) 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/devtools/devtools_util.h"
-
-#include "base/strings/string_number_conversions.h"
-
-namespace devtools_util {
-
-namespace {
-
-bool IsValidDictionary(const base::StringPiece& str, bool allow_empty) {
-  return str.length() >= (allow_empty ? 2 : 3) && str[0] == '{' &&
-         str[str.length() - 1] == '}';
-}
-
-// Example:
-// {"method":"Target.targetDestroyed","params":{"targetId":"1234..."}}
-bool ParseEvent(const base::StringPiece& message,
-                base::StringPiece& method,
-                base::StringPiece& params) {
-  static const char kMethodStart[] = "{\"method\":\"";
-  static const char kMethodEnd[] = "\"";
-  static const char kParamsStart[] = ",\"params\":";
-
-  if (!message.starts_with(kMethodStart))
-    return false;
-
-  const size_t method_start = sizeof(kMethodStart) - 1;
-  const size_t method_end = message.find(kMethodEnd, method_start);
-  if (method_end < 0U)
-    return false;
-  method = message.substr(method_start, method_end - method_start);
-  if (method.empty())
-    return false;
-
-  size_t remainder_start = method_end + sizeof(kMethodEnd) - 1;
-  if (remainder_start == message.size() - 1) {
-    // No more contents.
-    params = base::StringPiece();
-  } else {
-    const base::StringPiece& remainder = message.substr(remainder_start);
-    if (remainder.starts_with(kParamsStart)) {
-      // Stop immediately before the message closing bracket.
-      remainder_start += sizeof(kParamsStart) - 1;
-      params =
-          message.substr(remainder_start, message.size() - 1 - remainder_start);
-    } else {
-      // Invalid format.
-      return false;
-    }
-
-    if (!IsValidDictionary(params, /*allow_empty=*/true))
-      return false;
-  }
-
-  return true;
-}
-
-// Examples:
-// {"id":3,"result":{}}
-// {"id":4,"result":{"debuggerId":"-2193881606781505058.81393575456727957"}}
-// {"id":5,"error":{"code":-32000,"message":"Not supported"}}
-bool ParseResult(const base::StringPiece& message,
-                 int& message_id,
-                 bool& success,
-                 base::StringPiece& result) {
-  static const char kIdStart[] = "{\"id\":";
-  static const char kIdEnd[] = ",";
-  static const char kResultStart[] = "\"result\":";
-  static const char kErrorStart[] = "\"error\":";
-
-  if (!message.starts_with(kIdStart))
-    return false;
-
-  const size_t id_start = sizeof(kIdStart) - 1;
-  const size_t id_end = message.find(kIdEnd, id_start);
-  if (id_end < 0U)
-    return false;
-  const base::StringPiece& id_str = message.substr(id_start, id_end - id_start);
-  if (id_str.empty() || !base::StringToInt(id_str, &message_id))
-    return false;
-
-  size_t remainder_start = id_end + sizeof(kIdEnd) - 1;
-  const base::StringPiece& remainder = message.substr(remainder_start);
-  if (remainder.starts_with(kResultStart)) {
-    // Stop immediately before the message closing bracket.
-    remainder_start += sizeof(kResultStart) - 1;
-    result =
-        message.substr(remainder_start, message.size() - 1 - remainder_start);
-    success = true;
-  } else if (remainder.starts_with(kErrorStart)) {
-    // Stop immediately before the message closing bracket.
-    remainder_start += sizeof(kErrorStart) - 1;
-    result =
-        message.substr(remainder_start, message.size() - 1 - remainder_start);
-    success = false;
-  } else {
-    // Invalid format.
-    return false;
-  }
-
-  if (!IsValidDictionary(result, /*allow_empty=*/true))
-    return false;
-
-  return true;
-}
-
-}  // namespace
-
-// static
-bool ProtocolParser::IsValidMessage(const base::StringPiece& message) {
-  return IsValidDictionary(message, /*allow_empty=*/false);
-}
-
-bool ProtocolParser::Initialize(const base::StringPiece& message) {
-  if (status_ != UNINITIALIZED)
-    return false;
-
-  if (ParseEvent(message, method_, params_)) {
-    status_ = EVENT;
-  } else if (ParseResult(message, message_id_, success_, params_)) {
-    status_ = RESULT;
-  } else {
-    status_ = FAILURE;
-  }
-  return true;
-}
-
-}  // namespace devtools_util
--- a/libcef/browser/devtools/devtools_util.h
+++ b/libcef/browser/devtools/devtools_util.h
@@ -1,72 +0,0 @@
-// Copyright (c) 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_DEVTOOLS_DEVTOOLS_UTIL_H_
-#define CEF_LIBCEF_BROWSER_DEVTOOLS_DEVTOOLS_UTIL_H_
-#pragma once
-
-#include "base/strings/string_piece.h"
-
-namespace devtools_util {
-
-// Fast parser for DevTools JSON protocol messages. This implementation makes
-// certain assumptions about the JSON object structure (value order and
-// formatting) to avoid stateful parsing of messages that may be large
-// (sometimes > 1MB in size). The message must be a JSON dictionary that starts
-// with a "method" or "id" value which is non-empty and of the expected data
-// type. Messages that have a "method" value (event message) may optionally have
-// a "params" dictionary. Messages that have an "id" value (result message) must
-// have a "result" or "error" dictionary. The dictionary contents are not
-// validated and may be empty ("{}").
-//
-// Example event message:
-// {"method":"Target.targetDestroyed","params":{"targetId":"1234..."}}
-//
-// Example result messages:
-// {"id":3,"result":{}}
-// {"id":4,"result":{"debuggerId":"-2193881606781505058.81393575456727957"}}
-// {"id":5,"error":{"code":-32000,"message":"Not supported"}}
-struct ProtocolParser {
-  ProtocolParser() = default;
-
-  // Checks for a non-empty JSON dictionary.
-  static bool IsValidMessage(const base::StringPiece& message);
-
-  // Returns false if already initialized.
-  bool Initialize(const base::StringPiece& message);
-
-  bool IsInitialized() const { return status_ != UNINITIALIZED; }
-  bool IsEvent() const { return status_ == EVENT; }
-  bool IsResult() const { return status_ == RESULT; }
-  bool IsFailure() const { return status_ == FAILURE; }
-
-  void Reset() { status_ = UNINITIALIZED; }
-
-  // For event messages:
-  //   "method" string:
-  base::StringPiece method_;
-
-  // For result messages:
-  //   "id" int:
-  int message_id_ = 0;
-  //   true if "result" value, false if "error" value:
-  bool success_ = false;
-
-  // For both:
-  //   "params", "result" or "error" dictionary:
-  base::StringPiece params_;
-
- private:
-  enum Status {
-    UNINITIALIZED,
-    EVENT,    // Event message.
-    RESULT,   // Result message.
-    FAILURE,  // Parsing failure.
-  };
-  Status status_ = UNINITIALIZED;
-};
-
-}  // namespace devtools_util
-
-#endif  // CEF_LIBCEF_BROWSER_DEVTOOLS_DEVTOOLS_UTIL_H_
--- a/libcef/browser/devtools/devtools_util_unittest.cc
+++ b/libcef/browser/devtools/devtools_util_unittest.cc
@@ -1,204 +0,0 @@
-// Copyright (c) 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/devtools/devtools_util.h"
-
-#include "testing/gtest/include/gtest/gtest.h"
-
-using namespace devtools_util;
-
-TEST(DevToolsUtil, ProtocolParser_IsValidMessage) {
-  // Empty dictionary is not valid.
-  EXPECT_FALSE(ProtocolParser::IsValidMessage(""));
-  EXPECT_FALSE(ProtocolParser::IsValidMessage("{}"));
-
-  // Incorrectly formatted dictionary is not valid.
-  EXPECT_FALSE(ProtocolParser::IsValidMessage("{ ]"));
-
-  // Everything else is valid (we don't verify JSON structure).
-  EXPECT_TRUE(ProtocolParser::IsValidMessage("{ }"));
-  EXPECT_TRUE(ProtocolParser::IsValidMessage("{blah blah}"));
-  EXPECT_TRUE(ProtocolParser::IsValidMessage("{method:\"foobar\"}"));
-}
-
-TEST(DevToolsUtil, ProtocolParser_Initialize_IsFailure_Unknown) {
-  ProtocolParser parser;
-  EXPECT_FALSE(parser.IsInitialized());
-
-  // Empty message is invalid.
-  EXPECT_TRUE(parser.Initialize(""));
-  EXPECT_TRUE(parser.IsInitialized());
-  EXPECT_TRUE(parser.IsFailure());
-
-  parser.Reset();
-  EXPECT_FALSE(parser.IsInitialized());
-
-  // Empty dictionary is invalid.
-  EXPECT_TRUE(parser.Initialize("{}"));
-  EXPECT_TRUE(parser.IsInitialized());
-  EXPECT_TRUE(parser.IsFailure());
-
-  parser.Reset();
-  EXPECT_FALSE(parser.IsInitialized());
-
-  // Unrecognized dictionary type is invalid.
-  EXPECT_TRUE(parser.Initialize("{blah blah}"));
-  EXPECT_TRUE(parser.IsInitialized());
-  EXPECT_TRUE(parser.IsFailure());
-}
-
-TEST(DevToolsUtil, ProtocolParser_Initialize_IsFailure_EventMalformed) {
-  ProtocolParser parser;
-  EXPECT_FALSE(parser.IsInitialized());
-
-  // Empty method is invalid.
-  EXPECT_TRUE(parser.Initialize("{\"method\":\"\"}"));
-  EXPECT_TRUE(parser.IsInitialized());
-  EXPECT_TRUE(parser.IsFailure());
-
-  parser.Reset();
-  EXPECT_FALSE(parser.IsInitialized());
-
-  // Unrecognized value is invalid.
-  EXPECT_TRUE(parser.Initialize("{\"method\":\"foo\",oops:false}"));
-  EXPECT_TRUE(parser.IsInitialized());
-  EXPECT_TRUE(parser.IsFailure());
-
-  parser.Reset();
-  EXPECT_FALSE(parser.IsInitialized());
-
-  // Params must be a dictionary.
-  EXPECT_TRUE(parser.Initialize("{\"method\":\",params:[]}"));
-  EXPECT_TRUE(parser.IsInitialized());
-  EXPECT_TRUE(parser.IsFailure());
-}
-
-TEST(DevToolsUtil, ProtocolParser_Initialize_IsEvent) {
-  ProtocolParser parser;
-  EXPECT_FALSE(parser.IsInitialized());
-
-  // Method without params is valid.
-  std::string message = "{\"method\":\"Test.myMethod\"}";
-  EXPECT_TRUE(parser.Initialize(message));
-  EXPECT_TRUE(parser.IsInitialized());
-  EXPECT_TRUE(parser.IsEvent());
-  EXPECT_STREQ("Test.myMethod", parser.method_.as_string().data());
-  EXPECT_TRUE(parser.params_.empty());
-
-  parser.Reset();
-  EXPECT_FALSE(parser.IsInitialized());
-
-  // Method with empty params dictionary is valid.
-  message = "{\"method\":\"Test.myMethod2\",\"params\":{}}";
-  EXPECT_TRUE(parser.Initialize(message));
-  EXPECT_TRUE(parser.IsInitialized());
-  EXPECT_TRUE(parser.IsEvent());
-  EXPECT_STREQ("Test.myMethod2", parser.method_.as_string().data());
-  EXPECT_STREQ("{}", parser.params_.as_string().data());
-
-  parser.Reset();
-  EXPECT_FALSE(parser.IsInitialized());
-
-  // Method with non-empty params dictionary is valid.
-  message = "{\"method\":\"Test.myMethod3\",\"params\":{\"foo\":\"bar\"}}";
-  EXPECT_TRUE(parser.Initialize(message));
-  EXPECT_TRUE(parser.IsInitialized());
-  EXPECT_TRUE(parser.IsEvent());
-  EXPECT_STREQ("Test.myMethod3", parser.method_.as_string().data());
-  EXPECT_STREQ("{\"foo\":\"bar\"}", parser.params_.as_string().data());
-}
-
-TEST(DevToolsUtil, ProtocolParser_Initialize_IsFailure_ResultMalformed) {
-  ProtocolParser parser;
-  EXPECT_FALSE(parser.IsInitialized());
-
-  // Empty ID is invalid.
-  EXPECT_TRUE(parser.Initialize("{\"id\":,result:{}}"));
-  EXPECT_TRUE(parser.IsInitialized());
-  EXPECT_TRUE(parser.IsFailure());
-
-  parser.Reset();
-  EXPECT_FALSE(parser.IsInitialized());
-
-  // Missing result or error value is invalid.
-  EXPECT_TRUE(parser.Initialize("{\"id\":1}"));
-  EXPECT_TRUE(parser.IsInitialized());
-  EXPECT_TRUE(parser.IsFailure());
-
-  parser.Reset();
-  EXPECT_FALSE(parser.IsInitialized());
-
-  // Unrecognized value is invalid.
-  EXPECT_TRUE(parser.Initialize("{\"id\":1,oops:false}"));
-  EXPECT_TRUE(parser.IsInitialized());
-  EXPECT_TRUE(parser.IsFailure());
-
-  parser.Reset();
-  EXPECT_FALSE(parser.IsInitialized());
-
-  // Result must be a dictionary.
-  EXPECT_TRUE(parser.Initialize("{\"id\":1,\"result\":[]}"));
-  EXPECT_TRUE(parser.IsInitialized());
-  EXPECT_TRUE(parser.IsFailure());
-
-  parser.Reset();
-  EXPECT_FALSE(parser.IsInitialized());
-
-  // Error must be a dictionary.
-  EXPECT_TRUE(parser.Initialize("{\"id\":1,\"error\":[]}"));
-  EXPECT_TRUE(parser.IsInitialized());
-  EXPECT_TRUE(parser.IsFailure());
-}
-
-TEST(DevToolsUtil, ProtocolParser_Initialize_IsResult_Result) {
-  ProtocolParser parser;
-  EXPECT_FALSE(parser.IsInitialized());
-
-  // Id with empty result dictionary is valid.
-  std::string message = "{\"id\":1,\"result\":{}}";
-  EXPECT_TRUE(parser.Initialize(message));
-  EXPECT_TRUE(parser.IsInitialized());
-  EXPECT_TRUE(parser.IsResult());
-  EXPECT_EQ(1, parser.message_id_);
-  EXPECT_TRUE(parser.success_);
-  EXPECT_STREQ("{}", parser.params_.as_string().data());
-
-  parser.Reset();
-  EXPECT_FALSE(parser.IsInitialized());
-
-  // Id with non-empty result dictionary is valid.
-  message = "{\"id\":2,\"result\":{\"foo\":\"bar\"}}";
-  EXPECT_TRUE(parser.Initialize(message));
-  EXPECT_TRUE(parser.IsInitialized());
-  EXPECT_TRUE(parser.IsResult());
-  EXPECT_EQ(2, parser.message_id_);
-  EXPECT_TRUE(parser.success_);
-  EXPECT_STREQ("{\"foo\":\"bar\"}", parser.params_.as_string().data());
-}
-
-TEST(DevToolsUtil, ProtocolParser_Initialize_IsResult_Error) {
-  ProtocolParser parser;
-  EXPECT_FALSE(parser.IsInitialized());
-
-  // Id with empty error dictionary is valid.
-  std::string message = "{\"id\":1,\"error\":{}}";
-  EXPECT_TRUE(parser.Initialize(message));
-  EXPECT_TRUE(parser.IsInitialized());
-  EXPECT_TRUE(parser.IsResult());
-  EXPECT_EQ(1, parser.message_id_);
-  EXPECT_FALSE(parser.success_);
-  EXPECT_STREQ("{}", parser.params_.as_string().data());
-
-  parser.Reset();
-  EXPECT_FALSE(parser.IsInitialized());
-
-  // Id with non-empty error dictionary is valid.
-  message = "{\"id\":2,\"error\":{\"foo\":\"bar\"}}";
-  EXPECT_TRUE(parser.Initialize(message));
-  EXPECT_TRUE(parser.IsInitialized());
-  EXPECT_TRUE(parser.IsResult());
-  EXPECT_EQ(2, parser.message_id_);
-  EXPECT_FALSE(parser.success_);
-  EXPECT_STREQ("{\"foo\":\"bar\"}", parser.params_.as_string().data());
-}
--- a/libcef/browser/download_item_impl.cc
+++ b/libcef/browser/download_item_impl.cc
@@ -12,7 +12,7 @@
 CefDownloadItemImpl::CefDownloadItemImpl(download::DownloadItem* value)
    : CefValueBase<CefDownloadItem, download::DownloadItem>(
          value,
-          nullptr,
+          NULL,
          kOwnerNoDelete,
          true,
          new CefValueControllerNonThreadSafe()) {
--- a/libcef/browser/download_manager_delegate.cc
+++ b/libcef/browser/download_manager_delegate.cc
@@ -34,7 +34,7 @@ CefRefPtr<CefDownloadHandler> GetDownloadHandler(
  CefRefPtr<CefClient> client = browser->GetClient();
  if (client.get())
    return client->GetDownloadHandler();
-  return nullptr;
+  return NULL;
 }

 // CefBeforeDownloadCallback implementation.
@@ -43,11 +43,11 @@ class CefBeforeDownloadCallbackImpl : public CefBeforeDownloadCallback {
  CefBeforeDownloadCallbackImpl(const base::WeakPtr<DownloadManager>& manager,
                                uint32 download_id,
                                const base::FilePath& suggested_name,
-                                content::DownloadTargetCallback callback)
+                                const content::DownloadTargetCallback& callback)
      : manager_(manager),
        download_id_(download_id),
        suggested_name_(suggested_name),
-        callback_(std::move(callback)) {}
+        callback_(callback) {}

  void Continue(const CefString& download_path, bool show_dialog) override {
    if (CEF_CURRENTLY_ON_UIT()) {
@@ -56,27 +56,28 @@ class CefBeforeDownloadCallbackImpl : public CefBeforeDownloadCallback {

      if (manager_) {
        base::FilePath path = base::FilePath(download_path);
-        CEF_POST_USER_VISIBLE_TASK(
-            base::BindOnce(&CefBeforeDownloadCallbackImpl::GenerateFilename,
-                           manager_, download_id_, suggested_name_, path,
-                           show_dialog, std::move(callback_)));
+        CEF_POST_USER_VISIBLE_TASK(base::Bind(
+            &CefBeforeDownloadCallbackImpl::GenerateFilename, manager_,
+            download_id_, suggested_name_, path, show_dialog, callback_));
      }

      download_id_ = 0;
+      callback_.Reset();
    } else {
      CEF_POST_TASK(CEF_UIT,
-                    base::BindOnce(&CefBeforeDownloadCallbackImpl::Continue,
-                                   this, download_path, show_dialog));
+                    base::Bind(&CefBeforeDownloadCallbackImpl::Continue, this,
+                               download_path, show_dialog));
    }
  }

 private:
-  static void GenerateFilename(base::WeakPtr<DownloadManager> manager,
-                               uint32 download_id,
-                               const base::FilePath& suggested_name,
-                               const base::FilePath& download_path,
-                               bool show_dialog,
-                               content::DownloadTargetCallback callback) {
+  static void GenerateFilename(
+      base::WeakPtr<DownloadManager> manager,
+      uint32 download_id,
+      const base::FilePath& suggested_name,
+      const base::FilePath& download_path,
+      bool show_dialog,
+      const content::DownloadTargetCallback& callback) {
    CEF_REQUIRE_BLOCKING();

    base::FilePath suggested_path = download_path;
@@ -102,16 +103,16 @@ class CefBeforeDownloadCallbackImpl : public CefBeforeDownloadCallback {

    CEF_POST_TASK(
        CEF_UIT,
-        base::BindOnce(&CefBeforeDownloadCallbackImpl::ChooseDownloadPath,
-                       manager, download_id, suggested_path, show_dialog,
-                       std::move(callback)));
+        base::Bind(&CefBeforeDownloadCallbackImpl::ChooseDownloadPath, manager,
+                   download_id, suggested_path, show_dialog, callback));
  }

-  static void ChooseDownloadPath(base::WeakPtr<DownloadManager> manager,
-                                 uint32 download_id,
-                                 const base::FilePath& suggested_path,
-                                 bool show_dialog,
-                                 content::DownloadTargetCallback callback) {
+  static void ChooseDownloadPath(
+      base::WeakPtr<DownloadManager> manager,
+      uint32 download_id,
+      const base::FilePath& suggested_path,
+      bool show_dialog,
+      const content::DownloadTargetCallback& callback) {
    if (!manager)
      return;

@@ -141,23 +142,21 @@ class CefBeforeDownloadCallbackImpl : public CefBeforeDownloadCallback {

        browser->RunFileChooser(
            params,
-            base::BindOnce(
+            base::Bind(
                &CefBeforeDownloadCallbackImpl::ChooseDownloadPathCallback,
-                std::move(callback)));
+                callback));
      }
    }

    if (!handled) {
-      std::move(callback).Run(
-          suggested_path, DownloadItem::TARGET_DISPOSITION_OVERWRITE,
-          download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
-          download::DownloadItem::MixedContentStatus::UNKNOWN, suggested_path,
-          download::DOWNLOAD_INTERRUPT_REASON_NONE);
+      callback.Run(suggested_path, DownloadItem::TARGET_DISPOSITION_OVERWRITE,
+                   download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS, suggested_path,
+                   download::DOWNLOAD_INTERRUPT_REASON_NONE);
    }
  }

  static void ChooseDownloadPathCallback(
-      content::DownloadTargetCallback callback,
+      const content::DownloadTargetCallback& callback,
      int selected_accept_filter,
      const std::vector<base::FilePath>& file_paths) {
    DCHECK_LE(file_paths.size(), (size_t)1);
@@ -167,10 +166,9 @@ class CefBeforeDownloadCallbackImpl : public CefBeforeDownloadCallback {
      path = file_paths.front();

    // The download will be cancelled if |path| is empty.
-    std::move(callback).Run(path, DownloadItem::TARGET_DISPOSITION_OVERWRITE,
-                            download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
-                            download::DownloadItem::MixedContentStatus::UNKNOWN,
-                            path, download::DOWNLOAD_INTERRUPT_REASON_NONE);
+    callback.Run(path, DownloadItem::TARGET_DISPOSITION_OVERWRITE,
+                 download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS, path,
+                 download::DOWNLOAD_INTERRUPT_REASON_NONE);
  }

  base::WeakPtr<DownloadManager> manager_;
@@ -264,7 +262,7 @@ CefDownloadManagerDelegate::CefDownloadManagerDelegate(DownloadManager* manager)

 CefDownloadManagerDelegate::~CefDownloadManagerDelegate() {
  if (manager_) {
-    manager_->SetDelegate(nullptr);
+    manager_->SetDelegate(NULL);
    manager_->RemoveObserver(this);
  }

@@ -286,7 +284,7 @@ void CefDownloadManagerDelegate::OnDownloadUpdated(DownloadItem* download) {

    handler->OnDownloadUpdated(browser.get(), download_item.get(), callback);

-    download_item->Detach(nullptr);
+    download_item->Detach(NULL);
  }
 }

@@ -341,21 +339,20 @@ void CefDownloadManagerDelegate::OnDownloadCreated(DownloadManager* manager,

 void CefDownloadManagerDelegate::ManagerGoingDown(DownloadManager* manager) {
  DCHECK_EQ(manager, manager_);
-  manager->SetDelegate(nullptr);
+  manager->SetDelegate(NULL);
  manager->RemoveObserver(this);
  manager_ptr_factory_.InvalidateWeakPtrs();
-  manager_ = nullptr;
+  manager_ = NULL;
 }

 bool CefDownloadManagerDelegate::DetermineDownloadTarget(
    DownloadItem* item,
-    content::DownloadTargetCallback* callback) {
+    const content::DownloadTargetCallback& callback) {
  if (!item->GetForcedFilePath().empty()) {
-    std::move(*callback).Run(
+    callback.Run(
        item->GetForcedFilePath(), DownloadItem::TARGET_DISPOSITION_OVERWRITE,
-        download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
-        download::DownloadItem::MixedContentStatus::UNKNOWN,
-        item->GetForcedFilePath(), download::DOWNLOAD_INTERRUPT_REASON_NONE);
+        download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS, item->GetForcedFilePath(),
+        download::DOWNLOAD_INTERRUPT_REASON_NONE);
    return true;
  }

@@ -375,21 +372,21 @@ bool CefDownloadManagerDelegate::DetermineDownloadTarget(
    CefRefPtr<CefBeforeDownloadCallback> callbackObj(
        new CefBeforeDownloadCallbackImpl(manager_ptr_factory_.GetWeakPtr(),
                                          item->GetId(), suggested_name,
-                                          std::move(*callback)));
+                                          callback));

    handler->OnBeforeDownload(browser.get(), download_item.get(),
                              suggested_name.value(), callbackObj);

-    download_item->Detach(nullptr);
+    download_item->Detach(NULL);
  }

  return true;
 }

 void CefDownloadManagerDelegate::GetNextId(
-    content::DownloadIdCallback callback) {
+    const content::DownloadIdCallback& callback) {
  static uint32 next_id = DownloadItem::kInvalidId + 1;
-  std::move(callback).Run(next_id++);
+  callback.Run(next_id++);
 }

 std::string CefDownloadManagerDelegate::ApplicationClientIdForFileScanning() {
--- a/libcef/browser/download_manager_delegate.h
+++ b/libcef/browser/download_manager_delegate.h
@@ -37,8 +37,8 @@ class CefDownloadManagerDelegate : public download::DownloadItem::Observer,
  // DownloadManagerDelegate methods.
  bool DetermineDownloadTarget(
      download::DownloadItem* item,
-      content::DownloadTargetCallback* callback) override;
-  void GetNextId(content::DownloadIdCallback callback) override;
+      const content::DownloadTargetCallback& callback) override;
+  void GetNextId(const content::DownloadIdCallback& callback) override;
  std::string ApplicationClientIdForFileScanning() override;

  // CefBrowserHostImpl::Observer methods.
--- a/libcef/browser/extensions/api/tabs/tabs_api.cc
+++ b/libcef/browser/extensions/api/tabs/tabs_api.cc
@@ -110,7 +110,7 @@ ExecuteCodeFunction::InitResult ExecuteCodeInTabFunction::Init() {
    return set_init_result(VALIDATION_FAILURE);

  // |details| are not optional.
-  base::DictionaryValue* details_value = nullptr;
+  base::DictionaryValue* details_value = NULL;
  if (!args_->GetDictionary(1, &details_value))
    return set_init_result(VALIDATION_FAILURE);
  std::unique_ptr<InjectDetails> details(new InjectDetails());
@@ -282,10 +282,9 @@ bool TabsSetZoomFunction::RunAsync() {

  zoom::ZoomController* zoom_controller =
      zoom::ZoomController::FromWebContents(web_contents);
-  double zoom_level =
-      params->zoom_factor > 0
-          ? blink::PageZoomFactorToZoomLevel(params->zoom_factor)
-          : zoom_controller->GetDefaultZoomLevel();
+  double zoom_level = params->zoom_factor > 0
+                          ? blink::PageZoomFactorToZoomLevel(params->zoom_factor)
+                          : zoom_controller->GetDefaultZoomLevel();

  scoped_refptr<extensions::ExtensionZoomRequestClient> client(
      new extensions::ExtensionZoomRequestClient(extension()));
@@ -385,9 +384,8 @@ bool TabsGetZoomSettingsFunction::RunAsync() {
  zoom::ZoomController::ZoomMode zoom_mode = zoom_controller->zoom_mode();
  api::tabs::ZoomSettings zoom_settings;
  ZoomModeToZoomSettings(zoom_mode, &zoom_settings);
-  zoom_settings.default_zoom_factor.reset(
-      new double(blink::PageZoomLevelToZoomFactor(
-          zoom_controller->GetDefaultZoomLevel())));
+  zoom_settings.default_zoom_factor.reset(new double(
+      blink::PageZoomLevelToZoomFactor(zoom_controller->GetDefaultZoomLevel())));

  results_ = api::tabs::GetZoomSettings::Results::Create(zoom_settings);
  SendResponse(true);
--- a/libcef/browser/extensions/browser_extensions_util.cc
+++ b/libcef/browser/extensions/browser_extensions_util.cc
@@ -42,7 +42,7 @@ content::WebContents* GetFullPageGuestForOwnerContents(
    if (plugin_guest)
      return plugin_guest->web_contents();
  }
-  return nullptr;
+  return NULL;
 }

 void GetAllGuestsForOwnerContents(content::WebContents* owner,
@@ -58,10 +58,8 @@ content::WebContents* GetOwnerForGuestContents(content::WebContents* guest) {
      static_cast<content::WebContentsImpl*>(guest);
  content::BrowserPluginGuest* plugin_guest =
      guest_impl->GetBrowserPluginGuest();
-  if (plugin_guest) {
-    return content::WebContents::FromRenderFrameHost(
-        plugin_guest->GetEmbedderFrame());
-  }
+  if (plugin_guest)
+    return plugin_guest->embedder_web_contents();

  // Maybe it's a print preview dialog.
  auto print_preview_controller =
@@ -79,7 +77,7 @@ CefRefPtr<CefBrowserHostImpl> GetOwnerBrowserForFrameRoute(
        content::RenderFrameHost::FromID(render_process_id, render_routing_id);
    if (host)
      return GetOwnerBrowserForHost(host, is_guest_view);
-    return nullptr;
+    return NULL;
  } else {
    // Use the thread-safe approach.
    scoped_refptr<CefBrowserInfo> info =
@@ -95,7 +93,7 @@ CefRefPtr<CefBrowserHostImpl> GetOwnerBrowserForFrameRoute(
      }
      return browser;
    }
-    return nullptr;
+    return NULL;
  }
 }

--- a/libcef/browser/extensions/browser_platform_delegate_background.cc
+++ b/libcef/browser/extensions/browser_platform_delegate_background.cc
@@ -52,28 +52,17 @@ void CefBrowserPlatformDelegateBackground::WasResized() {
 }

 void CefBrowserPlatformDelegateBackground::SendKeyEvent(
-    const CefKeyEvent& event) {
+    const content::NativeWebKeyboardEvent& event) {
  // Nothing to do here.
 }

-void CefBrowserPlatformDelegateBackground::SendMouseClickEvent(
-    const CefMouseEvent& event,
-    CefBrowserHost::MouseButtonType type,
-    bool mouseUp,
-    int clickCount) {
-  // Nothing to do here.
-}
-
-void CefBrowserPlatformDelegateBackground::SendMouseMoveEvent(
-    const CefMouseEvent& event,
-    bool mouseLeave) {
+void CefBrowserPlatformDelegateBackground::SendMouseEvent(
+    const blink::WebMouseEvent& event) {
  // Nothing to do here.
 }

 void CefBrowserPlatformDelegateBackground::SendMouseWheelEvent(
-    const CefMouseEvent& event,
-    int deltaX,
-    int deltaY) {
+    const blink::WebMouseWheelEvent& event) {
  // Nothing to do here.
 }

@@ -102,6 +91,37 @@ bool CefBrowserPlatformDelegateBackground::HandleKeyboardEvent(
  return false;
 }

+void CefBrowserPlatformDelegateBackground::TranslateKeyEvent(
+    content::NativeWebKeyboardEvent& result,
+    const CefKeyEvent& key_event) const {
+  native_delegate_->TranslateKeyEvent(result, key_event);
+}
+
+void CefBrowserPlatformDelegateBackground::TranslateClickEvent(
+    blink::WebMouseEvent& result,
+    const CefMouseEvent& mouse_event,
+    CefBrowserHost::MouseButtonType type,
+    bool mouseUp,
+    int clickCount) const {
+  native_delegate_->TranslateClickEvent(result, mouse_event, type, mouseUp,
+                                        clickCount);
+}
+
+void CefBrowserPlatformDelegateBackground::TranslateMoveEvent(
+    blink::WebMouseEvent& result,
+    const CefMouseEvent& mouse_event,
+    bool mouseLeave) const {
+  native_delegate_->TranslateMoveEvent(result, mouse_event, mouseLeave);
+}
+
+void CefBrowserPlatformDelegateBackground::TranslateWheelEvent(
+    blink::WebMouseWheelEvent& result,
+    const CefMouseEvent& mouse_event,
+    int deltaX,
+    int deltaY) const {
+  native_delegate_->TranslateWheelEvent(result, mouse_event, deltaX, deltaY);
+}
+
 CefEventHandle CefBrowserPlatformDelegateBackground::GetEventHandle(
    const content::NativeWebKeyboardEvent& event) const {
  return native_delegate_->GetEventHandle(event);
--- a/libcef/browser/extensions/browser_platform_delegate_background.h
+++ b/libcef/browser/extensions/browser_platform_delegate_background.h
@@ -25,21 +25,29 @@ class CefBrowserPlatformDelegateBackground
  bool CanUseSharedTexture() const override;
  bool CanUseExternalBeginFrame() const override;
  void WasResized() override;
-  void SendKeyEvent(const CefKeyEvent& event) override;
-  void SendMouseClickEvent(const CefMouseEvent& event,
-                           CefBrowserHost::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 SendKeyEvent(const content::NativeWebKeyboardEvent& event) override;
+  void SendMouseEvent(const blink::WebMouseEvent& event) override;
+  void SendMouseWheelEvent(const blink::WebMouseWheelEvent& event) override;
  void SendTouchEvent(const CefTouchEvent& event) override;
  void SendFocusEvent(bool setFocus) override;
  gfx::Point GetScreenPoint(const gfx::Point& view) const override;
  void ViewText(const std::string& text) override;
  bool HandleKeyboardEvent(
      const content::NativeWebKeyboardEvent& event) override;
+  void TranslateKeyEvent(content::NativeWebKeyboardEvent& result,
+                         const CefKeyEvent& key_event) const override;
+  void TranslateClickEvent(blink::WebMouseEvent& result,
+                           const CefMouseEvent& mouse_event,
+                           CefBrowserHost::MouseButtonType type,
+                           bool mouseUp,
+                           int clickCount) const override;
+  void TranslateMoveEvent(blink::WebMouseEvent& result,
+                          const CefMouseEvent& mouse_event,
+                          bool mouseLeave) const override;
+  void TranslateWheelEvent(blink::WebMouseWheelEvent& result,
+                           const CefMouseEvent& mouse_event,
+                           int deltaX,
+                           int deltaY) const override;
  CefEventHandle GetEventHandle(
      const content::NativeWebKeyboardEvent& event) const override;
  std::unique_ptr<CefFileDialogRunner> CreateFileDialogRunner() override;
--- a/libcef/browser/extensions/component_extension_resource_manager.cc
+++ b/libcef/browser/extensions/component_extension_resource_manager.cc
@@ -50,28 +50,13 @@ CefComponentExtensionResourceManager::GetTemplateReplacementsForExtension(
 void CefComponentExtensionResourceManager::AddComponentResourceEntries(
    const GritResourceMap* entries,
    size_t size) {
-  base::FilePath gen_folder_path = base::FilePath().AppendASCII(
-      "@out_folder@/gen/chrome/browser/resources/");
-  gen_folder_path = gen_folder_path.NormalizePathSeparators();
-
  for (size_t i = 0; i < size; ++i) {
    base::FilePath resource_path =
        base::FilePath().AppendASCII(entries[i].name);
    resource_path = resource_path.NormalizePathSeparators();

-    if (!gen_folder_path.IsParent(resource_path)) {
-      DCHECK(!base::Contains(path_to_resource_info_, resource_path));
-      path_to_resource_info_[resource_path] = entries[i].value;
-    } else {
-      // If the resource is a generated file, strip the generated folder's path,
-      // so that it can be served from a normal URL (as if it were not
-      // generated).
-      base::FilePath effective_path =
-          base::FilePath().AppendASCII(resource_path.AsUTF8Unsafe().substr(
-              gen_folder_path.value().length()));
-      DCHECK(!base::Contains(path_to_resource_info_, effective_path));
-      path_to_resource_info_[effective_path] = entries[i].value;
-    }
+    DCHECK(!base::Contains(path_to_resource_info_, resource_path));
+    path_to_resource_info_[resource_path] = entries[i].value;
  }
 }

--- a/libcef/browser/extensions/extension_function_details.cc
+++ b/libcef/browser/extensions/extension_function_details.cc
@@ -44,9 +44,10 @@ class CefGetExtensionLoadFileCallbackImpl
      if (CEF_CURRENTLY_ON_UIT()) {
        RunNow(file_, std::move(callback_), nullptr);
      } else {
-        CEF_POST_TASK(CEF_UIT, base::BindOnce(
-                                   &CefGetExtensionLoadFileCallbackImpl::RunNow,
-                                   file_, std::move(callback_), nullptr));
+        CEF_POST_TASK(
+            CEF_UIT,
+            base::BindOnce(&CefGetExtensionLoadFileCallbackImpl::RunNow, file_,
+                           base::Passed(std::move(callback_)), nullptr));
      }
    }
  }
@@ -55,9 +56,10 @@ class CefGetExtensionLoadFileCallbackImpl
    if (CEF_CURRENTLY_ON_UIT()) {
      if (!callback_.is_null()) {
        // Always continue asynchronously.
-        CEF_POST_TASK(CEF_UIT, base::BindOnce(
-                                   &CefGetExtensionLoadFileCallbackImpl::RunNow,
-                                   file_, std::move(callback_), stream));
+        CEF_POST_TASK(
+            CEF_UIT,
+            base::BindOnce(&CefGetExtensionLoadFileCallbackImpl::RunNow, file_,
+                           base::Passed(std::move(callback_)), stream));
      }
    } else {
      CEF_POST_TASK(CEF_UIT, base::BindOnce(
@@ -371,7 +373,7 @@ base::DictionaryValue* CefExtensionFunctionDetails::OpenTab(
  create_params.window_info.reset(new CefWindowInfo);

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

  // Start with the active browser's settings.
@@ -423,8 +425,8 @@ std::unique_ptr<api::tabs::Tab> CefExtensionFunctionDetails::CreateTabObject(
  tab_object->id = std::make_unique<int>(new_browser->GetIdentifier());
  tab_object->index = index;
  tab_object->window_id = *tab_object->id;
-  tab_object->status = is_loading ? api::tabs::TAB_STATUS_LOADING
-                                  : api::tabs::TAB_STATUS_COMPLETE;
+  tab_object->status = std::make_unique<std::string>(
+      is_loading ? keys::kStatusValueLoading : keys::kStatusValueComplete);
  tab_object->active = active;
  tab_object->selected = true;
  tab_object->highlighted = true;
--- a/libcef/browser/extensions/extension_host_delegate.cc
+++ b/libcef/browser/extensions/extension_host_delegate.cc
@@ -27,7 +27,7 @@ content::JavaScriptDialogManager*
 CefExtensionHostDelegate::GetJavaScriptDialogManager() {
  // Never routed here from CefBrowserHostImpl.
  NOTREACHED();
-  return nullptr;
+  return NULL;
 }

 void CefExtensionHostDelegate::CreateTab(
@@ -59,6 +59,10 @@ bool CefExtensionHostDelegate::CheckMediaAccessPermission(
  return false;
 }

+ExtensionHostQueue* CefExtensionHostDelegate::GetExtensionHostQueue() const {
+  return CefExtensionsBrowserClient::Get()->GetExtensionHostQueue();
+}
+
 content::PictureInPictureResult CefExtensionHostDelegate::EnterPictureInPicture(
    content::WebContents* web_contents,
    const viz::SurfaceId& surface_id,
--- a/libcef/browser/extensions/extension_host_delegate.h
+++ b/libcef/browser/extensions/extension_host_delegate.h
@@ -34,6 +34,7 @@ class CefExtensionHostDelegate : public ExtensionHostDelegate {
                                  const GURL& security_origin,
                                  blink::mojom::MediaStreamType type,
                                  const Extension* extension) override;
+  ExtensionHostQueue* GetExtensionHostQueue() const override;
  content::PictureInPictureResult EnterPictureInPicture(
      content::WebContents* web_contents,
      const viz::SurfaceId& surface_id,
--- a/libcef/browser/extensions/extension_system.cc
+++ b/libcef/browser/extensions/extension_system.cc
@@ -44,7 +44,6 @@
 #include "extensions/browser/runtime_data.h"
 #include "extensions/browser/service_worker_manager.h"
 #include "extensions/browser/state_store.h"
-#include "extensions/browser/unloaded_extension_reason.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension_messages.h"
 #include "extensions/common/file_util.h"
@@ -64,12 +63,11 @@ namespace {
 std::unique_ptr<base::DictionaryValue> ParseManifest(
    const std::string& manifest_contents) {
  JSONStringValueDeserializer deserializer(manifest_contents);
-  std::unique_ptr<base::Value> manifest(
-      deserializer.Deserialize(nullptr, nullptr));
+  std::unique_ptr<base::Value> manifest(deserializer.Deserialize(NULL, NULL));

  if (!manifest.get() || !manifest->is_dict()) {
    LOG(ERROR) << "Failed to parse extension manifest.";
-    return nullptr;
+    return NULL;
  }
  // Transfer ownership to the caller.
  return base::WrapUnique(
@@ -97,8 +95,9 @@ void LoadExtensionOnUIThread(base::WeakPtr<CefExtensionSystem> context,
                             CefRefPtr<CefExtensionHandler> handler) {
  if (!CEF_CURRENTLY_ON_UIT()) {
    CEF_POST_TASK(CEF_UIT, base::BindOnce(LoadExtensionOnUIThread, context,
-                                          std::move(manifest), root_directory,
-                                          internal, loader_context, handler));
+                                          base::Passed(std::move(manifest)),
+                                          root_directory, internal,
+                                          loader_context, handler));
    return;
  }

@@ -185,78 +184,48 @@ void CefExtensionSystem::Init() {
      content::NotificationService::NoDetails());

  // Add the internal PDF extension. PDF loading works as follows:
-  // 1. The PDF PPAPI plugin is registered in libcef/common/content_client.cc
-  //    ComputeBuiltInPlugins to handle the kPDFPluginOutOfProcessMimeType.
-  // 2. The PDF extension is registered by the below call to AddExtension and
-  //    associated with the "application/pdf" mime type.
-  // 3. Web content running in the owner CefBrowser requests to load a PDF file
-  //    resource with the "application/pdf" mime type. This can be via a frame
-  //    (main frame/iframe) or object/embed tag.
+  // 1. PDF PPAPI plugin is registered to handle kPDFPluginOutOfProcessMimeType
+  //    in libcef/common/content_client.cc ComputeBuiltInPlugins.
+  // 2. PDF extension is registered and associated with the "application/pdf"
+  //    mime type by the below call to AddExtension.
+  // 3. A page requests a resource with the "application/pdf" mime type. For
+  //    example, by loading a PDF file.
  // 4. PluginResponseInterceptorURLLoaderThrottle intercepts the PDF resource
-  //    load in the browser process and registers the PDF resource as a stream
-  //    via MimeHandlerStreamManager::AddStream.
-  // 5. PluginResponseInterceptorURLLoaderThrottle::WillProcessResponse triggers
-  //    creation of a MimeHandlerViewEmbedder in the browser process via
-  //    MimeHandlerViewAttachHelper::OverrideBodyForInterceptedResponse.
-  // 6. MimeHandlerViewEmbedder::ReadyToCommitNavigation is called and sends a
-  //    Mojo message to MimeHandlerViewContainerManager::SetInternalId in the
-  //    owner renderer process.
-  // 7. The MimeHandlerViewContainerManager is created in the owner renderer
-  //    process via MimeHandlerViewContainerManager::BindReceiver and the
-  //    SetInternalId call arrives.
-  // 8. HTMLPlugInElement::RequestObject is called in the owner renderer process
-  //    to handle the PDF file frame/object/embed tag. This results in calls to
-  //    ContentBrowserClient::GetPluginMimeTypesWithExternalHandlers (browser
-  //    process) and ContentRendererClient::IsPluginHandledExternally (owner
-  //    renderer process), and determines that the plugin should be handled
-  //    externally (handled_externally=true).
-  // 9. MimeHandlerViewContainerManager::IsManagedByContainerManager sends a
-  //    Mojo message to MimeHandlerViewEmbedder::ReadyToCreateMimeHandlerView
-  //    in the browser process.
-  // 10.MimeHandlerViewEmbedder::RenderFrameCreated triggers creation of a
-  //    MimeHandlerViewGuest and CefMimeHandlerViewGuestDelegate in the browser
-  //    process.
-  // 11.MimeHandlerViewGuest::CreateWebContents creates a new guest WebContents
-  //    (is_guest_view=true) to host the PDF extension and the PDF resource
-  //    stream is retrieved via MimeHandlerStreamManager::ReleaseStream.
-  // 12.MimeHandlerViewGuest::DidAttachToEmbedder calls
-  //    CefMimeHandlerViewGuestDelegate::OnGuestAttached to associate the guest
-  //    WebContents routing IDs with the owner CefBrowser. MimeHandlerViewGuest
-  //    then loads the extension URL (index.html) in the guest WebContents.
-  // 13.Creation of the RenderFrame in the guest renderer process triggers a
-  //    sync IPC call from CefContentRendererClient::MaybeCreateBrowser to
-  //    CefBrowserInfoManager::GetBrowserInfo in the browser process to retrieve
-  //    the CefBrowser information, which will be immediately available due to
-  //    step 12.
-  // 14.The PDF extension begins to load. Extension resource requests are
-  //    handled via ExtensionURLLoaderFactory::CreateLoaderAndStart in the
-  //    browser process. Access to PDF extension resources is checked by
-  //    CefExtensionsBrowserClient::AllowCrossRendererResourceLoad and
-  //    PDF extension resources are provided from bundle via
-  //    CefExtensionsBrowserClient::LoadResourceFromResourceBundle
-  //    and CefComponentExtensionResourceManager. Access to chrome://resources
-  //    is granted via CefExtensionWebContentsObserver::RenderViewCreated.
-  // 15.The PDF extension calls chrome.mimeHandlerPrivate.getStreamInfo
-  //    (chrome/browser/resources/pdf/browser_api.js) to retrieve the PDF
-  //    resource stream. This API is implemented using Mojo as described in
+  // load in the browser process, generates a
+  //    unique View ID that is associated with the resource request for later
+  //    retrieval via MimeHandlerStreamManager and the
+  //    chrome.mimeHandlerPrivate JS API (extensions/common/api/
+  //    mime_handler_private.idl), and returns the unique View ID via the
+  //    |payload| argument.
+  // 5. The unique View ID arrives in the renderer process via
+  //    ResourceLoader::DidReceiveData and triggers creation of a new Document.
+  //    DOMImplementation::createDocument indirectly calls
+  //    RendererBlinkPlatformImpl::getPluginList to retrieve the list of
+  //    supported plugins from the browser process. If a plugin supports the
+  //    "application/pdf" mime type then a PluginDocument is created and
+  //    CefContentRendererClient::OverrideCreatePlugin is called. This then
+  //    indirectly calls CefContentRendererClient::CreateBrowserPluginDelegate
+  //    to create a MimeHandlerViewContainer.
+  // 6. A MimeHandlerViewGuest and CefMimeHandlerViewGuestDelegate is created in
+  //    the browser process.
+  // 7. MimeHandlerViewGuest navigates to the PDF extension URL.
+  // 8. Access to PDF extension resources is checked by
+  //    CefExtensionsBrowserClient::AllowCrossRendererResourceLoad.
+  // 9. PDF extension resources are provided from bundle via
+  //    CefExtensionsBrowserClient::LoadResourceFromResourceBundle,
+  //    CefContentBrowserClient::RegisterNonNetworkSubresourceURLLoaderFactories
+  //    and CefComponentExtensionResourceManager.
+  // 10.The PDF extension (chrome/browser/resources/pdf/browser_api.js) calls
+  //    chrome.mimeHandlerPrivate.getStreamInfo to retrieve the PDF resource
+  //    stream. This API is implemented using Mojo as described in
  //    libcef/common/extensions/api/README.txt.
-  // 16.The PDF extension requests the PDF PPAPI plugin to handle
-  //    kPDFPluginOutOfProcessMimeType. Approval arrives in the guest renderer
-  //    process via ExtensionFrameHelper::OnExtensionResponse which calls
-  //    NativeExtensionBindingsSystem::HandleResponse. This triggers creation of
-  //    an HTMLPlugInElement via native V8 bindings to host the PDF plugin.
-  // 17.HTMLPlugInElement::RequestObject is called in the guest renderer process
-  //    and determines that the PDF PPAPI plugin should be handled internally
-  //    (handled_externally=false). A PluginDocument is created and
-  //    CefContentRendererClient::OverrideCreatePlugin is called to create a
-  //    WebPlugin.
-  // 18.The PDF extension and PDF plugin are now loaded. Print commands, if
-  //    any, are handled in the guest renderer process by ChromePDFPrintClient
-  //    and CefPrintRenderFrameHelperDelegate.
-  // 19.When navigating away from the PDF file or closing the owner CefBrowser
-  //    the guest WebContents will be destroyed. This triggers a call to
-  //    CefMimeHandlerViewGuestDelegate::OnGuestDetached which removes the
-  //    routing ID association with the owner CefBrowser.
+  // 11.The PDF extension requests a plugin to handle
+  //    kPDFPluginOutOfProcessMimeType which loads the PDF PPAPI plugin.
+  // 12.Routing of print-related commands are handled by ChromePDFPrintClient
+  //    and CefPrintRenderFrameHelperDelegate in the renderer process.
+  // 13.The PDF extension is granted access to chrome://resources via
+  //    CefExtensionWebContentsObserver::RenderViewCreated in the browser
+  //    process.
  if (PdfExtensionEnabled()) {
    LoadExtension(ParseManifest(pdf_extension_util::GetManifest()),
                  base::FilePath(FILE_PATH_LITERAL("pdf")), true /* internal */,
@@ -447,7 +416,7 @@ AppSorting* CefExtensionSystem::app_sorting() {
 // ExtensionSystemImpl::RegisterExtensionWithRequestContexts.
 void CefExtensionSystem::RegisterExtensionWithRequestContexts(
    const Extension* extension,
-    base::OnceClosure callback) {
+    const base::Closure& callback) {
  // TODO(extensions): The |incognito_enabled| value should be set based on
  // manifest settings.
  base::PostTaskAndReply(
@@ -456,7 +425,7 @@ void CefExtensionSystem::RegisterExtensionWithRequestContexts(
                 base::RetainedRef(extension), base::Time::Now(),
                 true,    // incognito_enabled
                 false),  // notifications_disabled
-      std::move(callback));
+      callback);
 }

 // Implementation based on
--- a/libcef/browser/extensions/extension_system.h
+++ b/libcef/browser/extensions/extension_system.h
@@ -102,7 +102,7 @@ class CefExtensionSystem : public ExtensionSystem {
  AppSorting* app_sorting() override;
  void RegisterExtensionWithRequestContexts(
      const Extension* extension,
-      base::OnceClosure callback) override;
+      const base::Closure& callback) override;
  void UnregisterExtensionWithRequestContexts(
      const std::string& extension_id,
      const UnloadedExtensionReason reason) override;
--- a/libcef/browser/extensions/extension_view_host.cc
+++ b/libcef/browser/extensions/extension_view_host.cc
@@ -12,7 +12,7 @@
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/notification_types.h"
 #include "extensions/browser/runtime_data.h"
-#include "third_party/blink/public/common/input/web_gesture_event.h"
+#include "third_party/blink/public/platform/web_gesture_event.h"

 using content::NativeWebKeyboardEvent;
 using content::OpenURLParams;
--- a/libcef/browser/extensions/extensions_api_client.cc
+++ b/libcef/browser/extensions/extensions_api_client.cc
@@ -27,7 +27,7 @@ AppViewGuestDelegate* CefExtensionsAPIClient::CreateAppViewGuestDelegate()
    const {
  // TODO(extensions): Implement to support Apps.
  NOTREACHED();
-  return nullptr;
+  return NULL;
 }

 std::unique_ptr<guest_view::GuestViewManagerDelegate>
--- a/libcef/browser/extensions/extensions_browser_client.cc
+++ b/libcef/browser/extensions/extensions_browser_client.cc
@@ -24,16 +24,14 @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_frame_host.h"
 #include "extensions/browser/api/extensions_api_client.h"
-#include "extensions/browser/api/mime_handler_private/mime_handler_private.h"
 #include "extensions/browser/api/runtime/runtime_api_delegate.h"
 #include "extensions/browser/app_sorting.h"
 #include "extensions/browser/core_extensions_browser_api_provider.h"
 #include "extensions/browser/event_router.h"
 #include "extensions/browser/extension_host_delegate.h"
-#include "extensions/browser/extensions_browser_interface_binders.h"
-#include "extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h"
+#include "extensions/browser/mojo/interface_registration.h"
+#include "extensions/browser/serial_extension_host_queue.h"
 #include "extensions/browser/url_request_util.h"
-#include "extensions/common/api/mime_handler.mojom.h"
 #include "extensions/common/constants.h"

 using content::BrowserContext;
@@ -41,41 +39,6 @@ using content::BrowserThread;

 namespace extensions {

-namespace {
-
-void BindMimeHandlerService(
-    content::RenderFrameHost* frame_host,
-    mojo::PendingReceiver<extensions::mime_handler::MimeHandlerService>
-        receiver) {
-  auto* web_contents = content::WebContents::FromRenderFrameHost(frame_host);
-  if (!web_contents)
-    return;
-
-  auto* guest_view =
-      extensions::MimeHandlerViewGuest::FromWebContents(web_contents);
-  if (!guest_view)
-    return;
-  extensions::MimeHandlerServiceImpl::Create(guest_view->GetStreamWeakPtr(),
-                                             std::move(receiver));
-}
-
-void BindBeforeUnloadControl(
-    content::RenderFrameHost* frame_host,
-    mojo::PendingReceiver<extensions::mime_handler::BeforeUnloadControl>
-        receiver) {
-  auto* web_contents = content::WebContents::FromRenderFrameHost(frame_host);
-  if (!web_contents)
-    return;
-
-  auto* guest_view =
-      extensions::MimeHandlerViewGuest::FromWebContents(web_contents);
-  if (!guest_view)
-    return;
-  guest_view->FuseBeforeUnloadControl(std::move(receiver));
-}
-
-}  // namespace
-
 CefExtensionsBrowserClient::CefExtensionsBrowserClient()
    : api_client_(new CefExtensionsAPIClient),
      resource_manager_(new CefComponentExtensionResourceManager) {
@@ -102,7 +65,7 @@ bool CefExtensionsBrowserClient::AreExtensionsDisabled(
 }

 bool CefExtensionsBrowserClient::IsValidContext(BrowserContext* context) {
-  return GetOriginalContext(context) != nullptr;
+  return GetOriginalContext(context) != NULL;
 }

 bool CefExtensionsBrowserClient::IsSameContext(BrowserContext* first,
@@ -120,7 +83,7 @@ bool CefExtensionsBrowserClient::HasOffTheRecordContext(

 BrowserContext* CefExtensionsBrowserClient::GetOffTheRecordContext(
    BrowserContext* context) {
-  return nullptr;
+  return NULL;
 }

 BrowserContext* CefExtensionsBrowserClient::GetOriginalContext(
@@ -154,11 +117,11 @@ base::FilePath CefExtensionsBrowserClient::GetBundleResourcePath(

 void CefExtensionsBrowserClient::LoadResourceFromResourceBundle(
    const network::ResourceRequest& request,
-    mojo::PendingReceiver<network::mojom::URLLoader> loader,
+    network::mojom::URLLoaderRequest loader,
    const base::FilePath& resource_relative_path,
    const int resource_id,
    const std::string& content_security_policy,
-    mojo::PendingRemote<network::mojom::URLLoaderClient> client,
+    network::mojom::URLLoaderClientPtr client,
    bool send_cors_header) {
  chrome_url_request_util::LoadResourceFromResourceBundle(
      request, std::move(loader), resource_relative_path, resource_id,
@@ -167,7 +130,7 @@ void CefExtensionsBrowserClient::LoadResourceFromResourceBundle(

 bool CefExtensionsBrowserClient::AllowCrossRendererResourceLoad(
    const GURL& url,
-    blink::mojom::ResourceType resource_type,
+    content::ResourceType resource_type,
    ui::PageTransition page_transition,
    int child_id,
    bool is_incognito,
@@ -196,7 +159,7 @@ void CefExtensionsBrowserClient::GetEarlyExtensionPrefsObservers(

 ProcessManagerDelegate* CefExtensionsBrowserClient::GetProcessManagerDelegate()
    const {
-  return nullptr;
+  return NULL;
 }

 std::unique_ptr<ExtensionHostDelegate>
@@ -294,16 +257,12 @@ CefExtensionsBrowserClient::GetExtensionSystemFactory() {
  return CefExtensionSystemFactory::GetInstance();
 }

-void CefExtensionsBrowserClient::RegisterBrowserInterfaceBindersForFrame(
-    service_manager::BinderMapWithContext<content::RenderFrameHost*>* map,
+void CefExtensionsBrowserClient::RegisterExtensionInterfaces(
+    service_manager::BinderRegistryWithArgs<content::RenderFrameHost*>*
+        registry,
    content::RenderFrameHost* render_frame_host,
    const Extension* extension) const {
-  PopulateExtensionFrameBinders(map, render_frame_host, extension);
-
-  map->Add<extensions::mime_handler::MimeHandlerService>(
-      base::BindRepeating(&BindMimeHandlerService));
-  map->Add<extensions::mime_handler::BeforeUnloadControl>(
-      base::BindRepeating(&BindBeforeUnloadControl));
+  RegisterInterfacesForExtension(registry, render_frame_host, extension);
 }

 std::unique_ptr<RuntimeAPIDelegate>
@@ -332,7 +291,7 @@ void CefExtensionsBrowserClient::BroadcastEventToRenderers(
 ExtensionCache* CefExtensionsBrowserClient::GetExtensionCache() {
  // Only used by Chrome via ExtensionService.
  NOTREACHED();
-  return nullptr;
+  return NULL;
 }

 bool CefExtensionsBrowserClient::IsBackgroundUpdateAllowed() {
@@ -352,7 +311,7 @@ CefExtensionsBrowserClient::GetExtensionWebContentsObserver(

 KioskDelegate* CefExtensionsBrowserClient::GetKioskDelegate() {
  NOTREACHED();
-  return nullptr;
+  return NULL;
 }

 bool CefExtensionsBrowserClient::IsLockScreenContext(
@@ -364,4 +323,10 @@ std::string CefExtensionsBrowserClient::GetApplicationLocale() {
  return g_browser_process->GetApplicationLocale();
 }

+ExtensionHostQueue* CefExtensionsBrowserClient::GetExtensionHostQueue() {
+  if (!extension_host_queue_)
+    extension_host_queue_.reset(new SerialExtensionHostQueue);
+  return extension_host_queue_.get();
+}
+
 }  // namespace extensions
--- a/libcef/browser/extensions/extensions_browser_client.h
+++ b/libcef/browser/extensions/extensions_browser_client.h
@@ -11,6 +11,7 @@

 namespace extensions {

+class ExtensionHostQueue;
 class ExtensionsAPIClient;

 // An ExtensionsBrowserClient that supports a single content::BrowserContent
@@ -48,14 +49,14 @@ class CefExtensionsBrowserClient : public ExtensionsBrowserClient {
      int* resource_id) const override;
  void LoadResourceFromResourceBundle(
      const network::ResourceRequest& request,
-      mojo::PendingReceiver<network::mojom::URLLoader> loader,
+      network::mojom::URLLoaderRequest loader,
      const base::FilePath& resource_relative_path,
      const int resource_id,
      const std::string& content_security_policy,
-      mojo::PendingRemote<network::mojom::URLLoaderClient> client,
+      network::mojom::URLLoaderClientPtr client,
      bool send_cors_header) override;
  bool AllowCrossRendererResourceLoad(const GURL& url,
-                                      blink::mojom::ResourceType resource_type,
+                                      content::ResourceType resource_type,
                                      ui::PageTransition page_transition,
                                      int child_id,
                                      bool is_incognito,
@@ -81,11 +82,10 @@ class CefExtensionsBrowserClient : public ExtensionsBrowserClient {
  bool IsAppModeForcedForApp(const ExtensionId& extension_id) override;
  bool IsLoggedInAsPublicAccount() override;
  ExtensionSystemProvider* GetExtensionSystemFactory() override;
-  void RegisterBrowserInterfaceBindersForFrame(
-      service_manager::BinderMapWithContext<content::RenderFrameHost*>*
-          binder_map,
-      content::RenderFrameHost* render_frame_host,
-      const Extension* extension) const override;
+  void RegisterExtensionInterfaces(service_manager::BinderRegistryWithArgs<
+                                       content::RenderFrameHost*>* registry,
+                                   content::RenderFrameHost* render_frame_host,
+                                   const Extension* extension) const override;
  std::unique_ptr<RuntimeAPIDelegate> CreateRuntimeAPIDelegate(
      content::BrowserContext* context) const override;
  const ComponentExtensionResourceManager*
@@ -104,6 +104,8 @@ class CefExtensionsBrowserClient : public ExtensionsBrowserClient {
  bool IsLockScreenContext(content::BrowserContext* context) override;
  std::string GetApplicationLocale() override;

+  ExtensionHostQueue* GetExtensionHostQueue();
+
 private:
  // Support for extension APIs.
  std::unique_ptr<ExtensionsAPIClient> api_client_;
@@ -111,6 +113,9 @@ class CefExtensionsBrowserClient : public ExtensionsBrowserClient {
  // Resource manager used to supply resources from pak files.
  std::unique_ptr<ComponentExtensionResourceManager> resource_manager_;

+  // Used to create deferred RenderViews for extensions.
+  std::unique_ptr<ExtensionHostQueue> extension_host_queue_;
+
  DISALLOW_COPY_AND_ASSIGN(CefExtensionsBrowserClient);
 };

--- a/libcef/browser/extensions/mime_handler_view_guest_delegate.cc
+++ b/libcef/browser/extensions/mime_handler_view_guest_delegate.cc
@@ -17,9 +17,22 @@

 namespace extensions {

+namespace {
+
+CefRefPtr<CefBrowserHostImpl> GetOwnerBrowser(
+    extensions::MimeHandlerViewGuest* guest) {
+  content::WebContents* owner_web_contents = guest->owner_web_contents();
+  CefRefPtr<CefBrowserHostImpl> owner_browser =
+      CefBrowserHostImpl::GetBrowserForContents(owner_web_contents);
+  DCHECK(owner_browser);
+  return owner_browser;
+}
+
+}  // namespace
+
 CefMimeHandlerViewGuestDelegate::CefMimeHandlerViewGuestDelegate(
    MimeHandlerViewGuest* guest)
-    : guest_(guest), owner_web_contents_(guest_->owner_web_contents()) {}
+    : guest_(guest) {}

 CefMimeHandlerViewGuestDelegate::~CefMimeHandlerViewGuestDelegate() {}

@@ -27,10 +40,7 @@ void CefMimeHandlerViewGuestDelegate::OverrideWebContentsCreateParams(
    content::WebContents::CreateParams* params) {
  DCHECK(params->guest_delegate);

-  CefRefPtr<CefBrowserHostImpl> owner_browser =
-      CefBrowserHostImpl::GetBrowserForContents(owner_web_contents_);
-  DCHECK(owner_browser);
-
+  CefRefPtr<CefBrowserHostImpl> owner_browser = GetOwnerBrowser(guest_);
  if (owner_browser->IsWindowless()) {
    CefWebContentsViewOSR* view_osr = new CefWebContentsViewOSR(
        owner_browser->GetBackgroundColor(), false, false);
@@ -39,29 +49,24 @@ void CefMimeHandlerViewGuestDelegate::OverrideWebContentsCreateParams(
  }
 }

-void CefMimeHandlerViewGuestDelegate::OnGuestAttached() {
+void CefMimeHandlerViewGuestDelegate::OnGuestAttached(
+    content::WebContentsView* parent_view) {
  content::WebContents* web_contents = guest_->web_contents();
  DCHECK(web_contents);

-  CefRefPtr<CefBrowserHostImpl> owner_browser =
-      CefBrowserHostImpl::GetBrowserForContents(owner_web_contents_);
-  DCHECK(owner_browser);
-
  // Associate guest state information with the owner browser.
-  owner_browser->browser_info()->MaybeCreateFrame(web_contents->GetMainFrame(),
-                                                  true /* is_guest_view */);
+  GetOwnerBrowser(guest_)->browser_info()->MaybeCreateFrame(
+      web_contents->GetMainFrame(), true /* is_guest_view */);
 }

-void CefMimeHandlerViewGuestDelegate::OnGuestDetached() {
+void CefMimeHandlerViewGuestDelegate::OnGuestDetached(
+    content::WebContentsView* parent_view) {
  content::WebContents* web_contents = guest_->web_contents();
  DCHECK(web_contents);

-  CefRefPtr<CefBrowserHostImpl> owner_browser =
-      CefBrowserHostImpl::GetBrowserForContents(owner_web_contents_);
-  DCHECK(owner_browser);
-
  // Disassociate guest state information with the owner browser.
-  owner_browser->browser_info()->RemoveFrame(web_contents->GetMainFrame());
+  GetOwnerBrowser(guest_)->browser_info()->RemoveFrame(
+      web_contents->GetMainFrame());
 }

 bool CefMimeHandlerViewGuestDelegate::HandleContextMenu(
@@ -78,11 +83,7 @@ bool CefMimeHandlerViewGuestDelegate::HandleContextMenu(
  new_params.x += guest_coordinates.x();
  new_params.y += guest_coordinates.y();

-  CefRefPtr<CefBrowserHostImpl> owner_browser =
-      CefBrowserHostImpl::GetBrowserForContents(owner_web_contents_);
-  DCHECK(owner_browser);
-
-  return owner_browser->HandleContextMenu(web_contents, new_params);
+  return GetOwnerBrowser(guest_)->HandleContextMenu(web_contents, new_params);
 }

 }  // namespace extensions
--- a/libcef/browser/extensions/mime_handler_view_guest_delegate.h
+++ b/libcef/browser/extensions/mime_handler_view_guest_delegate.h
@@ -23,14 +23,13 @@ class CefMimeHandlerViewGuestDelegate : public MimeHandlerViewGuestDelegate {
  // MimeHandlerViewGuestDelegate methods.
  void OverrideWebContentsCreateParams(
      content::WebContents::CreateParams* params) override;
-  void OnGuestAttached() override;
-  void OnGuestDetached() override;
+  void OnGuestAttached(content::WebContentsView* parent_view) override;
+  void OnGuestDetached(content::WebContentsView* parent_view) override;
  bool HandleContextMenu(content::WebContents* web_contents,
                         const content::ContextMenuParams& params) override;

 private:
  MimeHandlerViewGuest* guest_;  // Owns us.
-  content::WebContents* owner_web_contents_;

  DISALLOW_COPY_AND_ASSIGN(CefMimeHandlerViewGuestDelegate);
 };
--- a/libcef/browser/extensions/pdf_extension_util.cc
+++ b/libcef/browser/extensions/pdf_extension_util.cc
@@ -32,9 +32,9 @@ const char kPdfResourceIdentifier[] = "chromium-pdf";
 const char kPdfPluginName[] = "Chrome PDF Viewer";

 std::string GetManifest() {
-  std::string manifest_contents =
-      ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(
-          IDR_PDF_MANIFEST);
+  std::string manifest_contents = ui::ResourceBundle::GetSharedInstance()
+                                      .GetRawDataResource(IDR_PDF_MANIFEST)
+                                      .as_string();
  DCHECK(manifest_contents.find(kNameTag) != std::string::npos);
  base::ReplaceFirstSubstringAfterOffset(&manifest_contents, 0, kNameTag,
                                         kPdfPluginName);
--- a/libcef/browser/extensions/pdf_web_contents_helper_client.cc
+++ b/libcef/browser/extensions/pdf_web_contents_helper_client.cc
@@ -4,8 +4,6 @@

 #include "libcef/browser/extensions/pdf_web_contents_helper_client.h"

-#include "extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h"
-
 namespace extensions {

 CefPDFWebContentsHelperClient::CefPDFWebContentsHelperClient() {}
@@ -23,11 +21,6 @@ void CefPDFWebContentsHelperClient::OnSaveURL(content::WebContents* contents) {}

 void CefPDFWebContentsHelperClient::SetPluginCanSave(
    content::WebContents* contents,
-    bool can_save) {
-  auto* guest_view =
-      extensions::MimeHandlerViewGuest::FromWebContents(contents);
-  if (guest_view)
-    guest_view->SetPluginCanSave(can_save);
-}
+    bool can_save) {}

 }  // namespace extensions
--- a/libcef/browser/extensions/value_store/cef_value_store.cc
+++ b/libcef/browser/extensions/value_store/cef_value_store.cc
@@ -61,7 +61,7 @@ ValueStore::ReadResult CefValueStore::Get(
  auto settings = std::make_unique<base::DictionaryValue>();
  for (std::vector<std::string>::const_iterator it = keys.begin();
       it != keys.end(); ++it) {
-    base::Value* value = nullptr;
+    base::Value* value = NULL;
    if (storage_.GetWithoutPathExpansion(*it, &value)) {
      settings->SetWithoutPathExpansion(*it, value->CreateDeepCopy());
    }
@@ -94,7 +94,7 @@ ValueStore::WriteResult CefValueStore::Set(
  std::unique_ptr<ValueStoreChangeList> changes(new ValueStoreChangeList());
  for (base::DictionaryValue::Iterator it(settings); !it.IsAtEnd();
       it.Advance()) {
-    base::Value* old_value = nullptr;
+    base::Value* old_value = NULL;
    if (!storage_.GetWithoutPathExpansion(it.key(), &old_value) ||
        !old_value->Equals(&it.value())) {
      changes->push_back(ValueStoreChange(
--- a/libcef/browser/file_dialog_manager.cc
+++ b/libcef/browser/file_dialog_manager.cc
@@ -20,20 +20,17 @@ namespace {

 class CefFileDialogCallbackImpl : public CefFileDialogCallback {
 public:
-  using CallbackType = CefFileDialogRunner::RunFileChooserCallback;
-
-  explicit CefFileDialogCallbackImpl(CallbackType callback)
-      : callback_(std::move(callback)) {}
-
+  explicit CefFileDialogCallbackImpl(
+      const CefFileDialogRunner::RunFileChooserCallback& callback)
+      : callback_(callback) {}
  ~CefFileDialogCallbackImpl() override {
    if (!callback_.is_null()) {
      // The callback is still pending. Cancel it now.
      if (CEF_CURRENTLY_ON_UIT()) {
-        CancelNow(std::move(callback_));
+        CancelNow(callback_);
      } else {
-        CEF_POST_TASK(CEF_UIT,
-                      base::BindOnce(&CefFileDialogCallbackImpl::CancelNow,
-                                     std::move(callback_)));
+        CEF_POST_TASK(CEF_UIT, base::Bind(&CefFileDialogCallbackImpl::CancelNow,
+                                          callback_));
      }
    }
  }
@@ -48,36 +45,41 @@ class CefFileDialogCallbackImpl : public CefFileDialogCallback {
          for (; it != file_paths.end(); ++it)
            vec.push_back(base::FilePath(*it));
        }
-        std::move(callback_).Run(selected_accept_filter, vec);
+        callback_.Run(selected_accept_filter, vec);
+        callback_.Reset();
      }
    } else {
      CEF_POST_TASK(CEF_UIT,
-                    base::BindOnce(&CefFileDialogCallbackImpl::Continue, this,
-                                   selected_accept_filter, file_paths));
+                    base::Bind(&CefFileDialogCallbackImpl::Continue, this,
+                               selected_accept_filter, file_paths));
    }
  }

  void Cancel() override {
    if (CEF_CURRENTLY_ON_UIT()) {
      if (!callback_.is_null()) {
-        CancelNow(std::move(callback_));
+        CancelNow(callback_);
+        callback_.Reset();
      }
    } else {
      CEF_POST_TASK(CEF_UIT,
-                    base::BindOnce(&CefFileDialogCallbackImpl::Cancel, this));
+                    base::Bind(&CefFileDialogCallbackImpl::Cancel, this));
    }
  }

-  CallbackType Disconnect() WARN_UNUSED_RESULT { return std::move(callback_); }
+  bool IsConnected() { return !callback_.is_null(); }
+
+  void Disconnect() { callback_.Reset(); }

 private:
-  static void CancelNow(CallbackType callback) {
+  static void CancelNow(
+      const CefFileDialogRunner::RunFileChooserCallback& callback) {
    CEF_REQUIRE_UIT();
    std::vector<base::FilePath> file_paths;
-    std::move(callback).Run(0, file_paths);
+    callback.Run(0, file_paths);
  }

-  CallbackType callback_;
+  CefFileDialogRunner::RunFileChooserCallback callback_;

  IMPLEMENT_REFCOUNTING(CefFileDialogCallbackImpl);
 };
@@ -97,16 +99,16 @@ class UploadFolderHelper
    : public net::DirectoryLister::DirectoryListerDelegate {
 public:
  explicit UploadFolderHelper(
-      CefFileDialogRunner::RunFileChooserCallback callback)
-      : callback_(std::move(callback)) {}
+      const CefFileDialogRunner::RunFileChooserCallback& callback)
+      : callback_(callback) {}

  ~UploadFolderHelper() override {
    if (!callback_.is_null()) {
      if (CEF_CURRENTLY_ON_UIT()) {
-        CancelNow(std::move(callback_));
+        CancelNow(callback_);
      } else {
-        CEF_POST_TASK(CEF_UIT, base::BindOnce(&UploadFolderHelper::CancelNow,
-                                              std::move(callback_)));
+        CEF_POST_TASK(CEF_UIT,
+                      base::Bind(&UploadFolderHelper::CancelNow, callback_));
      }
    }
  }
@@ -121,15 +123,17 @@ class UploadFolderHelper
  void OnListDone(int error) override {
    CEF_REQUIRE_UIT();
    if (!callback_.is_null()) {
-      std::move(callback_).Run(0, select_files_);
+      callback_.Run(0, select_files_);
+      callback_.Reset();
    }
  }

 private:
-  static void CancelNow(CefFileDialogRunner::RunFileChooserCallback callback) {
+  static void CancelNow(
+      const CefFileDialogRunner::RunFileChooserCallback& callback) {
    CEF_REQUIRE_UIT();
    std::vector<base::FilePath> file_paths;
-    std::move(callback).Run(0, file_paths);
+    callback.Run(0, file_paths);
  }

  CefFileDialogRunner::RunFileChooserCallback callback_;
@@ -152,7 +156,7 @@ CefFileDialogManager::~CefFileDialogManager() {}

 void CefFileDialogManager::Destroy() {
  DCHECK(!file_chooser_pending_);
-  runner_.reset(nullptr);
+  runner_.reset(NULL);
 }

 void CefFileDialogManager::RunFileDialog(
@@ -211,35 +215,37 @@ void CefFileDialogManager::RunFileChooser(

  CefFileDialogRunner::RunFileChooserCallback callback;
  if (params.mode == blink::mojom::FileChooserParams::Mode::kUploadFolder) {
-    callback = base::BindOnce(
+    callback = base::Bind(
        &CefFileDialogManager::OnRunFileChooserUploadFolderDelegateCallback,
-        weak_ptr_factory_.GetWeakPtr(), params.mode, std::move(listener));
+        weak_ptr_factory_.GetWeakPtr(), params.mode,
+        base::Passed(std::move(listener)));
  } else {
-    callback = base::BindOnce(
-        &CefFileDialogManager::OnRunFileChooserDelegateCallback,
-        weak_ptr_factory_.GetWeakPtr(), params.mode, std::move(listener));
+    callback =
+        base::Bind(&CefFileDialogManager::OnRunFileChooserDelegateCallback,
+                   weak_ptr_factory_.GetWeakPtr(), params.mode,
+                   base::Passed(std::move(listener)));
  }

-  RunFileChooserInternal(cef_params, std::move(callback));
+  RunFileChooserInternal(cef_params, callback);
 }

 void CefFileDialogManager::RunFileChooser(
    const CefFileDialogRunner::FileChooserParams& params,
-    CefFileDialogRunner::RunFileChooserCallback callback) {
-  CefFileDialogRunner::RunFileChooserCallback host_callback =
-      base::BindOnce(&CefFileDialogManager::OnRunFileChooserCallback,
-                     weak_ptr_factory_.GetWeakPtr(), std::move(callback));
-  RunFileChooserInternal(params, std::move(host_callback));
+    const CefFileDialogRunner::RunFileChooserCallback& callback) {
+  const CefFileDialogRunner::RunFileChooserCallback& host_callback =
+      base::Bind(&CefFileDialogManager::OnRunFileChooserCallback,
+                 weak_ptr_factory_.GetWeakPtr(), callback);
+  RunFileChooserInternal(params, host_callback);
 }

 void CefFileDialogManager::RunFileChooserInternal(
    const CefFileDialogRunner::FileChooserParams& params,
-    CefFileDialogRunner::RunFileChooserCallback callback) {
+    const CefFileDialogRunner::RunFileChooserCallback& callback) {
  CEF_REQUIRE_UIT();

  if (file_chooser_pending_) {
    // Dismiss the new dialog immediately.
-    std::move(callback).Run(0, std::vector<base::FilePath>());
+    callback.Run(0, std::vector<base::FilePath>());
    return;
  }

@@ -283,30 +289,35 @@ void CefFileDialogManager::RunFileChooserInternal(
        accept_filters.push_back(*it);

      CefRefPtr<CefFileDialogCallbackImpl> callbackImpl(
-          new CefFileDialogCallbackImpl(std::move(callback)));
+          new CefFileDialogCallbackImpl(callback));
      handled = handler->OnFileDialog(
          browser_, static_cast<cef_file_dialog_mode_t>(mode), params.title,
          params.default_file_name.value(), accept_filters,
          params.selected_accept_filter, callbackImpl.get());
      if (!handled) {
-        // May return nullptr if the client has already executed the callback.
-        callback = callbackImpl->Disconnect();
+        if (callbackImpl->IsConnected()) {
+          callbackImpl->Disconnect();
+        } else {
+          // User executed the callback even though they returned false.
+          NOTREACHED();
+          handled = true;
+        }
      }
    }
  }

-  if (!handled && !callback.is_null()) {
+  if (!handled) {
    if (runner_.get()) {
-      runner_->Run(browser_, params, std::move(callback));
+      runner_->Run(browser_, params, callback);
    } else {
      LOG(WARNING) << "No file dialog runner available for this platform";
-      std::move(callback).Run(0, std::vector<base::FilePath>());
+      callback.Run(0, std::vector<base::FilePath>());
    }
  }
 }

 void CefFileDialogManager::OnRunFileChooserCallback(
-    CefFileDialogRunner::RunFileChooserCallback callback,
+    const CefFileDialogRunner::RunFileChooserCallback& callback,
    int selected_accept_filter,
    const std::vector<base::FilePath>& file_paths) {
  CEF_REQUIRE_UIT();
@@ -314,8 +325,8 @@ void CefFileDialogManager::OnRunFileChooserCallback(
  Cleanup();

  // Execute the callback asynchronously.
-  CEF_POST_TASK(CEF_UIT, base::BindOnce(std::move(callback),
-                                        selected_accept_filter, file_paths));
+  CEF_POST_TASK(CEF_UIT,
+                base::Bind(callback, selected_accept_filter, file_paths));
 }

 void CefFileDialogManager::OnRunFileChooserUploadFolderDelegateCallback(
@@ -333,9 +344,10 @@ void CefFileDialogManager::OnRunFileChooserUploadFolderDelegateCallback(
  } else {
    lister_.reset(new net::DirectoryLister(
        file_paths[0], net::DirectoryLister::NO_SORT_RECURSIVE,
-        new UploadFolderHelper(base::BindOnce(
-            &CefFileDialogManager::OnRunFileChooserDelegateCallback,
-            weak_ptr_factory_.GetWeakPtr(), mode, std::move(listener)))));
+        new UploadFolderHelper(
+            base::Bind(&CefFileDialogManager::OnRunFileChooserDelegateCallback,
+                       weak_ptr_factory_.GetWeakPtr(), mode,
+                       base::Passed(std::move(listener))))));
    lister_->Start();
  }
 }
--- a/libcef/browser/file_dialog_manager.h
+++ b/libcef/browser/file_dialog_manager.h
@@ -52,18 +52,19 @@ class CefFileDialogManager {
  // 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);

 private:
  void RunFileChooserInternal(
      const CefFileDialogRunner::FileChooserParams& params,
-      CefFileDialogRunner::RunFileChooserCallback callback);
+      const CefFileDialogRunner::RunFileChooserCallback& callback);

  // Used with the RunFileChooser variant where the caller specifies a callback
  // (no associated RenderFrameHost).
  void OnRunFileChooserCallback(
-      CefFileDialogRunner::RunFileChooserCallback callback,
+      const CefFileDialogRunner::RunFileChooserCallback& callback,
      int selected_accept_filter,
      const std::vector<base::FilePath>& file_paths);

--- a/libcef/browser/file_dialog_runner.h
+++ b/libcef/browser/file_dialog_runner.h
@@ -30,7 +30,7 @@ class CefFileDialogRunner {
  };

  // The argument vector will be empty if the dialog was canceled.
-  typedef base::OnceCallback<void(int, const std::vector<base::FilePath>&)>
+  typedef base::Callback<void(int, const std::vector<base::FilePath>&)>
      RunFileChooserCallback;

  // Display the file chooser dialog. Execute |callback| on completion.
--- a/libcef/browser/frame_host_impl.cc
+++ b/libcef/browser/frame_host_impl.cc
@@ -158,13 +158,13 @@ void CefFrameHostImpl::GetText(CefRefPtr<CefStringVisitor> visitor) {
 }

 void CefFrameHostImpl::LoadRequest(CefRefPtr<CefRequest> request) {
-  CefNavigateParams params(GURL(), kPageTransitionExplicit);
+  CefNavigateParams params(GURL(), ui::PAGE_TRANSITION_TYPED);
  static_cast<CefRequestImpl*>(request.get())->Get(params);
  Navigate(params);
 }

 void CefFrameHostImpl::LoadURL(const CefString& url) {
-  LoadURLWithExtras(url, content::Referrer(), kPageTransitionExplicit,
+  LoadURLWithExtras(url, content::Referrer(), ui::PAGE_TRANSITION_TYPED,
                    std::string());
 }

@@ -367,11 +367,6 @@ void CefFrameHostImpl::SendCommand(
  if (frame_id < CefFrameHostImpl::kMainFrameId)
    return;

-  if (!render_frame_host_ || !response_manager_) {
-    // detached frame has no response_manager_
-    return;
-  }
-
  TRACE_EVENT2("cef", "CefFrameHostImpl::SendCommand", "frame_id", frame_id,
               "needsResponse", responseHandler.get() ? 1 : 0);
  Cef_Request_Params params;
@@ -412,11 +407,6 @@ void CefFrameHostImpl::SendCode(
  if (frame_id < CefFrameHostImpl::kMainFrameId)
    return;

-  if (!render_frame_host_ || !response_manager_) {
-    // detached frame has no response_manager_
-    return;
-  }
-
  TRACE_EVENT2("cef", "CefFrameHostImpl::SendCommand", "frame_id", frame_id,
               "needsResponse", responseHandler.get() ? 1 : 0);
  Cef_Request_Params params;
@@ -474,6 +464,7 @@ bool CefFrameHostImpl::OnMessageReceived(const IPC::Message& message) {
  bool handled = true;
  IPC_BEGIN_MESSAGE_MAP(CefFrameHostImpl, message)
    IPC_MESSAGE_HANDLER(CefHostMsg_FrameAttached, OnAttached)
+    IPC_MESSAGE_HANDLER(CefHostMsg_FrameFocused, OnFocused)
    IPC_MESSAGE_HANDLER(CefHostMsg_DidFinishLoad, OnDidFinishLoad)
    IPC_MESSAGE_HANDLER(CefHostMsg_UpdateDraggableRegions,
                        OnUpdateDraggableRegions)
@@ -543,11 +534,6 @@ const int64_t CefFrameHostImpl::kFocusedFrameId = -2;
 const int64_t CefFrameHostImpl::kUnspecifiedFrameId = -3;
 const int64_t CefFrameHostImpl::kInvalidFrameId = -4;

-// This equates to (TT_EXPLICIT | TT_DIRECT_LOAD_FLAG).
-const ui::PageTransition CefFrameHostImpl::kPageTransitionExplicit =
-    static_cast<ui::PageTransition>(ui::PAGE_TRANSITION_TYPED |
-                                    ui::PAGE_TRANSITION_FROM_ADDRESS_BAR);
-
 int64 CefFrameHostImpl::GetFrameId() const {
  base::AutoLock lock_scope(state_lock_);
  return is_main_frame_ ? kMainFrameId : frame_id_;
@@ -570,6 +556,16 @@ void CefFrameHostImpl::OnAttached() {
  }
 }

+void CefFrameHostImpl::OnFocused() {
+  if (!IsFocused()) {
+    // Calls back to SetFocused(true) after updating state on the previously
+    // focused frame.
+    auto browser = GetBrowserHostImpl();
+    if (browser)
+      browser->OnFrameFocused(this);
+  }
+}
+
 void CefFrameHostImpl::OnDidFinishLoad(const GURL& validated_url,
                                       int http_status_code) {
  auto browser = GetBrowserHostImpl();
--- a/libcef/browser/frame_host_impl.h
+++ b/libcef/browser/frame_host_impl.h
@@ -138,17 +138,13 @@ class CefFrameHostImpl : public CefFrame {
  static const int64_t kUnspecifiedFrameId;
  static const int64_t kInvalidFrameId;

-  // PageTransition type for explicit navigations. This must pass the check in
-  // ContentBrowserClient::IsExplicitNavigation for debug URLs (HandleDebugURL)
-  // to work as expected.
-  static const ui::PageTransition kPageTransitionExplicit;
-
 private:
  int64 GetFrameId() const;
  CefRefPtr<CefBrowserHostImpl> GetBrowserHostImpl() const;

  // OnMessageReceived message handlers.
  void OnAttached();
+  void OnFocused();
  void OnDidFinishLoad(const GURL& validated_url, int http_status_code);
  void OnUpdateDraggableRegions(
      const std::vector<Cef_DraggableRegion_Params>& regions);
--- 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