alloy: Fix audio capturer crash on exit (fixes #3689)

See https://issues.chromium.org/issues/338040708

.gitignore

@@ -51,5 +51,6 @@ Thumbs.db
 /binary_distrib
 /docs
 # CEF generated files
+/include/cef_config.h
 /include/cef_version.h
 .ccls-cache/

BUILD.gn

@@ -99,7 +99,6 @@ import("//build/config/locales.gni")
 import("//build/config/ozone.gni")
 import("//build/config/sanitizers/sanitizers.gni")
 import("//build/config/ui.gni")
-import("//cef/libcef/features/features.gni")
 import("//chrome/common/features.gni")
 import("//content/public/app/mac_helpers.gni")
 import("//extensions/buildflags/buildflags.gni")
@@ -252,7 +251,8 @@ if (is_linux) {
 # Set by GetRequiredArgs() in //cef/tools/gn_args.py.
 #
 
-# Enable support for Print Preview.
+# Set ENABLE_PRINTING=1 ENABLE_BASIC_PRINTING=1.
+assert(enable_basic_printing)
 assert(enable_print_preview)
 
 # Enable support for Widevine CDM.
@@ -349,10 +349,6 @@ if (is_win) {
       "//build/config:precompiled_headers",
     ]
 
-    public_configs = [
-      "libcef/features:config",
-    ]
-
     if (is_component_build) {
       # Avoid linker errors with content_switches.cc in component build by not
       # defining CONTENT_EXPORT.
@@ -461,14 +457,32 @@ source_set("libcef_test_support") {
 source_set("libcef_static") {
   sources = includes_common +
             gypi_paths.autogen_cpp_includes + [
+    "libcef/browser/alloy/alloy_browser_context.cc",
+    "libcef/browser/alloy/alloy_browser_context.h",
     "libcef/browser/alloy/alloy_browser_host_impl.cc",
     "libcef/browser/alloy/alloy_browser_host_impl.h",
+    "libcef/browser/alloy/alloy_browser_main.cc",
+    "libcef/browser/alloy/alloy_browser_main.h",
+    "libcef/browser/alloy/alloy_content_browser_client.cc",
+    "libcef/browser/alloy/alloy_content_browser_client.h",
+    "libcef/browser/alloy/alloy_download_util.cc",
+    "libcef/browser/alloy/alloy_download_util.h",
+    "libcef/browser/alloy/alloy_web_contents_view_delegate.cc",
+    "libcef/browser/alloy/alloy_web_contents_view_delegate.h",
     "libcef/browser/alloy/browser_platform_delegate_alloy.cc",
     "libcef/browser/alloy/browser_platform_delegate_alloy.h",
     "libcef/browser/alloy/dialogs/alloy_constrained_window_views_client.cc",
     "libcef/browser/alloy/dialogs/alloy_constrained_window_views_client.h",
+    "libcef/browser/alloy/dialogs/alloy_javascript_dialog_manager_delegate.cc",
+    "libcef/browser/alloy/dialogs/alloy_javascript_dialog_manager_delegate.h",
     "libcef/browser/alloy/dialogs/alloy_web_contents_dialog_helper.cc",
     "libcef/browser/alloy/dialogs/alloy_web_contents_dialog_helper.h",
+    "libcef/browser/alloy/chrome_browser_process_alloy.cc",
+    "libcef/browser/alloy/chrome_browser_process_alloy.h",
+    "libcef/browser/alloy/chrome_profile_manager_alloy.cc",
+    "libcef/browser/alloy/chrome_profile_manager_alloy.h",
+    "libcef/browser/alloy/chrome_profile_alloy.cc",
+    "libcef/browser/alloy/chrome_profile_alloy.h",
     "libcef/browser/audio_capturer.cc",
     "libcef/browser/audio_capturer.h",
     "libcef/browser/audio_loopback_stream_creator.cc",
@@ -477,6 +491,8 @@ source_set("libcef_static") {
     "libcef/browser/browser_contents_delegate.h",
     "libcef/browser/browser_context.cc",
     "libcef/browser/browser_context.h",
+    "libcef/browser/browser_context_keyed_service_factories.cc",
+    "libcef/browser/browser_context_keyed_service_factories.h",
     "libcef/browser/browser_frame.cc",
     "libcef/browser/browser_frame.h",
     "libcef/browser/browser_host_base.cc",
@@ -512,14 +528,9 @@ source_set("libcef_static") {
     "libcef/browser/chrome/chrome_content_browser_client_cef.h",
     "libcef/browser/chrome/chrome_context_menu_handler.cc",
     "libcef/browser/chrome/chrome_context_menu_handler.h",
-    "libcef/browser/chrome/chrome_devtools_window_runner.cc",
-    "libcef/browser/chrome/chrome_devtools_window_runner.h",
     "libcef/browser/chrome/chrome_startup_browser_creator.cc",
     "libcef/browser/chrome/chrome_startup_browser_creator.h",
-    "libcef/browser/chrome/chrome_web_contents_view_delegate_cef.h",
     "libcef/browser/chrome_crash_reporter_client_stub.cc",
-    "libcef/browser/chrome/extensions/chrome_extension_util.cc",
-    "libcef/browser/chrome/extensions/chrome_extension_util.h",
     "libcef/browser/chrome/extensions/chrome_mime_handler_view_guest_delegate_cef.cc",
     "libcef/browser/chrome/extensions/chrome_mime_handler_view_guest_delegate_cef.h",
     "libcef/browser/chrome/views/browser_platform_delegate_chrome_child_window.cc",
@@ -544,18 +555,62 @@ source_set("libcef_static") {
     "libcef/browser/context_menu_params_impl.h",
     "libcef/browser/devtools/devtools_controller.cc",
     "libcef/browser/devtools/devtools_controller.h",
-    "libcef/browser/devtools/devtools_protocol_manager.cc",
-    "libcef/browser/devtools/devtools_protocol_manager.h",
-    "libcef/browser/devtools/devtools_window_runner.h",
-    "libcef/browser/devtools/devtools_window_runner_create.cc",
+    "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",
     "libcef/browser/download_item_impl.h",
     "libcef/browser/download_manager_delegate.cc",
     "libcef/browser/download_manager_delegate.h",
-    "libcef/browser/download_manager_delegate_impl.cc",
-    "libcef/browser/download_manager_delegate_impl.h",
+    "libcef/browser/extension_impl.cc",
+    "libcef/browser/extension_impl.h",
+    "libcef/browser/extensions/api/file_system/cef_file_system_delegate.cc",
+    "libcef/browser/extensions/api/file_system/cef_file_system_delegate.h",
+    "libcef/browser/extensions/api/storage/sync_value_store_cache.cc",
+    "libcef/browser/extensions/api/storage/sync_value_store_cache.h",
+    "libcef/browser/extensions/api/tabs/tabs_api.cc",
+    "libcef/browser/extensions/api/tabs/tabs_api.h",
+    "libcef/browser/extensions/alloy_extensions_util.cc",
+    "libcef/browser/extensions/alloy_extensions_util.h",
     "libcef/browser/extensions/browser_extensions_util.cc",
     "libcef/browser/extensions/browser_extensions_util.h",
+    "libcef/browser/extensions/browser_platform_delegate_background.cc",
+    "libcef/browser/extensions/browser_platform_delegate_background.h",
+    "libcef/browser/extensions/chrome_api_registration.cc",
+    "libcef/browser/extensions/chrome_api_registration.h",
+    "libcef/browser/extensions/component_extension_resource_manager.cc",
+    "libcef/browser/extensions/component_extension_resource_manager.h",
+    "libcef/browser/extensions/extensions_api_client.cc",
+    "libcef/browser/extensions/extensions_api_client.h",
+    "libcef/browser/extensions/extensions_browser_api_provider.cc",
+    "libcef/browser/extensions/extensions_browser_api_provider.h",
+    "libcef/browser/extensions/extensions_browser_client.cc",
+    "libcef/browser/extensions/extensions_browser_client.h",
+    "libcef/browser/extensions/extension_background_host.cc",
+    "libcef/browser/extensions/extension_background_host.h",
+    "libcef/browser/extensions/extension_function_details.cc",
+    "libcef/browser/extensions/extension_function_details.h",
+    "libcef/browser/extensions/extension_host_delegate.cc",
+    "libcef/browser/extensions/extension_host_delegate.h",
+    "libcef/browser/extensions/extension_system.cc",
+    "libcef/browser/extensions/extension_system.h",
+    "libcef/browser/extensions/extension_system_factory.cc",
+    "libcef/browser/extensions/extension_system_factory.h",
+    "libcef/browser/extensions/extension_view_host.cc",
+    "libcef/browser/extensions/extension_view_host.h",
+    "libcef/browser/extensions/extension_web_contents_observer.cc",
+    "libcef/browser/extensions/extension_web_contents_observer.h",
+    "libcef/browser/extensions/mime_handler_view_guest_delegate.cc",
+    "libcef/browser/extensions/mime_handler_view_guest_delegate.h",
+    "libcef/browser/extensions/value_store/cef_value_store.cc",
+    "libcef/browser/extensions/value_store/cef_value_store.h",
+    "libcef/browser/extensions/value_store/cef_value_store_factory.cc",
+    "libcef/browser/extensions/value_store/cef_value_store_factory.h",
     "libcef/browser/file_dialog_manager.cc",
     "libcef/browser/file_dialog_manager.h",
     "libcef/browser/file_dialog_runner.cc",
@@ -578,6 +633,8 @@ source_set("libcef_static") {
     "libcef/browser/main_runner.h",
     "libcef/browser/media_access_query.cc",
     "libcef/browser/media_access_query.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",
@@ -606,6 +663,12 @@ source_set("libcef_static") {
     "libcef/browser/net/chrome_scheme_handler.cc",
     "libcef/browser/net/chrome_scheme_handler.h",
     "libcef/browser/net/crlset_file_util_impl.cc",
+    "libcef/browser/net/devtools_scheme_handler.cc",
+    "libcef/browser/net/devtools_scheme_handler.h",
+    "libcef/browser/net/internal_scheme_handler.cc",
+    "libcef/browser/net/internal_scheme_handler.h",
+    "libcef/browser/net/scheme_handler.cc",
+    "libcef/browser/net/scheme_handler.h",
     "libcef/browser/net/throttle_handler.cc",
     "libcef/browser/net/throttle_handler.h",
     "libcef/browser/net_service/browser_urlrequest_impl.cc",
@@ -661,6 +724,8 @@ source_set("libcef_static") {
     "libcef/browser/prefs/pref_helper.h",
     "libcef/browser/prefs/pref_registrar.cc",
     "libcef/browser/prefs/pref_registrar.h",
+    "libcef/browser/prefs/pref_store.cc",
+    "libcef/browser/prefs/pref_store.h",
     "libcef/browser/prefs/renderer_prefs.cc",
     "libcef/browser/prefs/renderer_prefs.h",
     "libcef/browser/print_settings_impl.cc",
@@ -677,6 +742,10 @@ source_set("libcef_static") {
     "libcef/browser/server_impl.h",
     "libcef/browser/simple_menu_model_impl.cc",
     "libcef/browser/simple_menu_model_impl.h",
+    "libcef/browser/speech_recognition_manager_delegate.cc",
+    "libcef/browser/speech_recognition_manager_delegate.h",
+    "libcef/browser/ssl_host_state_delegate.cc",
+    "libcef/browser/ssl_host_state_delegate.h",
     "libcef/browser/ssl_info_impl.cc",
     "libcef/browser/ssl_info_impl.h",
     "libcef/browser/ssl_status_impl.cc",
@@ -759,6 +828,12 @@ source_set("libcef_static") {
     "libcef/browser/xml_reader_impl.h",
     "libcef/browser/zip_reader_impl.cc",
     "libcef/browser/zip_reader_impl.h",
+    "libcef/common/alloy/alloy_content_client.cc",
+    "libcef/common/alloy/alloy_content_client.h",
+    "libcef/common/alloy/alloy_main_delegate.cc",
+    "libcef/common/alloy/alloy_main_delegate.h",
+    "libcef/common/alloy/alloy_main_runner_delegate.cc",
+    "libcef/common/alloy/alloy_main_runner_delegate.h",
     "libcef/common/app_manager.cc",
     "libcef/common/app_manager.h",
     "libcef/common/base_impl.cc",
@@ -778,6 +853,14 @@ source_set("libcef_static") {
     "libcef/common/crash_reporting.h",
     "libcef/common/drag_data_impl.cc",
     "libcef/common/drag_data_impl.h",
+    "libcef/common/extensions/chrome_generated_schemas.cc",
+    "libcef/common/extensions/chrome_generated_schemas.h",
+    "libcef/common/extensions/extensions_api_provider.cc",
+    "libcef/common/extensions/extensions_api_provider.h",
+    "libcef/common/extensions/extensions_client.cc",
+    "libcef/common/extensions/extensions_client.h",
+    "libcef/common/extensions/extensions_util.cc",
+    "libcef/common/extensions/extensions_util.h",
     "libcef/common/file_util_impl.cc",
     "libcef/common/frame_util.cc",
     "libcef/common/frame_util.h",
@@ -787,6 +870,8 @@ source_set("libcef_static") {
     "libcef/common/main_runner_handler.h",
     "libcef/common/net/http_header_utils.cc",
     "libcef/common/net/http_header_utils.h",
+    "libcef/common/net/net_resource_provider.cc",
+    "libcef/common/net/net_resource_provider.h",
     "libcef/common/net/scheme_registration.cc",
     "libcef/common/net/scheme_registration.h",
     "libcef/common/net/url_util.cc",
@@ -836,6 +921,12 @@ source_set("libcef_static") {
     "libcef/common/waitable_event_impl.h",
     "libcef/features/runtime.h",
     "libcef/features/runtime_checks.h",
+    "libcef/renderer/alloy/alloy_content_renderer_client.cc",
+    "libcef/renderer/alloy/alloy_content_renderer_client.h",
+    "libcef/renderer/alloy/alloy_render_thread_observer.cc",
+    "libcef/renderer/alloy/alloy_render_thread_observer.h",
+    "libcef/renderer/alloy/url_loader_throttle_provider_impl.cc",
+    "libcef/renderer/alloy/url_loader_throttle_provider_impl.h",
     "libcef/renderer/browser_impl.cc",
     "libcef/renderer/browser_impl.h",
     "libcef/renderer/chrome/chrome_content_renderer_client_cef.cc",
@@ -848,6 +939,8 @@ source_set("libcef_static") {
     "libcef/renderer/extensions/extensions_renderer_api_provider.h",
     "libcef/renderer/extensions/extensions_renderer_client.cc",
     "libcef/renderer/extensions/extensions_renderer_client.h",
+    "libcef/renderer/extensions/print_render_frame_helper_delegate.cc",
+    "libcef/renderer/extensions/print_render_frame_helper_delegate.h",
     "libcef/renderer/frame_impl.cc",
     "libcef/renderer/frame_impl.h",
     "libcef/renderer/render_frame_observer.cc",
@@ -865,121 +958,6 @@ source_set("libcef_static") {
     "//chrome/app/chrome_main_delegate.h",
   ]
 
-  if (enable_alloy_bootstrap) {
-    sources += [
-      "libcef/browser/alloy/alloy_browser_context.cc",
-      "libcef/browser/alloy/alloy_browser_context.h",
-      "libcef/browser/alloy/alloy_browser_main.cc",
-      "libcef/browser/alloy/alloy_browser_main.h",
-      "libcef/browser/alloy/alloy_content_browser_client.cc",
-      "libcef/browser/alloy/alloy_content_browser_client.h",
-      "libcef/browser/alloy/alloy_download_manager_delegate.cc",
-      "libcef/browser/alloy/alloy_download_manager_delegate.h",
-      "libcef/browser/alloy/alloy_download_util.cc",
-      "libcef/browser/alloy/alloy_download_util.h",
-      "libcef/browser/alloy/alloy_web_contents_view_delegate.cc",
-      "libcef/browser/alloy/alloy_web_contents_view_delegate.h",
-      "libcef/browser/alloy/devtools/alloy_devtools_window_runner.cc",
-      "libcef/browser/alloy/devtools/alloy_devtools_window_runner.h",
-      "libcef/browser/alloy/devtools/devtools_file_manager.cc",
-      "libcef/browser/alloy/devtools/devtools_file_manager.h",
-      "libcef/browser/alloy/devtools/devtools_frontend.cc",
-      "libcef/browser/alloy/devtools/devtools_frontend.h",
-      "libcef/browser/alloy/devtools/devtools_manager_delegate.cc",
-      "libcef/browser/alloy/devtools/devtools_manager_delegate.h",
-      "libcef/browser/alloy/dialogs/alloy_javascript_dialog_manager_delegate.cc",
-      "libcef/browser/alloy/dialogs/alloy_javascript_dialog_manager_delegate.h",
-      "libcef/browser/alloy/chrome_browser_process_alloy.cc",
-      "libcef/browser/alloy/chrome_browser_process_alloy.h",
-      "libcef/browser/alloy/chrome_profile_manager_alloy.cc",
-      "libcef/browser/alloy/chrome_profile_manager_alloy.h",
-      "libcef/browser/alloy/chrome_profile_alloy.cc",
-      "libcef/browser/alloy/chrome_profile_alloy.h",
-      "libcef/browser/browser_context_keyed_service_factories.cc",
-      "libcef/browser/browser_context_keyed_service_factories.h",
-      "libcef/browser/extension_impl.cc",
-      "libcef/browser/extension_impl.h",
-      "libcef/browser/extensions/api/file_system/cef_file_system_delegate.cc",
-      "libcef/browser/extensions/api/file_system/cef_file_system_delegate.h",
-      "libcef/browser/extensions/api/storage/sync_value_store_cache.cc",
-      "libcef/browser/extensions/api/storage/sync_value_store_cache.h",
-      "libcef/browser/extensions/api/tabs/tabs_api.cc",
-      "libcef/browser/extensions/api/tabs/tabs_api.h",
-      "libcef/browser/extensions/alloy_extensions_util.cc",
-      "libcef/browser/extensions/alloy_extensions_util.h",
-      "libcef/browser/extensions/browser_platform_delegate_background.cc",
-      "libcef/browser/extensions/browser_platform_delegate_background.h",
-      "libcef/browser/extensions/chrome_api_registration.cc",
-      "libcef/browser/extensions/chrome_api_registration.h",
-      "libcef/browser/extensions/component_extension_resource_manager.cc",
-      "libcef/browser/extensions/component_extension_resource_manager.h",
-      "libcef/browser/extensions/extensions_api_client.cc",
-      "libcef/browser/extensions/extensions_api_client.h",
-      "libcef/browser/extensions/extensions_browser_api_provider.cc",
-      "libcef/browser/extensions/extensions_browser_api_provider.h",
-      "libcef/browser/extensions/extensions_browser_client.cc",
-      "libcef/browser/extensions/extensions_browser_client.h",
-      "libcef/browser/extensions/extension_background_host.cc",
-      "libcef/browser/extensions/extension_background_host.h",
-      "libcef/browser/extensions/extension_function_details.cc",
-      "libcef/browser/extensions/extension_function_details.h",
-      "libcef/browser/extensions/extension_host_delegate.cc",
-      "libcef/browser/extensions/extension_host_delegate.h",
-      "libcef/browser/extensions/extension_system.cc",
-      "libcef/browser/extensions/extension_system.h",
-      "libcef/browser/extensions/extension_system_factory.cc",
-      "libcef/browser/extensions/extension_system_factory.h",
-      "libcef/browser/extensions/extension_view_host.cc",
-      "libcef/browser/extensions/extension_view_host.h",
-      "libcef/browser/extensions/extension_web_contents_observer.cc",
-      "libcef/browser/extensions/extension_web_contents_observer.h",
-      "libcef/browser/extensions/mime_handler_view_guest_delegate.cc",
-      "libcef/browser/extensions/mime_handler_view_guest_delegate.h",
-      "libcef/browser/extensions/value_store/cef_value_store.cc",
-      "libcef/browser/extensions/value_store/cef_value_store.h",
-      "libcef/browser/extensions/value_store/cef_value_store_factory.cc",
-      "libcef/browser/extensions/value_store/cef_value_store_factory.h",
-      "libcef/browser/media_capture_devices_dispatcher.cc",
-      "libcef/browser/media_capture_devices_dispatcher.h",
-      "libcef/browser/net/devtools_scheme_handler.cc",
-      "libcef/browser/net/devtools_scheme_handler.h",
-      "libcef/browser/net/internal_scheme_handler.cc",
-      "libcef/browser/net/internal_scheme_handler.h",
-      "libcef/browser/net/scheme_handler.cc",
-      "libcef/browser/net/scheme_handler.h",
-      "libcef/browser/prefs/pref_store.cc",
-      "libcef/browser/prefs/pref_store.h",
-      "libcef/browser/speech_recognition_manager_delegate.cc",
-      "libcef/browser/speech_recognition_manager_delegate.h",
-      "libcef/browser/ssl_host_state_delegate.cc",
-      "libcef/browser/ssl_host_state_delegate.h",
-      "libcef/common/alloy/alloy_content_client.cc",
-      "libcef/common/alloy/alloy_content_client.h",
-      "libcef/common/alloy/alloy_main_delegate.cc",
-      "libcef/common/alloy/alloy_main_delegate.h",
-      "libcef/common/alloy/alloy_main_runner_delegate.cc",
-      "libcef/common/alloy/alloy_main_runner_delegate.h",
-      "libcef/common/extensions/chrome_generated_schemas.cc",
-      "libcef/common/extensions/chrome_generated_schemas.h",
-      "libcef/common/extensions/extensions_api_provider.cc",
-      "libcef/common/extensions/extensions_api_provider.h",
-      "libcef/common/extensions/extensions_client.cc",
-      "libcef/common/extensions/extensions_client.h",
-      "libcef/common/extensions/extensions_util.cc",
-      "libcef/common/extensions/extensions_util.h",
-      "libcef/common/net/net_resource_provider.cc",
-      "libcef/common/net/net_resource_provider.h",
-      "libcef/renderer/alloy/alloy_content_renderer_client.cc",
-      "libcef/renderer/alloy/alloy_content_renderer_client.h",
-      "libcef/renderer/alloy/alloy_render_frame_observer.cc",
-      "libcef/renderer/alloy/alloy_render_frame_observer.h",
-      "libcef/renderer/alloy/alloy_render_thread_observer.cc",
-      "libcef/renderer/alloy/alloy_render_thread_observer.h",
-      "libcef/renderer/alloy/url_loader_throttle_provider_impl.cc",
-      "libcef/renderer/alloy/url_loader_throttle_provider_impl.h",
-    ]
-  }
-
   configs += [
     "libcef/features:config",
     "//build/config:precompiled_headers",
@@ -1017,6 +995,7 @@ source_set("libcef_static") {
 
     # Normal build dependencies. Should be sorted alphabetically.
     "//base:base_static",
+    "//base/third_party/dynamic_annotations",
     "//cc",
     "//chrome:dependencies",
     "//chrome:packed_resources",
@@ -1127,6 +1106,12 @@ source_set("libcef_static") {
       deps += [ "//content:sandbox_helper_win" ]
     }
 
+    libs = [
+      "comctl32.lib",
+      # For D3D11_DECODER_PROFILE_H264_VLD_NOFGT.
+      "dxguid.lib",
+    ]
+
     data_deps = [
       "//chrome/elevation_service",
     ]
@@ -1166,8 +1151,6 @@ source_set("libcef_static") {
 
   if (is_mac) {
     sources += includes_mac + [
-      "libcef/browser/chrome/chrome_content_browser_client_cef_mac.mm",
-      "libcef/browser/chrome/chrome_web_contents_view_delegate_cef_mac.mm",
       "libcef/browser/native/browser_platform_delegate_native_mac.h",
       "libcef/browser/native/browser_platform_delegate_native_mac.mm",
       "libcef/browser/native/cursor_util_mac.mm",
@@ -1189,10 +1172,6 @@ source_set("libcef_static") {
       "//chrome/app/chrome_main_mac.h",
       "//chrome/app/chrome_main_mac.mm",
     ]
-  } else {
-    sources += [
-      "libcef/browser/chrome/chrome_web_contents_view_delegate_cef.cc",
-    ]
   }
 
   if (ozone_platform_x11) {
@@ -1243,30 +1222,19 @@ config("libcef_autogen_config") {
   }
 }
 
-# Configuration that supports #include paths relative to src/cef/ for CEF
-# client-side code. CEF library-side code (Chromium code and cef/libcef/
-# directory) uses #include paths relative to src/. See libcef/features:config
-# for CEF library-side configuration.
-config("libcef_includes_config") {
-  include_dirs = [
-    # cef/include/ directory and CEF client-side code use #includes relative to
-    # the cef/ directory.
-    ".",
-    # CEF generated header files that also need to be discoverable.
-    # These #includes from client-side code will not be prefixed with cef/.
-    # They will be copied to the include/ directory in the binary distribution.
-    "$root_out_dir/includes/cef",
-  ]
-}
-
 # Configuration that will be applied to all targets that depend on
 # libcef_dll_wrapper.
 config("libcef_dll_wrapper_config") {
-  configs = [
-    ":libcef_autogen_config",
-    ":libcef_includes_config",
+  include_dirs = [
+    # CEF sources use include paths relative to the CEF root directory.
+    ".",
+    # CEF generates some header files that also need to be discoverable.
+    # They will be copied to the include/ directory in the binary distribution.
+    "$root_out_dir/includes",
   ]
 
+  configs = [ ":libcef_autogen_config" ]
+
   if (is_win) {
     if (current_cpu == "x86") {
       # Set the initial stack size to 0.5MiB, instead of the 1.5MiB minimum
@@ -1314,23 +1282,20 @@ static_library("libcef_dll_wrapper") {
 if (is_win) {
   static_library("cef_sandbox") {
     sources = [ "libcef_dll/sandbox/sandbox_win.cc" ]
-    configs += [ ":libcef_includes_config" ]
-    deps = [
-      ":make_config_header",
-      "libcef/features",
-      "//sandbox",
-    ]
+    # CEF sources use include paths relative to the CEF root directory.
+    include_dirs = [ "." ]
+    deps = [ "libcef/features", "//sandbox" ]
   }
 }
 
 if (is_mac) {
   static_library("cef_sandbox") {
     sources = [ "libcef_dll/sandbox/sandbox_mac.mm" ]
-    configs += [ ":libcef_includes_config" ]
+    # CEF sources use include paths relative to the CEF root directory.
+    include_dirs = [ "." ]
     deps = [
-      ":make_config_header",
       "//build/config:executable_deps",
-      "//sandbox/mac:seatbelt",
+      "//sandbox/mac:seatbelt"
     ]
   }
 }
@@ -1386,7 +1351,7 @@ template("make_pack_header") {
 
 # Generate cef_pack_resources.h.
 make_pack_header("resources") {
-  header = "$root_out_dir/includes/cef/include/cef_pack_resources.h"
+  header = "$root_out_dir/includes/include/cef_pack_resources.h"
   inputs = [
     "$root_gen_dir/base/tracing/protos/grit/tracing_proto_resources.h",
     "$root_gen_dir/cef/grit/cef_resources.h",
@@ -1450,7 +1415,7 @@ make_pack_header("resources") {
 
 # Generate cef_pack_strings.h.
 make_pack_header("strings") {
-  header = "$root_out_dir/includes/cef/include/cef_pack_strings.h"
+  header = "$root_out_dir/includes/include/cef_pack_strings.h"
   inputs = [
     "$root_gen_dir/cef/grit/cef_strings.h",
     "$root_gen_dir/chrome/grit/branded_strings.h",
@@ -1488,7 +1453,7 @@ make_pack_header("strings") {
 
 # Generate cef_command_ids.h.
 make_pack_header("command_ids") {
-  header = "$root_out_dir/includes/cef/include/cef_command_ids.h"
+  header = "$root_out_dir/includes/include/cef_command_ids.h"
   inputs = [
     "//chrome/app/chrome_command_ids.h",
   ]
@@ -1506,29 +1471,18 @@ action("make_api_hash_header") {
            gypi_paths2.includes_capi +
            gypi_paths.autogen_capi_includes
   include_dir = [ "include" ]
-  outputs = [ "$root_out_dir/includes/cef/include/cef_api_hash.h" ]
+  outputs = [ "$root_out_dir/includes/include/cef_api_hash.h" ]
 
   args = rebase_path(outputs + include_dir, root_build_dir)
 }
 
-# This no-op action lists args.gn as an output, allowing it to be referenced as
-# an input (trigger) for other actions. Otherwise, GN will complain that no
-# target generates the args.gn file because it’s below the $root_out_dir.
-action("args_gn_source") {
-  script = "//build/noop.py"
-  outputs = [ "$root_out_dir/args.gn" ]
-}
-
 # Generate cef_config.h.
 action("make_config_header") {
   script = "tools/make_config_header.py"
 
-  deps = [ ":args_gn_source" ]
+  outputs = [ "$root_out_dir/includes/include/cef_config.h" ]
 
-  inputs = [ "$root_out_dir/args.gn" ]
-  outputs = [ "$root_out_dir/includes/cef/include/cef_config.h" ]
-
-  args = rebase_path(outputs + inputs, root_build_dir)
+  args = rebase_path(outputs + [ "$root_out_dir/args.gn" ], root_build_dir)
 }
 
 # Generate cef_color_ids.h.
@@ -1540,7 +1494,7 @@ action("make_colorids_header") {
     "//components/color/color_id.h",
     "//chrome/browser/ui/color/chrome_color_id.h",
   ]
-  outputs = [ "$root_out_dir/includes/cef/include/cef_color_ids.h" ]
+  outputs = [ "$root_out_dir/includes/include/cef_color_ids.h" ]
 
   args = rebase_path(outputs + inputs, root_build_dir)
 }
@@ -1751,12 +1705,6 @@ if (is_mac) {
       # Delay-load as many DLLs as possible for sandbox and startup perf
       # improvements.
       configs += [ "//build/config/win:delayloads" ]
-
-      libs = [
-        "comctl32.lib",
-        # For D3D11_DECODER_PROFILE_H264_VLD_NOFGT.
-        "dxguid.lib",
-      ]
     }
 
     if (is_linux && !is_debug && !use_partition_alloc_as_malloc) {
@@ -1968,7 +1916,7 @@ if (is_mac) {
   bundle_data("cefclient_resources_bundle_data") {
     sources = gypi_paths2.shared_sources_resources +
               gypi_paths2.cefclient_sources_resources + [
-      "tests/cefclient/mac/cefclient.icns",
+      "tests/cefclient/resources/mac/cefclient.icns",
     ]
 
     outputs = [
@@ -1976,9 +1924,16 @@ if (is_mac) {
     ]
   }
 
+  bundle_data("cefclient_resources_bundle_data_extensions_set_page_color") {
+    sources = gypi_paths2.cefclient_sources_resources_extensions_set_page_color
+    outputs = [
+      "{{bundle_resources_dir}}/extensions/set_page_color/{{source_file_part}}",
+    ]
+  }
+
   bundle_data("cefclient_resources_bundle_data_english") {
     sources = [
-      "tests/cefclient/mac/English.lproj/InfoPlist.strings",
+      "tests/cefclient/resources/mac/English.lproj/InfoPlist.strings",
     ]
 
     outputs = [
@@ -1988,7 +1943,7 @@ if (is_mac) {
 
   mac_xib_bundle_data("cefclient_xibs") {
     sources = [
-      "tests/cefclient/mac/English.lproj/MainMenu.xib",
+      "tests/cefclient/resources/mac/English.lproj/MainMenu.xib",
     ]
 
     output_path = "{{bundle_resources_dir}}/English.lproj"
@@ -1998,7 +1953,7 @@ if (is_mac) {
     # Necessary because the cef_framework target is testonly.
     testonly = true
 
-    helper_info_plist = "tests/cefclient/mac/helper-Info.plist.in"
+    helper_info_plist = "tests/cefclient/resources/mac/helper-Info.plist"
     helper_sources = includes_common +
                      includes_mac +
                      gypi_paths2.includes_wrapper +
@@ -2012,7 +1967,7 @@ if (is_mac) {
       "CEF_USE_SANDBOX",
     ]
 
-    info_plist = "tests/cefclient/mac/Info.plist.in"
+    info_plist = "tests/cefclient/resources/mac/Info.plist"
     sources = includes_common +
               includes_mac +
               gypi_paths2.includes_wrapper +
@@ -2025,6 +1980,7 @@ if (is_mac) {
               gypi_paths2.cefclient_sources_mac
     deps = [
       ":cefclient_resources_bundle_data",
+      ":cefclient_resources_bundle_data_extensions_set_page_color",
       ":cefclient_resources_bundle_data_english",
       ":cefclient_xibs",
     ]
@@ -2074,7 +2030,7 @@ if (is_mac) {
     # Necessary because the cef_framework target is testonly.
     testonly = true
 
-    helper_info_plist = "tests/cefsimple/mac/helper-Info.plist.in"
+    helper_info_plist = "tests/cefsimple/mac/helper-Info.plist"
     helper_sources = includes_common +
                      includes_mac +
                      gypi_paths2.includes_wrapper +
@@ -2084,7 +2040,7 @@ if (is_mac) {
       "CEF_USE_SANDBOX",
     ]
 
-    info_plist = "tests/cefsimple/mac/Info.plist.in"
+    info_plist = "tests/cefsimple/mac/Info.plist"
     sources = includes_common +
               includes_mac +
               gypi_paths2.includes_wrapper +
@@ -2111,7 +2067,7 @@ if (is_mac) {
 
   bundle_data("ceftests_resources_bundle_data") {
     sources = gypi_paths2.shared_sources_resources + [
-      "tests/ceftests/mac/ceftests.icns",
+      "tests/ceftests/resources/mac/ceftests.icns",
     ]
 
     outputs = [
@@ -2121,7 +2077,7 @@ if (is_mac) {
 
   bundle_data("ceftests_resources_bundle_data_english") {
     sources = [
-      "tests/ceftests/mac/English.lproj/InfoPlist.strings",
+      "tests/ceftests/resources/mac/English.lproj/InfoPlist.strings",
     ]
 
     outputs = [
@@ -2131,7 +2087,7 @@ if (is_mac) {
 
   mac_xib_bundle_data("ceftests_xibs") {
     sources = [
-      "tests/ceftests/mac/English.lproj/MainMenu.xib",
+      "tests/ceftests/resources/mac/English.lproj/MainMenu.xib",
     ]
     output_path = "{{bundle_resources_dir}}/English.lproj"
   }
@@ -2139,12 +2095,11 @@ if (is_mac) {
   cef_app("ceftests") {
     testonly = true
 
-    helper_info_plist = "tests/ceftests/mac/helper-Info.plist.in"
+    helper_info_plist = "tests/ceftests/resources/mac/helper-Info.plist"
     helper_sources = gypi_paths2.shared_sources_common +
                      gypi_paths2.shared_sources_renderer +
                      gypi_paths2.shared_sources_mac_helper +
-                     gypi_paths2.ceftests_sources_mac_helper +
-                     gypi_paths2.ceftests_sources_mac_helper_shared
+                     gypi_paths2.ceftests_sources_mac_helper
     helper_deps = [
       ":gtest_teamcity",
       "//testing/gtest",
@@ -2157,7 +2112,7 @@ if (is_mac) {
       "CEF_TESTS_IN_SRC_DIRECTORY",
     ]
 
-    info_plist = "tests/ceftests/mac/Info.plist.in"
+    info_plist = "tests/ceftests/resources/mac/Info.plist"
     sources = includes_common +
               includes_mac +
               gypi_paths2.includes_wrapper +
@@ -2215,6 +2170,11 @@ if (is_mac) {
                 gypi_paths2.cefclient_sources_resources
       outputs = [ "${root_out_dir}/cefclient_files/{{source_file_part}}" ]
     }
+
+    copy("copy_cefclient_files_extensions_set_page_color") {
+      sources = gypi_paths2.cefclient_sources_resources_extensions_set_page_color
+      outputs = [ "${root_out_dir}/cefclient_files/extensions/set_page_color/{{source_file_part}}" ]
+    }
   }
 
   executable("cefclient") {
@@ -2242,8 +2202,7 @@ if (is_mac) {
     if (is_win) {
       sources += includes_win +
                  gypi_paths2.shared_sources_win +
-                 gypi_paths2.cefclient_sources_win +
-                 gypi_paths2.cefclient_sources_resources_win_rc
+                 gypi_paths2.cefclient_sources_win
 
       # Set /SUBSYSTEM:WINDOWS.
       configs -= [ "//build/config/win:console" ]
@@ -2273,13 +2232,8 @@ if (is_mac) {
 
       if (target_cpu != "arm64") {
         libs += [
-          "glu32.lib",
           "opengl32.lib",
-        ]
-        ldflags = [
-          "/DELAYLOAD:glu32.dll",
-          "/DELAYLOAD:oleaut32.dll",
-          "/DELAYLOAD:opengl32.dll",
+          "glu32.lib"
         ]
       }
     }
@@ -2291,6 +2245,7 @@ if (is_mac) {
 
       deps += [
         ":copy_cefclient_files",
+        ":copy_cefclient_files_extensions_set_page_color",
       ]
 
       libs = [
@@ -2339,8 +2294,7 @@ if (is_mac) {
 
     if (is_win) {
       sources += includes_win +
-                 gypi_paths2.cefsimple_sources_win +
-                 gypi_paths2.cefsimple_sources_resources_win_rc
+                 gypi_paths2.cefsimple_sources_win
 
       # Set /SUBSYSTEM:WINDOWS.
       configs -= [ "//build/config/win:console" ]
@@ -2415,8 +2369,7 @@ if (is_mac) {
 
     if (is_win) {
       sources += gypi_paths2.shared_sources_win +
-                 gypi_paths2.ceftests_sources_win +
-                 gypi_paths2.ceftests_sources_resources_win_rc
+                 gypi_paths2.ceftests_sources_win
 
       # Delay-load as many DLLs as possible for sandbox and startup perf
       # improvements.

CHROMIUM_BUILD_COMPATIBILITY.txt

@@ -7,6 +7,6 @@
 # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
 
 {
-  'chromium_checkout': 'refs/tags/127.0.6533.120',
-  'depot_tools_checkout': '22f6c9d8e9'
+  'chromium_checkout': 'refs/tags/124.0.6367.207',
+  'depot_tools_checkout': '19199514e8'
 }

CMakeLists.txt.in

@@ -240,18 +240,16 @@ PRINT_CEF_CONFIG()
 # Define the API documentation target.
 #
 
-if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile")
-  find_package(Doxygen)
-  if(DOXYGEN_FOUND)
-    add_custom_target(apidocs ALL
-      # Generate documentation in the docs/html directory.
-      COMMAND "${DOXYGEN_EXECUTABLE}" Doxyfile
-      # Write a docs/index.html file.
-      COMMAND ${CMAKE_COMMAND} -E echo "<html><head><meta http-equiv=\"refresh\" content=\"0;URL='html/index.html'\"/></head></html>" > docs/index.html
-      WORKING_DIRECTORY "${CEF_ROOT}"
-      COMMENT "Generating API documentation with Doxygen..."
-      VERBATIM )
-  else()
-    message(WARNING "Doxygen must be installed to generate API documentation.")
-  endif()
-endif()
+find_package(Doxygen)
+if(DOXYGEN_FOUND)
+  add_custom_target(apidocs ALL
+    # Generate documentation in the docs/html directory.
+    COMMAND "${DOXYGEN_EXECUTABLE}" Doxyfile
+    # Write a docs/index.html file.
+    COMMAND ${CMAKE_COMMAND} -E echo "<html><head><meta http-equiv=\"refresh\" content=\"0;URL='html/index.html'\"/></head></html>" > docs/index.html
+    WORKING_DIRECTORY "${CEF_ROOT}"
+    COMMENT "Generating API documentation with Doxygen..."
+    VERBATIM )
+else()
+  message(WARNING "Doxygen must be installed to generate API documentation.")
+endif()

bazel/BUILD.bazel

@@ -1,8 +0,0 @@
-# Copyright (c) 2024 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.
-
-# Allow access from targets in other packages.
-package(default_visibility = [
-    "//visibility:public",
-])

bazel/copy_filegroups.bzl

@@ -1,65 +0,0 @@
-# Copyright (c) 2024 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.
-
-def _copy_filegroups_impl(ctx):
-    inputs = ctx.files.filegroups
-    remove_prefixes = ctx.attr.remove_prefixes
-    add_prefix = ctx.attr.add_prefix
-
-    outputs = []
-    for f in inputs:
-        relative_path = f.path
-        if relative_path.startswith("external/"):
-          # Remove the "external/<repo>" component, if any.
-          relative_path = "/".join(relative_path.split("/")[2:])
-
-        for prefix in remove_prefixes:
-            # Add trailing forward slash if necessary.
-            if prefix[-1] != "/":
-                prefix += "/"
-            if len(prefix) > 0 and relative_path.startswith(prefix):
-                relative_path = relative_path[len(prefix):]
-                break
-
-        if len(add_prefix) > 0:
-            # Add trailing forward slash if necessary.
-            if add_prefix[-1] != "/":
-                add_prefix += "/"
-            relative_path = add_prefix + relative_path
-
-        out = ctx.actions.declare_file(relative_path)
-        outputs.append(out)
-
-        if relative_path.find("/") > 0:
-            command="mkdir -p $(dirname {}) && cp {} {}".format(out.path, f.path, out.path)
-        else:
-            command="cp {} {}".format(f.path, out.path)
-
-        ctx.actions.run_shell(
-            outputs=[out],
-            inputs=depset([f]),
-            command=command
-        )
-
-    # Small sanity check
-    if len(inputs) != len(outputs):
-        fail("Output count should be 1-to-1 with input count.")
-
-    return DefaultInfo(
-        files=depset(outputs),
-        runfiles=ctx.runfiles(files=outputs)
-    )
-
-# Allows the file contents of |filegroups| to be copied next to a cc_binary
-# target via the |data| attribute.
-# Implementation based on https://stackoverflow.com/a/57983629
-copy_filegroups = rule(
-    implementation=_copy_filegroups_impl,
-    attrs={
-        "filegroups": attr.label_list(),
-        "remove_prefixes": attr.string_list(default = []),
-        "add_prefix": attr.string(default = ""),
-    },
-)
-

bazel/library_helpers.bzl

@@ -1,90 +0,0 @@
-# Copyright (c) 2024 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.
-
-load("//bazel/win:variables.bzl",
-     WIN_COMMON_COPTS="COMMON_COPTS",
-     WIN_COMMON_COPTS_RELEASE="COMMON_COPTS_RELEASE",
-     WIN_COMMON_COPTS_DEBUG="COMMON_COPTS_DEBUG",
-     WIN_COMMON_DEFINES="COMMON_DEFINES",
-     WIN_COMMON_DEFINES_RELEASE="COMMON_DEFINES_RELEASE",
-     WIN_COMMON_DEFINES_DEBUG="COMMON_DEFINES_DEBUG")
-load("//bazel/linux:variables.bzl",
-     LINUX_COMMON_COPTS="COMMON_COPTS",
-     LINUX_COMMON_COPTS_RELEASE="COMMON_COPTS_RELEASE",
-     LINUX_COMMON_COPTS_DEBUG="COMMON_COPTS_DEBUG",
-     LINUX_COMMON_DEFINES="COMMON_DEFINES",
-     LINUX_COMMON_DEFINES_RELEASE="COMMON_DEFINES_RELEASE",
-     LINUX_COMMON_DEFINES_DEBUG="COMMON_DEFINES_DEBUG")
-load("//bazel/mac:variables.bzl",
-     MAC_COMMON_COPTS="COMMON_COPTS",
-     MAC_COMMON_COPTS_RELEASE="COMMON_COPTS_RELEASE",
-     MAC_COMMON_COPTS_DEBUG="COMMON_COPTS_DEBUG")
-load("@rules_cc//cc:defs.bzl", "cc_library", "objc_library")
-
-def declare_cc_library(copts=[], local_defines=[], **kwargs):
-    """
-    cc_library wrapper that applies common copts and local_defines.
-    """
-    # NOTE: objc_library does not support local_defines on MacOS, so on
-    # that platform we put the defines in copts instead.
-    cc_library(
-        copts = select({
-            "@platforms//os:windows": WIN_COMMON_COPTS,
-            "@platforms//os:linux": LINUX_COMMON_COPTS,
-            "@platforms//os:macos": MAC_COMMON_COPTS,
-            "//conditions:default": None,
-        }) + select({
-            "@cef//:windows_opt": WIN_COMMON_COPTS_RELEASE,
-            "@cef//:windows_dbg": WIN_COMMON_COPTS_DEBUG,
-            "@cef//:windows_fastbuild": WIN_COMMON_COPTS_RELEASE,
-            "@cef//:linux_opt": LINUX_COMMON_COPTS_RELEASE,
-            "@cef//:linux_dbg": LINUX_COMMON_COPTS_DEBUG,
-            "@cef//:linux_fastbuild": LINUX_COMMON_COPTS_RELEASE,
-            "@cef//:macos_opt": MAC_COMMON_COPTS_RELEASE,
-            "@cef//:macos_dbg": MAC_COMMON_COPTS_DEBUG,
-            "@cef//:macos_fastbuild": MAC_COMMON_COPTS_RELEASE,
-            "//conditions:default": None,
-        }) + copts,
-        local_defines = select({
-            "@platforms//os:windows": WIN_COMMON_DEFINES,
-            "@platforms//os:linux": LINUX_COMMON_DEFINES,
-            "//conditions:default": None,
-        }) + select({
-            "@cef//:windows_opt": WIN_COMMON_DEFINES_RELEASE,
-            "@cef//:windows_dbg": WIN_COMMON_DEFINES_DEBUG,
-            "@cef//:windows_fastbuild": WIN_COMMON_DEFINES_RELEASE,
-            "@cef//:linux_opt": LINUX_COMMON_DEFINES_RELEASE,
-            "@cef//:linux_dbg": LINUX_COMMON_DEFINES_DEBUG,
-            "@cef//:linux_fastbuild": LINUX_COMMON_DEFINES_RELEASE,
-            "//conditions:default": None,
-        }) + local_defines,
-        **kwargs
-    )
-
-def declare_objc_library(copts=[], **kwargs):
-    """
-    objc_library wrapper that applies common copts.
-    """
-    # NOTE: objc_library does not support local_defines on MacOS, so on
-    # that platform we put the defines in copts instead.
-    objc_library(
-        copts = select({
-            "@platforms//os:windows": WIN_COMMON_COPTS,
-            "@platforms//os:linux": LINUX_COMMON_COPTS,
-            "@platforms//os:macos": MAC_COMMON_COPTS,
-            "//conditions:default": None,
-        }) + select({
-            "@cef//:windows_opt": WIN_COMMON_COPTS_RELEASE,
-            "@cef//:windows_dbg": WIN_COMMON_COPTS_DEBUG,
-            "@cef//:windows_fastbuild": WIN_COMMON_COPTS_RELEASE,
-            "@cef//:linux_opt": LINUX_COMMON_COPTS_RELEASE,
-            "@cef//:linux_dbg": LINUX_COMMON_COPTS_DEBUG,
-            "@cef//:linux_fastbuild": LINUX_COMMON_COPTS_RELEASE,
-            "@cef//:macos_opt": MAC_COMMON_COPTS_RELEASE,
-            "@cef//:macos_dbg": MAC_COMMON_COPTS_DEBUG,
-            "@cef//:macos_fastbuild": MAC_COMMON_COPTS_RELEASE,
-            "//conditions:default": None,
-        }) + copts,
-        **kwargs
-    )

bazel/linux/BUILD.bazel

@@ -1,8 +0,0 @@
-# Copyright (c) 2024 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.
-
-# Allow access from targets in other packages.
-package(default_visibility = [
-    "//visibility:public",
-])

bazel/linux/exe_helpers.bzl

@@ -1,63 +0,0 @@
-# Copyright (c) 2024 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.
-
-load("//bazel:copy_filegroups.bzl", "copy_filegroups")
-load("//bazel/linux:fix_rpath.bzl", "fix_rpath")
-load("//bazel/linux:variables.bzl",
-     "COMMON_LINKOPTS",
-     "COMMON_COPTS", "COMMON_COPTS_RELEASE", "COMMON_COPTS_DEBUG",
-     "COMMON_DEFINES", "COMMON_DEFINES_RELEASE", "COMMON_DEFINES_DEBUG")
-load("@rules_cc//cc:defs.bzl", "cc_binary")
-
-def declare_exe(name, srcs=[], deps=[], linkopts=[], copts=[], local_defines=[], data=[], **kwargs):
-    # Copy SOs and resources into the current project.
-    copy_target = "{}_sos_and_resources".format(name)
-    copy_filegroups(
-        name = copy_target,
-        filegroups = [
-            "@cef//:sos",
-            "@cef//:resources",
-        ],
-        remove_prefixes = [
-            "Debug",
-            "Release",
-            "Resources",
-        ],
-    )
-
-    # Executable target.
-    binary_target = "{}_incorrect_rpath".format(name)
-    cc_binary(
-        name = binary_target,
-        srcs = srcs,
-        deps = [
-            "@cef//:cef_wrapper",
-            "@cef//:cef",
-            "@cef//:cef_sandbox",
-        ] + deps,
-        linkopts = COMMON_LINKOPTS + linkopts,
-        copts = COMMON_COPTS + select({
-            "@cef//:linux_dbg": COMMON_COPTS_DEBUG,
-            "//conditions:default": COMMON_COPTS_RELEASE,
-        }) + copts,
-        local_defines = COMMON_DEFINES + select({
-            "@cef//:linux_dbg": COMMON_DEFINES_DEBUG,
-            "//conditions:default": COMMON_DEFINES_RELEASE,
-        }) + local_defines,
-        data = [
-            ":{}".format(copy_target),
-        ] + data,
-        target_compatible_with = ["@platforms//os:linux"],
-        **kwargs
-    )
-
-    # Set rpath to $ORIGIN so that libraries can be loaded from next to the
-    # executable.
-    fix_rpath(
-        name = "{}_fixed_rpath".format(name),
-        src = ":{}".format(binary_target),
-        out = name,
-        target_compatible_with = ["@platforms//os:linux"],
-    )
-

bazel/linux/fix_rpath.bzl

@@ -1,41 +0,0 @@
-# Copyright (c) 2024 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.
-
-def _fix_rpath_impl(ctx):
-    inputs = ctx.runfiles(files = [ctx.file.src])
-    # Bring over 'data' dependencies from the input.
-    inputs = inputs.merge_all([ctx.attr.src[DefaultInfo].default_runfiles])
-
-    src = ctx.file.src.path
-    out = ctx.outputs.out.path
-
-    ctx.actions.run_shell(
-        outputs = [ctx.outputs.out],
-        inputs = inputs.files,
-        arguments = [src, out],
-        command = "cp $1 $2 && " +
-                  "chmod +w $2 && " +
-                  "patchelf --remove-rpath $2 && " +
-                  "patchelf --set-rpath '$ORIGIN' $2"
-    )
-
-    return [DefaultInfo(files = depset([ctx.outputs.out]))]
-
-# Set rpath to $ORIGIN so that libraries can be loaded from next to the
-# executable. The result can be confirmed with:
-# $ objdump -x ./bazel-bin/path/to/binary | grep 'R.*PATH'
-#
-# Alternatively, define a custom CC toolchain that overrides
-# 'runtime_library_search_directories'.
-#
-# This rule requires preinstallation of the patchelf package:
-# $ sudo apt install patchelf
-fix_rpath = rule(
-    implementation = _fix_rpath_impl,
-    attrs = {
-        "src": attr.label(allow_single_file = True),
-        "out": attr.output(mandatory = True),
-    },
-)
-

bazel/linux/pkg_config/BUILD.bazel

@@ -1,7 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-exports_files([
-    "pkg_config.bzl",
-    "BUILD.tmpl",
-])
-

bazel/linux/pkg_config/BUILD.tmpl

@@ -1,32 +0,0 @@
-# vi: ft=bzl
-package(default_visibility = ["//visibility:private"])
-
-_imports = [p[:len(p)-2] for p in glob(["{}/**/*.a".format(d) for d in [%{deps}]])]
-[cc_import(
-    name = i.replace("/", "_"),
-    hdrs = glob([%{hdrs}]),
-    # TODO: library extension for platform.
-    static_library = "{}.a".format(i),
-    shared_library = "{}.dylib".format(i),
-) for i in _imports]
-
-cc_library(
-    name = "internal_lib",
-    hdrs = glob([%{hdrs}]),
-    copts = [%{copts}],
-    includes = [%{includes}],
-    linkopts = [%{linkopts}],
-    deps = [(":" + i.replace("/", "_")) for i in _imports],
-)
-
-cc_library(
-    name = "lib",
-    hdrs = glob(["%{strip_include}/**/*.h"]),
-    copts = [%{extra_copts}],
-    linkopts = [%{extra_linkopts}],
-    deps = [":internal_lib"] + [%{extra_deps}],
-    visibility = ["//visibility:public"],
-    strip_include_prefix = "%{strip_include}",
-    include_prefix = "%{include_prefix}",
-)
-

bazel/linux/pkg_config/README.cef

@@ -1,11 +0,0 @@
-Name: pkg_config
-URL: https://github.com/cherrry/bazel_pkg_config
-Version: 284219a
-
-Description:
-Bazel rules for pkg-config tools.
-
-CEF-specific changes:
-- Fix failure with duplicate symlinks.
-- Remove `--static` flag from pkg-config invocation.
-

bazel/linux/pkg_config/WORKSPACE

@@ -1,2 +0,0 @@
-workspace(name = "pkg_config")
-

bazel/linux/pkg_config/pkg_config.bzl

@@ -1,194 +0,0 @@
-def _success(value):
-    return struct(error = None, value = value)
-
-def _error(message):
-    return struct(error = message, value = None)
-
-def _split(result, delimeter = " "):
-    if result.error != None:
-        return result
-    return _success([arg for arg in result.value.strip().split(delimeter) if arg])
-
-def _find_binary(ctx, binary_name):
-    binary = ctx.which(binary_name)
-    if binary == None:
-        return _error("Unable to find binary: {}".format(binary_name))
-    return _success(binary)
-
-def _execute(ctx, binary, args):
-    result = ctx.execute([binary] + args)
-    if result.return_code != 0:
-        return _error("Failed execute {} {}".format(binary, args))
-    return _success(result.stdout)
-
-def _pkg_config(ctx, pkg_config, pkg_name, args):
-    return _execute(ctx, pkg_config, [pkg_name] + args)
-
-def _check(ctx, pkg_config, pkg_name):
-    exist = _pkg_config(ctx, pkg_config, pkg_name, ["--exists"])
-    if exist.error != None:
-        return _error("Package {} does not exist".format(pkg_name))
-
-    if ctx.attr.version != "":
-        version = _pkg_config(ctx, pkg_config, pkg_name, ["--exact-version", ctx.attr.version])
-        if version.error != None:
-            return _error("Require {} version = {}".format(pkg_name, ctx.attr.version))
-
-    if ctx.attr.min_version != "":
-        version = _pkg_config(ctx, pkg_config, pkg_name, ["--atleast-version", ctx.attr.min_version])
-        if version.error != None:
-            return _error("Require {} version >= {}".format(pkg_name, ctx.attr.min_version))
-
-    if ctx.attr.max_version != "":
-        version = _pkg_config(ctx, pkg_config, pkg_name, ["--max-version", ctx.attr.max_version])
-        if version.error != None:
-            return _error("Require {} version <= {}".format(pkg_name, ctx.attr.max_version))
-
-    return _success(None)
-
-def _extract_prefix(flags, prefix, strip = True):
-    stripped, remain = [], []
-    for arg in flags:
-        if arg.startswith(prefix):
-            if strip:
-                stripped += [arg[len(prefix):]]
-            else:
-                stripped += [arg]
-        else:
-            remain += [arg]
-    return stripped, remain
-
-def _includes(ctx, pkg_config, pkg_name):
-    includes = _split(_pkg_config(ctx, pkg_config, pkg_name, ["--cflags-only-I"]))
-    if includes.error != None:
-        return includes
-    includes, unused = _extract_prefix(includes.value, "-I", strip = True)
-    return _success(includes)
-
-def _copts(ctx, pkg_config, pkg_name):
-    return _split(_pkg_config(ctx, pkg_config, pkg_name, [
-        "--cflags-only-other",
-        "--libs-only-L",
-    ]))
-
-def _linkopts(ctx, pkg_config, pkg_name):
-    return _split(_pkg_config(ctx, pkg_config, pkg_name, [
-        "--libs-only-other",
-        "--libs-only-l",
-    ]))
-
-def _ignore_opts(opts, ignore_opts):
-    remain = []
-    for opt in opts:
-        if opt not in ignore_opts:
-            remain += [opt]
-    return remain
-
-def _symlinks(ctx, basename, srcpaths):
-    result = []
-    root = ctx.path("")
-    base = root.get_child(basename)
-    rootlen = len(str(base)) - len(basename)
-    for src in [ctx.path(p) for p in srcpaths]:
-        dest = base.get_child(src.basename)
-        if not dest.exists:
-            ctx.symlink(src, dest)
-        result += [str(dest)[rootlen:]]
-    return result
-
-def _deps(ctx, pkg_config, pkg_name):
-    deps = _split(_pkg_config(ctx, pkg_config, pkg_name, [
-        "--libs-only-L",
-        "--static",
-    ]))
-    if deps.error != None:
-        return deps
-    deps, unused = _extract_prefix(deps.value, "-L", strip = True)
-    result = []
-    for dep in {dep: True for dep in deps}.keys():
-        base = "deps_" + dep.replace("/", "_").replace(".", "_")
-        result += _symlinks(ctx, base, [dep])
-    return _success(result)
-
-def _fmt_array(array):
-    return ",".join(['"{}"'.format(a) for a in array])
-
-def _fmt_glob(array):
-    return _fmt_array(["{}/**/*.h".format(a) for a in array])
-
-def _pkg_config_impl(ctx):
-    pkg_name = ctx.attr.pkg_name
-    if pkg_name == "":
-        pkg_name = ctx.attr.name
-
-    pkg_config = _find_binary(ctx, "pkg-config")
-    if pkg_config.error != None:
-        return pkg_config
-    pkg_config = pkg_config.value
-
-    check = _check(ctx, pkg_config, pkg_name)
-    if check.error != None:
-        return check
-
-    includes = _includes(ctx, pkg_config, pkg_name)
-    if includes.error != None:
-        return includes
-    includes = includes.value
-    includes = _symlinks(ctx, "includes", includes)
-    strip_include = "includes"
-    if len(includes) == 1:
-        strip_include = includes[0]
-    if ctx.attr.strip_include != "":
-        strip_include += "/" + ctx.attr.strip_include
-
-    ignore_opts = ctx.attr.ignore_opts
-    copts = _copts(ctx, pkg_config, pkg_name)
-    if copts.error != None:
-        return copts
-    copts = _ignore_opts(copts.value, ignore_opts)
-
-    linkopts = _linkopts(ctx, pkg_config, pkg_name)
-    if linkopts.error != None:
-        return linkopts
-    linkopts = _ignore_opts(linkopts.value, ignore_opts)
-
-    deps = _deps(ctx, pkg_config, pkg_name)
-    if deps.error != None:
-        return deps
-    deps = deps.value
-
-    include_prefix = ctx.attr.name
-    if ctx.attr.include_prefix != "":
-        include_prefix = ctx.attr.include_prefix + "/" + ctx.attr.name
-
-    build = ctx.template("BUILD", Label("//:BUILD.tmpl"), substitutions = {
-        "%{name}": ctx.attr.name,
-        "%{hdrs}": _fmt_glob(includes),
-        "%{includes}": _fmt_array(includes),
-        "%{copts}": _fmt_array(copts),
-        "%{extra_copts}": _fmt_array(ctx.attr.copts),
-        "%{deps}": _fmt_array(deps),
-        "%{extra_deps}": _fmt_array(ctx.attr.deps),
-        "%{linkopts}": _fmt_array(linkopts),
-        "%{extra_linkopts}": _fmt_array(ctx.attr.linkopts),
-        "%{strip_include}": strip_include,
-        "%{include_prefix}": include_prefix,
-    }, executable = False)
-
-pkg_config = repository_rule(
-    attrs = {
-        "pkg_name": attr.string(doc = "Package name for pkg-config query, default to name."),
-        "include_prefix": attr.string(doc = "Additional prefix when including file, e.g. third_party. Compatible with strip_include option to produce desired include paths."),
-        "strip_include": attr.string(doc = "Strip prefix when including file, e.g. libs, files not included will be invisible. Compatible with include_prefix option to produce desired include paths."),
-        "version": attr.string(doc = "Exact package version."),
-        "min_version": attr.string(doc = "Minimum package version."),
-        "max_version": attr.string(doc = "Maximum package version."),
-        "deps": attr.string_list(doc = "Dependency targets."),
-        "linkopts": attr.string_list(doc = "Extra linkopts value."),
-        "copts": attr.string_list(doc = "Extra copts value."),
-        "ignore_opts": attr.string_list(doc = "Ignore listed opts in copts or linkopts."),
-    },
-    local = True,
-    implementation = _pkg_config_impl,
-)
-

bazel/linux/variables.bzl

@@ -1,68 +0,0 @@
-# Copyright (c) 2024 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.
-
-#
-# Distribution SOs.
-#
-
-SOS = [
-    "libcef.so",
-    "libEGL.so",
-    "libGLESv2.so",
-    "libvk_swiftshader.so",
-    "libvulkan.so.1",
-]
-
-#
-# Common 'linkopts' for cc_binary targets.
-#
-
-# Standard link libraries.
-STANDARD_LIBS = [
-    "X11",
-]
-
-COMMON_LINKOPTS_DEBUG = [
-]
-
-COMMON_LINKOPTS_RELEASE = [
-]
-
-COMMON_LINKOPTS = [
-    "-l{}".format(lib) for lib in STANDARD_LIBS
-]  + select({
-    "@cef//:linux_dbg": COMMON_LINKOPTS_DEBUG,
-    "//conditions:default": COMMON_LINKOPTS_RELEASE,
-})
-
-#
-# Common 'copts' for cc_libary and cc_binary targets.
-#
-
-COMMON_COPTS = [
-]
-
-COMMON_COPTS_DEBUG = [
-]
-
-COMMON_COPTS_RELEASE = [
-]
-
-#
-# Common 'defines' for cc_libary targets.
-#
-
-COMMON_DEFINES = [
-    # Used by apps to test if the sandbox is enabled
-    "CEF_USE_SANDBOX",
-]
-
-COMMON_DEFINES_DEBUG = [
-]
-
-COMMON_DEFINES_RELEASE = [
-    # Not a debug build
-    "NDEBUG",
-]
-

bazel/mac/BUILD.bazel

@@ -1,8 +0,0 @@
-# Copyright (c) 2024 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.
-
-# Allow access from targets in other packages.
-package(default_visibility = [
-    "//visibility:public",
-])

bazel/mac/app_helpers.bzl

@@ -1,113 +0,0 @@
-# Copyright (c) 2024 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.
-
-load("@bazel_skylib//rules:expand_template.bzl", "expand_template")
-load("@build_bazel_rules_apple//apple:macos.bzl", "macos_application")
-load("//bazel:variables.bzl", "VERSION_PLIST")
-load("//bazel/mac:variables.bzl",
-     "MACOS_DEPLOYMENT_TARGET",
-     "MACOS_BUNDLE_ID_BASE",
-     "CEF_FRAMEWORK_NAME",
-     "COMMON_LINKOPTS")
-
-def _declare_helper_app(name, info_plist, deps, helper_base_name, helper_suffix, **kwargs):
-    """
-    Creates a Helper .app target.
-    """
-    helper_name = "{} Helper".format(name)
-    bundle_id_suffix = ""
-
-    if helper_suffix:
-        helper_name += " ({})".format(helper_suffix)
-        bundle_id_suffix += ".{}".format(helper_suffix.lower())
-
-    # Helper app bundle Info.plist.
-    expand_template(
-        name = "{}_InfoPList".format(helper_base_name),
-        template = info_plist,
-        out = "{}Info.plist".format(helper_base_name),
-        substitutions = {
-            "${EXECUTABLE_NAME}": helper_name,
-            "${PRODUCT_NAME}": name,
-            "${BUNDLE_ID_SUFFIX}": bundle_id_suffix,
-            "${VERSION_SHORT}": VERSION_PLIST,
-            "${VERSION_LONG}": VERSION_PLIST,
-        },
-    )
-
-    # Helper app bundle.
-    macos_application(
-        name = helper_base_name,
-        bundle_name = helper_name,
-        bundle_id = "{}.{}.helper{}".format(MACOS_BUNDLE_ID_BASE, name.lower(), bundle_id_suffix),
-        infoplists = [":{}_InfoPList".format(helper_base_name)],
-        minimum_os_version = MACOS_DEPLOYMENT_TARGET,
-        deps = [
-            "@cef//:cef_sandbox",
-        ] + deps,
-        **kwargs,
-    )
-
-HELPERS = {
-    "HelperBase": "",
-    "HelperAlerts": "Alerts",
-    "HelperGPU": "GPU",
-    "HelperPlugin": "Plugin",
-    "HelperRenderer": "Renderer",
-}
-
-def declare_all_helper_apps(name, info_plist, deps, **kwargs):
-    """
-    Creates all Helper .app targets.
-    """
-    [_declare_helper_app(
-        name = name,
-        info_plist = info_plist,
-        deps = deps,
-        helper_base_name = h,
-        helper_suffix = v,
-        **kwargs,
-    ) for h, v in HELPERS.items()]
-
-def declare_main_app(name, info_plist, deps, resources, linkopts=[], **kwargs):
-    """
-    Creates the main .app target.
-    """
-
-    # Main app bundle Info.plist.
-    expand_template(
-        name = "InfoPList",
-        template = info_plist,
-        out = "Info.plist",
-        substitutions = {
-            "${EXECUTABLE_NAME}": name,
-            "${PRODUCT_NAME}": name,
-            "${VERSION_SHORT}": VERSION_PLIST,
-            "${VERSION_LONG}": VERSION_PLIST,
-        },
-    )
-
-    # Main app bindle.
-    macos_application(
-        name = name,
-        additional_contents = {
-            ":HelperBase": "Frameworks",
-            ":HelperAlerts": "Frameworks",
-            ":HelperGPU": "Frameworks",
-            ":HelperPlugin": "Frameworks",
-            ":HelperRenderer": "Frameworks",
-            "@cef//:cef_framework": "Frameworks/{}.framework".format(CEF_FRAMEWORK_NAME),
-        },
-        bundle_name = name,
-        bundle_id = "{}.{}".format(MACOS_BUNDLE_ID_BASE, name.lower()),
-        infoplists = [":InfoPList"],
-        linkopts = COMMON_LINKOPTS + linkopts,
-        minimum_os_version = MACOS_DEPLOYMENT_TARGET,
-        resources = resources,
-        target_compatible_with = [
-            "@platforms//os:macos",
-        ],
-        deps = deps,
-        **kwargs,
-    )

bazel/mac/variables.bzl

@@ -1,52 +0,0 @@
-# Copyright (c) 2024 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.
-
-MACOS_DEPLOYMENT_TARGET="10.15"
-MACOS_BUNDLE_ID_BASE="org.cef"
-CEF_FRAMEWORK_NAME="Chromium Embedded Framework"
-
-#
-# Common 'linkopts' for macos_application targets.
-#
-
-# Standard link frameworks.
-STANDARD_FRAMEWORKS = [
-    "AppKit",
-]
-
-COMMON_LINKOPTS_DEBUG = [
-]
-
-COMMON_LINKOPTS_RELEASE = [
-]
-
-COMMON_LINKOPTS = [
-    "-framework {}".format(lib) for lib in STANDARD_FRAMEWORKS
-]  + select({
-    "@cef//:macos_dbg": COMMON_LINKOPTS_DEBUG,
-    "//conditions:default": COMMON_LINKOPTS_RELEASE,
-})
-
-#
-# Common 'copts' for cc_libary, objc_library and macos_application targets.
-# We include defines in 'copts' because objc_library does not support
-# 'local_defines'. See https://github.com/bazelbuild/bazel/issues/17482.
-#
-
-COMMON_COPTS = [
-    "-Wno-undefined-var-template",
-    "-Wno-missing-field-initializers",
-    "-Wno-deprecated-copy",
-
-    # Used by apps to test if the sandbox is enabled
-    "-DCEF_USE_SANDBOX",
-]
-
-COMMON_COPTS_DEBUG = [
-]
-
-COMMON_COPTS_RELEASE = [
-    # Not a debug build
-    "-DNDEBUG",
-]

bazel/win/BUILD.bazel

@@ -1,8 +0,0 @@
-# Copyright (c) 2024 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.
-
-# Allow access from targets in other packages.
-package(default_visibility = [
-    "//visibility:public",
-])

bazel/win/cc_env.bzl

@@ -1,33 +0,0 @@
-# Copyright (c) 2024 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.
-
-load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain", _use_cpp_toolchain="use_cpp_toolchain")
-load("@rules_cc//cc:action_names.bzl", "CPP_COMPILE_ACTION_NAME")
-
-# Since we need windows.h and other headers, we should ensure we have the same
-# development environment as a regular cl.exe call. So use the current toolchain
-# to grab environment variables to feed into the actual rc.exe call
-# Much of this is taken from:
-#   https://github.com/bazelbuild/rules_cc/blob/main/examples/my_c_archive/my_c_archive.bzl
-def collect_compilation_env(ctx):
-    cc_toolchain = find_cpp_toolchain(ctx)
-    feature_configuration = cc_common.configure_features(
-        ctx = ctx,
-        cc_toolchain = cc_toolchain,
-        requested_features = ctx.features,
-        unsupported_features = ctx.disabled_features,
-    )
-
-    compiler_variables = cc_common.create_compile_variables(
-        feature_configuration = feature_configuration,
-        cc_toolchain = cc_toolchain,
-    )
-
-    return cc_common.get_environment_variables(
-      feature_configuration = feature_configuration,
-      action_name = CPP_COMPILE_ACTION_NAME,
-      variables = compiler_variables,
-    )
-
-use_cpp_toolchain=_use_cpp_toolchain

bazel/win/exe_helpers.bzl

@@ -1,82 +0,0 @@
-# Copyright (c) 2024 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.
-
-load("//bazel:copy_filegroups.bzl", "copy_filegroups")
-load("//bazel/win:mt.bzl", "add_manifest")
-load("//bazel/win:rc.bzl", "compile_rc")
-load("//bazel/win:variables.bzl",
-     "COMMON_LINKOPTS",
-     "COMMON_COPTS", "COMMON_COPTS_RELEASE", "COMMON_COPTS_DEBUG",
-     "COMMON_DEFINES", "COMMON_DEFINES_RELEASE", "COMMON_DEFINES_DEBUG")
-load("@rules_cc//cc:defs.bzl", "cc_binary")
-
-def declare_exe(name, srcs, manifest_srcs, rc_file, resources_srcs, resources_deps=[],
-                deps=[], linkopts=[], copts=[], local_defines=[], data=[],
-                additional_linker_inputs=[], features=[], **kwargs):
-    # Resource file.
-    res_target = "{}_res".format(name)
-    compile_rc(
-        name = res_target,
-        rc_file = rc_file,
-        srcs = resources_srcs,
-        deps = resources_deps,
-        out = "{}.res".format(name),
-        target_compatible_with = ["@platforms//os:windows"],
-    )
-
-    # Copy DLLs and resources into the current project.
-    copy_target = "{}_dlls_and_resources".format(name)
-    copy_filegroups(
-        name = copy_target,
-        filegroups = [
-            "@cef//:dlls",
-            "@cef//:resources",
-        ],
-        remove_prefixes = [
-            "Debug",
-            "Release",
-            "Resources",
-        ],
-    )
-
-    # Executable target.
-    binary_target = "{}_no_manifest".format(name)
-    cc_binary(
-        name = binary_target,
-        srcs = srcs,
-        deps = [
-            "@cef//:cef_wrapper",
-            "@cef//:cef",
-            "@cef//:cef_sandbox",
-        ] + deps,
-        linkopts = [
-            "$(location :{})".format(res_target),
-        ] + COMMON_LINKOPTS + linkopts,
-        copts = COMMON_COPTS + select({
-            "@cef//:windows_dbg": COMMON_COPTS_DEBUG,
-            "//conditions:default": COMMON_COPTS_RELEASE,
-        }) + copts,
-        local_defines = COMMON_DEFINES + select({
-            "@cef//:windows_dbg": COMMON_DEFINES_DEBUG,
-            "//conditions:default": COMMON_DEFINES_RELEASE,
-        }) + local_defines,
-        additional_linker_inputs = [
-            ":{}".format(res_target),
-        ] + additional_linker_inputs,
-        data = [
-            ":{}".format(copy_target),
-        ] + data,
-        features = ["generate_pdb_file"] + features,
-        target_compatible_with = ["@platforms//os:windows"],
-        **kwargs
-    )
-
-    # Add manifest and rename to final executable.
-    add_manifest(
-        name = name,
-        mt_files = manifest_srcs,
-        in_binary = ":{}".format(binary_target),
-        out_binary = "{}.exe".format(name),
-        target_compatible_with = ["@platforms//os:windows"],
-    )

bazel/win/mt.bzl

@@ -1,72 +0,0 @@
-# Copyright (c) 2024 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.
-
-load("//bazel/win:cc_env.bzl", "collect_compilation_env", "use_cpp_toolchain")
-
-# Copy exe and pdb file without tracking the destination as an output.
-# Based on https://github.com/bazelbuild/bazel-skylib/blob/main/rules/private/copy_file_private.bzl
-def _write_copy_cmd(ctx, src, dst):
-    # Most Windows binaries built with MSVC use a certain argument quoting
-    # scheme. Bazel uses that scheme too to quote arguments. However,
-    # cmd.exe uses different semantics, so Bazel's quoting is wrong here.
-    # To fix that we write the command to a .bat file so no command line
-    # quoting or escaping is required.
-    bat = ctx.actions.declare_file(ctx.label.name + "-cmd.bat")
-    src_path = src.path.replace("/", "\\")
-    dst_path = dst.path.replace("/", "\\")
-    ctx.actions.write(
-        output = bat,
-        # Do not use lib/shell.bzl's shell.quote() method, because that uses
-        # Bash quoting syntax, which is different from cmd.exe's syntax.
-        content = "@copy /Y \"%s\" \"%s\" >NUL\n@copy /Y \"%s\" \"%s\" >NUL" % (
-            src_path,
-            dst_path,
-            src_path.replace(".exe", ".pdb"),
-            dst_path.replace(".exe", ".pdb"),
-        ),
-        is_executable = True,
-    )
-    return bat
-
-def _add_mt_impl(ctx):
-    mt_files = ctx.files.mt_files
-    input = ctx.attr.in_binary[DebugPackageInfo].unstripped_file
-    output = ctx.outputs.out_binary
-    bat = _write_copy_cmd(ctx, input, output)
-
-    inputs = mt_files + [input, bat]
-
-    # Bring over 'data' dependencies from the input.
-    deps_inputs =  ctx.runfiles(files = inputs)
-    deps_inputs = deps_inputs.merge_all([ctx.attr.in_binary[DefaultInfo].default_runfiles])
-
-    ctx.actions.run(
-        executable = ctx.executable._tool,
-        inputs = deps_inputs.files,
-        outputs = [output],
-        env = collect_compilation_env(ctx),
-        # The bat file will be executed before the tool command.
-        arguments = [bat.path, "-nologo", "-manifest"] + [f.path for f in mt_files] +
-                    ["-outputresource:{}".format(output.path)],
-        mnemonic = "AddMT"
-    )
-
-    return DefaultInfo(files = depset([output]))
-
-add_manifest = rule(
-    implementation = _add_mt_impl,
-    attrs = {
-        "mt_files": attr.label_list(allow_files = [".manifest"]),
-        "in_binary": attr.label(providers = [CcInfo], allow_single_file = True),
-        "out_binary": attr.output(),
-        "_cc_toolchain": attr.label(default = Label("@bazel_tools//tools/cpp:current_cc_toolchain")),
-        "_tool": attr.label(
-          default = "@winsdk//:mt_pybin",
-          executable = True,
-          cfg = "exec"
-        )
-    },
-    fragments = ["cpp"],
-    toolchains = use_cpp_toolchain(),
-)

bazel/win/rc.bzl

@@ -1,50 +0,0 @@
-# Copyright (c) 2024 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.
-
-load("//bazel/win:cc_env.bzl", "collect_compilation_env", "use_cpp_toolchain")
-
-def _compile_rc_impl(ctx):
-    rc_file = ctx.file.rc_file
-    output = ctx.outputs.out
-
-    inputs = [rc_file] + ctx.files.srcs
-    includes = ["/i{}/{}".format(ctx.label.package, i) for i in ctx.attr.includes]
-
-    # Grab all include paths/files required for the run
-    for dep in ctx.attr.deps:
-      comp_ctx = dep[CcInfo].compilation_context
-
-      includes += ["/i{}".format(i) for i in comp_ctx.quote_includes.to_list()]
-      includes += ["/i{}".format(i) for i in comp_ctx.system_includes.to_list()]
-      inputs += comp_ctx.headers.to_list()
-
-    ctx.actions.run(
-        executable = ctx.executable._tool,
-        inputs = inputs,
-        outputs = [output],
-        env = collect_compilation_env(ctx),
-        arguments = includes + ["/fo", output.path, rc_file.path],
-        mnemonic = "CompileRC"
-    )
-
-    return DefaultInfo(files = depset([output]))
-
-compile_rc = rule(
-    implementation = _compile_rc_impl,
-    attrs = {
-        "rc_file": attr.label(allow_single_file = [".rc"]),
-        "srcs": attr.label_list(allow_files = True),
-        "deps": attr.label_list(providers = [CcInfo]),
-        "includes": attr.string_list(),
-        "out": attr.output(),
-        "_cc_toolchain": attr.label(default = Label("@bazel_tools//tools/cpp:current_cc_toolchain")),
-        "_tool": attr.label(
-          default = "@winsdk//:rc_pybin",
-          executable = True,
-          cfg = "exec"
-        )
-    },
-    fragments = ["cpp"],
-    toolchains = use_cpp_toolchain(),
-)

bazel/win/setup_sdk.bzl

@@ -1,124 +0,0 @@
-# Copyright (c) 2024 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.
-
-load("@bazel_tools//tools/cpp:windows_cc_configure.bzl", "find_vc_path", "setup_vc_env_vars")
-
-def _get_arch(rctx):
-    if rctx.os.arch == "amd64":
-        return "x64"
-
-def _is_windows(rctx):
-    return rctx.os.name.find("windows") != -1
-
-# Tools in the form <Target>: [<Tool>, <Other files needed for that target>]
-TOOLS = {
-    "mt": {
-        "tool": "mt.exe",
-        "deps": [],
-    },
-    "rc": {
-        "tool": "rc.exe",
-        "deps": ["rcdll.dll"],
-    },
-}
-
-def _setup_tools(rctx, sdk_bin_path, sdk_metadata_path):
-    contents = ""
-
-    rctx.symlink(sdk_metadata_path, "VerUnionMetadata")
-    contents += """
-exports_files(["VerUnionMetadata"])
-"""
-
-    for toolname, toolcfg in TOOLS.items():
-        toolexec = toolcfg["tool"]
-        deps = toolcfg["deps"]
-        direct_deps = [toolexec] + deps
-        shared_deps = toolcfg.get("shared_deps", [])
-
-        # Symlink any tools into the right places
-        for dep in direct_deps:
-            rctx.symlink(
-                "{}/{}".format(sdk_bin_path, dep),
-                dep,
-            )
-
-        # Setting up a filegroup for those dependents
-        contents += """
-filegroup(
-  name = "{}_deps",
-  srcs = {},
-)
-""".format(toolname, direct_deps + shared_deps)
-
-        # Now create a wrapper for this tool that simply calls it
-        rctx.template(
-            "{}_wrapper.py".format(toolname),
-            Label("//bazel/win:wrapper.py.tpl"),
-            substitutions = {
-                "${binary}": toolexec,
-            },
-            executable = True,
-        )
-
-        # And add that newly created wrapper to the BUILD.bazel file
-        contents += """
-py_binary(
-    name = "{0}_pybin",
-    srcs = ["{0}_wrapper.py"],
-    main = "{0}_wrapper.py",
-    data = [
-        "@rules_python//python/runfiles",
-        ":{0}_deps"
-    ],
-    python_version = "PY3",
-)
-""".format(toolname)
-
-    return contents
-
-def _setup_vc_debug_runtime(rctx, sdk_bin_path):
-    ucrtbased_dll = "ucrtbased.dll"
-    rctx.symlink("{}/ucrt/{}".format(sdk_bin_path, ucrtbased_dll), ucrtbased_dll)
-
-    contents = """
-filegroup(
-    name = "vc_debug_runtime",
-    srcs = ["{}"],
-)
-""".format(ucrtbased_dll)
-
-    return contents
-
-def _windows_sdk_impl(rctx):
-    # We only support Windows
-    if not _is_windows(rctx):
-        fail("This rule only supports Windows")
-
-    # Figure out where the SDK is, which is based on a registry key.
-    vc_path = find_vc_path(rctx)
-    env = setup_vc_env_vars(rctx, vc_path, envvars = ["WINDOWSSDKVERBINPATH", "WindowsSdkDir", "WindowsSDKVersion"])
-    sdk_bin_path = "{}{}".format(env["WINDOWSSDKVERBINPATH"], _get_arch(rctx))
-    sdk_metadata_path = "{}UnionMetadata/{}".format(env["WindowsSdkDir"], env["WindowsSDKVersion"])
-
-    # Start with some pre-amble
-    contents = """# Autogenerated by //bazel/win:sdk.bzl
-load("@rules_python//python:defs.bzl", "py_binary")
-
-package(default_visibility = ["//visibility:public"])
-"""
-
-    # Handle setting up tools from our list
-    contents += _setup_tools(rctx, sdk_bin_path, sdk_metadata_path)
-
-    contents += _setup_vc_debug_runtime(rctx, sdk_bin_path)
-
-    rctx.file("BUILD.bazel", contents)
-
-setup_sdk = repository_rule(
-    attrs = {},
-    local = True,
-    configure = True,
-    implementation = _windows_sdk_impl,
-)

bazel/win/variables.bzl

@@ -1,199 +0,0 @@
-# Copyright (c) 2024 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.
-
-#
-# Distribution DLLs.
-#
-
-# NOTE: libcef.dll is included via the //:cef dependency.
-DLLS = [
-    "chrome_elf.dll",
-    "d3dcompiler_47.dll",
-    "libEGL.dll",
-    "libGLESv2.dll",
-    "vk_swiftshader.dll",
-    "vulkan-1.dll",
-]
-
-DLLS_X64 = [
-    "dxil.dll",
-    "dxcompiler.dll",
-]
-
-#
-# Common 'linkopts' for cc_binary targets.
-#
-
-# Windows delayload DLLs.
-# Delayload most libraries as the DLLs are simply not required at startup (or
-# at all, depending on the process type). Some dlls open handles when they are
-# loaded, and we may not want them to be loaded in renderers or other sandboxed
-# processes. Conversely, some DLLs must be loaded before sandbox lockdown. In
-# unsandboxed processes they will load when first needed. The linker will
-# automatically ignore anything which is not linked to the binary at all (it is
-# harmless to have an unmatched /delayload). This list should be kept in sync
-# with Chromium's "delayloads" target from the //build/config/win/BUILD.gn file.
-DELAYLOAD_DLLS = [
-    "api-ms-win-core-winrt-error-l1-1-0.dll",
-    "api-ms-win-core-winrt-l1-1-0.dll",
-    "api-ms-win-core-winrt-string-l1-1-0.dll",
-    "advapi32.dll",
-    "comctl32.dll",
-    "comdlg32.dll",
-    "credui.dll",
-    "cryptui.dll",
-    "d3d11.dll",
-    "d3d9.dll",
-    "dwmapi.dll",
-    "dxgi.dll",
-    "dxva2.dll",
-    "esent.dll",
-    "gdi32.dll",
-    "hid.dll",
-    "imagehlp.dll",
-    "imm32.dll",
-    "msi.dll",
-    "netapi32.dll",
-    "ncrypt.dll",
-    "ole32.dll",
-    "oleacc.dll",
-    "propsys.dll",
-    "psapi.dll",
-    "rpcrt4.dll",
-    "rstrtmgr.dll",
-    "setupapi.dll",
-    "shell32.dll",
-    "shlwapi.dll",
-    "uiautomationcore.dll",
-    "urlmon.dll",
-    "user32.dll",
-    "usp10.dll",
-    "uxtheme.dll",
-    "wer.dll",
-    "wevtapi.dll",
-    "wininet.dll",
-    "winusb.dll",
-    "wsock32.dll",
-    "wtsapi32.dll",
-]
-
-# Standard link libraries.
-STANDARD_LIBS = [
-    "comctl32.lib",
-    "gdi32.lib",
-    "rpcrt4.lib",
-    "shlwapi.lib",
-    "user32.lib",
-    "ws2_32.lib",
-]
-
-# Sandbox link libraries.
-SANDBOX_LIBS = [
-    "Advapi32.lib",
-    "dbghelp.lib",
-    "Delayimp.lib",
-    "ntdll.lib",
-    "OleAut32.lib",
-    "PowrProf.lib",
-    "Propsys.lib",
-    "psapi.lib",
-    "SetupAPI.lib",
-    "Shcore.lib",
-    "Shell32.lib",
-    "Userenv.lib",
-    "version.lib",
-    "wbemuuid.lib",
-    "WindowsApp.lib",
-    "winmm.lib",
-]
-
-COMMON_LINKOPTS_DEBUG = [
-]
-
-COMMON_LINKOPTS_RELEASE = [
-]
-
-COMMON_LINKOPTS = [
-    # No default manifest (see compile_rc target).
-    "/MANIFEST:NO",
-    # Allow 32-bit processes to access 3GB of RAM.
-    "/LARGEADDRESSAWARE",
-    # Generate Debug information.
-    # TODO: Remove after fixing opt builds to work without it.
-    "/DEBUG",
-] + [
-    "/DELAYLOAD:{}".format(dll) for dll in DELAYLOAD_DLLS
-] + [
-    "/DEFAULTLIB:{}".format(lib) for lib in STANDARD_LIBS
-] + select({
-    # Set the initial stack size to 0.5MiB, instead of the 1.5MiB minimum
-    # needed by CEF's main thread. This saves significant memory on threads
-    # (like those in the Windows thread pool, and others) whose stack size we
-    # can only control through this setting. The main thread (in 32-bit builds
-    # only) uses fibers to switch to a 4MiB stack at runtime via
-    # CefRunWinMainWithPreferredStackSize().
-    "@cef//:windows_32": ["/STACK:0x80000"],
-    # Increase the initial stack size to 8MiB from the default 1MiB.
-    "//conditions:default": ["/STACK:0x800000"],
-}) + select({
-    "@cef//:windows_dbg": COMMON_LINKOPTS_DEBUG,
-    "//conditions:default": COMMON_LINKOPTS_RELEASE,
-})
-
-#
-# Common 'copts' for cc_libary and cc_binary targets.
-#
-
-COMMON_COPTS = [
-]
-
-COMMON_COPTS_DEBUG = [
-]
-
-COMMON_COPTS_RELEASE = [
-]
-
-#
-# Common 'defines' for cc_libary targets.
-#
-
-COMMON_DEFINES = [
-    # Windows platform
-    "WIN32",
-    "_WIN32",
-    "_WINDOWS",
-    # Unicode build           
-    "UNICODE",
-    "_UNICODE",
-    # Targeting Windows 10. We can't say `=_WIN32_WINNT_WIN10` here because
-    # some files do `#if WINVER < 0x0600` without including windows.h before,
-    # and then _WIN32_WINNT_WIN10 isn't yet known to be 0x0A00.
-    "WINVER=0x0A00",
-    "_WIN32_WINNT=0x0A00",
-    "NTDDI_VERSION=NTDDI_WIN10_FE",
-    # Use the standard's templated min/max
-    "NOMINMAX",
-    # Exclude less common API declarations
-    "WIN32_LEAN_AND_MEAN",
-    # Disable exceptions
-    "_HAS_EXCEPTIONS=0",
-
-    # Required by cef_sandbox.lib
-    "PSAPI_VERSION=1",
-    # Used by apps to test if the sandbox is enabled
-    "CEF_USE_SANDBOX",
-]
-
-COMMON_DEFINES_DEBUG = [
-    # Required by cef_sandbox.lib
-    # Disable iterator debugging
-    "HAS_ITERATOR_DEBUGGING=0",
-    "_ITERATOR_DEBUG_LEVEL=0",
-]
-
-COMMON_DEFINES_RELEASE = [
-    # Not a debug build
-    "NDEBUG",
-    "_NDEBUG",
-]

bazel/win/wrapper.py.tpl

@@ -1,69 +0,0 @@
-# Copyright (c) 2024 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.
-
-import os
-import subprocess
-import sys
-from rules_python.python.runfiles import runfiles
-
-REPLACEMENTS = {
-  "XXX_GETCWD_XXX": os.getcwd(),
-}
-
-def replace_in_str(input):
-  output = input
-  for placeholder, replacement in REPLACEMENTS.items():
-    if placeholder in output:
-      output = output.replace(placeholder, replacement)
-  return output
-
-def print_error(str):
-  print(str, file=sys.stderr)
-
-r = runfiles.Create()
-wrapped_binary = r.Rlocation("winsdk/${binary}")
-args = list(map(replace_in_str, sys.argv[1:]))
-
-# Optionally execute a script before tool execution.
-if args[0].endswith('.bat') or args[0].endswith('.cmd'):
-  if sys.platform != 'win32':
-    raise RuntimeError("Error running bat file; unsupported platform")
-
-  # Execute the .bat file first.
-  bat_file = args[0].replace('/', '\\')
-  p = subprocess.run(
-      bat_file, shell=True,
-      stdout = subprocess.PIPE,
-      stderr = subprocess.STDOUT,
-      text=True)
-  if p.returncode != 0:
-    print_error("[Generated python wrapper] Error running bat file:")
-    print_error(f"CWD: {os.getcwd()}")
-    print_error(f"EXEC: {bat_file}")
-    print_error(f"Exec output:")
-    print_error(p.stdout)
-    raise RuntimeError(f"Error running bat file; {bat_file}")
-
-  args = args[1:]
-
-try:
-  p = subprocess.run(
-      [wrapped_binary] + args,
-      stdout = subprocess.PIPE,
-      stderr = subprocess.STDOUT,
-      text=True)
-  if p.returncode != 0:
-    print_error("[Generated python wrapper] Error running command:")
-    print_error(f"CWD: {os.getcwd()}")
-    print_error(f"EXEC: {wrapped_binary}")
-    print_error(f"ARGS: {args}")
-    print_error(f"Exec output:")
-    print_error(p.stdout)
-    raise RuntimeError(f"Error running wrapped command; {wrapped_binary}")
-except OSError as e:
-  print_error("[Generated python wrapper] Error running command:")
-  print_error(f"CWD: {os.getcwd()}")
-  print_error(f"EXEC: {wrapped_binary}")
-  print_error(f"ARGS: {args}")
-  raise

cef_paths2.gypi

@@ -20,6 +20,7 @@
       'include/base/cef_logging.h',
       'include/base/cef_macros.h',
       'include/base/cef_platform_thread.h',
+      'include/base/cef_ptr_util.h',
       'include/base/cef_ref_counted.h',
       'include/base/cef_scoped_refptr.h',
       'include/base/cef_thread_checker.h',
@@ -53,10 +54,9 @@
       'include/internal/cef_time.h',
       'include/internal/cef_trace_event_internal.h',
       'include/internal/cef_types.h',
+      'include/internal/cef_types_color.h',
       'include/internal/cef_types_content_settings.h',
       'include/internal/cef_types_geometry.h',
-      'include/internal/cef_types_runtime.h',
-      'include/internal/cef_types_color.h',
     ],
     'includes_capi': [
       'include/capi/cef_base_capi.h',
@@ -166,6 +166,8 @@
     'shared_sources_browser': [
       'tests/shared/browser/client_app_browser.cc',
       'tests/shared/browser/client_app_browser.h',
+      'tests/shared/browser/extension_util.cc',
+      'tests/shared/browser/extension_util.h',
       'tests/shared/browser/file_util.cc',
       'tests/shared/browser/file_util.h',
       'tests/shared/browser/geometry_util.cc',
@@ -242,7 +244,6 @@
       'tests/cefclient/browser/client_prefs.cc',
       'tests/cefclient/browser/client_prefs.h',
       'tests/cefclient/browser/client_types.h',
-      'tests/cefclient/browser/default_client_handler.cc',
       'tests/cefclient/browser/default_client_handler.h',
       'tests/cefclient/browser/dialog_test.cc',
       'tests/cefclient/browser/dialog_test.h',
@@ -336,6 +337,13 @@
       'tests/cefclient/resources/window.html',
       'tests/cefclient/resources/xmlhttprequest.html',
     ],
+    'cefclient_sources_resources_extensions_set_page_color': [
+      'tests/cefclient/resources/extensions/set_page_color/icon.png',
+      'tests/cefclient/resources/extensions/set_page_color/manifest.json',
+      'tests/cefclient/resources/extensions/set_page_color/popup.html',
+      'tests/cefclient/resources/extensions/set_page_color/popup.js',
+      'tests/cefclient/resources/extensions/set_page_color/README.md',
+    ],
     'cefclient_sources_win': [
       'tests/cefclient/browser/browser_window_osr_win.cc',
       'tests/cefclient/browser/browser_window_osr_win.h',
@@ -371,14 +379,12 @@
       'tests/cefclient/browser/window_test_runner_win.cc',
       'tests/cefclient/browser/window_test_runner_win.h',
       'tests/cefclient/cefclient_win.cc',
+      'tests/cefclient/resources/win/cefclient.rc',
     ],
     'cefclient_sources_resources_win': [
-      'tests/cefclient/win/cefclient.exe.manifest',
-      'tests/cefclient/win/cefclient.ico',
-      'tests/cefclient/win/small.ico',
-    ],
-    'cefclient_sources_resources_win_rc': [
-      'tests/cefclient/win/cefclient.rc',
+      'tests/cefclient/resources/win/cefclient.exe.manifest',
+      'tests/cefclient/resources/win/cefclient.ico',
+      'tests/cefclient/resources/win/small.ico',
     ],
     'cefclient_sources_mac': [
       'tests/cefclient/browser/browser_window_osr_mac.h',
@@ -401,12 +407,12 @@
       'tests/cefclient/browser/window_test_runner_mac.h',
       'tests/cefclient/browser/window_test_runner_mac.mm',
       'tests/cefclient/cefclient_mac.mm',
-    ],
+   ],
     'cefclient_bundle_resources_mac': [
-      'tests/cefclient/mac/cefclient.icns',
-      'tests/cefclient/mac/English.lproj/InfoPlist.strings',
-      'tests/cefclient/mac/English.lproj/MainMenu.xib',
-      'tests/cefclient/mac/Info.plist.in',
+      'tests/cefclient/resources/mac/cefclient.icns',
+      'tests/cefclient/resources/mac/English.lproj/InfoPlist.strings',
+      'tests/cefclient/resources/mac/English.lproj/MainMenu.xib',
+      'tests/cefclient/resources/mac/Info.plist',
     ],
     'cefclient_sources_linux': [
       'tests/cefclient/browser/browser_window_osr_gtk.cc',
@@ -438,17 +444,15 @@
       'tests/cefsimple/simple_handler.h',
     ],
     'cefsimple_sources_win': [
+      'tests/cefsimple/cefsimple.rc',
       'tests/cefsimple/cefsimple_win.cc',
-      'tests/cefsimple/resource.h',
       'tests/cefsimple/simple_handler_win.cc',
+      'tests/cefsimple/resource.h',
     ],
     'cefsimple_sources_resources_win': [
-      'tests/cefsimple/win/cefsimple.exe.manifest',
-      'tests/cefsimple/win/cefsimple.ico',
-      'tests/cefsimple/win/small.ico',
-    ],
-    'cefsimple_sources_resources_win_rc': [
-      'tests/cefsimple/win/cefsimple.rc',
+      'tests/cefsimple/cefsimple.exe.manifest',
+      'tests/cefsimple/res/cefsimple.ico',
+      'tests/cefsimple/res/small.ico',
     ],
     'cefsimple_sources_mac': [
       'tests/cefsimple/cefsimple_mac.mm',
@@ -461,7 +465,7 @@
       'tests/cefsimple/mac/cefsimple.icns',
       'tests/cefsimple/mac/English.lproj/InfoPlist.strings',
       'tests/cefsimple/mac/English.lproj/MainMenu.xib',
-      'tests/cefsimple/mac/Info.plist.in',
+      'tests/cefsimple/mac/Info.plist',
     ],
     'cefsimple_sources_linux': [
       'tests/cefsimple/cefsimple_linux.cc',
@@ -486,6 +490,13 @@
       'tests/ceftests/dom_unittest.cc',
       'tests/ceftests/download_unittest.cc',
       'tests/ceftests/draggable_regions_unittest.cc',
+      'tests/ceftests/extensions/background_unittest.cc',
+      'tests/ceftests/extensions/chrome_alarms_unittest.cc',
+      'tests/ceftests/extensions/chrome_storage_unittest.cc',
+      'tests/ceftests/extensions/chrome_tabs_unittest.cc',
+      'tests/ceftests/extensions/extension_test_handler.cc',
+      'tests/ceftests/extensions/extension_test_handler.h',
+      'tests/ceftests/extensions/view_unittest.cc',
       'tests/ceftests/file_util_unittest.cc',
       'tests/ceftests/frame_handler_unittest.cc',
       'tests/ceftests/frame_unittest.cc',
@@ -579,32 +590,24 @@
     'ceftests_sources_win': [
       'tests/ceftests/resource_util_win_dir.cc',
       'tests/ceftests/resource_util_win_idmap.cc',
+      'tests/ceftests/resources/win/ceftests.rc',
     ],
     'ceftests_sources_resources_win': [
-      'tests/ceftests/win/ceftests.exe.manifest',
-      'tests/ceftests/win/ceftests.ico',
-      'tests/ceftests/win/small.ico',
-    ],
-    'ceftests_sources_resources_win_rc': [
-      'tests/ceftests/win/ceftests.rc',
+      'tests/ceftests/resources/win/ceftests.exe.manifest',
+      'tests/ceftests/resources/win/ceftests.ico',
+      'tests/ceftests/resources/win/small.ico',
     ],
     'ceftests_sources_mac': [
       'tests/ceftests/os_rendering_unittest_mac.h',
       'tests/ceftests/os_rendering_unittest_mac.mm',
       'tests/ceftests/run_all_unittests_mac.mm',
     ],
-    'ceftests_sources_mac_browser_shared': [
-      'tests/shared/renderer/client_app_renderer.h',
-    ],
-    'ceftests_sources_mac_helper_shared': [
-      'tests/shared/browser/client_app_browser.h',
+    'ceftests_sources_mac_helper': [
       'tests/shared/browser/file_util.cc',
       'tests/shared/browser/file_util.h',
       'tests/shared/browser/resource_util.h',
       'tests/shared/browser/resource_util_mac.mm',
       'tests/shared/browser/resource_util_posix.cc',
-    ],
-    'ceftests_sources_mac_helper': [
       'tests/ceftests/audio_output_unittest.cc',
       'tests/ceftests/client_app_delegates.cc',
       'tests/ceftests/cookie_unittest.cc',
@@ -660,10 +663,10 @@
       'tests/ceftests/v8_unittest.cc',
     ],
     'ceftests_bundle_resources_mac': [
-      'tests/ceftests/mac/ceftests.icns',
-      'tests/ceftests/mac/English.lproj/InfoPlist.strings',
-      'tests/ceftests/mac/English.lproj/MainMenu.xib',
-      'tests/ceftests/mac/Info.plist.in',
+      'tests/ceftests/resources/mac/ceftests.icns',
+      'tests/ceftests/resources/mac/English.lproj/InfoPlist.strings',
+      'tests/ceftests/resources/mac/English.lproj/MainMenu.xib',
+      'tests/ceftests/resources/mac/Info.plist',
     ],
     'ceftests_sources_linux': [
       'tests/ceftests/resource_util_linux.cc',

include/base/cef_build.h

@@ -69,28 +69,7 @@
 #if defined(USING_CHROMIUM_INCLUDES)
 // When building CEF include the Chromium header directly.
 #include "build/build_config.h"
-#include "cef/libcef/features/features.h"
-
-// The following #defines are used in cef/include/ headers and CEF client-side
-// code. CEF library-side code should use BUILDFLAG checks directly instead of
-// these #defines. CEF client-side code will get these #defines from
-// cef_config.h so any changes must also be reflected in
-// tools/make_config_header.py.
-
-#if BUILDFLAG(IS_LINUX)
-#include "ui/base/ozone_buildflags.h"
-#if BUILDFLAG(IS_OZONE_X11)
-#define CEF_X11 1
-#endif
-#endif
-
-#if !BUILDFLAG(ENABLE_ALLOY_BOOTSTRAP)
-#define DISABLE_ALLOY_BOOTSTRAP 1
-#endif
-
 #else  // !USING_CHROMIUM_INCLUDES
-#include "include/cef_config.h"
-
 // The following is substantially similar to the Chromium implementation.
 // If the Chromium implementation diverges the below implementation should be
 // updated to match.

include/base/cef_ptr_util.h

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

include/base/cef_tuple.h

@@ -66,7 +66,6 @@
 // updated to match.
 
 #include <stddef.h>
-
 #include <tuple>
 #include <utility>
 

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=6ee74f31d37a1b5ab3c9c5ccbe2dce9841329b38$
+// $hash=abcb584dbf5965834f415a0f2daeda3e361696b2$
 //
 
 #ifndef CEF_INCLUDE_CAPI_CEF_BROWSER_CAPI_H_
@@ -911,8 +911,6 @@ typedef struct _cef_browser_host_t {
   /// Returns the extension hosted in this browser or NULL if no extension is
   /// hosted. See cef_request_context_t::LoadExtension for details.
   ///
-  /// WARNING: This function is deprecated and will be removed in ~M127.
-  ///
   struct _cef_extension_t*(CEF_CALLBACK* get_extension)(
       struct _cef_browser_host_t* self);
 
@@ -921,8 +919,6 @@ typedef struct _cef_browser_host_t {
   /// script. Background hosts do not have a window and are not displayable. See
   /// cef_request_context_t::LoadExtension for details.
   ///
-  /// WARNING: This function is deprecated and will be removed in ~M127.
-  ///
   int(CEF_CALLBACK* is_background_host)(struct _cef_browser_host_t* self);
 
   ///
@@ -989,13 +985,6 @@ typedef struct _cef_browser_host_t {
   ///
   int(CEF_CALLBACK* is_render_process_unresponsive)(
       struct _cef_browser_host_t* self);
-
-  ///
-  /// Returns the runtime style for this browser (ALLOY or CHROME). See
-  /// cef_runtime_style_t documentation for details.
-  ///
-  cef_runtime_style_t(CEF_CALLBACK* get_runtime_style)(
-      struct _cef_browser_host_t* self);
 } cef_browser_host_t;
 
 ///

include/capi/cef_dialog_handler_capi.h

@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=bf7208a86ee17f63fd7163cef8c3a13373a1f1c8$
+// $hash=5644fdc2453dd083079bf9e3616b687eeb49f250$
 //
 
 #ifndef CEF_INCLUDE_CAPI_CEF_DIALOG_HANDLER_CAPI_H_
@@ -86,20 +86,13 @@ typedef struct _cef_dialog_handler_t {
   /// to show the default title ("Open" or "Save" depending on the mode).
   /// |default_file_path| is the path with optional directory and/or file name
   /// component that should be initially selected in the dialog.
-  /// |accept_filters| are used to restrict the selectable file types and may be
-  /// any combination of valid lower-cased MIME types (e.g. "text/*" or
-  /// "image/*") and individual file extensions (e.g. ".txt" or ".png").
-  /// |accept_extensions| provides the semicolon-delimited expansion of MIME
-  /// types to file extensions (if known, or NULL string otherwise).
-  /// |accept_descriptions| provides the descriptions for MIME types (if known,
-  /// or NULL string otherwise). For example, the "image/*" mime type might have
-  /// extensions ".png;.jpg;.bmp;..." and description "Image Files".
-  /// |accept_filters|, |accept_extensions| and |accept_descriptions| will all
-  /// be the same size. To display a custom dialog return true (1) and execute
-  /// |callback| either inline or at a later time. To display the default dialog
-  /// return false (0). If this function returns false (0) it may be called an
-  /// additional time for the same dialog (both before and after MIME type
-  /// expansion).
+  /// |accept_filters| are used to restrict the selectable file types and may
+  /// any combination of (a) valid lower-cased MIME types (e.g. "text/*" or
+  /// "image/*"), (b) individual file extensions (e.g. ".txt" or ".png"), or (c)
+  /// combined description and file extension delimited using "|" and ";" (e.g.
+  /// "Image Types|.png;.gif;.jpg"). To display a custom dialog return true (1)
+  /// and execute |callback| either inline or at a later time. To display the
+  /// default dialog return false (0).
   ///
   int(CEF_CALLBACK* on_file_dialog)(
       struct _cef_dialog_handler_t* self,
@@ -108,8 +101,6 @@ typedef struct _cef_dialog_handler_t {
       const cef_string_t* title,
       const cef_string_t* default_file_path,
       cef_string_list_t accept_filters,
-      cef_string_list_t accept_extensions,
-      cef_string_list_t accept_descriptions,
       struct _cef_file_dialog_callback_t* callback);
 } cef_dialog_handler_t;
 

include/capi/cef_download_handler_capi.h

@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=7ecfb07a95315ff81937e9f68d419122fc88f1b7$
+// $hash=60a08a60be70e8fe5df17f18f8e5758e1830d5e1$
 //
 
 #ifndef CEF_INCLUDE_CAPI_CEF_DOWNLOAD_HANDLER_CAPI_H_
@@ -117,13 +117,12 @@ typedef struct _cef_download_handler_t {
 
   ///
   /// Called before a download begins. |suggested_name| is the suggested name
-  /// for the download file. Return true (1) and execute |callback| either
-  /// asynchronously or in this function to continue or cancel the download.
-  /// Return false (0) to proceed with default handling (cancel with Alloy
-  /// style, download shelf with Chrome style). Do not keep a reference to
-  /// |download_item| outside of this function.
+  /// for the download file. By default the download will be canceled. Execute
+  /// |callback| either asynchronously or in this function to continue the
+  /// download if desired. Do not keep a reference to |download_item| outside of
+  /// this function.
   ///
-  int(CEF_CALLBACK* on_before_download)(
+  void(CEF_CALLBACK* on_before_download)(
       struct _cef_download_handler_t* self,
       struct _cef_browser_t* browser,
       struct _cef_download_item_t* download_item,

include/capi/cef_extension_capi.h

@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=634054ad25154c30fb4ec630fe7fb79b0cf1f9b3$
+// $hash=0ca2b788f70f8c9f5b2706d691d8e063be00ed19$
 //
 
 #ifndef CEF_INCLUDE_CAPI_CEF_EXTENSION_CAPI_H_
@@ -54,8 +54,6 @@ struct _cef_request_context_t;
 /// Object representing an extension. Methods may be called on any thread unless
 /// otherwise indicated.
 ///
-/// WARNING: This API is deprecated and will be removed in ~M127.
-///
 typedef struct _cef_extension_t {
   ///
   /// Base structure.

include/capi/cef_extension_handler_capi.h

@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=ebac34c9b85de780ce7524211c5dd61a80d4576c$
+// $hash=5cfff4465a586d2b2ea7b54a9549096faec415f6$
 //
 
 #ifndef CEF_INCLUDE_CAPI_CEF_EXTENSION_HANDLER_CAPI_H_
@@ -80,8 +80,6 @@ typedef struct _cef_get_extension_resource_callback_t {
 /// cef_request_context_t::LoadExtension for information about extension
 /// loading.
 ///
-/// WARNING: This API is deprecated and will be removed in ~M127.
-///
 typedef struct _cef_extension_handler_t {
   ///
   /// Base structure.

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=2c496139ca9a59303b1493ee93d2c3ae96a956c0$
+// $hash=7df03921b2ee743fb059f13e545ccf89904eb060$
 //
 
 #ifndef CEF_INCLUDE_CAPI_CEF_REQUEST_CONTEXT_CAPI_H_
@@ -253,8 +253,6 @@ typedef struct _cef_request_context_t {
   /// See https://developer.chrome.com/extensions for extension implementation
   /// and usage documentation.
   ///
-  /// WARNING: This function is deprecated and will be removed in ~M127.
-  ///
   void(CEF_CALLBACK* load_extension)(struct _cef_request_context_t* self,
                                      const cef_string_t* root_directory,
                                      struct _cef_dictionary_value_t* manifest,
@@ -266,8 +264,6 @@ typedef struct _cef_request_context_t {
   /// access to the extension (see HasExtension). This function must be called
   /// on the browser process UI thread.
   ///
-  /// WARNING: This function is deprecated and will be removed in ~M127.
-  ///
   int(CEF_CALLBACK* did_load_extension)(struct _cef_request_context_t* self,
                                         const cef_string_t* extension_id);
 
@@ -277,8 +273,6 @@ typedef struct _cef_request_context_t {
   /// extension (see DidLoadExtension). This function must be called on the
   /// browser process UI thread.
   ///
-  /// WARNING: This function is deprecated and will be removed in ~M127.
-  ///
   int(CEF_CALLBACK* has_extension)(struct _cef_request_context_t* self,
                                    const cef_string_t* extension_id);
 
@@ -288,8 +282,6 @@ typedef struct _cef_request_context_t {
   /// extension ID values. Returns true (1) on success. This function must be
   /// called on the browser process UI thread.
   ///
-  /// WARNING: This function is deprecated and will be removed in ~M127.
-  ///
   int(CEF_CALLBACK* get_extensions)(struct _cef_request_context_t* self,
                                     cef_string_list_t extension_ids);
 
@@ -298,8 +290,6 @@ typedef struct _cef_request_context_t {
   /// extension is accessible in this context (see HasExtension). This function
   /// must be called on the browser process UI thread.
   ///
-  /// WARNING: This function is deprecated and will be removed in ~M127.
-  ///
   struct _cef_extension_t*(CEF_CALLBACK* get_extension)(
       struct _cef_request_context_t* self,
       const cef_string_t* extension_id);

include/capi/cef_v8_capi.h

@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=5dd4948a92af2ad69e2171f2dffb8f2c23e5c147$
+// $hash=3a188f380f8044060ea93fdca0b3d231df88979d$
 //
 
 #ifndef CEF_INCLUDE_CAPI_CEF_V8_CAPI_H_
@@ -611,6 +611,7 @@ typedef struct _cef_v8value_t {
   ///
   int(CEF_CALLBACK* set_value_byaccessor)(struct _cef_v8value_t* self,
                                           const cef_string_t* key,
+                                          cef_v8_accesscontrol_t settings,
                                           cef_v8_propertyattribute_t attribute);
 
   ///

include/capi/test/cef_test_helpers_capi.h

@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=da2edf5e08eb45942b6a82109aa86682c202ccac$
+// $hash=db81a65aba3c2d1213744ad4251322acf97c608c$
 //
 
 #ifndef CEF_INCLUDE_CAPI_TEST_CEF_TEST_HELPERS_CAPI_H_
@@ -67,14 +67,6 @@ CEF_EXPORT void cef_execute_java_script_with_user_gesture_for_tests(
 ///
 CEF_EXPORT void cef_set_data_directory_for_tests(const cef_string_t* dir);
 
-///
-/// Returns true (1) if |feature_name| is enabled by default, command line or
-/// field trial. This supports a short list of curated values that are queried
-/// by unit tests.
-///
-CEF_EXPORT int cef_is_feature_enabled_for_tests(
-    const cef_string_t* feature_name);
-
 #ifdef __cplusplus
 }
 #endif

include/capi/views/cef_browser_view_capi.h

@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=1c2fbbffaf51e90a2d55bfa7eb3fa3a4e315f4ac$
+// $hash=2e5a3b3b1f427a7eb1e6a447fe0d31c5ace49469$
 //
 
 #ifndef CEF_INCLUDE_CAPI_VIEWS_CEF_BROWSER_VIEW_CAPI_H_
@@ -93,13 +93,6 @@ typedef struct _cef_browser_view_t {
   ///
   void(CEF_CALLBACK* set_prefer_accelerators)(struct _cef_browser_view_t* self,
                                               int prefer_accelerators);
-
-  ///
-  /// Returns the runtime style for this BrowserView (ALLOY or CHROME). See
-  /// cef_runtime_style_t documentation for details.
-  ///
-  cef_runtime_style_t(CEF_CALLBACK* get_runtime_style)(
-      struct _cef_browser_view_t* self);
 } cef_browser_view_t;
 
 ///

include/capi/views/cef_browser_view_delegate_capi.h

@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=a0a9f2bfcdf8e05d3d1114fcd8860caaa726ec98$
+// $hash=1f2a6e206b86945386bef57167b80e2fb6067c59$
 //
 
 #ifndef CEF_INCLUDE_CAPI_VIEWS_CEF_BROWSER_VIEW_DELEGATE_CAPI_H_
@@ -141,13 +141,6 @@ typedef struct _cef_browser_view_delegate_t {
       struct _cef_browser_view_delegate_t* self,
       struct _cef_browser_view_t* browser_view,
       cef_gesture_command_t gesture_command);
-
-  ///
-  /// Optionally change the runtime style for this BrowserView. See
-  /// cef_runtime_style_t documentation for details.
-  ///
-  cef_runtime_style_t(CEF_CALLBACK* get_browser_runtime_style)(
-      struct _cef_browser_view_delegate_t* self);
 } cef_browser_view_delegate_t;
 
 #ifdef __cplusplus

include/capi/views/cef_window_capi.h

@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=dd32b58ec9aca0e04a1d30ccf94a741995fcc094$
+// $hash=2abb3759a22a95ffc0207f0538c645a74a5030c6$
 //
 
 #ifndef CEF_INCLUDE_CAPI_VIEWS_CEF_WINDOW_CAPI_H_
@@ -401,13 +401,6 @@ typedef struct _cef_window_t {
   /// or cef_view_delegate_t::OnThemeChanged.
   ///
   void(CEF_CALLBACK* theme_changed)(struct _cef_window_t* self);
-
-  ///
-  /// Returns the runtime style for this Window (ALLOY or CHROME). See
-  /// cef_runtime_style_t documentation for details.
-  ///
-  cef_runtime_style_t(CEF_CALLBACK* get_runtime_style)(
-      struct _cef_window_t* self);
 } cef_window_t;
 
 ///

include/capi/views/cef_window_delegate_capi.h

@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=e8c9e32caa8d317a7cb6ff2f0ad6be49cf1b7ad1$
+// $hash=e6bbc33db1b5ed3832982f8799e14557204f4028$
 //
 
 #ifndef CEF_INCLUDE_CAPI_VIEWS_CEF_WINDOW_DELEGATE_CAPI_H_
@@ -275,13 +275,6 @@ typedef struct _cef_window_delegate_t {
       struct _cef_window_delegate_t* self,
       struct _cef_window_t* window,
       int chrome_theme);
-
-  ///
-  /// Optionally change the runtime style for this Window. See
-  /// cef_runtime_style_t documentation for details.
-  ///
-  cef_runtime_style_t(CEF_CALLBACK* get_window_runtime_style)(
-      struct _cef_window_delegate_t* self);
 } cef_window_delegate_t;
 
 #ifdef __cplusplus

include/cef_api_hash.h

@@ -42,13 +42,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 "d3709fcbd6630817b73287083d5440bffffcfb0b"
+#define CEF_API_HASH_UNIVERSAL "35035b76d79ba0c7144aedb63d72b7988d372706"
 #if defined(OS_WIN)
-#define CEF_API_HASH_PLATFORM "2e66390b5f0fa21ab4667b503e76164037cd674e"
+#define CEF_API_HASH_PLATFORM "9227cf2e0abf4f378e31e6095d503a91b2da59af"
 #elif defined(OS_MAC)
-#define CEF_API_HASH_PLATFORM "94ce56bc6f289ae039ca7db2ac8d32901e71a4e1"
+#define CEF_API_HASH_PLATFORM "fe0bdc49d209ee3cf108bdb72faec21316f9d0e0"
 #elif defined(OS_LINUX)
-#define CEF_API_HASH_PLATFORM "2fda6a422c06b87a4ce47bdfd4c985346f1eaab8"
+#define CEF_API_HASH_PLATFORM "df471096e6600c025ac0655b5eaa9818f075b8ba"
 #endif
 
 #ifdef __cplusplus

include/cef_browser.h

@@ -39,7 +39,6 @@
 #pragma once
 
 #include <vector>
-
 #include "include/cef_base.h"
 #include "include/cef_devtools_message_observer.h"
 #include "include/cef_drag_data.h"
@@ -943,8 +942,6 @@ class CefBrowserHost : public virtual CefBaseRefCounted {
   /// Returns the extension hosted in this browser or NULL if no extension is
   /// hosted. See CefRequestContext::LoadExtension for details.
   ///
-  /// WARNING: This method is deprecated and will be removed in ~M127.
-  ///
   /*--cef()--*/
   virtual CefRefPtr<CefExtension> GetExtension() = 0;
 
@@ -953,8 +950,6 @@ class CefBrowserHost : public virtual CefBaseRefCounted {
   /// Background hosts do not have a window and are not displayable. See
   /// CefRequestContext::LoadExtension for details.
   ///
-  /// WARNING: This method is deprecated and will be removed in ~M127.
-  ///
   /*--cef()--*/
   virtual bool IsBackgroundHost() = 0;
 
@@ -1023,13 +1018,6 @@ class CefBrowserHost : public virtual CefBaseRefCounted {
   ///
   /*--cef()--*/
   virtual bool IsRenderProcessUnresponsive() = 0;
-
-  ///
-  /// Returns the runtime style for this browser (ALLOY or CHROME). See
-  /// cef_runtime_style_t documentation for details.
-  ///
-  /*--cef(default_retval=CEF_RUNTIME_STYLE_DEFAULT)--*/
-  virtual cef_runtime_style_t GetRuntimeStyle() = 0;
 };
 
 #endif  // CEF_INCLUDE_CEF_BROWSER_H_

include/cef_command_line.h

@@ -40,7 +40,6 @@
 
 #include <map>
 #include <vector>
-
 #include "include/cef_base.h"
 
 ///

include/cef_cookie.h

@@ -39,7 +39,6 @@
 #pragma once
 
 #include <vector>
-
 #include "include/cef_base.h"
 #include "include/cef_callback.h"
 

include/cef_dialog_handler.h

@@ -77,30 +77,21 @@ class CefDialogHandler : public virtual CefBaseRefCounted {
   /// empty to show the default title ("Open" or "Save" depending on the mode).
   /// |default_file_path| is the path with optional directory and/or file name
   /// component that should be initially selected in the dialog.
-  /// |accept_filters| are used to restrict the selectable file types and may be
-  /// any combination of valid lower-cased MIME types (e.g. "text/*" or
-  /// "image/*") and individual file extensions (e.g. ".txt" or ".png").
-  /// |accept_extensions| provides the semicolon-delimited expansion of MIME
-  /// types to file extensions (if known, or empty string otherwise).
-  /// |accept_descriptions| provides the descriptions for MIME types (if known,
-  /// or empty string otherwise). For example, the "image/*" mime type might
-  /// have extensions ".png;.jpg;.bmp;..." and description "Image Files".
-  /// |accept_filters|, |accept_extensions| and |accept_descriptions| will all
-  /// be the same size. To display a custom dialog return true and execute
-  /// |callback| either inline or at a later time. To display the default dialog
-  /// return false. If this method returns false it may be called an additional
-  /// time for the same dialog (both before and after MIME type expansion).
+  /// |accept_filters| are used to restrict the selectable file types and may
+  /// any combination of (a) valid lower-cased MIME types (e.g. "text/*" or
+  /// "image/*"), (b) individual file extensions (e.g. ".txt" or ".png"), or (c)
+  /// combined description and file extension delimited using "|" and ";" (e.g.
+  /// "Image Types|.png;.gif;.jpg"). To display a custom dialog return true and
+  /// execute |callback| either inline or at a later time. To display the
+  /// default dialog return false.
   ///
   /*--cef(optional_param=title,optional_param=default_file_path,
-          optional_param=accept_filters,optional_param=accept_extensions,
-          optional_param=accept_descriptions)--*/
+          optional_param=accept_filters)--*/
   virtual bool OnFileDialog(CefRefPtr<CefBrowser> browser,
                             FileDialogMode mode,
                             const CefString& title,
                             const CefString& default_file_path,
                             const std::vector<CefString>& accept_filters,
-                            const std::vector<CefString>& accept_extensions,
-                            const std::vector<CefString>& accept_descriptions,
                             CefRefPtr<CefFileDialogCallback> callback) {
     return false;
   }

include/cef_dom.h

@@ -39,7 +39,6 @@
 #pragma once
 
 #include <map>
-
 #include "include/cef_base.h"
 
 class CefDOMDocument;

include/cef_download_handler.h

@@ -106,19 +106,17 @@ class CefDownloadHandler : public virtual CefBaseRefCounted {
 
   ///
   /// Called before a download begins. |suggested_name| is the suggested name
-  /// for the download file. Return true and execute |callback| either
-  /// asynchronously or in this method to continue or cancel the download.
-  /// Return false to proceed with default handling (cancel with Alloy style,
-  /// download shelf with Chrome style). Do not keep a reference to
-  /// |download_item| outside of this method.
+  /// for the download file. By default the download will be canceled. Execute
+  /// |callback| either asynchronously or in this method to continue the
+  /// download if desired. Do not keep a reference to |download_item| outside of
+  /// this method.
   ///
   /*--cef()--*/
-  virtual bool OnBeforeDownload(CefRefPtr<CefBrowser> browser,
-                                CefRefPtr<CefDownloadItem> download_item,
-                                const CefString& suggested_name,
-                                CefRefPtr<CefBeforeDownloadCallback> callback) {
-    return false;
-  }
+  virtual void OnBeforeDownload(
+      CefRefPtr<CefBrowser> browser,
+      CefRefPtr<CefDownloadItem> download_item,
+      const CefString& suggested_name,
+      CefRefPtr<CefBeforeDownloadCallback> callback) = 0;
 
   ///
   /// Called when a download's status or progress information has been updated.

include/cef_drag_data.h

@@ -39,7 +39,6 @@
 #pragma once
 
 #include <vector>
-
 #include "include/cef_base.h"
 #include "include/cef_image.h"
 #include "include/cef_stream.h"

include/cef_extension.h

@@ -48,8 +48,6 @@ class CefRequestContext;
 /// Object representing an extension. Methods may be called on any thread unless
 /// otherwise indicated.
 ///
-/// WARNING: This API is deprecated and will be removed in ~M127.
-///
 /*--cef(source=library)--*/
 class CefExtension : public CefBaseRefCounted {
  public:

include/cef_extension_handler.h

@@ -70,8 +70,6 @@ class CefGetExtensionResourceCallback : public CefBaseRefCounted {
 /// The methods of this class will be called on the UI thread. See
 /// CefRequestContext::LoadExtension for information about extension loading.
 ///
-/// WARNING: This API is deprecated and will be removed in ~M127.
-///
 /*--cef(source=client)--*/
 class CefExtensionHandler : public virtual CefBaseRefCounted {
  public:

include/cef_media_router.h

@@ -39,7 +39,6 @@
 #pragma once
 
 #include <vector>
-
 #include "include/cef_base.h"
 #include "include/cef_callback.h"
 #include "include/cef_registration.h"

include/cef_request.h

@@ -40,7 +40,6 @@
 
 #include <map>
 #include <vector>
-
 #include "include/cef_base.h"
 
 class CefPostData;

include/cef_request_context.h

@@ -266,8 +266,6 @@ class CefRequestContext : public CefPreferenceManager {
   /// See https://developer.chrome.com/extensions for extension implementation
   /// and usage documentation.
   ///
-  /// WARNING: This method is deprecated and will be removed in ~M127.
-  ///
   /*--cef(optional_param=manifest,optional_param=handler)--*/
   virtual void LoadExtension(const CefString& root_directory,
                              CefRefPtr<CefDictionaryValue> manifest,
@@ -279,8 +277,6 @@ class CefRequestContext : public CefPreferenceManager {
   /// access to the extension (see HasExtension). This method must be called on
   /// the browser process UI thread.
   ///
-  /// WARNING: This method is deprecated and will be removed in ~M127.
-  ///
   /*--cef()--*/
   virtual bool DidLoadExtension(const CefString& extension_id) = 0;
 
@@ -290,8 +286,6 @@ class CefRequestContext : public CefPreferenceManager {
   /// extension (see DidLoadExtension). This method must be called on the
   /// browser process UI thread.
   ///
-  /// WARNING: This method is deprecated and will be removed in ~M127.
-  ///
   /*--cef()--*/
   virtual bool HasExtension(const CefString& extension_id) = 0;
 
@@ -301,8 +295,6 @@ class CefRequestContext : public CefPreferenceManager {
   /// extension ID values. Returns true on success. This method must be called
   /// on the browser process UI thread.
   ///
-  /// WARNING: This method is deprecated and will be removed in ~M127.
-  ///
   /*--cef()--*/
   virtual bool GetExtensions(std::vector<CefString>& extension_ids) = 0;
 
@@ -311,8 +303,6 @@ class CefRequestContext : public CefPreferenceManager {
   /// extension is accessible in this context (see HasExtension). This method
   /// must be called on the browser process UI thread.
   ///
-  /// WARNING: This method is deprecated and will be removed in ~M127.
-  ///
   /*--cef()--*/
   virtual CefRefPtr<CefExtension> GetExtension(
       const CefString& extension_id) = 0;

include/cef_response.h

@@ -39,7 +39,6 @@
 #pragma once
 
 #include <map>
-
 #include "include/cef_base.h"
 
 ///

include/cef_server.h

@@ -39,7 +39,6 @@
 #pragma once
 
 #include <map>
-
 #include "include/cef_base.h"
 #include "include/cef_callback.h"
 #include "include/cef_request.h"

include/cef_ssl_info.h

@@ -40,6 +40,7 @@
 
 #include "include/cef_base.h"
 #include "include/cef_values.h"
+
 #include "include/cef_x509_certificate.h"
 
 ///

include/cef_v8.h

@@ -39,7 +39,6 @@
 #pragma once
 
 #include <vector>
-
 #include "include/cef_base.h"
 #include "include/cef_browser.h"
 #include "include/cef_frame.h"
@@ -435,6 +434,7 @@ class CefV8ArrayBufferReleaseCallback : public virtual CefBaseRefCounted {
 /*--cef(source=library,no_debugct_check)--*/
 class CefV8Value : public virtual CefBaseRefCounted {
  public:
+  typedef cef_v8_accesscontrol_t AccessControl;
   typedef cef_v8_propertyattribute_t PropertyAttribute;
 
   ///
@@ -793,7 +793,9 @@ class CefV8Value : public virtual CefBaseRefCounted {
   /// will return true even though assignment failed.
   ///
   /*--cef(capi_name=set_value_byaccessor,optional_param=key)--*/
-  virtual bool SetValue(const CefString& key, PropertyAttribute attribute) = 0;
+  virtual bool SetValue(const CefString& key,
+                        AccessControl settings,
+                        PropertyAttribute attribute) = 0;
 
   ///
   /// Read the keys for the object's values into the specified vector. Integer-

include/cef_values.h

@@ -39,7 +39,6 @@
 #pragma once
 
 #include <vector>
-
 #include "include/cef_base.h"
 
 class CefBinaryValue;

include/internal/cef_linux.h

@@ -70,7 +70,6 @@ struct CefWindowInfoTraits {
     target->shared_texture_enabled = src->shared_texture_enabled;
     target->external_begin_frame_enabled = src->external_begin_frame_enabled;
     target->window = src->window;
-    target->runtime_style = src->runtime_style;
   }
 };
 
@@ -111,7 +110,6 @@ class CefWindowInfo : public CefStructBase<CefWindowInfoTraits> {
   void SetAsWindowless(CefWindowHandle parent) {
     windowless_rendering_enabled = true;
     parent_window = parent;
-    runtime_style = CEF_RUNTIME_STYLE_ALLOY;
   }
 };
 

include/internal/cef_mac.h

@@ -71,7 +71,6 @@ struct CefWindowInfoTraits {
     target->shared_texture_enabled = src->shared_texture_enabled;
     target->external_begin_frame_enabled = src->external_begin_frame_enabled;
     target->view = src->view;
-    target->runtime_style = src->runtime_style;
   }
 };
 
@@ -113,7 +112,6 @@ class CefWindowInfo : public CefStructBase<CefWindowInfoTraits> {
   void SetAsWindowless(CefWindowHandle parent) {
     windowless_rendering_enabled = true;
     parent_view = parent;
-    runtime_style = CEF_RUNTIME_STYLE_ALLOY;
   }
 };
 

include/internal/cef_types.h

@@ -235,14 +235,12 @@ typedef struct _cef_settings_t {
   ///
   cef_string_t main_bundle_path;
 
-#if !defined(DISABLE_ALLOY_BOOTSTRAP)
   ///
   /// Set to true (1) to enable use of the Chrome runtime in CEF. This feature
   /// is considered experimental and is not recommended for most users at this
   /// time. See issue #2969 for details.
   ///
   int chrome_runtime;
-#endif
 
   ///
   /// Set to true (1) to have the browser process message loop run in a separate
@@ -514,13 +512,6 @@ typedef struct _cef_settings_t {
   /// runtime on Windows.
   ///
   int chrome_app_icon_id;
-
-#if defined(OS_POSIX) && !defined(OS_ANDROID)
-  ///
-  /// Specify whether signal handlers must be disabled on POSIX systems.
-  ///
-  int disable_signal_handlers;
-#endif
 } cef_settings_t;
 
 ///
@@ -1246,6 +1237,16 @@ typedef enum {
   CEF_TEXT_INPUT_MODE_MAX = CEF_TEXT_INPUT_MODE_SEARCH,
 } cef_text_input_mode_t;
 
+///
+/// V8 access control values.
+///
+typedef enum {
+  V8_ACCESS_CONTROL_DEFAULT = 0,
+  V8_ACCESS_CONTROL_ALL_CAN_READ = 1,
+  V8_ACCESS_CONTROL_ALL_CAN_WRITE = 1 << 1,
+  V8_ACCESS_CONTROL_PROHIBITS_OVERWRITING = 1 << 2
+} cef_v8_accesscontrol_t;
+
 ///
 /// V8 property attribute values.
 ///
@@ -3470,18 +3471,18 @@ typedef enum {
   CEF_CPAIT_COOKIE_CONTROLS,
   CEF_CPAIT_FILE_SYSTEM_ACCESS,
   CEF_CPAIT_FIND,
-  CEF_CPAIT_MEMORY_SAVER,
+  CEF_CPAIT_HIGH_EFFICIENCY,
   CEF_CPAIT_INTENT_PICKER,
   CEF_CPAIT_LOCAL_CARD_MIGRATION,
   CEF_CPAIT_MANAGE_PASSWORDS,
   CEF_CPAIT_PAYMENTS_OFFER_NOTIFICATION,
   CEF_CPAIT_PRICE_TRACKING,
   CEF_CPAIT_PWA_INSTALL,
-  CEF_CPAIT_QR_CODE_GENERATOR_DEPRECATED,
-  CEF_CPAIT_READER_MODE_DEPRECATED,
+  CEF_CPAIT_QR_CODE_GENERATOR,
+  CEF_CPAIT_READER_MODE,
   CEF_CPAIT_SAVE_AUTOFILL_ADDRESS,
   CEF_CPAIT_SAVE_CARD,
-  CEF_CPAIT_SEND_TAB_TO_SELF_DEPRECATED,
+  CEF_CPAIT_SEND_TAB_TO_SELF,
   CEF_CPAIT_SHARING_HUB,
   CEF_CPAIT_SIDE_SEARCH,
   CEF_CPAIT_SMS_REMOTE_FETCHER,
@@ -3493,9 +3494,7 @@ typedef enum {
   CEF_CPAIT_MANDATORY_REAUTH,
   CEF_CPAIT_PRICE_INSIGHTS,
   CEF_CPAIT_PRICE_READ_ANYTHING,
-  CEF_CPAIT_PRODUCT_SPECIFICATIONS,
-  CEF_CPAIT_LENS_OVERLAY,
-  CEF_CPAIT_MAX_VALUE = CEF_CPAIT_LENS_OVERLAY,
+  CEF_CPAIT_MAX_VALUE = CEF_CPAIT_PRICE_READ_ANYTHING,
 } cef_chrome_page_action_icon_type_t;
 
 ///
@@ -3641,14 +3640,12 @@ typedef enum {
   CEF_PERMISSION_TYPE_MIDI_SYSEX = 1 << 13,
   CEF_PERMISSION_TYPE_MULTIPLE_DOWNLOADS = 1 << 14,
   CEF_PERMISSION_TYPE_NOTIFICATIONS = 1 << 15,
-  CEF_PERMISSION_TYPE_KEYBOARD_LOCK = 1 << 16,
-  CEF_PERMISSION_TYPE_POINTER_LOCK = 1 << 17,
-  CEF_PERMISSION_TYPE_PROTECTED_MEDIA_IDENTIFIER = 1 << 18,
-  CEF_PERMISSION_TYPE_REGISTER_PROTOCOL_HANDLER = 1 << 19,
-  CEF_PERMISSION_TYPE_STORAGE_ACCESS = 1 << 20,
-  CEF_PERMISSION_TYPE_VR_SESSION = 1 << 21,
-  CEF_PERMISSION_TYPE_WINDOW_MANAGEMENT = 1 << 22,
-  CEF_PERMISSION_TYPE_FILE_SYSTEM_ACCESS = 1 << 23,
+  CEF_PERMISSION_TYPE_PROTECTED_MEDIA_IDENTIFIER = 1 << 16,
+  CEF_PERMISSION_TYPE_REGISTER_PROTOCOL_HANDLER = 1 << 17,
+  CEF_PERMISSION_TYPE_STORAGE_ACCESS = 1 << 18,
+  CEF_PERMISSION_TYPE_VR_SESSION = 1 << 19,
+  CEF_PERMISSION_TYPE_WINDOW_MANAGEMENT = 1 << 20,
+  CEF_PERMISSION_TYPE_FILE_SYSTEM_ACCESS = 1 << 21,
 } cef_permission_request_types_t;
 
 ///

include/internal/cef_types_content_settings.h

@@ -380,13 +380,6 @@ typedef enum {
   /// a requesting-origin/top-level-site combination and persistent.
   CEF_CONTENT_SETTING_TYPE_TOP_LEVEL_TPCD_TRIAL,
 
-  /// Content Setting for a first-party origin trial that allows websites to
-  /// enable third-party cookie deprecation.
-  /// ALLOW (default): no effect (e.g. third-party cookies allowed, if not
-  ///                  blocked otherwise).
-  /// BLOCK: third-party cookies blocked, but 3PCD mitigations enabled.
-  CEF_CONTENT_SETTING_TOP_LEVEL_TPCD_ORIGIN_TRIAL,
-
   /// Content setting used to indicate whether entering picture-in-picture
   /// automatically should be enabled.
   CEF_CONTENT_SETTING_TYPE_AUTO_PICTURE_IN_PICTURE,
@@ -435,15 +428,6 @@ typedef enum {
   /// Pointer Lock API allows a site to hide the cursor and have exclusive
   /// access to mouse inputs.
   CEF_CONTENT_SETTING_TYPE_POINTER_LOCK,
-
-  /// Website setting which is used for UnusedSitePermissionsService to store
-  /// auto-revoked notification permissions from abusive sites.
-  CEF_CONTENT_SETTING_TYPE_REVOKED_ABUSIVE_NOTIFICATION_PERMISSIONS,
-
-  /// Content setting that controls tracking protection status per site.
-  /// BLOCK: Protections enabled. This is the default state.
-  /// ALLOW: Protections disabled.
-  CEF_CONTENT_SETTING_TYPE_TRACKING_PROTECTION,
 } cef_content_setting_types_t;
 
 ///

include/internal/cef_types_linux.h

@@ -32,6 +32,7 @@
 #pragma once
 
 #include "include/base/cef_build.h"
+#include "include/cef_config.h"
 
 #if defined(OS_LINUX)
 
@@ -44,7 +45,6 @@ typedef struct _XDisplay XDisplay;
 #include "include/internal/cef_string.h"
 #include "include/internal/cef_types_color.h"
 #include "include/internal/cef_types_geometry.h"
-#include "include/internal/cef_types_runtime.h"
 
 // Handle types.
 #if defined(CEF_X11)
@@ -136,13 +136,6 @@ typedef struct _cef_window_info_t {
   /// Pointer for the new browser window. Only used with windowed rendering.
   ///
   cef_window_handle_t window;
-
-  ///
-  /// Optionally change the runtime style. Alloy style will always be used if
-  /// |windowless_rendering_enabled| is true. See cef_runtime_style_t
-  /// documentation for details.
-  ///
-  cef_runtime_style_t runtime_style;
 } cef_window_info_t;
 
 ///

include/internal/cef_types_mac.h

@@ -37,7 +37,6 @@
 #include "include/internal/cef_string.h"
 #include "include/internal/cef_types_color.h"
 #include "include/internal/cef_types_geometry.h"
-#include "include/internal/cef_types_runtime.h"
 
 // Handle types.
 // Actually NSCursor*
@@ -138,13 +137,6 @@ typedef struct _cef_window_info_t {
   /// rendering.
   ///
   cef_window_handle_t view;
-
-  ///
-  /// Optionally change the runtime style. Alloy style will always be used if
-  /// |windowless_rendering_enabled| is true or if |parent_view| is provided.
-  /// See cef_runtime_style_t documentation for details.
-  ///
-  cef_runtime_style_t runtime_style;
 } cef_window_info_t;
 
 ///

include/internal/cef_types_runtime.h

@@ -1,88 +0,0 @@
-// Copyright (c) 2024 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.
-
-#ifndef CEF_INCLUDE_INTERNAL_CEF_TYPES_RUNTIME_H_
-#define CEF_INCLUDE_INTERNAL_CEF_TYPES_RUNTIME_H_
-#pragma once
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-///
-/// CEF supports both a Chrome runtime (based on the Chrome UI layer) and an
-/// Alloy runtime (based on the Chromium content layer). The Chrome runtime
-/// provides the full Chrome UI and browser functionality whereas the Alloy
-/// runtime provides less default browser functionality but adds additional
-/// client callbacks and support for windowless (off-screen) rendering. For
-/// additional comparative details on runtime types see
-/// https://bitbucket.org/chromiumembedded/cef/wiki/Architecture.md#markdown-header-cef3
-///
-/// Each runtime is composed of a bootstrap component and a style component. The
-/// bootstrap component is configured via CefSettings.chrome_runtime and cannot
-/// be changed after CefInitialize. The style component is individually
-/// configured for each window/browser at creation time and, in combination with
-/// the Chrome bootstrap, different styles can be mixed during runtime.
-///
-/// Windowless rendering will always use Alloy style. Windowed rendering with a
-/// default window or client-provided parent window can configure the style via
-/// CefWindowInfo.runtime_style. Windowed rendering with the Views framework can
-/// configure the style via CefWindowDelegate::GetWindowRuntimeStyle and
-/// CefBrowserViewDelegate::GetBrowserRuntimeStyle. Alloy style Windows with the
-/// Views framework can host only Alloy style BrowserViews but Chrome style
-/// Windows can host both style BrowserViews. Additionally, a Chrome style
-/// Window can host at most one Chrome style BrowserView but potentially
-/// multiple Alloy style BrowserViews. See CefWindowInfo.runtime_style
-/// documentation for any additional platform-specific limitations.
-///
-typedef enum {
-  ///
-  /// Use the default runtime style. The default style will match the
-  /// CefSettings.chrome_runtime value in most cases. See above documentation
-  /// for exceptions.
-  ///
-  CEF_RUNTIME_STYLE_DEFAULT,
-
-  ///
-  /// Use the Chrome runtime style. Only supported with the Chrome runtime.
-  ///
-  CEF_RUNTIME_STYLE_CHROME,
-
-  ///
-  /// Use the Alloy runtime style. Supported with both the Alloy and Chrome
-  /// runtime.
-  ///
-  CEF_RUNTIME_STYLE_ALLOY,
-} cef_runtime_style_t;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // CEF_INCLUDE_INTERNAL_CEF_TYPES_RUNTIME_H_

include/internal/cef_types_win.h

@@ -39,7 +39,6 @@
 #include "include/internal/cef_string.h"
 #include "include/internal/cef_types_color.h"
 #include "include/internal/cef_types_geometry.h"
-#include "include/internal/cef_types_runtime.h"
 
 // Handle types.
 #define cef_cursor_handle_t HCURSOR
@@ -105,13 +104,6 @@ typedef struct _cef_window_info_t {
   /// Handle for the new browser window. Only used with windowed rendering.
   ///
   cef_window_handle_t window;
-
-  ///
-  /// Optionally change the runtime style. Alloy style will always be used if
-  /// |windowless_rendering_enabled| is true. See cef_runtime_style_t
-  /// documentation for details.
-  ///
-  cef_runtime_style_t runtime_style;
 } cef_window_info_t;
 
 ///

include/internal/cef_types_wrappers.h

@@ -387,9 +387,7 @@ struct CefSettingsTraits {
                    &target->framework_dir_path, copy);
     cef_string_set(src->main_bundle_path.str, src->main_bundle_path.length,
                    &target->main_bundle_path, copy);
-#if !defined(DISABLE_ALLOY_BOOTSTRAP)
     target->chrome_runtime = src->chrome_runtime;
-#endif
     target->multi_threaded_message_loop = src->multi_threaded_message_loop;
     target->external_message_pump = src->external_message_pump;
     target->windowless_rendering_enabled = src->windowless_rendering_enabled;
@@ -437,10 +435,6 @@ struct CefSettingsTraits {
     cef_string_set(src->chrome_policy_id.str, src->chrome_policy_id.length,
                    &target->chrome_policy_id, copy);
     target->chrome_app_icon_id = src->chrome_app_icon_id;
-
-#if defined(OS_POSIX) && !defined(OS_ANDROID)
-    target->disable_signal_handlers = src->disable_signal_handlers;
-#endif
   }
 };
 

include/internal/cef_win.h

@@ -73,7 +73,6 @@ struct CefWindowInfoTraits {
     target->shared_texture_enabled = src->shared_texture_enabled;
     target->external_begin_frame_enabled = src->external_begin_frame_enabled;
     target->window = src->window;
-    target->runtime_style = src->runtime_style;
   }
 };
 
@@ -131,7 +130,6 @@ class CefWindowInfo : public CefStructBase<CefWindowInfoTraits> {
   void SetAsWindowless(CefWindowHandle parent) {
     windowless_rendering_enabled = TRUE;
     parent_window = parent;
-    runtime_style = CEF_RUNTIME_STYLE_ALLOY;
   }
 };
 

include/test/cef_test_helpers.h

@@ -67,12 +67,4 @@ void CefExecuteJavaScriptWithUserGestureForTests(CefRefPtr<CefFrame> frame,
 /*--cef()--*/
 void CefSetDataDirectoryForTests(const CefString& dir);
 
-///
-/// Returns true if |feature_name| is enabled by default, command line or field
-/// trial. This supports a short list of curated values that are queried by unit
-/// tests.
-///
-/*--cef()--*/
-bool CefIsFeatureEnabledForTests(const CefString& feature_name);
-
 #endif  // CEF_INCLUDE_TEST_CEF_TEST_HELPERS_H_

include/test/cef_test_server.h

@@ -49,7 +49,6 @@
 #endif
 
 #include <map>
-
 #include "include/cef_base.h"
 #include "include/cef_request.h"
 

include/views/cef_browser_view.h

@@ -107,13 +107,6 @@ class CefBrowserView : public CefView {
   ///
   /*--cef()--*/
   virtual void SetPreferAccelerators(bool prefer_accelerators) = 0;
-
-  ///
-  /// Returns the runtime style for this BrowserView (ALLOY or CHROME). See
-  /// cef_runtime_style_t documentation for details.
-  ///
-  /*--cef(default_retval=CEF_RUNTIME_STYLE_DEFAULT)--*/
-  virtual cef_runtime_style_t GetRuntimeStyle() = 0;
 };
 
 #endif  // CEF_INCLUDE_VIEWS_CEF_BROWSER_VIEW_H_

include/views/cef_browser_view_delegate.h

@@ -140,15 +140,6 @@ class CefBrowserViewDelegate : public CefViewDelegate {
                                 cef_gesture_command_t gesture_command) {
     return false;
   }
-
-  ///
-  /// Optionally change the runtime style for this BrowserView. See
-  /// cef_runtime_style_t documentation for details.
-  ///
-  /*--cef(default_retval=CEF_RUNTIME_STYLE_DEFAULT)--*/
-  virtual cef_runtime_style_t GetBrowserRuntimeStyle() {
-    return CEF_RUNTIME_STYLE_DEFAULT;
-  }
 };
 
 #endif  // CEF_INCLUDE_VIEWS_CEF_BROWSER_VIEW_DELEGATE_H_

include/views/cef_window.h

@@ -414,13 +414,6 @@ class CefWindow : public CefPanel {
   ///
   /*--cef()--*/
   virtual void ThemeChanged() = 0;
-
-  ///
-  /// Returns the runtime style for this Window (ALLOY or CHROME). See
-  /// cef_runtime_style_t documentation for details.
-  ///
-  /*--cef(default_retval=CEF_RUNTIME_STYLE_DEFAULT)--*/
-  virtual cef_runtime_style_t GetRuntimeStyle() = 0;
 };
 
 #endif  // CEF_INCLUDE_VIEWS_CEF_WINDOW_H_

include/views/cef_window_delegate.h

@@ -271,15 +271,6 @@ class CefWindowDelegate : public CefPanelDelegate {
   /*--cef()--*/
   virtual void OnThemeColorsChanged(CefRefPtr<CefWindow> window,
                                     bool chrome_theme) {}
-
-  ///
-  /// Optionally change the runtime style for this Window. See
-  /// cef_runtime_style_t documentation for details.
-  ///
-  /*--cef(default_retval=CEF_RUNTIME_STYLE_DEFAULT)--*/
-  virtual cef_runtime_style_t GetWindowRuntimeStyle() {
-    return CEF_RUNTIME_STYLE_DEFAULT;
-  }
 };
 
 #endif  // CEF_INCLUDE_VIEWS_CEF_WINDOW_DELEGATE_H_

libcef/browser/alloy/alloy_browser_context.cc

@@ -2,24 +2,25 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cef/libcef/browser/alloy/alloy_browser_context.h"
+#include "libcef/browser/alloy/alloy_browser_context.h"
 
 #include <map>
 #include <memory>
 #include <utility>
 
+#include "libcef/browser/download_manager_delegate.h"
+#include "libcef/browser/extensions/extension_system.h"
+#include "libcef/browser/prefs/browser_prefs.h"
+#include "libcef/browser/ssl_host_state_delegate.h"
+#include "libcef/browser/thread_util.h"
+#include "libcef/common/cef_switches.h"
+#include "libcef/common/extensions/extensions_util.h"
+
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/strings/string_util.h"
-#include "cef/libcef/browser/alloy/alloy_download_manager_delegate.h"
-#include "cef/libcef/browser/extensions/extension_system.h"
-#include "cef/libcef/browser/prefs/browser_prefs.h"
-#include "cef/libcef/browser/ssl_host_state_delegate.h"
-#include "cef/libcef/browser/thread_util.h"
-#include "cef/libcef/common/cef_switches.h"
-#include "cef/libcef/common/extensions/extensions_util.h"
 #include "chrome/browser/font_family_cache.h"
 #include "chrome/browser/permissions/permission_manager_factory.h"
 #include "chrome/browser/plugins/chrome_plugin_service_filter.h"
@@ -194,10 +195,6 @@ void AlloyBrowserContext::Shutdown() {
 
   ChromePluginServiceFilter::GetInstance()->UnregisterProfile(this);
 
-  // Clear this reference before the associated KeyedServiceFactory is destroyed
-  // by PerformInterlockedTwoPhaseShutdown().
-  extension_system_ = nullptr;
-
   // Remove any BrowserContextKeyedServiceFactory associations. This must be
   // called before the ProxyService owned by AlloyBrowserContext is destroyed.
   // The SimpleDependencyManager should always be passed after the
@@ -300,6 +297,15 @@ bool AlloyBrowserContext::UnloadExtension(const CefString& extension_id) {
   return extension_system()->UnloadExtension(extension_id);
 }
 
+bool AlloyBrowserContext::IsPrintPreviewSupported() const {
+  CEF_REQUIRE_UIT();
+  if (!extensions::PrintPreviewEnabled()) {
+    return false;
+  }
+
+  return !GetPrefs()->GetBoolean(prefs::kPrintPreviewDisabled);
+}
+
 content::ClientHintsControllerDelegate*
 AlloyBrowserContext::GetClientHintsControllerDelegate() {
   return nullptr;
@@ -339,7 +345,7 @@ content::DownloadManagerDelegate*
 AlloyBrowserContext::GetDownloadManagerDelegate() {
   if (!download_manager_delegate_) {
     download_manager_delegate_ =
-        std::make_unique<AlloyDownloadManagerDelegate>(GetDownloadManager());
+        std::make_unique<CefDownloadManagerDelegate>(GetDownloadManager());
   }
   return download_manager_delegate_.get();
 }
@@ -432,11 +438,6 @@ AlloyBrowserContext::GetProfileCloudPolicyManager() {
   return nullptr;
 }
 
-policy::CloudPolicyManager* AlloyBrowserContext::GetCloudPolicyManager() {
-  DCHECK(false);
-  return nullptr;
-}
-
 policy::ProfilePolicyConnector*
 AlloyBrowserContext::GetProfilePolicyConnector() {
   DCHECK(false);
@@ -460,12 +461,6 @@ void AlloyBrowserContext::RebuildTable(
   enumerator->OnComplete(true);
 }
 
-void AlloyBrowserContext::BuildVisitedLinkTable(
-    const scoped_refptr<VisitedLinkEnumerator>& enumerator) {
-  // Called when visited links will not or cannot be loaded from disk.
-  enumerator->OnVisitedLinkComplete(true);
-}
-
 DownloadPrefs* AlloyBrowserContext::GetDownloadPrefs() {
   CEF_REQUIRE_UIT();
   if (!download_prefs_) {
@@ -474,13 +469,6 @@ DownloadPrefs* AlloyBrowserContext::GetDownloadPrefs() {
   return download_prefs_.get();
 }
 
-void AlloyBrowserContext::AddVisitedURLs(
-    const GURL& url,
-    const std::vector<GURL>& redirect_chain,
-    ui::PageTransition /*transition*/) {
-  if (!redirect_chain.empty()) {
-    visitedlink_master_->AddURLs(redirect_chain);
-  } else {
-    visitedlink_master_->AddURL(url);
-  }
+void AlloyBrowserContext::AddVisitedURLs(const std::vector<GURL>& urls) {
+  visitedlink_master_->AddURLs(urls);
 }

libcef/browser/alloy/alloy_browser_context.h

@@ -6,16 +6,16 @@
 #define CEF_LIBCEF_BROWSER_ALLOY_ALLOY_BROWSER_CONTEXT_H_
 #pragma once
 
-#include "base/memory/raw_ptr.h"
-#include "cef/include/cef_request_context_handler.h"
-#include "cef/libcef/browser/alloy/chrome_profile_alloy.h"
-#include "cef/libcef/browser/browser_context.h"
-#include "cef/libcef/browser/request_context_handler_map.h"
+#include "include/cef_request_context_handler.h"
+#include "libcef/browser/alloy/chrome_profile_alloy.h"
+#include "libcef/browser/browser_context.h"
+#include "libcef/browser/request_context_handler_map.h"
+
 #include "chrome/browser/download/download_prefs.h"
 #include "components/proxy_config/pref_proxy_config_tracker.h"
 #include "components/visitedlink/browser/visitedlink_delegate.h"
 
-class AlloyDownloadManagerDelegate;
+class CefDownloadManagerDelegate;
 class CefSSLHostStateDelegate;
 class CefVisitedLinkListener;
 class PrefService;
@@ -56,9 +56,7 @@ class AlloyBrowserContext : public ChromeProfileAlloy,
   bool GetExtensions(std::vector<CefString>& extension_ids) override;
   CefRefPtr<CefExtension> GetExtension(const CefString& extension_id) override;
   bool UnloadExtension(const CefString& extension_id) override;
-  void AddVisitedURLs(const GURL& url,
-                      const std::vector<GURL>& redirect_chain,
-                      ui::PageTransition transition) override;
+  bool IsPrintPreviewSupported() const override;
 
   // content::BrowserContext overrides.
   content::ClientHintsControllerDelegate* GetClientHintsControllerDelegate()
@@ -94,7 +92,6 @@ class AlloyBrowserContext : public ChromeProfileAlloy,
   policy::SchemaRegistryService* GetPolicySchemaRegistryService() override;
   policy::UserCloudPolicyManager* GetUserCloudPolicyManager() override;
   policy::ProfileCloudPolicyManager* GetProfileCloudPolicyManager() override;
-  policy::CloudPolicyManager* GetCloudPolicyManager() override;
   policy::ProfilePolicyConnector* GetProfilePolicyConnector() override;
   const policy::ProfilePolicyConnector* GetProfilePolicyConnector()
       const override;
@@ -111,16 +108,17 @@ class AlloyBrowserContext : public ChromeProfileAlloy,
 
   // visitedlink::VisitedLinkDelegate methods.
   void RebuildTable(const scoped_refptr<URLEnumerator>& enumerator) override;
-  void BuildVisitedLinkTable(
-      const scoped_refptr<VisitedLinkEnumerator>& enumerator) override;
 
   // Manages extensions.
   extensions::CefExtensionSystem* extension_system() const {
     return extension_system_;
   }
 
-  // Called from DownloadPrefs::FromBrowserContext via
-  // alloy::GetDownloadPrefsFromBrowserContext.
+  // Called from AlloyBrowserHostImpl::DidFinishNavigation to update the table
+  // of visited links.
+  void AddVisitedURLs(const std::vector<GURL>& urls);
+
+  // Called from DownloadPrefs::FromBrowserContext.
   DownloadPrefs* GetDownloadPrefs();
 
  private:
@@ -129,14 +127,14 @@ class AlloyBrowserContext : public ChromeProfileAlloy,
   std::unique_ptr<PrefService> pref_service_;
   std::unique_ptr<PrefProxyConfigTracker> pref_proxy_config_tracker_;
 
-  std::unique_ptr<AlloyDownloadManagerDelegate> download_manager_delegate_;
+  std::unique_ptr<CefDownloadManagerDelegate> download_manager_delegate_;
   std::unique_ptr<CefSSLHostStateDelegate> ssl_host_state_delegate_;
   std::unique_ptr<visitedlink::VisitedLinkWriter> visitedlink_master_;
   // |visitedlink_listener_| is owned by visitedlink_master_.
-  raw_ptr<CefVisitedLinkListener> visitedlink_listener_ = nullptr;
+  CefVisitedLinkListener* visitedlink_listener_ = nullptr;
 
   // Owned by the KeyedService system.
-  raw_ptr<extensions::CefExtensionSystem> extension_system_ = nullptr;
+  extensions::CefExtensionSystem* extension_system_ = nullptr;
 
   // The key to index KeyedService instances created by
   // SimpleKeyedServiceFactory.

libcef/browser/alloy/alloy_browser_host_impl.cc

@@ -3,38 +3,39 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cef/libcef/browser/alloy/alloy_browser_host_impl.h"
+#include "libcef/browser/alloy/alloy_browser_host_impl.h"
 
 #include <memory>
 #include <string>
 #include <utility>
 
+#include "libcef/browser/alloy/alloy_browser_context.h"
+#include "libcef/browser/alloy/browser_platform_delegate_alloy.h"
+#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"
+#include "libcef/browser/browser_platform_delegate.h"
+#include "libcef/browser/context.h"
+#include "libcef/browser/devtools/devtools_manager.h"
+#include "libcef/browser/hang_monitor.h"
+#include "libcef/browser/media_access_query.h"
+#include "libcef/browser/osr/osr_util.h"
+#include "libcef/browser/request_context_impl.h"
+#include "libcef/browser/thread_util.h"
+#include "libcef/common/cef_switches.h"
+#include "libcef/common/drag_data_impl.h"
+#include "libcef/common/frame_util.h"
+#include "libcef/common/net/url_util.h"
+#include "libcef/common/request_impl.h"
+#include "libcef/common/values_impl.h"
+#include "libcef/features/runtime_checks.h"
+
 #include "base/command_line.h"
 #include "base/functional/bind.h"
 #include "base/functional/callback_helpers.h"
-#include "cef/libcef/browser/alloy/browser_platform_delegate_alloy.h"
-#include "cef/libcef/browser/audio_capturer.h"
-#include "cef/libcef/browser/browser_context.h"
-#include "cef/libcef/browser/browser_info.h"
-#include "cef/libcef/browser/browser_info_manager.h"
-#include "cef/libcef/browser/browser_platform_delegate.h"
-#include "cef/libcef/browser/context.h"
-#include "cef/libcef/browser/extensions/browser_extensions_util.h"
-#include "cef/libcef/browser/hang_monitor.h"
-#include "cef/libcef/browser/media_access_query.h"
-#include "cef/libcef/browser/osr/osr_util.h"
-#include "cef/libcef/browser/request_context_impl.h"
-#include "cef/libcef/browser/thread_util.h"
-#include "cef/libcef/common/cef_switches.h"
-#include "cef/libcef/common/drag_data_impl.h"
-#include "cef/libcef/common/frame_util.h"
-#include "cef/libcef/common/net/url_util.h"
-#include "cef/libcef/common/request_impl.h"
-#include "cef/libcef/common/values_impl.h"
-#include "cef/libcef/features/runtime.h"
 #include "chrome/browser/file_select_helper.h"
 #include "chrome/browser/picture_in_picture/picture_in_picture_window_manager.h"
-#include "components/input/native_web_keyboard_event.h"
 #include "components/zoom/page_zoom.h"
 #include "content/browser/gpu/compositor_util.h"
 #include "content/public/browser/desktop_media_id.h"
@@ -47,15 +48,13 @@
 #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/input/native_web_keyboard_event.h"
 #include "content/public/common/url_constants.h"
 #include "extensions/common/constants.h"
+#include "extensions/common/extension.h"
 #include "net/base/net_errors.h"
 #include "ui/events/base_event_utils.h"
 
-#if BUILDFLAG(ENABLE_ALLOY_BOOTSTRAP)
-#include "extensions/common/extension.h"
-#endif
-
 using content::KeyboardEventProcessingResult;
 
 namespace {
@@ -74,19 +73,11 @@ CefRefPtr<AlloyBrowserHostImpl> AlloyBrowserHostImpl::Create(
       CefBrowserPlatformDelegate::Create(create_params);
   CHECK(platform_delegate);
 
-  // Expect runtime style to match.
-  CHECK(platform_delegate->IsAlloyStyle());
-
-#if BUILDFLAG(ENABLE_ALLOY_BOOTSTRAP)
   const bool is_devtools_popup = !!create_params.devtools_opener;
-#else
-  const bool is_devtools_popup = false;
-#endif
 
   scoped_refptr<CefBrowserInfo> info =
       CefBrowserInfoManager::GetInstance()->CreateBrowserInfo(
           is_devtools_popup, platform_delegate->IsWindowless(),
-          platform_delegate->IsPrintPreviewSupported(),
           create_params.extra_info);
 
   bool own_web_contents = false;
@@ -98,7 +89,6 @@ CefRefPtr<AlloyBrowserHostImpl> AlloyBrowserHostImpl::Create(
   auto request_context_impl =
       static_cast<CefRequestContextImpl*>(create_params.request_context.get());
 
-#if BUILDFLAG(ENABLE_ALLOY_BOOTSTRAP)
   CefRefPtr<CefExtension> cef_extension;
   if (create_params.extension) {
     auto cef_browser_context = request_context_impl->GetBrowserContext();
@@ -106,39 +96,25 @@ CefRefPtr<AlloyBrowserHostImpl> AlloyBrowserHostImpl::Create(
         cef_browser_context->GetExtension(create_params.extension->id());
     CHECK(cef_extension);
   }
-#endif
 
-#if BUILDFLAG(ENABLE_ALLOY_BOOTSTRAP)
   auto platform_delegate_ptr = platform_delegate.get();
-#endif
 
   CefRefPtr<AlloyBrowserHostImpl> browser = CreateInternal(
       create_params.settings, create_params.client, web_contents,
       own_web_contents, info,
-#if BUILDFLAG(ENABLE_ALLOY_BOOTSTRAP)
-      FromBaseChecked(create_params.devtools_opener),
-#else
-      /*opener=*/nullptr,
-#endif
-      is_devtools_popup, request_context_impl, std::move(platform_delegate)
-#if BUILDFLAG(ENABLE_ALLOY_BOOTSTRAP)
-                                                   ,
-      cef_extension
-#endif
-  );
+      static_cast<AlloyBrowserHostImpl*>(create_params.devtools_opener.get()),
+      is_devtools_popup, request_context_impl, std::move(platform_delegate),
+      cef_extension);
   if (!browser) {
     return nullptr;
   }
 
   GURL url = url_util::MakeGURL(create_params.url, /*fixup=*/true);
 
-#if BUILDFLAG(ENABLE_ALLOY_BOOTSTRAP)
   if (create_params.extension) {
     platform_delegate_ptr->CreateExtensionHost(
         create_params.extension, url, create_params.extension_host_type);
-  } else
-#endif
-      if (!url.is_empty()) {
+  } else if (!url.is_empty()) {
     content::OpenURLParams params(url, content::Referrer(),
                                   WindowOpenDisposition::CURRENT_TAB,
                                   CefFrameHostImpl::kPageTransitionExplicit,
@@ -159,12 +135,8 @@ CefRefPtr<AlloyBrowserHostImpl> AlloyBrowserHostImpl::CreateInternal(
     CefRefPtr<AlloyBrowserHostImpl> opener,
     bool is_devtools_popup,
     CefRefPtr<CefRequestContextImpl> request_context,
-    std::unique_ptr<CefBrowserPlatformDelegate> platform_delegate
-#if BUILDFLAG(ENABLE_ALLOY_BOOTSTRAP)
-    ,
-    CefRefPtr<CefExtension> extension
-#endif
-) {
+    std::unique_ptr<CefBrowserPlatformDelegate> platform_delegate,
+    CefRefPtr<CefExtension> extension) {
   CEF_REQUIRE_UIT();
   DCHECK(web_contents);
   DCHECK(browser_info);
@@ -195,12 +167,7 @@ CefRefPtr<AlloyBrowserHostImpl> AlloyBrowserHostImpl::CreateInternal(
 
   CefRefPtr<AlloyBrowserHostImpl> browser = new AlloyBrowserHostImpl(
       settings, client, web_contents, browser_info, opener, request_context,
-      std::move(platform_delegate)
-#if BUILDFLAG(ENABLE_ALLOY_BOOTSTRAP)
-          ,
-      extension
-#endif
-  );
+      std::move(platform_delegate), extension);
   browser->InitializeBrowser();
 
   if (!browser->CreateHostWindow()) {
@@ -214,8 +181,8 @@ CefRefPtr<AlloyBrowserHostImpl> AlloyBrowserHostImpl::CreateInternal(
     // 1. Notify the opener browser's platform delegate. With Views this will
     // result in a call to CefBrowserViewDelegate::OnPopupBrowserViewCreated().
     // Do this first for consistency with the Chrome runtime.
-    opener->platform_delegate_->PopupBrowserCreated(
-        browser->platform_delegate(), browser.get(), is_devtools_popup);
+    opener->platform_delegate_->PopupBrowserCreated(browser.get(),
+                                                    is_devtools_popup);
   }
 
   // 2. Notify the browser's LifeSpanHandler. This must always be the first
@@ -233,38 +200,36 @@ CefRefPtr<AlloyBrowserHostImpl> AlloyBrowserHostImpl::CreateInternal(
   return browser;
 }
 
-// static
-CefRefPtr<AlloyBrowserHostImpl> AlloyBrowserHostImpl::FromBaseChecked(
-    CefRefPtr<CefBrowserHostBase> host_base) {
-  if (!host_base) {
-    return nullptr;
-  }
-  CHECK(host_base->IsAlloyStyle());
-  return static_cast<AlloyBrowserHostImpl*>(host_base.get());
-}
-
 // static
 CefRefPtr<AlloyBrowserHostImpl> AlloyBrowserHostImpl::GetBrowserForHost(
     const content::RenderViewHost* host) {
-  return FromBaseChecked(CefBrowserHostBase::GetBrowserForHost(host));
+  REQUIRE_ALLOY_RUNTIME();
+  auto browser = CefBrowserHostBase::GetBrowserForHost(host);
+  return static_cast<AlloyBrowserHostImpl*>(browser.get());
 }
 
 // static
 CefRefPtr<AlloyBrowserHostImpl> AlloyBrowserHostImpl::GetBrowserForHost(
     const content::RenderFrameHost* host) {
-  return FromBaseChecked(CefBrowserHostBase::GetBrowserForHost(host));
+  REQUIRE_ALLOY_RUNTIME();
+  auto browser = CefBrowserHostBase::GetBrowserForHost(host);
+  return static_cast<AlloyBrowserHostImpl*>(browser.get());
 }
 
 // static
 CefRefPtr<AlloyBrowserHostImpl> AlloyBrowserHostImpl::GetBrowserForContents(
     const content::WebContents* contents) {
-  return FromBaseChecked(CefBrowserHostBase::GetBrowserForContents(contents));
+  REQUIRE_ALLOY_RUNTIME();
+  auto browser = CefBrowserHostBase::GetBrowserForContents(contents);
+  return static_cast<AlloyBrowserHostImpl*>(browser.get());
 }
 
 // static
 CefRefPtr<AlloyBrowserHostImpl> AlloyBrowserHostImpl::GetBrowserForGlobalId(
     const content::GlobalRenderFrameHostId& global_id) {
-  return FromBaseChecked(CefBrowserHostBase::GetBrowserForGlobalId(global_id));
+  REQUIRE_ALLOY_RUNTIME();
+  auto browser = CefBrowserHostBase::GetBrowserForGlobalId(global_id);
+  return static_cast<AlloyBrowserHostImpl*>(browser.get());
 }
 
 // AlloyBrowserHostImpl methods.
@@ -368,6 +333,42 @@ void AlloyBrowserHostImpl::StopFinding(bool clearSelection) {
   }
 }
 
+void AlloyBrowserHostImpl::ShowDevToolsOnUIThread(
+    std::unique_ptr<CefShowDevToolsParams> params) {
+  CEF_REQUIRE_UIT();
+  if (!EnsureDevToolsManager()) {
+    return;
+  }
+  devtools_manager_->ShowDevTools(params->window_info_, params->client_,
+                                  params->settings_,
+                                  params->inspect_element_at_);
+}
+
+void AlloyBrowserHostImpl::CloseDevTools() {
+  if (!CEF_CURRENTLY_ON_UIT()) {
+    CEF_POST_TASK(CEF_UIT,
+                  base::BindOnce(&AlloyBrowserHostImpl::CloseDevTools, this));
+    return;
+  }
+
+  if (!devtools_manager_) {
+    return;
+  }
+  devtools_manager_->CloseDevTools();
+}
+
+bool AlloyBrowserHostImpl::HasDevTools() {
+  if (!CEF_CURRENTLY_ON_UIT()) {
+    DCHECK(false) << "called on invalid thread";
+    return false;
+  }
+
+  if (!devtools_manager_) {
+    return false;
+  }
+  return devtools_manager_->HasDevTools();
+}
+
 void AlloyBrowserHostImpl::SetAutoResizeEnabled(bool enabled,
                                                 const CefSize& min_size,
                                                 const CefSize& max_size) {
@@ -383,7 +384,6 @@ void AlloyBrowserHostImpl::SetAutoResizeEnabled(bool enabled,
   }
 }
 
-#if BUILDFLAG(ENABLE_ALLOY_BOOTSTRAP)
 CefRefPtr<CefExtension> AlloyBrowserHostImpl::GetExtension() {
   return extension_;
 }
@@ -391,7 +391,6 @@ CefRefPtr<CefExtension> AlloyBrowserHostImpl::GetExtension() {
 bool AlloyBrowserHostImpl::IsBackgroundHost() {
   return is_background_host_;
 }
-#endif
 
 bool AlloyBrowserHostImpl::CanExecuteChromeCommand(int command_id) {
   return false;
@@ -581,6 +580,17 @@ void AlloyBrowserHostImpl::DestroyBrowser() {
 
   destruction_state_ = DESTRUCTION_STATE_COMPLETED;
 
+  // Notify that this browser has been destroyed. These must be delivered in
+  // the expected order.
+
+  // 1. Notify the platform delegate. With Views this will result in a call to
+  // CefBrowserViewDelegate::OnBrowserDestroyed().
+  platform_delegate_->NotifyBrowserDestroyed();
+
+  // 2. Notify the browser's LifeSpanHandler. This must always be the last
+  // notification for this browser.
+  OnBeforeClose();
+
   // Destroy any platform constructs first.
   if (javascript_dialog_manager_.get()) {
     javascript_dialog_manager_->Destroy();
@@ -589,8 +599,16 @@ void AlloyBrowserHostImpl::DestroyBrowser() {
     menu_manager_->Destroy();
   }
 
-  // Disassociate the platform delegate from this browser. This will trigger
-  // WebContents destruction in most cases.
+  // Notify any observers that may have state associated with this browser.
+  OnBrowserDestroyed();
+
+  // If the WebContents still exists at this point, signal destruction before
+  // browser destruction.
+  if (web_contents()) {
+    WebContentsDestroyed();
+  }
+
+  // Disassociate the platform delegate from this browser.
   platform_delegate_->BrowserDestroyed(this);
 
   // Delete objects created by the platform delegate that may be referenced by
@@ -618,9 +636,8 @@ void AlloyBrowserHostImpl::CancelContextMenu() {
 
 bool AlloyBrowserHostImpl::MaybeAllowNavigation(
     content::RenderFrameHost* opener,
+    bool is_guest_view,
     const content::OpenURLParams& params) {
-  const bool is_guest_view = extensions::IsBrowserPluginGuest(
-      content::WebContents::FromRenderFrameHost(opener));
   if (is_guest_view && !params.is_pdf &&
       !params.url.SchemeIs(extensions::kExtensionScheme) &&
       !params.url.SchemeIs(content::kChromeUIScheme)) {
@@ -632,7 +649,7 @@ bool AlloyBrowserHostImpl::MaybeAllowNavigation(
     CEF_POST_TASK(CEF_UIT,
                   base::BindOnce(
                       base::IgnoreResult(&AlloyBrowserHostImpl::OpenURLFromTab),
-                      this, nullptr, params, base::NullCallback()));
+                      this, nullptr, params));
 
     return false;
   }
@@ -640,13 +657,11 @@ bool AlloyBrowserHostImpl::MaybeAllowNavigation(
   return true;
 }
 
-#if BUILDFLAG(ENABLE_ALLOY_BOOTSTRAP)
 extensions::ExtensionHost* AlloyBrowserHostImpl::GetExtensionHost() const {
   CEF_REQUIRE_UIT();
   DCHECK(platform_delegate_);
   return platform_delegate_->GetExtensionHost();
 }
-#endif
 
 void AlloyBrowserHostImpl::OnSetFocus(cef_focus_source_t source) {
   if (!CEF_CURRENTLY_ON_UIT()) {
@@ -942,11 +957,8 @@ bool AlloyBrowserHostImpl::IsAudioMuted() {
 
 content::WebContents* AlloyBrowserHostImpl::OpenURLFromTab(
     content::WebContents* source,
-    const content::OpenURLParams& params,
-    base::OnceCallback<void(content::NavigationHandle&)>
-        navigation_handle_callback) {
-  auto target_contents = contents_delegate_->OpenURLFromTabEx(
-      source, params, navigation_handle_callback);
+    const content::OpenURLParams& params) {
+  auto target_contents = contents_delegate_->OpenURLFromTab(source, params);
   if (target_contents) {
     // Start a navigation in the current browser that will result in the
     // creation of a new render process.
@@ -958,13 +970,11 @@ content::WebContents* AlloyBrowserHostImpl::OpenURLFromTab(
   return nullptr;
 }
 
-#if BUILDFLAG(ENABLE_ALLOY_BOOTSTRAP)
 bool AlloyBrowserHostImpl::ShouldAllowRendererInitiatedCrossProcessNavigation(
     bool is_main_frame_navigation) {
   return platform_delegate_->ShouldAllowRendererInitiatedCrossProcessNavigation(
       is_main_frame_navigation);
 }
-#endif
 
 void AlloyBrowserHostImpl::AddNewContents(
     content::WebContents* source,
@@ -1084,13 +1094,13 @@ void AlloyBrowserHostImpl::CanDownload(
 
 KeyboardEventProcessingResult AlloyBrowserHostImpl::PreHandleKeyboardEvent(
     content::WebContents* source,
-    const input::NativeWebKeyboardEvent& event) {
+    const content::NativeWebKeyboardEvent& event) {
   return contents_delegate_->PreHandleKeyboardEvent(source, event);
 }
 
 bool AlloyBrowserHostImpl::HandleKeyboardEvent(
     content::WebContents* source,
-    const input::NativeWebKeyboardEvent& event) {
+    const content::NativeWebKeyboardEvent& event) {
   // Check to see if event should be ignored.
   if (event.skip_if_unhandled) {
     return false;
@@ -1106,13 +1116,11 @@ bool AlloyBrowserHostImpl::HandleKeyboardEvent(
   return false;
 }
 
-#if BUILDFLAG(ENABLE_ALLOY_BOOTSTRAP)
 bool AlloyBrowserHostImpl::PreHandleGestureEvent(
     content::WebContents* source,
     const blink::WebGestureEvent& event) {
   return platform_delegate_->PreHandleGestureEvent(source, event);
 }
-#endif
 
 bool AlloyBrowserHostImpl::CanDragEnter(content::WebContents* source,
                                         const content::DropData& data,
@@ -1138,8 +1146,8 @@ void AlloyBrowserHostImpl::GetCustomWebContentsView(
     const GURL& target_url,
     int opener_render_process_id,
     int opener_render_frame_id,
-    raw_ptr<content::WebContentsView>* view,
-    raw_ptr<content::RenderViewHostDelegateView>* delegate_view) {
+    content::WebContentsView** view,
+    content::RenderViewHostDelegateView** delegate_view) {
   CefBrowserInfoManager::GetInstance()->GetCustomWebContentsView(
       target_url,
       frame_util::MakeGlobalId(opener_render_process_id,
@@ -1167,8 +1175,7 @@ void AlloyBrowserHostImpl::WebContentsCreated(
 
   scoped_refptr<CefBrowserInfo> info =
       CefBrowserInfoManager::GetInstance()->CreatePopupBrowserInfo(
-          new_contents, platform_delegate->IsWindowless(),
-          platform_delegate->IsPrintPreviewSupported(), extra_info);
+          new_contents, platform_delegate->IsWindowless(), extra_info);
   CHECK(info.get());
   CHECK(info->is_popup());
 
@@ -1184,14 +1191,10 @@ void AlloyBrowserHostImpl::WebContentsCreated(
 
   // We don't officially own |new_contents| until AddNewContents() is called.
   // However, we need to install observers/delegates here.
-  CefRefPtr<AlloyBrowserHostImpl> browser = CreateInternal(
-      settings, client, new_contents, /*own_web_contents=*/false, info, opener,
-      /*is_devtools_popup=*/false, request_context, std::move(platform_delegate)
-#if BUILDFLAG(ENABLE_ALLOY_BOOTSTRAP)
-                                                        ,
-      /*extension=*/nullptr
-#endif
-  );
+  CefRefPtr<AlloyBrowserHostImpl> browser =
+      CreateInternal(settings, client, new_contents, /*own_web_contents=*/false,
+                     info, opener, /*is_devtools_popup=*/false, request_context,
+                     std::move(platform_delegate), /*extension=*/nullptr);
 }
 
 void AlloyBrowserHostImpl::RendererUnresponsive(
@@ -1210,7 +1213,11 @@ void AlloyBrowserHostImpl::RendererResponsive(
 
 content::JavaScriptDialogManager*
 AlloyBrowserHostImpl::GetJavaScriptDialogManager(content::WebContents* source) {
-  return CefBrowserHostBase::GetJavaScriptDialogManager();
+  if (!javascript_dialog_manager_) {
+    javascript_dialog_manager_ =
+        std::make_unique<CefJavaScriptDialogManager>(this);
+  }
+  return javascript_dialog_manager_.get();
 }
 
 void AlloyBrowserHostImpl::RunFileChooser(
@@ -1275,12 +1282,10 @@ bool AlloyBrowserHostImpl::CheckMediaAccessPermission(
                                                         security_origin, type);
 }
 
-#if BUILDFLAG(ENABLE_ALLOY_BOOTSTRAP)
 bool AlloyBrowserHostImpl::IsNeverComposited(
     content::WebContents* web_contents) {
   return platform_delegate_->IsNeverComposited(web_contents);
 }
-#endif
 
 content::PictureInPictureResult AlloyBrowserHostImpl::EnterPictureInPicture(
     content::WebContents* web_contents) {
@@ -1297,14 +1302,9 @@ void AlloyBrowserHostImpl::ExitPictureInPicture() {
   PictureInPictureWindowManager::GetInstance()->ExitPictureInPicture();
 }
 
-bool AlloyBrowserHostImpl::IsBackForwardCacheSupported(
-    content::WebContents& web_contents) {
-#if BUILDFLAG(ENABLE_ALLOY_BOOTSTRAP)
-  return true;
-#else
-  // Disabled with Alloy bootstrap due to issue #3237.
-  return cef::IsChromeRuntimeEnabled();
-#endif
+bool AlloyBrowserHostImpl::IsBackForwardCacheSupported() {
+  // Disabled due to issue #3237.
+  return false;
 }
 
 content::PreloadingEligibility AlloyBrowserHostImpl::IsPrerender2Supported(
@@ -1312,24 +1312,17 @@ content::PreloadingEligibility AlloyBrowserHostImpl::IsPrerender2Supported(
   return content::PreloadingEligibility::kEligible;
 }
 
-void AlloyBrowserHostImpl::DraggableRegionsChanged(
-    const std::vector<blink::mojom::DraggableRegionPtr>& regions,
-    content::WebContents* contents) {
-  contents_delegate_->DraggableRegionsChanged(regions, contents);
-}
-
 // content::WebContentsObserver methods.
 // -----------------------------------------------------------------------------
 
 void AlloyBrowserHostImpl::DidFinishNavigation(
     content::NavigationHandle* navigation_handle) {
   if (web_contents()) {
-    auto cef_browser_context = CefBrowserContext::FromBrowserContext(
-        web_contents()->GetBrowserContext());
+    auto cef_browser_context =
+        static_cast<AlloyBrowserContext*>(web_contents()->GetBrowserContext());
     if (cef_browser_context) {
       cef_browser_context->AddVisitedURLs(
-          navigation_handle->GetURL(), navigation_handle->GetRedirectChain(),
-          navigation_handle->GetPageTransition());
+          navigation_handle->GetRedirectChain());
     }
   }
 }
@@ -1362,46 +1355,34 @@ void AlloyBrowserHostImpl::OnRecentlyAudibleTimerFired() {
 }
 
 void AlloyBrowserHostImpl::AccessibilityEventReceived(
-    const ui::AXUpdatesAndEvents& details) {
+    const content::AXEventNotificationDetails& content_event_bundle) {
   // Only needed in windowless mode.
   if (IsWindowless()) {
     if (!web_contents() || !platform_delegate_) {
       return;
     }
 
-    platform_delegate_->AccessibilityEventReceived(details);
+    platform_delegate_->AccessibilityEventReceived(content_event_bundle);
   }
 }
 
 void AlloyBrowserHostImpl::AccessibilityLocationChangesReceived(
-    const std::vector<ui::AXLocationChanges>& details) {
+    const std::vector<content::AXLocationChangeNotificationDetails>& locData) {
   // Only needed in windowless mode.
   if (IsWindowless()) {
     if (!web_contents() || !platform_delegate_) {
       return;
     }
 
-    platform_delegate_->AccessibilityLocationChangesReceived(details);
+    platform_delegate_->AccessibilityLocationChangesReceived(locData);
   }
 }
 
 void AlloyBrowserHostImpl::WebContentsDestroyed() {
-  // In case we're notified before the CefBrowserContentsDelegate,
-  // reset it first for consistent state in DestroyWebContents.
-  if (GetWebContents()) {
-    contents_delegate_->WebContentsDestroyed();
-  }
-
   auto wc = web_contents();
   content::WebContentsObserver::Observe(nullptr);
-  DestroyWebContents(wc);
-
-  if (destruction_state_ < DESTRUCTION_STATE_COMPLETED) {
-    // We were not called via DestroyBrowser. This can occur when (for example)
-    // a pending popup WebContents is destroyed during parent WebContents
-    // destruction. Try to close the associated browser now.
-    CEF_POST_TASK(CEF_UIT, base::BindOnce(&AlloyBrowserHostImpl::CloseBrowser,
-                                          this, /*force_close=*/true));
+  if (platform_delegate_) {
+    platform_delegate_->WebContentsDestroyed(wc);
   }
 }
 
@@ -1438,12 +1419,8 @@ AlloyBrowserHostImpl::AlloyBrowserHostImpl(
     scoped_refptr<CefBrowserInfo> browser_info,
     CefRefPtr<AlloyBrowserHostImpl> opener,
     CefRefPtr<CefRequestContextImpl> request_context,
-    std::unique_ptr<CefBrowserPlatformDelegate> platform_delegate
-#if BUILDFLAG(ENABLE_ALLOY_BOOTSTRAP)
-    ,
-    CefRefPtr<CefExtension> extension
-#endif
-    )
+    std::unique_ptr<CefBrowserPlatformDelegate> platform_delegate,
+    CefRefPtr<CefExtension> extension)
     : CefBrowserHostBase(settings,
                          client,
                          std::move(platform_delegate),
@@ -1451,12 +1428,8 @@ AlloyBrowserHostImpl::AlloyBrowserHostImpl(
                          request_context),
       content::WebContentsObserver(web_contents),
       opener_(kNullWindowHandle),
-      is_windowless_(platform_delegate_->IsWindowless())
-#if BUILDFLAG(ENABLE_ALLOY_BOOTSTRAP)
-      ,
-      extension_(extension)
-#endif
-{
+      is_windowless_(platform_delegate_->IsWindowless()),
+      extension_(extension) {
   contents_delegate_->ObserveWebContents(web_contents);
 
   if (opener.get() && !is_views_hosted_) {

libcef/browser/alloy/alloy_browser_host_impl.h

@@ -11,22 +11,21 @@
 #include <string>
 #include <vector>
 
+#include "include/cef_browser.h"
+#include "include/cef_client.h"
+#include "include/cef_frame.h"
+#include "libcef/browser/browser_host_base.h"
+#include "libcef/browser/browser_info.h"
+#include "libcef/browser/frame_host_impl.h"
+#include "libcef/browser/javascript_dialog_manager.h"
+#include "libcef/browser/menu_manager.h"
+#include "libcef/browser/request_context_impl.h"
+
 #include "base/synchronization/lock.h"
-#include "cef/include/cef_browser.h"
-#include "cef/include/cef_client.h"
-#include "cef/include/cef_frame.h"
-#include "cef/libcef/browser/browser_host_base.h"
-#include "cef/libcef/browser/browser_info.h"
-#include "cef/libcef/browser/frame_host_impl.h"
-#include "cef/libcef/browser/menu_manager.h"
-#include "cef/libcef/browser/request_context_impl.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/browser/web_contents_observer.h"
-
-#if BUILDFLAG(ENABLE_ALLOY_BOOTSTRAP)
 #include "extensions/common/mojom/view_type.mojom-forward.h"
-#endif
 
 class CefAudioCapturer;
 class CefBrowserInfo;
@@ -63,11 +62,6 @@ class AlloyBrowserHostImpl : public CefBrowserHostBase,
   static CefRefPtr<AlloyBrowserHostImpl> Create(
       CefBrowserCreateParams& create_params);
 
-  // Safe (checked) conversion from CefBrowserHostBase to AlloyBrowserHostImpl.
-  // Use this method instead of static_cast.
-  static CefRefPtr<AlloyBrowserHostImpl> FromBaseChecked(
-      CefRefPtr<CefBrowserHostBase> host_base);
-
   // Returns the browser associated with the specified RenderViewHost.
   static CefRefPtr<AlloyBrowserHostImpl> GetBrowserForHost(
       const content::RenderViewHost* host);
@@ -91,6 +85,8 @@ class AlloyBrowserHostImpl : public CefBrowserHostBase,
             bool matchCase,
             bool findNext) override;
   void StopFinding(bool clearSelection) override;
+  void CloseDevTools() override;
+  bool HasDevTools() override;
   bool IsWindowRenderingDisabled() override;
   void WasResized() override;
   void WasHidden(bool hidden) override;
@@ -124,17 +120,15 @@ class AlloyBrowserHostImpl : public CefBrowserHostBase,
   void SetAutoResizeEnabled(bool enabled,
                             const CefSize& min_size,
                             const CefSize& max_size) override;
-#if BUILDFLAG(ENABLE_ALLOY_BOOTSTRAP)
   CefRefPtr<CefExtension> GetExtension() override;
   bool IsBackgroundHost() override;
-#endif
   bool CanExecuteChromeCommand(int command_id) override;
   void ExecuteChromeCommand(int command_id,
                             cef_window_open_disposition_t disposition) override;
 
-  // CefBrowserHostBase methods:
+  // Returns true if windowless rendering is enabled.
   bool IsWindowless() const override;
-  bool IsAlloyStyle() const override { return true; }
+
   bool IsVisible() const override;
 
   // Returns true if this browser supports picture-in-picture.
@@ -153,6 +147,7 @@ class AlloyBrowserHostImpl : public CefBrowserHostBase,
   void CancelContextMenu();
 
   bool MaybeAllowNavigation(content::RenderFrameHost* opener,
+                            bool is_guest_view,
                             const content::OpenURLParams& params) override;
 
   // Convert from view DIP coordinates to screen coordinates. If
@@ -169,10 +164,8 @@ class AlloyBrowserHostImpl : public CefBrowserHostBase,
   void UpdateDragOperation(ui::mojom::DragOperation operation,
                            bool document_is_handling_drag);
 
-#if BUILDFLAG(ENABLE_ALLOY_BOOTSTRAP)
   // Accessors that must be called on the UI thread.
   extensions::ExtensionHost* GetExtensionHost() const;
-#endif
 
   void OnSetFocus(cef_focus_source_t source) override;
 
@@ -189,13 +182,9 @@ class AlloyBrowserHostImpl : public CefBrowserHostBase,
   // content::WebContentsDelegate methods.
   content::WebContents* OpenURLFromTab(
       content::WebContents* source,
-      const content::OpenURLParams& params,
-      base::OnceCallback<void(content::NavigationHandle&)>
-          navigation_handle_callback) override;
-#if BUILDFLAG(ENABLE_ALLOY_BOOTSTRAP)
+      const content::OpenURLParams& params) override;
   bool ShouldAllowRendererInitiatedCrossProcessNavigation(
       bool is_main_frame_navigation) override;
-#endif
   void AddNewContents(content::WebContents* source,
                       std::unique_ptr<content::WebContents> new_contents,
                       const GURL& target_url,
@@ -222,13 +211,12 @@ class AlloyBrowserHostImpl : public CefBrowserHostBase,
                    base::OnceCallback<void(bool)> callback) override;
   content::KeyboardEventProcessingResult PreHandleKeyboardEvent(
       content::WebContents* source,
-      const input::NativeWebKeyboardEvent& event) override;
-  bool HandleKeyboardEvent(content::WebContents* source,
-                           const input::NativeWebKeyboardEvent& event) override;
-#if BUILDFLAG(ENABLE_ALLOY_BOOTSTRAP)
+      const content::NativeWebKeyboardEvent& event) override;
+  bool HandleKeyboardEvent(
+      content::WebContents* source,
+      const content::NativeWebKeyboardEvent& event) override;
   bool PreHandleGestureEvent(content::WebContents* source,
                              const blink::WebGestureEvent& event) override;
-#endif
   bool CanDragEnter(content::WebContents* source,
                     const content::DropData& data,
                     blink::DragOperationsMask operations_allowed) override;
@@ -237,8 +225,8 @@ class AlloyBrowserHostImpl : public CefBrowserHostBase,
       const GURL& target_url,
       int opener_render_process_id,
       int opener_render_frame_id,
-      raw_ptr<content::WebContentsView>* view,
-      raw_ptr<content::RenderViewHostDelegateView>* delegate_view) override;
+      content::WebContentsView** view,
+      content::RenderViewHostDelegateView** delegate_view) override;
   void WebContentsCreated(content::WebContents* source_contents,
                           int opener_render_process_id,
                           int opener_render_frame_id,
@@ -282,18 +270,13 @@ class AlloyBrowserHostImpl : public CefBrowserHostBase,
   bool CheckMediaAccessPermission(content::RenderFrameHost* render_frame_host,
                                   const url::Origin& security_origin,
                                   blink::mojom::MediaStreamType type) override;
-#if BUILDFLAG(ENABLE_ALLOY_BOOTSTRAP)
   bool IsNeverComposited(content::WebContents* web_contents) override;
-#endif
   content::PictureInPictureResult EnterPictureInPicture(
       content::WebContents* web_contents) override;
   void ExitPictureInPicture() override;
-  bool IsBackForwardCacheSupported(content::WebContents& web_contents) override;
+  bool IsBackForwardCacheSupported() override;
   content::PreloadingEligibility IsPrerender2Supported(
       content::WebContents& web_contents) override;
-  void DraggableRegionsChanged(
-      const std::vector<blink::mojom::DraggableRegionPtr>& regions,
-      content::WebContents* contents) override;
 
   // content::WebContentsObserver methods.
   using content::WebContentsObserver::BeforeUnloadFired;
@@ -301,11 +284,16 @@ class AlloyBrowserHostImpl : public CefBrowserHostBase,
       content::NavigationHandle* navigation_handle) override;
   void OnAudioStateChanged(bool audible) override;
   void AccessibilityEventReceived(
-      const ui::AXUpdatesAndEvents& details) override;
+      const content::AXEventNotificationDetails& content_event_bundle) override;
   void AccessibilityLocationChangesReceived(
-      const std::vector<ui::AXLocationChanges>& details) override;
+      const std::vector<content::AXLocationChangeNotificationDetails>& locData)
+      override;
   void WebContentsDestroyed() override;
 
+ protected:
+  void ShowDevToolsOnUIThread(
+      std::unique_ptr<CefShowDevToolsParams> params) override;
+
  private:
   friend class CefBrowserPlatformDelegateAlloy;
 
@@ -318,12 +306,8 @@ class AlloyBrowserHostImpl : public CefBrowserHostBase,
       CefRefPtr<AlloyBrowserHostImpl> opener,
       bool is_devtools_popup,
       CefRefPtr<CefRequestContextImpl> request_context,
-      std::unique_ptr<CefBrowserPlatformDelegate> platform_delegate
-#if BUILDFLAG(ENABLE_ALLOY_BOOTSTRAP)
-      ,
-      CefRefPtr<CefExtension> extension
-#endif
-  );
+      std::unique_ptr<CefBrowserPlatformDelegate> platform_delegate,
+      CefRefPtr<CefExtension> extension);
 
   AlloyBrowserHostImpl(
       const CefBrowserSettings& settings,
@@ -332,12 +316,8 @@ class AlloyBrowserHostImpl : public CefBrowserHostBase,
       scoped_refptr<CefBrowserInfo> browser_info,
       CefRefPtr<AlloyBrowserHostImpl> opener,
       CefRefPtr<CefRequestContextImpl> request_context,
-      std::unique_ptr<CefBrowserPlatformDelegate> platform_delegate
-#if BUILDFLAG(ENABLE_ALLOY_BOOTSTRAP)
-      ,
-      CefRefPtr<CefExtension> extension
-#endif
-  );
+      std::unique_ptr<CefBrowserPlatformDelegate> platform_delegate,
+      CefRefPtr<CefExtension> extension);
 
   // Give the platform delegate an opportunity to create the host window.
   bool CreateHostWindow();
@@ -348,10 +328,8 @@ class AlloyBrowserHostImpl : public CefBrowserHostBase,
   CefWindowHandle opener_;
   const bool is_windowless_;
   CefWindowHandle host_window_handle_ = kNullWindowHandle;
-#if BUILDFLAG(ENABLE_ALLOY_BOOTSTRAP)
   CefRefPtr<CefExtension> extension_;
   bool is_background_host_ = false;
-#endif
 
   // Represents the current browser destruction state. Only accessed on the UI
   // thread.
@@ -361,6 +339,9 @@ class AlloyBrowserHostImpl : public CefBrowserHostBase,
   // on the UI thread.
   bool window_destroyed_ = false;
 
+  // Used for creating and managing JavaScript dialogs.
+  std::unique_ptr<CefJavaScriptDialogManager> javascript_dialog_manager_;
+
   // Used for creating and managing context menus.
   std::unique_ptr<CefMenuManager> menu_manager_;
 

libcef/browser/alloy/alloy_browser_main.cc

@@ -2,31 +2,32 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cef/libcef/browser/alloy/alloy_browser_main.h"
+#include "libcef/browser/alloy/alloy_browser_main.h"
 
 #include <stdint.h>
 
 #include <memory>
 #include <string>
 
+#include "libcef/browser/alloy/dialogs/alloy_constrained_window_views_client.h"
+#include "libcef/browser/browser_context.h"
+#include "libcef/browser/browser_context_keyed_service_factories.h"
+#include "libcef/browser/context.h"
+#include "libcef/browser/devtools/devtools_manager_delegate.h"
+#include "libcef/browser/extensions/extension_system_factory.h"
+#include "libcef/browser/file_dialog_runner.h"
+#include "libcef/browser/net/chrome_scheme_handler.h"
+#include "libcef/browser/permission_prompt.h"
+#include "libcef/browser/thread_util.h"
+#include "libcef/common/app_manager.h"
+#include "libcef/common/command_line_impl.h"
+#include "libcef/common/extensions/extensions_util.h"
+#include "libcef/common/net/net_resource_provider.h"
+
 #include "base/feature_list.h"
 #include "base/functional/bind.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/task/thread_pool.h"
-#include "cef/libcef/browser/alloy/devtools/devtools_manager_delegate.h"
-#include "cef/libcef/browser/alloy/dialogs/alloy_constrained_window_views_client.h"
-#include "cef/libcef/browser/browser_context.h"
-#include "cef/libcef/browser/browser_context_keyed_service_factories.h"
-#include "cef/libcef/browser/context.h"
-#include "cef/libcef/browser/extensions/extension_system_factory.h"
-#include "cef/libcef/browser/file_dialog_runner.h"
-#include "cef/libcef/browser/net/chrome_scheme_handler.h"
-#include "cef/libcef/browser/permission_prompt.h"
-#include "cef/libcef/browser/thread_util.h"
-#include "cef/libcef/common/app_manager.h"
-#include "cef/libcef/common/command_line_impl.h"
-#include "cef/libcef/common/extensions/extensions_util.h"
-#include "cef/libcef/common/net/net_resource_provider.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_process_singleton.h"
 #include "chrome/browser/media/router/chrome_media_router_factory.h"
@@ -50,7 +51,6 @@
 #include "ui/native_theme/native_theme.h"
 
 #if BUILDFLAG(IS_LINUX)
-#include "components/password_manager/core/browser/password_manager_switches.h"
 #include "ui/base/ozone_buildflags.h"
 #if defined(USE_AURA) && BUILDFLAG(IS_OZONE_X11)
 #include "ui/events/devices/x11/touch_factory_x11.h"
@@ -90,11 +90,11 @@
 
 #if BUILDFLAG(IS_LINUX)
 #include "base/path_service.h"
-#include "cef/libcef/browser/printing/print_dialog_linux.h"
 #include "chrome/browser/themes/theme_service_aura_linux.h"
 #include "chrome/browser/ui/views/theme_profile_key.h"
 #include "chrome/grit/branded_strings.h"
 #include "components/os_crypt/sync/key_storage_config_linux.h"
+#include "libcef/browser/printing/print_dialog_linux.h"
 #include "ui/base/cursor/cursor_factory.h"
 #include "ui/base/ime/input_method.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -191,8 +191,7 @@ AlloyBrowserMainParts::~AlloyBrowserMainParts() {
 }
 
 void AlloyBrowserMainParts::ToolkitInitialized() {
-  SetConstrainedWindowViewsClient(
-      CreateAlloyConstrainedWindowViewsClient(nullptr));
+  SetConstrainedWindowViewsClient(CreateAlloyConstrainedWindowViewsClient());
 #if defined(USE_AURA)
   CHECK(aura::Env::GetInstance());
 
@@ -284,13 +283,12 @@ void AlloyBrowserMainParts::PostCreateMainMessageLoop() {
   std::unique_ptr<os_crypt::Config> config =
       std::make_unique<os_crypt::Config>();
   // Forward to os_crypt the flag to use a specific password store.
-  config->store =
-      command_line->GetSwitchValueASCII(password_manager::kPasswordStore);
-  // Forward the product name
+  config->store = command_line->GetSwitchValueASCII(switches::kPasswordStore);
+  // Forward the product name (defaults to "Chromium").
   config->product_name = l10n_util::GetStringUTF8(IDS_PRODUCT_NAME);
   // OSCrypt can be disabled in a special settings file.
   config->should_use_preference =
-      command_line->HasSwitch(password_manager::kEnableEncryptionSelection);
+      command_line->HasSwitch(switches::kEnableEncryptionSelection);
   base::PathService::Get(chrome::DIR_USER_DATA, &config->user_data_path);
   DCHECK(!config->user_data_path.empty());
   OSCrypt::SetConfig(std::move(config));

libcef/browser/alloy/alloy_browser_main.h

@@ -6,12 +6,11 @@
 #define CEF_LIBCEF_BROWSER_ALLOY_ALLOY_BROWSER_MAIN_H_
 #pragma once
 
-#include <string_view>
+#include "libcef/browser/request_context_impl.h"
 
 #include "base/command_line.h"
-#include "base/memory/raw_ptr.h"
+#include "base/strings/string_piece.h"
 #include "build/build_config.h"
-#include "cef/libcef/browser/request_context_impl.h"
 #include "components/prefs/pref_service.h"
 #include "content/public/browser/browser_main_parts.h"
 #include "ui/display/screen.h"
@@ -80,7 +79,7 @@ class AlloyBrowserMainParts : public content::BrowserMainParts {
 #endif  // BUILDFLAG(IS_WIN)
 
   CefRefPtr<CefRequestContextImpl> global_request_context_;
-  raw_ptr<CefDevToolsDelegate> devtools_delegate_ = nullptr;  // Deletes itself.
+  CefDevToolsDelegate* devtools_delegate_ = nullptr;  // Deletes itself.
 
   // Blocking task runners exposed via CefTaskRunner. For consistency with
   // previous named thread behavior always execute all pending tasks before

libcef/browser/alloy/alloy_browser_main_win.cc

@@ -2,13 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cef/libcef/browser/alloy/alloy_browser_main.h"
-
 #include <Objbase.h>
-
+#include <commctrl.h>
 #include <windows.h>
 
-#include <commctrl.h>
+#include "libcef/browser/alloy/alloy_browser_main.h"
 
 #include "base/logging.h"
 

libcef/browser/alloy/alloy_content_browser_client.cc

@@ -2,12 +2,48 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cef/libcef/browser/alloy/alloy_content_browser_client.h"
+#include "libcef/browser/alloy/alloy_content_browser_client.h"
 
 #include <algorithm>
 #include <tuple>
 #include <utility>
 
+#include "include/cef_version.h"
+#include "libcef/browser/alloy/alloy_browser_context.h"
+#include "libcef/browser/alloy/alloy_browser_host_impl.h"
+#include "libcef/browser/alloy/alloy_browser_main.h"
+#include "libcef/browser/alloy/alloy_web_contents_view_delegate.h"
+#include "libcef/browser/browser_context.h"
+#include "libcef/browser/browser_frame.h"
+#include "libcef/browser/browser_info.h"
+#include "libcef/browser/browser_info_manager.h"
+#include "libcef/browser/browser_manager.h"
+#include "libcef/browser/browser_platform_delegate.h"
+#include "libcef/browser/certificate_query.h"
+#include "libcef/browser/context.h"
+#include "libcef/browser/devtools/devtools_manager_delegate.h"
+#include "libcef/browser/extensions/extension_system.h"
+#include "libcef/browser/extensions/extension_web_contents_observer.h"
+#include "libcef/browser/media_capture_devices_dispatcher.h"
+#include "libcef/browser/net/chrome_scheme_handler.h"
+#include "libcef/browser/net/throttle_handler.h"
+#include "libcef/browser/net_service/cookie_manager_impl.h"
+#include "libcef/browser/net_service/login_delegate.h"
+#include "libcef/browser/net_service/proxy_url_loader_factory.h"
+#include "libcef/browser/net_service/resource_request_handler_wrapper.h"
+#include "libcef/browser/prefs/renderer_prefs.h"
+#include "libcef/browser/speech_recognition_manager_delegate.h"
+#include "libcef/browser/thread_util.h"
+#include "libcef/browser/x509_certificate_impl.h"
+#include "libcef/common/alloy/alloy_content_client.h"
+#include "libcef/common/app_manager.h"
+#include "libcef/common/cef_switches.h"
+#include "libcef/common/command_line_impl.h"
+#include "libcef/common/extensions/extensions_util.h"
+#include "libcef/common/frame_util.h"
+#include "libcef/common/net/scheme_registration.h"
+#include "libcef/common/request_impl.h"
+
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
@@ -16,41 +52,6 @@
 #include "base/stl_util.h"
 #include "base/threading/thread_restrictions.h"
 #include "cef/grit/cef_resources.h"
-#include "cef/include/cef_version.h"
-#include "cef/libcef/browser/alloy/alloy_browser_context.h"
-#include "cef/libcef/browser/alloy/alloy_browser_host_impl.h"
-#include "cef/libcef/browser/alloy/alloy_browser_main.h"
-#include "cef/libcef/browser/alloy/alloy_web_contents_view_delegate.h"
-#include "cef/libcef/browser/alloy/devtools/devtools_manager_delegate.h"
-#include "cef/libcef/browser/browser_context.h"
-#include "cef/libcef/browser/browser_frame.h"
-#include "cef/libcef/browser/browser_info.h"
-#include "cef/libcef/browser/browser_info_manager.h"
-#include "cef/libcef/browser/browser_manager.h"
-#include "cef/libcef/browser/browser_platform_delegate.h"
-#include "cef/libcef/browser/certificate_query.h"
-#include "cef/libcef/browser/context.h"
-#include "cef/libcef/browser/extensions/extension_system.h"
-#include "cef/libcef/browser/extensions/extension_web_contents_observer.h"
-#include "cef/libcef/browser/media_capture_devices_dispatcher.h"
-#include "cef/libcef/browser/net/chrome_scheme_handler.h"
-#include "cef/libcef/browser/net/throttle_handler.h"
-#include "cef/libcef/browser/net_service/cookie_manager_impl.h"
-#include "cef/libcef/browser/net_service/login_delegate.h"
-#include "cef/libcef/browser/net_service/proxy_url_loader_factory.h"
-#include "cef/libcef/browser/net_service/resource_request_handler_wrapper.h"
-#include "cef/libcef/browser/prefs/renderer_prefs.h"
-#include "cef/libcef/browser/speech_recognition_manager_delegate.h"
-#include "cef/libcef/browser/thread_util.h"
-#include "cef/libcef/browser/x509_certificate_impl.h"
-#include "cef/libcef/common/alloy/alloy_content_client.h"
-#include "cef/libcef/common/app_manager.h"
-#include "cef/libcef/common/cef_switches.h"
-#include "cef/libcef/common/command_line_impl.h"
-#include "cef/libcef/common/extensions/extensions_util.h"
-#include "cef/libcef/common/frame_util.h"
-#include "cef/libcef/common/net/scheme_registration.h"
-#include "cef/libcef/common/request_impl.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/content_settings/cookie_settings_factory.h"
 #include "chrome/browser/extensions/chrome_content_browser_client_extensions_part.h"
@@ -91,7 +92,6 @@
 #include "components/pdf/browser/pdf_navigation_throttle.h"
 #include "components/pdf/browser/pdf_url_loader_request_interceptor.h"
 #include "components/pdf/common/constants.h"
-#include "components/pdf/common/pdf_util.h"
 #include "components/policy/core/common/policy_pref_names.h"
 #include "components/spellcheck/common/spellcheck.mojom.h"
 #include "components/version_info/version_info.h"
@@ -160,10 +160,10 @@
 #include "net/ssl/client_cert_store_mac.h"
 #include "services/video_capture/public/mojom/constants.mojom.h"
 #elif BUILDFLAG(IS_POSIX)
-#include "cef/libcef/common/crash_reporting.h"
 #include "components/crash/core/app/crash_switches.h"
 #include "components/crash/core/app/crashpad.h"
 #include "content/public/common/content_descriptors.h"
+#include "libcef/common/crash_reporting.h"
 #endif
 
 #if BUILDFLAG(IS_WIN)
@@ -361,15 +361,10 @@ const extensions::Extension* GetEnabledExtensionFromSiteURL(
 
 std::unique_ptr<blink::URLLoaderThrottle> CreateGoogleURLLoaderThrottle(
     Profile* profile) {
-#if BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
-  std::vector<chrome::mojom::BoundSessionThrottlerParamsPtr>
-      bound_session_throttler_params;
-#endif
-
   chrome::mojom::DynamicParamsPtr dynamic_params =
       chrome::mojom::DynamicParams::New(
 #if BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
-          std::move(bound_session_throttler_params),
+          /*bound_session_params=*/nullptr,
 #endif
           profile->GetPrefs()->GetBoolean(
               policy::policy_prefs::kForceGoogleSafeSearch),
@@ -389,10 +384,6 @@ AlloyContentBrowserClient::AlloyContentBrowserClient() = default;
 
 AlloyContentBrowserClient::~AlloyContentBrowserClient() = default;
 
-void AlloyContentBrowserClient::CleanupOnUIThread() {
-  browser_main_parts_ = nullptr;
-}
-
 std::unique_ptr<content::BrowserMainParts>
 AlloyContentBrowserClient::CreateBrowserMainParts(
     bool /* is_integration_test */) {
@@ -458,7 +449,7 @@ bool AlloyContentBrowserClient::DoesSiteRequireDedicatedProcess(
 }
 
 bool AlloyContentBrowserClient::ShouldTreatURLSchemeAsFirstPartyWhenTopLevel(
-    std::string_view scheme,
+    base::StringPiece scheme,
     bool is_embedded_origin_secure) {
   // This is needed to bypass the normal SameSite rules for any chrome:// page
   // embedding a secure origin, regardless of the registrable domains of any
@@ -479,7 +470,7 @@ bool AlloyContentBrowserClient::ShouldTreatURLSchemeAsFirstPartyWhenTopLevel(
 
 bool AlloyContentBrowserClient::
     ShouldIgnoreSameSiteCookieRestrictionsWhenTopLevel(
-        std::string_view scheme,
+        base::StringPiece scheme,
         bool is_embedded_origin_secure) {
   return is_embedded_origin_secure && scheme == content::kChromeUIScheme;
 }
@@ -634,6 +625,10 @@ void AlloyContentBrowserClient::AppendExtraCommandLineSwitches(
           process ? CefBrowserContext::FromBrowserContext(browser_context)
                   : nullptr;
       if (cef_browser_context) {
+        if (cef_browser_context->IsPrintPreviewSupported()) {
+          command_line->AppendSwitch(switches::kEnablePrintPreview);
+        }
+
         // Based on ChromeContentBrowserClientExtensionsPart::
         // AppendExtraRendererCommandLineSwitches
         if (extensions::ProcessMap::Get(browser_context)
@@ -922,10 +917,10 @@ void AlloyContentBrowserClient::
           },
           &render_frame_host));
 
-  associated_registry.AddInterface<pdf::mojom::PdfHost>(base::BindRepeating(
+  associated_registry.AddInterface<pdf::mojom::PdfService>(base::BindRepeating(
       [](content::RenderFrameHost* render_frame_host,
-         mojo::PendingAssociatedReceiver<pdf::mojom::PdfHost> receiver) {
-        pdf::PDFDocumentHelper::BindPdfHost(
+         mojo::PendingAssociatedReceiver<pdf::mojom::PdfService> receiver) {
+        pdf::PDFDocumentHelper::BindPdfService(
             std::move(receiver), render_frame_host,
             std::make_unique<ChromePDFDocumentHelperClient>());
       },
@@ -1188,7 +1183,6 @@ void AlloyContentBrowserClient::WillCreateURLLoaderFactory(
     int render_process_id,
     URLLoaderFactoryType type,
     const url::Origin& request_initiator,
-    const net::IsolationInfo& isolation_info,
     std::optional<int64_t> navigation_id,
     ukm::SourceIdObj ukm_source_id,
     network::URLLoaderFactoryBuilder& factory_builder,

libcef/browser/alloy/alloy_content_browser_client.h

@@ -9,11 +9,11 @@
 #include <string>
 #include <utility>
 
-#include "base/memory/raw_ptr.h"
+#include "include/cef_request_context_handler.h"
+#include "libcef/browser/request_context_impl.h"
+
 #include "base/memory/ref_counted.h"
 #include "build/build_config.h"
-#include "cef/include/cef_request_context_handler.h"
-#include "cef/libcef/browser/request_context_impl.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/web_contents.h"
 #include "third_party/skia/include/core/SkColor.h"
@@ -34,8 +34,6 @@ class AlloyContentBrowserClient : public content::ContentBrowserClient {
   AlloyContentBrowserClient();
   ~AlloyContentBrowserClient() override;
 
-  void CleanupOnUIThread();
-
   // ContentBrowserClient implementation.
   std::unique_ptr<content::BrowserMainParts> CreateBrowserMainParts(
       bool is_integration_test) override;
@@ -47,10 +45,10 @@ class AlloyContentBrowserClient : public content::ContentBrowserClient {
   bool DoesSiteRequireDedicatedProcess(content::BrowserContext* browser_context,
                                        const GURL& effective_site_url) override;
   bool ShouldTreatURLSchemeAsFirstPartyWhenTopLevel(
-      std::string_view scheme,
+      base::StringPiece scheme,
       bool is_embedded_origin_secure) override;
   bool ShouldIgnoreSameSiteCookieRestrictionsWhenTopLevel(
-      std::string_view scheme,
+      base::StringPiece scheme,
       bool is_embedded_origin_secure) override;
   void OverrideURLLoaderFactoryParams(
       content::BrowserContext* browser_context,
@@ -188,7 +186,6 @@ class AlloyContentBrowserClient : public content::ContentBrowserClient {
       int render_process_id,
       URLLoaderFactoryType type,
       const url::Origin& request_initiator,
-      const net::IsolationInfo& isolation_info,
       std::optional<int64_t> navigation_id,
       ukm::SourceIdObj ukm_source_id,
       network::URLLoaderFactoryBuilder& factory_builder,
@@ -281,7 +278,7 @@ class AlloyContentBrowserClient : public content::ContentBrowserClient {
   const extensions::Extension* GetExtension(
       content::SiteInstance* site_instance);
 
-  raw_ptr<AlloyBrowserMainParts> browser_main_parts_ = nullptr;
+  AlloyBrowserMainParts* browser_main_parts_ = nullptr;
 };
 
 #endif  // CEF_LIBCEF_BROWSER_ALLOY_ALLOY_CONTENT_BROWSER_CLIENT_H_

libcef/browser/alloy/alloy_download_manager_delegate.cc

@@ -1,22 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "cef/libcef/browser/alloy/alloy_download_manager_delegate.h"
-
-#include "chrome/common/chrome_constants.h"
-#include "components/download/public/common/download_item.h"
-
-AlloyDownloadManagerDelegate::AlloyDownloadManagerDelegate(
-    content::DownloadManager* manager)
-    : CefDownloadManagerDelegateImpl(manager, /*alloy_bootstrap=*/true) {}
-
-void AlloyDownloadManagerDelegate::GetNextId(
-    content::DownloadIdCallback callback) {
-  static uint32_t next_id = download::DownloadItem::kInvalidId + 1;
-  std::move(callback).Run(next_id++);
-}
-
-std::string AlloyDownloadManagerDelegate::ApplicationClientIdForFileScanning() {
-  return std::string(chrome::kApplicationClientIDStringForAVScanning);
-}

libcef/browser/alloy/alloy_download_manager_delegate.h

@@ -1,26 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CEF_LIBCEF_BROWSER_ALLOY_ALLOY_DOWNLOAD_MANAGER_DELEGATE_H_
-#define CEF_LIBCEF_BROWSER_ALLOY_ALLOY_DOWNLOAD_MANAGER_DELEGATE_H_
-#pragma once
-
-#include "cef/libcef/browser/download_manager_delegate_impl.h"
-
-// Specialization for the Alloy bootstrap.
-class AlloyDownloadManagerDelegate : public CefDownloadManagerDelegateImpl {
- public:
-  explicit AlloyDownloadManagerDelegate(content::DownloadManager* manager);
-
-  AlloyDownloadManagerDelegate(const AlloyDownloadManagerDelegate&) = delete;
-  AlloyDownloadManagerDelegate& operator=(const AlloyDownloadManagerDelegate&) =
-      delete;
-
- private:
-  // DownloadManagerDelegate methods.
-  void GetNextId(content::DownloadIdCallback callback) override;
-  std::string ApplicationClientIdForFileScanning() override;
-};
-
-#endif  // CEF_LIBCEF_BROWSER_ALLOY_ALLOY_DOWNLOAD_MANAGER_DELEGATE_H_

libcef/browser/alloy/alloy_download_util.cc

@@ -2,16 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be found
 // in the LICENSE file.
 
-#include "cef/libcef/browser/alloy/alloy_download_util.h"
+#include "libcef/browser/alloy/alloy_download_util.h"
 
-#include "cef/libcef/browser/alloy/alloy_browser_context.h"
+#include "libcef/browser/alloy/alloy_browser_context.h"
 
 namespace alloy {
 
 DownloadPrefs* GetDownloadPrefsFromBrowserContext(
     content::BrowserContext* context) {
-  // This function is only called with Alloy bootstrap, so the static_cast is
-  // safe.
   return static_cast<AlloyBrowserContext*>(context)->GetDownloadPrefs();
 }
 

libcef/browser/alloy/alloy_download_util.h

@@ -6,8 +6,6 @@
 #define CEF_LIBCEF_BROWSER_ALLOY_ALLOY_DOWNLOAD_UTIL_H_
 #pragma once
 
-#include "cef/libcef/features/features.h"
-
 class DownloadPrefs;
 
 namespace content {

libcef/browser/alloy/alloy_web_contents_view_delegate.cc

@@ -2,11 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cef/libcef/browser/alloy/alloy_web_contents_view_delegate.h"
+#include "libcef/browser/alloy/alloy_web_contents_view_delegate.h"
 
-#include "cef/libcef/browser/alloy/alloy_browser_host_impl.h"
 #include "content/public/browser/web_contents.h"
 
+#include "libcef/browser/alloy/alloy_browser_host_impl.h"
+
 AlloyWebContentsViewDelegate::AlloyWebContentsViewDelegate(
     content::WebContents* web_contents)
     : web_contents_(web_contents) {}

libcef/browser/alloy/alloy_web_contents_view_delegate.h

@@ -6,8 +6,8 @@
 #define CEF_LIBCEF_BROWSER_ALLOY_ALLOY_WEB_CONTENTS_VIEW_DELEGATE_H_
 #pragma once
 
-#include "base/memory/raw_ptr.h"
-#include "cef/include/internal/cef_ptr.h"
+#include "include/internal/cef_ptr.h"
+
 #include "content/public/browser/web_contents_view_delegate.h"
 
 namespace content {
@@ -27,7 +27,7 @@ class AlloyWebContentsViewDelegate : public content::WebContentsViewDelegate {
                        const content::ContextMenuParams& params) override;
 
  private:
-  const raw_ptr<content::WebContents> web_contents_;
+  content::WebContents* const web_contents_;
 };
 
 #endif  // CEF_LIBCEF_BROWSER_ALLOY_ALLOY_WEB_CONTENTS_VIEW_DELEGATE_H_

libcef/browser/alloy/browser_platform_delegate_alloy.cc

@@ -2,66 +2,42 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cef/libcef/browser/alloy/browser_platform_delegate_alloy.h"
+#include "libcef/browser/alloy/browser_platform_delegate_alloy.h"
 
 #include <memory>
 
+#include "libcef/browser/alloy/alloy_browser_host_impl.h"
+#include "libcef/browser/alloy/dialogs/alloy_javascript_dialog_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"
+#include "libcef/browser/extensions/extension_view_host.h"
+#include "libcef/browser/extensions/extension_web_contents_observer.h"
+#include "libcef/common/extensions/extensions_util.h"
+#include "libcef/common/net/url_util.h"
+#include "libcef/features/runtime_checks.h"
+
 #include "base/logging.h"
-#include "cef/libcef/browser/alloy/alloy_browser_host_impl.h"
-#include "cef/libcef/browser/extensions/extension_background_host.h"
-#include "cef/libcef/browser/extensions/extension_system.h"
-#include "cef/libcef/browser/extensions/extension_view_host.h"
-#include "cef/libcef/browser/extensions/extension_web_contents_observer.h"
-#include "cef/libcef/common/extensions/extensions_util.h"
-#include "cef/libcef/common/net/url_util.h"
-#include "cef/libcef/features/features.h"
-#include "chrome/browser/task_manager/web_contents_tags.h"
-#include "chrome/browser/ui/tab_helpers.h"
+#include "chrome/browser/printing/print_view_manager.h"
+#include "chrome/browser/ui/prefs/prefs_tab_helper.h"
 #include "components/find_in_page/find_tab_helper.h"
 #include "components/find_in_page/find_types.h"
-#include "components/performance_manager/embedder/performance_manager_registry.h"
+#include "components/javascript_dialogs/tab_modal_dialog_manager.h"
+#include "components/permissions/permission_request_manager.h"
+#include "components/zoom/zoom_controller.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/public/browser/render_view_host.h"
 #include "extensions/browser/process_manager.h"
 #include "pdf/pdf_features.h"
 #include "third_party/blink/public/mojom/frame/find_in_page.mojom.h"
 
-#if BUILDFLAG(ENABLE_ALLOY_BOOTSTRAP)
-#include "cef/libcef/browser/alloy/dialogs/alloy_javascript_dialog_manager_delegate.h"
-#include "cef/libcef/features/runtime_checks.h"
-#include "chrome/browser/printing/printing_init.h"
-#include "chrome/browser/ui/prefs/prefs_tab_helper.h"
-#include "components/javascript_dialogs/tab_modal_dialog_manager.h"
-#include "components/permissions/permission_request_manager.h"
-#include "components/zoom/zoom_controller.h"
-#include "extensions/browser/extension_registry.h"
-#endif  // BUILDFLAG(ENABLE_ALLOY_BOOTSTRAP)
-
-namespace {
-
-const char kAttachedHelpersUserDataKey[] = "CefAttachedHelpers";
-
-#if BUILDFLAG(ENABLE_ALLOY_BOOTSTRAP)
-const extensions::Extension* GetExtensionForUrl(
-    content::BrowserContext* browser_context,
-    const GURL& url) {
-  auto* registry = extensions::ExtensionRegistry::Get(browser_context);
-  if (!registry) {
-    return nullptr;
-  }
-  std::string extension_id = url.host();
-  return registry->enabled_extensions().GetByID(extension_id);
-}
-#endif  // BUILDFLAG(ENABLE_ALLOY_BOOTSTRAP)
-
-}  // namespace
-
 CefBrowserPlatformDelegateAlloy::CefBrowserPlatformDelegateAlloy()
     : weak_ptr_factory_(this) {}
 
 content::WebContents* CefBrowserPlatformDelegateAlloy::CreateWebContents(
     CefBrowserCreateParams& create_params,
     bool& own_web_contents) {
+  REQUIRE_ALLOY_RUNTIME();
   DCHECK(primary_);
 
   if (!create_params.request_context) {
@@ -74,13 +50,13 @@ content::WebContents* CefBrowserPlatformDelegateAlloy::CreateWebContents(
   CHECK(browser_context);
 
   scoped_refptr<content::SiteInstance> site_instance;
-#if BUILDFLAG(ENABLE_ALLOY_BOOTSTRAP)
   if (extensions::ExtensionsEnabled() && !create_params.url.empty()) {
     GURL gurl = url_util::MakeGURL(create_params.url, /*fixup=*/true);
     if (!create_params.extension) {
       // We might be loading an extension app view where the extension URL is
       // provided by the client.
-      create_params.extension = GetExtensionForUrl(browser_context, gurl);
+      create_params.extension =
+          extensions::GetExtensionForUrl(browser_context, gurl);
     }
     if (create_params.extension) {
       if (create_params.extension_host_type ==
@@ -101,7 +77,6 @@ content::WebContents* CefBrowserPlatformDelegateAlloy::CreateWebContents(
       DCHECK(site_instance);
     }
   }
-#endif  // BUILDFLAG(ENABLE_ALLOY_BOOTSTRAP)
 
   content::WebContents::CreateParams wc_create_params(browser_context,
                                                       site_instance);
@@ -125,7 +100,7 @@ void CefBrowserPlatformDelegateAlloy::WebContentsCreated(
   CefBrowserPlatformDelegate::WebContentsCreated(web_contents, owned);
 
   if (primary_) {
-    AttachHelpers(web_contents);
+    find_in_page::FindTabHelper::CreateForWebContents(web_contents);
 
     if (owned) {
       SetOwnedWebContents(web_contents);
@@ -143,6 +118,7 @@ void CefBrowserPlatformDelegateAlloy::AddNewContents(
     const blink::mojom::WindowFeatures& window_features,
     bool user_gesture,
     bool* was_blocked) {
+  REQUIRE_ALLOY_RUNTIME();
   DCHECK(primary_);
 
   CefRefPtr<AlloyBrowserHostImpl> owner =
@@ -155,16 +131,13 @@ void CefBrowserPlatformDelegateAlloy::AddNewContents(
     return;
   }
 
-#if BUILDFLAG(ENABLE_ALLOY_BOOTSTRAP)
   if (extension_host_) {
     extension_host_->AddNewContents(source, std::move(new_contents), target_url,
                                     disposition, window_features, user_gesture,
                                     was_blocked);
   }
-#endif
 }
 
-#if BUILDFLAG(ENABLE_ALLOY_BOOTSTRAP)
 bool CefBrowserPlatformDelegateAlloy::
     ShouldAllowRendererInitiatedCrossProcessNavigation(
         bool is_main_frame_navigation) {
@@ -174,7 +147,6 @@ bool CefBrowserPlatformDelegateAlloy::
   }
   return true;
 }
-#endif
 
 void CefBrowserPlatformDelegateAlloy::RenderViewReady() {
   ConfigureAutoResize();
@@ -190,17 +162,22 @@ void CefBrowserPlatformDelegateAlloy::BrowserCreated(
   }
 
   DCHECK(!web_contents_->GetDelegate());
-  web_contents_->SetDelegate(
-      AlloyBrowserHostImpl::FromBaseChecked(browser).get());
+  web_contents_->SetDelegate(static_cast<AlloyBrowserHostImpl*>(browser));
 
-  AttachHelpers(web_contents_);
+  permissions::PermissionRequestManager::CreateForWebContents(web_contents_);
+  PrefsTabHelper::CreateForWebContents(web_contents_);
+  printing::PrintViewManager::CreateForWebContents(web_contents_);
+  zoom::ZoomController::CreateForWebContents(web_contents_);
+
+  javascript_dialogs::TabModalDialogManager::CreateForWebContents(
+      web_contents_,
+      CreateAlloyJavaScriptTabModalDialogManagerDelegateDesktop(web_contents_));
 
   // Used for print preview and JavaScript dialogs.
   web_contents_dialog_helper_ =
       std::make_unique<AlloyWebContentsDialogHelper>(web_contents_, this);
 }
 
-#if BUILDFLAG(ENABLE_ALLOY_BOOTSTRAP)
 void CefBrowserPlatformDelegateAlloy::CreateExtensionHost(
     const extensions::Extension* extension,
     const GURL& url,
@@ -213,12 +190,12 @@ void CefBrowserPlatformDelegateAlloy::CreateExtensionHost(
   DCHECK(browser_);
   DCHECK(!extension_host_);
 
-  auto alloy_browser = AlloyBrowserHostImpl::FromBaseChecked(browser_.get());
+  auto alloy_browser = static_cast<AlloyBrowserHostImpl*>(browser_);
 
   if (host_type == extensions::mojom::ViewType::kExtensionPopup) {
     // Create an extension host that we own.
     extension_host_ = new extensions::CefExtensionViewHost(
-        alloy_browser.get(), extension, web_contents_, url, host_type);
+        alloy_browser, extension, web_contents_, url, host_type);
     // Trigger load of the extension URL.
     extension_host_->CreateRendererSoon();
   } else if (host_type ==
@@ -227,7 +204,7 @@ void CefBrowserPlatformDelegateAlloy::CreateExtensionHost(
     alloy_browser->is_background_host_ = true;
     // Create an extension host that will be owned by ProcessManager.
     extension_host_ = new extensions::CefExtensionBackgroundHost(
-        alloy_browser.get(),
+        alloy_browser,
         base::BindOnce(&CefBrowserPlatformDelegateAlloy::OnExtensionHostDeleted,
                        weak_ptr_factory_.GetWeakPtr()),
         extension, web_contents_, url, host_type);
@@ -241,14 +218,11 @@ extensions::ExtensionHost* CefBrowserPlatformDelegateAlloy::GetExtensionHost()
     const {
   return extension_host_;
 }
-#endif  // BUILDFLAG(ENABLE_ALLOY_BOOTSTRAP)
 
 void CefBrowserPlatformDelegateAlloy::BrowserDestroyed(
     CefBrowserHostBase* browser) {
   if (primary_) {
-#if BUILDFLAG(ENABLE_ALLOY_BOOTSTRAP)
     DestroyExtensionHost();
-#endif
     owned_web_contents_.reset();
   }
 
@@ -290,7 +264,6 @@ void CefBrowserPlatformDelegateAlloy::NotifyMoveOrResizeStarted() {
 }
 #endif
 
-#if BUILDFLAG(ENABLE_ALLOY_BOOTSTRAP)
 bool CefBrowserPlatformDelegateAlloy::PreHandleGestureEvent(
     content::WebContents* source,
     const blink::WebGestureEvent& event) {
@@ -307,7 +280,6 @@ bool CefBrowserPlatformDelegateAlloy::IsNeverComposited(
   }
   return false;
 }
-#endif  // BUILDFLAG(ENABLE_ALLOY_BOOTSTRAP)
 
 void CefBrowserPlatformDelegateAlloy::SetAutoResizeEnabled(
     bool enabled,
@@ -340,6 +312,19 @@ void CefBrowserPlatformDelegateAlloy::ConfigureAutoResize() {
   }
 }
 
+bool CefBrowserPlatformDelegateAlloy::IsPrintPreviewSupported() const {
+  REQUIRE_ALLOY_RUNTIME();
+
+  // Print preview is not currently supported with OSR.
+  if (IsWindowless()) {
+    return false;
+  }
+
+  auto cef_browser_context =
+      CefBrowserContext::FromBrowserContext(web_contents_->GetBrowserContext());
+  return cef_browser_context->IsPrintPreviewSupported();
+}
+
 void CefBrowserPlatformDelegateAlloy::Find(const CefString& searchText,
                                            bool forward,
                                            bool matchCase,
@@ -404,7 +389,6 @@ void CefBrowserPlatformDelegateAlloy::SetOwnedWebContents(
   owned_web_contents_.reset(owned_contents);
 }
 
-#if BUILDFLAG(ENABLE_ALLOY_BOOTSTRAP)
 void CefBrowserPlatformDelegateAlloy::DestroyExtensionHost() {
   if (!extension_host_) {
     return;
@@ -430,51 +414,3 @@ void CefBrowserPlatformDelegateAlloy::OnExtensionHostDeleted() {
   DCHECK(extension_host_);
   extension_host_ = nullptr;
 }
-#endif  // BUILDFLAG(ENABLE_ALLOY_BOOTSTRAP)
-
-void CefBrowserPlatformDelegateAlloy::AttachHelpers(
-    content::WebContents* web_contents) {
-  // If already attached, nothing to be done.
-  base::SupportsUserData::Data* attached_tag =
-      web_contents->GetUserData(&kAttachedHelpersUserDataKey);
-  if (attached_tag) {
-    return;
-  }
-
-  // Mark as attached.
-  web_contents->SetUserData(&kAttachedHelpersUserDataKey,
-                            std::make_unique<base::SupportsUserData::Data>());
-
-#if BUILDFLAG(ENABLE_ALLOY_BOOTSTRAP)
-  // Create all the helpers.
-  if (cef::IsAlloyRuntimeEnabled()) {
-    find_in_page::FindTabHelper::CreateForWebContents(web_contents);
-    permissions::PermissionRequestManager::CreateForWebContents(web_contents);
-    PrefsTabHelper::CreateForWebContents(web_contents);
-    printing::InitializePrintingForWebContents(web_contents);
-    zoom::ZoomController::CreateForWebContents(web_contents);
-
-    javascript_dialogs::TabModalDialogManager::CreateForWebContents(
-        web_contents, CreateAlloyJavaScriptTabModalDialogManagerDelegateDesktop(
-                          web_contents));
-  } else
-#endif  // BUILDFLAG(ENABLE_ALLOY_BOOTSTRAP)
-  {
-    if (IsWindowless()) {
-      // Logic from ChromeContentBrowserClientCef::GetWebContentsViewDelegate
-      // which is not called for windowless browsers. Needs to be done before
-      // calling AttachTabHelpers.
-      if (auto* registry =
-              performance_manager::PerformanceManagerRegistry::GetInstance()) {
-        registry->MaybeCreatePageNodeForWebContents(web_contents);
-      }
-    }
-
-    // Adopt the WebContents now, so all observers are in place, as the network
-    // requests for its initial navigation will start immediately
-    TabHelpers::AttachTabHelpers(web_contents);
-
-    // Make the tab show up in the task manager.
-    task_manager::WebContentsTags::CreateForTabContents(web_contents);
-  }
-}

libcef/browser/alloy/browser_platform_delegate_alloy.h

@@ -6,10 +6,10 @@
 #ifndef CEF_LIBCEF_BROWSER_ALLOY_BROWSER_PLATFORM_DELEGATE_ALLOY_H_
 #define CEF_LIBCEF_BROWSER_ALLOY_BROWSER_PLATFORM_DELEGATE_ALLOY_H_
 
-#include "base/memory/raw_ptr.h"
+#include "libcef/browser/alloy/dialogs/alloy_web_contents_dialog_helper.h"
+#include "libcef/browser/browser_platform_delegate.h"
+
 #include "base/memory/weak_ptr.h"
-#include "cef/libcef/browser/alloy/dialogs/alloy_web_contents_dialog_helper.h"
-#include "cef/libcef/browser/browser_platform_delegate.h"
 #include "components/find_in_page/find_notification_details.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/gfx/geometry/size.h"
@@ -33,18 +33,14 @@ class CefBrowserPlatformDelegateAlloy : public CefBrowserPlatformDelegate {
                       const blink::mojom::WindowFeatures& window_features,
                       bool user_gesture,
                       bool* was_blocked) override;
-#if BUILDFLAG(ENABLE_ALLOY_BOOTSTRAP)
   bool ShouldAllowRendererInitiatedCrossProcessNavigation(
       bool is_main_frame_navigation) override;
-#endif
   void RenderViewReady() override;
   void BrowserCreated(CefBrowserHostBase* browser) override;
-#if BUILDFLAG(ENABLE_ALLOY_BOOTSTRAP)
   void CreateExtensionHost(const extensions::Extension* extension,
                            const GURL& url,
                            extensions::mojom::ViewType host_type) override;
   extensions::ExtensionHost* GetExtensionHost() const override;
-#endif
   void BrowserDestroyed(CefBrowserHostBase* browser) override;
   web_modal::WebContentsModalDialogHost* GetWebContentsModalDialogHost()
       const override;
@@ -52,15 +48,13 @@ class CefBrowserPlatformDelegateAlloy : public CefBrowserPlatformDelegate {
 #if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC))
   void NotifyMoveOrResizeStarted() override;
 #endif
-#if BUILDFLAG(ENABLE_ALLOY_BOOTSTRAP)
   bool PreHandleGestureEvent(content::WebContents* source,
                              const blink::WebGestureEvent& event) override;
   bool IsNeverComposited(content::WebContents* web_contents) override;
-#endif
-  bool IsAlloyStyle() const override { return true; }
   void SetAutoResizeEnabled(bool enabled,
                             const CefSize& min_size,
                             const CefSize& max_size) override;
+  bool IsPrintPreviewSupported() const override;
   void Find(const CefString& searchText,
             bool forward,
             bool matchCase,
@@ -89,17 +83,11 @@ class CefBrowserPlatformDelegateAlloy : public CefBrowserPlatformDelegate {
  private:
   void SetOwnedWebContents(content::WebContents* owned_contents);
 
-#if BUILDFLAG(ENABLE_ALLOY_BOOTSTRAP)
   void DestroyExtensionHost();
   void OnExtensionHostDeleted();
-#endif
 
   void ConfigureAutoResize();
 
-  // Attach all the associated helpers that are needed for the WebContents. It
-  // is safe to call this on a WebContents that was already attached.
-  void AttachHelpers(content::WebContents* web_contents);
-
   // Non-nullptr if this object owns the WebContents. Will be nullptr for popup
   // browsers between the calls to WebContentsCreated() and AddNewContents(),
   // and may never be set if the parent browser is destroyed during popup
@@ -113,11 +101,9 @@ class CefBrowserPlatformDelegateAlloy : public CefBrowserPlatformDelegate {
   // matches, the find selection rectangle, etc.
   find_in_page::FindNotificationDetails last_search_result_;
 
-#if BUILDFLAG(ENABLE_ALLOY_BOOTSTRAP)
   // Used when the browser is hosting an extension.
-  raw_ptr<extensions::ExtensionHost> extension_host_ = nullptr;
+  extensions::ExtensionHost* extension_host_ = nullptr;
   bool is_background_host_ = false;
-#endif
 
   // Used with auto-resize.
   bool auto_resize_enabled_ = false;

libcef/browser/alloy/chrome_browser_process_alloy.cc

@@ -3,21 +3,23 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cef/libcef/browser/alloy/chrome_browser_process_alloy.h"
+#include "libcef/browser/alloy/chrome_browser_process_alloy.h"
 
 #include <memory>
 
+#include "libcef/browser/alloy/chrome_profile_manager_alloy.h"
+#include "libcef/browser/browser_context.h"
+#include "libcef/browser/context.h"
+#include "libcef/browser/extensions/extensions_browser_client.h"
+#include "libcef/browser/prefs/browser_prefs.h"
+#include "libcef/browser/thread_util.h"
+#include "libcef/common/cef_switches.h"
+#include "libcef/common/extensions/extensions_client.h"
+#include "libcef/common/extensions/extensions_util.h"
+
 #include "base/command_line.h"
 #include "base/path_service.h"
-#include "cef/libcef/browser/alloy/chrome_profile_manager_alloy.h"
-#include "cef/libcef/browser/browser_context.h"
-#include "cef/libcef/browser/context.h"
-#include "cef/libcef/browser/extensions/extensions_browser_client.h"
-#include "cef/libcef/browser/prefs/browser_prefs.h"
-#include "cef/libcef/browser/thread_util.h"
-#include "cef/libcef/common/cef_switches.h"
-#include "cef/libcef/common/extensions/extensions_client.h"
-#include "cef/libcef/common/extensions/extensions_util.h"
+#include "chrome/browser/browser_features.h"
 #include "chrome/browser/component_updater/chrome_component_updater_configurator.h"
 #include "chrome/browser/net/system_network_context_manager.h"
 #include "chrome/browser/permissions/chrome_permissions_client.h"
@@ -91,12 +93,16 @@ void ChromeBrowserProcessAlloy::OnContextInitialized() {
       providers;
 
 #if BUILDFLAG(IS_WIN)
-  // The DPAPI key provider requires OSCrypt::Init to have already been called
-  // to initialize the key storage. This happens in
-  // AlloyBrowserMainParts::PreCreateMainMessageLoop.
-  providers.emplace_back(std::make_pair(
-      /*precedence=*/10u,
-      std::make_unique<os_crypt_async::DPAPIKeyProvider>(local_state())));
+  // TODO(crbug.com/1373092): For Windows, continue to add providers behind
+  // features, as support for them is added.
+  if (base::FeatureList::IsEnabled(features::kEnableDPAPIEncryptionProvider)) {
+    // The DPAPI key provider requires OSCrypt::Init to have already been called
+    // to initialize the key storage. This happens in
+    // AlloyBrowserMainParts::PreCreateMainMessageLoop.
+    providers.emplace_back(std::make_pair(
+        /*precedence=*/10u,
+        std::make_unique<os_crypt_async::DPAPIKeyProvider>(local_state())));
+  }
 #endif  // BUILDFLAG(IS_WIN)
 
   os_crypt_async_ =
@@ -149,7 +155,6 @@ void ChromeBrowserProcessAlloy::CleanupOnUIThread() {
     }
   }
 
-  os_crypt_async_.reset();
   local_state_.reset();
   browser_policy_connector_.reset();
   background_printing_manager_.reset();
@@ -365,12 +370,6 @@ ChromeBrowserProcessAlloy::subresource_filter_ruleset_service() {
   return nullptr;
 }
 
-subresource_filter::RulesetService*
-ChromeBrowserProcessAlloy::fingerprinting_protection_ruleset_service() {
-  DCHECK(false);
-  return nullptr;
-}
-
 StartupData* ChromeBrowserProcessAlloy::startup_data() {
   DCHECK(false);
   return nullptr;
@@ -440,12 +439,6 @@ os_crypt_async::OSCryptAsync* ChromeBrowserProcessAlloy::os_crypt_async() {
   return os_crypt_async_.get();
 }
 
-void ChromeBrowserProcessAlloy::set_additional_os_crypt_async_provider_for_test(
-    size_t precedence,
-    std::unique_ptr<os_crypt_async::KeyProvider> provider) {
-  DCHECK(false);
-}
-
 BuildState* ChromeBrowserProcessAlloy::GetBuildState() {
   DCHECK(false);
   return nullptr;

libcef/browser/alloy/chrome_browser_process_alloy.h

@@ -92,8 +92,6 @@ class ChromeBrowserProcessAlloy : public BrowserProcess {
   safe_browsing::SafeBrowsingService* safe_browsing_service() override;
   subresource_filter::RulesetService* subresource_filter_ruleset_service()
       override;
-  subresource_filter::RulesetService*
-  fingerprinting_protection_ruleset_service() override;
   StartupData* startup_data() override;
 
 #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
@@ -109,9 +107,6 @@ class ChromeBrowserProcessAlloy : public BrowserProcess {
   resource_coordinator::ResourceCoordinatorParts* resource_coordinator_parts()
       override;
   os_crypt_async::OSCryptAsync* os_crypt_async() override;
-  void set_additional_os_crypt_async_provider_for_test(
-      size_t precedence,
-      std::unique_ptr<os_crypt_async::KeyProvider> provider) override;
   BuildState* GetBuildState() override;
   SerialPolicyAllowedPorts* serial_policy_allowed_ports() override;
   HidSystemTrayIcon* hid_system_tray_icon() override;

libcef/browser/alloy/chrome_profile_alloy.cc

@@ -3,9 +3,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cef/libcef/browser/alloy/chrome_profile_alloy.h"
+#include "libcef/browser/alloy/chrome_profile_alloy.h"
 
-#include "base/memory/raw_ptr.h"
 #include "base/no_destructor.h"
 #include "components/profile_metrics/browser_profile_type.h"
 #include "components/variations/variations_client.h"
@@ -32,22 +31,35 @@ class CefVariationsClient : public variations::VariationsClient {
   }
 
  private:
-  raw_ptr<content::BrowserContext> browser_context_;
+  content::BrowserContext* browser_context_;
 };
 
 }  // namespace
 
-ChromeProfileAlloy::ChromeProfileAlloy() : Profile(nullptr) {
-  // Alloy contexts are never flagged as off-the-record. It causes problems
-  // for the extension system.
-  DCHECK(!IsOffTheRecord());
-
+ChromeProfileAlloy::ChromeProfileAlloy() {
   profile_metrics::SetBrowserProfileType(
       this, profile_metrics::BrowserProfileType::kRegular);
 }
 
 ChromeProfileAlloy::~ChromeProfileAlloy() = default;
 
+bool ChromeProfileAlloy::IsOffTheRecord() {
+  return false;
+}
+
+bool ChromeProfileAlloy::IsOffTheRecord() const {
+  // Alloy contexts are never flagged as off-the-record. It causes problems
+  // for the extension system.
+  return false;
+}
+
+const Profile::OTRProfileID& ChromeProfileAlloy::GetOTRProfileID() const {
+  DCHECK(false);
+  static base::NoDestructor<Profile::OTRProfileID> otr_profile_id(
+      Profile::OTRProfileID::PrimaryID());
+  return *otr_profile_id;
+}
+
 variations::VariationsClient* ChromeProfileAlloy::GetVariationsClient() {
   if (!variations_client_) {
     variations_client_ = std::make_unique<CefVariationsClient>(this);

libcef/browser/alloy/chrome_profile_alloy.h

@@ -25,6 +25,9 @@ class ChromeProfileAlloy : public Profile {
 
  protected:
   // Profile methods.
+  bool IsOffTheRecord() override;
+  bool IsOffTheRecord() const override;
+  const OTRProfileID& GetOTRProfileID() const override;
   variations::VariationsClient* GetVariationsClient() override;
   scoped_refptr<base::SequencedTaskRunner> GetIOTaskRunner() override;
   std::string GetProfileUserName() const override;

libcef/browser/alloy/chrome_profile_manager_alloy.cc

@@ -3,11 +3,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cef/libcef/browser/alloy/chrome_profile_manager_alloy.h"
+#include "libcef/browser/alloy/chrome_profile_manager_alloy.h"
 
-#include "cef/libcef/browser/browser_context.h"
-#include "cef/libcef/browser/request_context_impl.h"
-#include "cef/libcef/common/app_manager.h"
+#include "libcef/browser/browser_context.h"
+#include "libcef/browser/request_context_impl.h"
+#include "libcef/common/app_manager.h"
 
 namespace {
 

libcef/browser/alloy/devtools/alloy_devtools_window_runner.cc

@@ -1,46 +0,0 @@
-// Copyright 2024 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 "cef/libcef/browser/alloy/devtools/alloy_devtools_window_runner.h"
-
-#include "cef/libcef/browser/alloy/devtools/devtools_frontend.h"
-#include "cef/libcef/browser/thread_util.h"
-
-void AlloyDevToolsWindowRunner::ShowDevTools(
-    CefBrowserHostBase* opener,
-    std::unique_ptr<CefShowDevToolsParams> params) {
-  CEF_REQUIRE_UIT();
-  if (devtools_frontend_) {
-    if (!params->inspect_element_at_.IsEmpty()) {
-      devtools_frontend_->InspectElementAt(params->inspect_element_at_.x,
-                                           params->inspect_element_at_.y);
-    }
-    devtools_frontend_->Focus();
-    return;
-  }
-
-  auto alloy_browser = AlloyBrowserHostImpl::FromBaseChecked(opener);
-  devtools_frontend_ = CefDevToolsFrontend::Show(
-      alloy_browser.get(), params->window_info_, params->client_,
-      params->settings_, params->inspect_element_at_,
-      base::BindOnce(&AlloyDevToolsWindowRunner::OnFrontEndDestroyed,
-                     weak_ptr_factory_.GetWeakPtr()));
-}
-
-void AlloyDevToolsWindowRunner::CloseDevTools() {
-  CEF_REQUIRE_UIT();
-  if (devtools_frontend_) {
-    devtools_frontend_->Close();
-  }
-}
-
-bool AlloyDevToolsWindowRunner::HasDevTools() {
-  CEF_REQUIRE_UIT();
-  return !!devtools_frontend_;
-}
-
-void AlloyDevToolsWindowRunner::OnFrontEndDestroyed() {
-  CEF_REQUIRE_UIT();
-  devtools_frontend_ = nullptr;
-}