Add workaround for crash on Views popup window creation (see issue #3040)

Requires Xcode 12.2 and the MacOS 11.0 SDK. To generate ARM64 builds set
the CEF_ENABLE_ARM64=1 environment variable and replace all usage of
--x64-build with --arm64-build in script command-line arguments.

BUILD.gn

@@ -122,8 +122,8 @@ if (is_linux) {
   import("//third_party/fontconfig/fontconfig.gni")
 }
 if (is_mac) {
+  import("//build/apple/tweak_info_plist.gni")
   import("//build/config/mac/rules.gni")
-  import("//build/mac/tweak_info_plist.gni")
   import("//build/util/version.gni")
   import("//media/cdm/library_cdm/cdm_paths.gni")
   import("//build/config/mac/base_rules.gni")
@@ -407,20 +407,37 @@ test("libcef_static_unittests") {
 static_library("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/browser_platform_delegate_alloy.cc",
+    "libcef/browser/alloy/browser_platform_delegate_alloy.h",
+    "libcef/browser/alloy/chrome_browser_process_alloy.cc",
+    "libcef/browser/alloy/chrome_browser_process_alloy.h",
+    "libcef/browser/alloy/chrome_profile_manager_alloy.cc",
+    "libcef/browser/alloy/chrome_profile_manager_alloy.h",
+    "libcef/browser/alloy/chrome_profile_alloy.cc",
+    "libcef/browser/alloy/chrome_profile_alloy.h",
+    "libcef/browser/alloy/alloy_content_browser_client.cc",
+    "libcef/browser/alloy/alloy_content_browser_client.h",
     "libcef/browser/audio_capturer.cc",
     "libcef/browser/audio_capturer.h",
+    "libcef/browser/browser_contents_delegate.cc",
+    "libcef/browser/browser_contents_delegate.h",
     "libcef/browser/browser_context.cc",
     "libcef/browser/browser_context.h",
     "libcef/browser/browser_context_keyed_service_factories.cc",
     "libcef/browser/browser_context_keyed_service_factories.h",
-    "libcef/browser/browser_host_impl.cc",
-    "libcef/browser/browser_host_impl.h",
+    "libcef/browser/browser_host_base.cc",
+    "libcef/browser/browser_host_base.h",
+    "libcef/browser/browser_host_create.cc",
     "libcef/browser/browser_info.cc",
     "libcef/browser/browser_info.h",
     "libcef/browser/browser_info_manager.cc",
     "libcef/browser/browser_info_manager.h",
-    "libcef/browser/browser_main.cc",
-    "libcef/browser/browser_main.h",
     "libcef/browser/browser_message_filter.cc",
     "libcef/browser/browser_message_filter.h",
     "libcef/browser/browser_message_loop.cc",
@@ -430,15 +447,20 @@ static_library("libcef_static") {
     "libcef/browser/browser_platform_delegate_create.cc",
     "libcef/browser/browser_util.cc",
     "libcef/browser/browser_util.h",
-    "libcef/browser/chrome_browser_process_stub.cc",
-    "libcef/browser/chrome_browser_process_stub.h",
+    "libcef/browser/chrome/browser_delegate.h",
+    "libcef/browser/chrome/browser_platform_delegate_chrome.cc",
+    "libcef/browser/chrome/browser_platform_delegate_chrome.h",
+    "libcef/browser/chrome/chrome_browser_context.cc",
+    "libcef/browser/chrome/chrome_browser_context.h",
+    "libcef/browser/chrome/chrome_browser_delegate.cc",
+    "libcef/browser/chrome/chrome_browser_delegate.h",
+    "libcef/browser/chrome/chrome_browser_host_impl.cc",
+    "libcef/browser/chrome/chrome_browser_host_impl.h",
+    "libcef/browser/chrome/chrome_browser_main_extra_parts_cef.cc",
+    "libcef/browser/chrome/chrome_browser_main_extra_parts_cef.h",
+    "libcef/browser/chrome/chrome_content_browser_client_cef.cc",
+    "libcef/browser/chrome/chrome_content_browser_client_cef.h",
     "libcef/browser/chrome_crash_reporter_client_stub.cc",
-    "libcef/browser/chrome_profile_manager_stub.cc",
-    "libcef/browser/chrome_profile_manager_stub.h",
-    "libcef/browser/chrome_profile_stub.cc",
-    "libcef/browser/chrome_profile_stub.h",
-    "libcef/browser/content_browser_client.cc",
-    "libcef/browser/content_browser_client.h",
     "libcef/browser/context.cc",
     "libcef/browser/context.h",
     "libcef/browser/context_menu_params_impl.cc",
@@ -508,9 +530,13 @@ static_library("libcef_static") {
     "libcef/browser/frame_host_impl.h",
     "libcef/browser/image_impl.cc",
     "libcef/browser/image_impl.h",
+    "libcef/browser/iothread_state.cc",
+    "libcef/browser/iothread_state.h",
     "libcef/browser/javascript_dialog_runner.h",
     "libcef/browser/javascript_dialog_manager.cc",
     "libcef/browser/javascript_dialog_manager.h",
+    "libcef/browser/main_runner.cc",
+    "libcef/browser/main_runner.h",
     "libcef/browser/media_capture_devices_dispatcher.cc",
     "libcef/browser/media_capture_devices_dispatcher.h",
     "libcef/browser/media_router/media_route_impl.cc",
@@ -530,6 +556,8 @@ static_library("libcef_static") {
     "libcef/browser/menu_runner.h",
     "libcef/browser/native/browser_platform_delegate_native.cc",
     "libcef/browser/native/browser_platform_delegate_native.h",
+    "libcef/browser/native/cursor_util.h",
+    "libcef/browser/native/cursor_util.cc",
     "libcef/browser/navigate_params.cc",
     "libcef/browser/navigate_params.h",
     "libcef/browser/navigation_entry_impl.cc",
@@ -543,6 +571,8 @@ static_library("libcef_static") {
     "libcef/browser/net/internal_scheme_handler.h",
     "libcef/browser/net/scheme_handler.cc",
     "libcef/browser/net/scheme_handler.h",
+    "libcef/browser/net/throttle_handler.cc",
+    "libcef/browser/net/throttle_handler.h",
     "libcef/browser/net_service/browser_urlrequest_impl.cc",
     "libcef/browser/net_service/browser_urlrequest_impl.h",
     "libcef/browser/net_service/cookie_helper.cc",
@@ -601,8 +631,6 @@ static_library("libcef_static") {
     "libcef/browser/printing/print_view_manager.cc",
     "libcef/browser/printing/print_view_manager.h",
     "libcef/browser/process_util_impl.cc",
-    "libcef/browser/resource_context.cc",
-    "libcef/browser/resource_context.h",
     "libcef/browser/request_context_handler_map.cc",
     "libcef/browser/request_context_handler_map.h",
     "libcef/browser/request_context_impl.cc",
@@ -636,6 +664,14 @@ static_library("libcef_static") {
     "libcef/browser/xml_reader_impl.h",
     "libcef/browser/zip_reader_impl.cc",
     "libcef/browser/zip_reader_impl.h",
+    "libcef/common/alloy/alloy_content_client.cc",
+    "libcef/common/alloy/alloy_content_client.h",
+    "libcef/common/alloy/alloy_main_delegate.cc",
+    "libcef/common/alloy/alloy_main_delegate.h",
+    "libcef/common/alloy/alloy_main_runner_delegate.cc",
+    "libcef/common/alloy/alloy_main_runner_delegate.h",
+    "libcef/common/app_manager.cc",
+    "libcef/common/app_manager.h",
     "libcef/common/base_impl.cc",
     "libcef/common/cef_message_generator.cc",
     "libcef/common/cef_message_generator.h",
@@ -643,10 +679,14 @@ static_library("libcef_static") {
     "libcef/common/cef_messages.h",
     "libcef/common/cef_switches.cc",
     "libcef/common/cef_switches.h",
+    "libcef/common/chrome/chrome_content_client_cef.cc",
+    "libcef/common/chrome/chrome_content_client_cef.h",
+    "libcef/common/chrome/chrome_main_delegate_cef.cc",
+    "libcef/common/chrome/chrome_main_delegate_cef.h",
+    "libcef/common/chrome/chrome_main_runner_delegate.cc",
+    "libcef/common/chrome/chrome_main_runner_delegate.h",
     "libcef/common/command_line_impl.cc",
     "libcef/common/command_line_impl.h",
-    "libcef/common/content_client.cc",
-    "libcef/common/content_client.h",
     "libcef/common/crash_reporter_client.cc",
     "libcef/common/crash_reporter_client.h",
     "libcef/common/crash_reporting.cc",
@@ -665,8 +705,8 @@ static_library("libcef_static") {
     "libcef/common/frame_util.cc",
     "libcef/common/frame_util.h",
     "libcef/common/json_impl.cc",
-    "libcef/common/main_delegate.cc",
-    "libcef/common/main_delegate.h",
+    "libcef/common/main_runner_delegate.h",
+    "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",
@@ -688,6 +728,8 @@ static_library("libcef_static") {
     "libcef/common/resource_bundle_delegate.h",
     "libcef/common/resource_bundle_impl.cc",
     "libcef/common/resource_bundle_impl.h",
+    "libcef/common/resource_util.cc",
+    "libcef/common/resource_util.h",
     "libcef/common/response_impl.cc",
     "libcef/common/response_impl.h",
     "libcef/common/response_manager.cc",
@@ -701,6 +743,8 @@ static_library("libcef_static") {
     "libcef/common/task_impl.cc",
     "libcef/common/task_runner_impl.cc",
     "libcef/common/task_runner_impl.h",
+    "libcef/common/task_runner_manager.cc",
+    "libcef/common/task_runner_manager.h",
     "libcef/common/test/translator_test_impl.cc",
     "libcef/common/thread_impl.cc",
     "libcef/common/thread_impl.h",
@@ -717,10 +761,22 @@ static_library("libcef_static") {
     "libcef/common/waitable_event_impl.h",
     "libcef/common/widevine_loader.cc",
     "libcef/common/widevine_loader.h",
+    "libcef/features/runtime.h",
+    "libcef/features/runtime_checks.h",
+    "libcef/renderer/alloy/alloy_content_renderer_client.cc",
+    "libcef/renderer/alloy/alloy_content_renderer_client.h",
+    "libcef/renderer/alloy/alloy_render_frame_observer.cc",
+    "libcef/renderer/alloy/alloy_render_frame_observer.h",
+    "libcef/renderer/alloy/alloy_render_thread_observer.cc",
+    "libcef/renderer/alloy/alloy_render_thread_observer.h",
+    "libcef/renderer/alloy/url_loader_throttle_provider_impl.cc",
+    "libcef/renderer/alloy/url_loader_throttle_provider_impl.h",
     "libcef/renderer/browser_impl.cc",
     "libcef/renderer/browser_impl.h",
-    "libcef/renderer/content_renderer_client.cc",
-    "libcef/renderer/content_renderer_client.h",
+    "libcef/renderer/browser_manager.cc",
+    "libcef/renderer/browser_manager.h",
+    "libcef/renderer/chrome/chrome_content_renderer_client_cef.cc",
+    "libcef/renderer/chrome/chrome_content_renderer_client_cef.h",
     "libcef/renderer/dom_document_impl.cc",
     "libcef/renderer/dom_document_impl.h",
     "libcef/renderer/dom_node_impl.cc",
@@ -742,10 +798,12 @@ static_library("libcef_static") {
     "libcef/renderer/render_urlrequest_impl.cc",
     "libcef/renderer/render_urlrequest_impl.h",
     "libcef/renderer/thread_util.h",
-    "libcef/renderer/url_loader_throttle_provider_impl.cc",
-    "libcef/renderer/url_loader_throttle_provider_impl.h",
     "libcef/renderer/v8_impl.cc",
     "libcef/renderer/v8_impl.h",
+
+    # For Chrome runtime support.
+    "//chrome/app/chrome_main_delegate.cc",
+    "//chrome/app/chrome_main_delegate.h",
   ]
 
   configs += [
@@ -772,7 +830,6 @@ static_library("libcef_static") {
 
   deps = [
     ":cef_make_headers",
-    ":cef_service_manifests",
 
     ":libcef_static_unittested",
 
@@ -788,12 +845,13 @@ static_library("libcef_static") {
     "//base:base_static",
     "//base/third_party/dynamic_annotations",
     "//cc",
-    "//chrome/browser",
-    "//chrome/child",
-    "//chrome/common",
-    "//chrome/renderer",
+    "//chrome:browser_dependencies",
+    "//chrome:child_dependencies",
+    "//chrome:packed_resources",
+    "//chrome:resources",
+    "//chrome:strings",
+    "//chrome/common:buildflags",
     "//chrome/services/printing:lib",
-    "//chrome/utility",
     "//components/cdm/renderer",
     "//components/certificate_transparency",
     "//components/content_settings/core/browser",
@@ -803,8 +861,9 @@ static_library("libcef_static") {
     "//components/google/core/common",
     "//components/keyed_service/content:content",
     "//components/keyed_service/core:core",
+    "//components/media_router/common/mojom:media_router",
     "//components/navigation_interception",
-    "//components/network_session_configurator/browser",
+    "//components/network_session_configurator/common",
     "//components/pdf/browser",
     "//components/pdf/renderer",
     "//components/plugins/renderer",
@@ -850,7 +909,6 @@ static_library("libcef_static") {
     "//printing/buildflags",
     "//services/network:network_service",
     "//services/network/public/cpp",
-    "//services/service_manager/embedder",
     "//services/service_manager/public/cpp",
     "//skia",
     "//storage/browser",
@@ -879,9 +937,10 @@ static_library("libcef_static") {
 
   if (is_win) {
     sources += includes_win + [
-      "libcef/browser/browser_main_win.cc",
+      "libcef/browser/alloy/alloy_browser_main_win.cc",
       "libcef/browser/native/browser_platform_delegate_native_win.cc",
       "libcef/browser/native/browser_platform_delegate_native_win.h",
+      "libcef/browser/native/cursor_util_win.cc",
       "libcef/browser/native/file_dialog_runner_win.cc",
       "libcef/browser/native/file_dialog_runner_win.h",
       "libcef/browser/native/javascript_dialog_runner_win.cc",
@@ -895,7 +954,6 @@ static_library("libcef_static") {
       "libcef/browser/native/native_menu_win.h",
       "libcef/browser/osr/browser_platform_delegate_osr_win.cc",
       "libcef/browser/osr/browser_platform_delegate_osr_win.h",
-      "libcef/browser/osr/render_widget_host_view_osr_win.cc",
 
       # Part of //chrome/utility.
       "//chrome/utility/printing_handler.cc",
@@ -926,11 +984,11 @@ static_library("libcef_static") {
     sources += includes_linux + [
       "libcef/browser/native/browser_platform_delegate_native_linux.cc",
       "libcef/browser/native/browser_platform_delegate_native_linux.h",
+      "libcef/browser/native/cursor_util_linux.cc",
       "libcef/browser/native/menu_runner_linux.cc",
       "libcef/browser/native/menu_runner_linux.h",
       "libcef/browser/osr/browser_platform_delegate_osr_linux.cc",
       "libcef/browser/osr/browser_platform_delegate_osr_linux.h",
-      "libcef/browser/osr/render_widget_host_view_osr_linux.cc",
       "libcef/browser/printing/print_dialog_linux.cc",
       "libcef/browser/printing/print_dialog_linux.h",
     ]
@@ -968,6 +1026,10 @@ static_library("libcef_static") {
       "libcef/browser/osr/browser_platform_delegate_osr_mac.mm",
       "libcef/common/util_mac.h",
       "libcef/common/util_mac.mm",
+
+      # For Chrome runtime support.
+      "//chrome/app/chrome_main_mac.h",
+      "//chrome/app/chrome_main_mac.mm",
     ]
   }
 
@@ -1126,8 +1188,6 @@ static_library("libcef_static") {
         sources += [
           # Support for UI input events.
           # Part of //ui/aura:test_support which is testingonly.
-          "//ui/aura/test/ui_controls_factory_aurax11.cc",
-          "//ui/aura/test/x11_event_sender.cc",
           "//ui/aura/test/x11_event_sender.h",
           # Part of //ui/views:test_support which is testingonly.
           "//ui/views/test/ui_controls_factory_desktop_aurax11.cc",
@@ -1198,7 +1258,7 @@ if (is_win) {
     sources = [ "libcef_dll/sandbox/sandbox_win.cc" ]
     # CEF sources use include paths relative to the CEF root directory.
     include_dirs = [ "." ]
-    deps = [ "//sandbox" ]
+    deps = [ "libcef/features", "//sandbox" ]
   }
 }
 
@@ -1207,60 +1267,13 @@ if (is_mac) {
     sources = [ "libcef_dll/sandbox/sandbox_mac.mm" ]
     # CEF sources use include paths relative to the CEF root directory.
     include_dirs = [ "." ]
-    deps = [ "//sandbox/mac:seatbelt" ]
+    deps = [
+      "//build/config:executable_deps",
+      "//sandbox/mac:seatbelt"
+    ]
   }
 }
 
-#
-# Service manifests.
-#
-
-source_set("cef_content_browser_overlay_manifest") {
-  sources = [
-    "libcef/common/service_manifests/cef_content_browser_overlay_manifest.cc",
-    "libcef/common/service_manifests/cef_content_browser_overlay_manifest.h",
-  ]
-
-  configs += [
-    "libcef/features:config"
-  ]
-
-  deps = [
-    "//base",
-    "//extensions/buildflags",
-    "//extensions/common:mojom",
-    "//extensions/common/api:mojom",
-    "//services/service_manager/public/cpp",
-    "//third_party/blink/public/common",
-  ]
-}
-
-source_set("cef_content_renderer_overlay_manifest") {
-  sources = [
-    "libcef/common/service_manifests/cef_content_renderer_overlay_manifest.h",
-  ]
-
-  configs += [
-    "libcef/features:config"
-  ]
-
-  deps = [
-    "//base",
-    "//components/subresource_filter/content/mojom",
-    "//extensions/buildflags",
-    "//extensions/common:mojom",
-    "//services/service_manager/public/cpp",
-    "//third_party/blink/public/common",
-  ]
-}
-
-source_set("cef_service_manifests") {
-  public_deps = [
-    ":cef_content_browser_overlay_manifest",
-    ":cef_content_renderer_overlay_manifest",
-  ]
-}
-
 #
 # Resource grit/pack targets.
 #
@@ -1329,13 +1342,15 @@ repack("pak_devtools") {
   # Add associated .h files in the make_pack_header("resources") target.
   sources = [
     "$root_gen_dir/content/browser/devtools/devtools_resources.pak",
+    "$root_gen_dir/third_party/blink/public/resources/inspector_overlay_resources.pak",
   ]
 
   # Use public_deps so that generated grit headers are discoverable from
   # the libcef_static target. Grit deps that generate .cc files must be
   # listed both here and in the libcef_static target.
   public_deps = [
-    "//content/browser/devtools:resources",
+    "//content/browser/devtools:devtools_resources",
+    "//third_party/blink/public:devtools_inspector_resources",
   ]
 
   output = "$root_out_dir/devtools_resources.pak"
@@ -1419,6 +1434,7 @@ repack("pak") {
     "$root_gen_dir/chrome/browser_resources.pak",
     "$root_gen_dir/chrome/dev_ui_browser_resources.pak",
     "$root_gen_dir/chrome/net_internals_resources.pak",
+    "$root_gen_dir/chrome/print_preview_pdf_resources.pak",
     "$root_gen_dir/chrome/print_preview_resources.pak",
     "$root_gen_dir/chrome/common_resources.pak",
     "$root_gen_dir/components/components_resources.pak",
@@ -1438,6 +1454,7 @@ repack("pak") {
     "//chrome/browser:dev_ui_browser_resources",
     "//chrome/browser:resources",
     "//chrome/browser/resources/net_internals:net_internals_resources",
+    "//chrome/browser/resources:print_preview_pdf_resources",
     "//chrome/browser/resources:print_preview_resources",
     "//chrome/common:resources",
     "//components/resources:components_resources",
@@ -1490,6 +1507,8 @@ make_pack_header("resources") {
     "$root_gen_dir/chrome/grit/component_extension_resources.h",
     "$root_gen_dir/chrome/grit/dev_ui_browser_resources.h",
     "$root_gen_dir/chrome/grit/net_internals_resources.h",
+    "$root_gen_dir/chrome/grit/print_preview_pdf_resources.h",
+    "$root_gen_dir/chrome/grit/print_preview_resources.h",
     "$root_gen_dir/chrome/grit/renderer_resources.h",
     "$root_gen_dir/components/grit/components_resources.h",
     "$root_gen_dir/components/grit/dev_ui_components_resources.h",
@@ -1517,6 +1536,7 @@ make_pack_header("strings") {
     "$root_gen_dir/chrome/grit/generated_resources.h",
     "$root_gen_dir/chrome/grit/locale_settings.h",
     "$root_gen_dir/chrome/grit/platform_locale_settings.h",
+    "$root_gen_dir/components/strings/grit/components_chromium_strings.h",
     "$root_gen_dir/components/strings/grit/components_strings.h",
     "$root_gen_dir/extensions/strings/grit/extensions_strings.h",
     "$root_gen_dir/services/strings/grit/services_strings.h",
@@ -1615,7 +1635,7 @@ if (is_mac) {
       ]
       public_deps += [ "//v8" ]
       if (use_v8_context_snapshot) {
-        sources += [ "$root_out_dir/v8_context_snapshot.bin" ]
+        sources += [ "$root_out_dir/$v8_context_snapshot_filename" ]
         public_deps += [ "//tools/v8_context_snapshot" ]
       }
     }
@@ -1691,10 +1711,6 @@ if (is_mac) {
               gypi_paths2.libcef_sources_common +
               gypi_paths.autogen_library_side
 
-    # TODO(rsesek): Handle these missing pieces:
-    #   - crash_inspector
-    #   - crash_report_sender.app
-
     deps = [
       ":cef_framework_angle_library",
       ":cef_framework_locales",
@@ -1895,8 +1911,8 @@ if (is_mac) {
         deps += invoker.deps
       }
 
-      if (defined(invoker.libs)) {
-        libs = invoker.libs
+      if (defined(invoker.frameworks)) {
+        frameworks = invoker.frameworks
       }
 
       if (defined(invoker.defines)) {
@@ -1980,7 +1996,7 @@ if (is_mac) {
       ":cefclient_resources_bundle_data_english",
       ":cefclient_xibs",
     ]
-    libs = [
+    frameworks = [
       "AppKit.framework",
       "OpenGL.framework",
     ]
@@ -2044,7 +2060,7 @@ if (is_mac) {
       ":cefsimple_resources_bundle_data_english",
       ":cefsimple_xibs",
     ]
-    libs = [
+    frameworks = [
       "AppKit.framework",
     ]
     defines = [
@@ -2115,7 +2131,7 @@ if (is_mac) {
       ":ceftests_xibs",
       "//testing/gtest",
     ]
-    libs = [
+    frameworks = [
       "AppKit.framework",
     ]
     defines = [

CHROMIUM_BUILD_COMPATIBILITY.txt

@@ -7,6 +7,6 @@
 # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
 
 {
-  'chromium_checkout': 'refs/tags/84.0.4147.105',
-  'depot_tools_checkout': '233589f2e7'
+  'chromium_checkout': 'refs/tags/87.0.4280.141',
+  'depot_tools_checkout': '39d870e1f0'
 }

CHROMIUM_UPDATE.txt

@@ -27,8 +27,6 @@
   # Files in the chromium/src directory that should be evaluated for changes.
   # Similar changes may need to be applied to the CEF source code.
   'files': [
-    'chrome/app/chrome_*_manifest.*',
-    'chrome/app/chrome_*_manifests.*',
     'chrome/browser/browser_process.h',
     'chrome/browser/extensions/api/tabs/tabs_api.*',
     'chrome/browser/extensions/chrome_component_extension_resource_manager.*',

CMakeLists.txt.in

@@ -12,7 +12,7 @@
 # distribution include:
 #
 # Linux:      Ninja, Unix Makefiles
-# MacOS:      Ninja, Xcode 8+
+# MacOS:      Ninja, Xcode 8+ (x64) or Xcode 12.2+ (ARM64)
 # Windows:    Ninja, Visual Studio 2015+
 #
 # Ninja is a cross-platform open-source tool for running fast builds using
@@ -53,8 +53,8 @@
 #   installed. Only 64-bit builds are supported.
 #
 # - Windows requirements:
-#   Visual Studio 2015 or newer building on Windows 7 or newer. Visual Studio
-#   2019 and Windows 10 64-bit are recommended.
+#   Visual Studio 2015 Update 2 or newer building on Windows 7 or newer. Visual
+#   Studio 2019 and Windows 10 64-bit are recommended.
 #
 # BUILD EXAMPLES
 #
@@ -84,6 +84,15 @@
 #     > cmake -G "Ninja" -DPROJECT_ARCH="x86_64" -DCMAKE_BUILD_TYPE=Debug ..
 #     > ninja cefclient cefsimple
 #
+# To perform a MacOS build using an ARM64 CEF binary distribution:
+#   Using the Xcode IDE:
+#     > cmake -G "Xcode" -DPROJECT_ARCH="arm64" ..
+#     Open build\cef.xcodeproj in Xcode and select Product > Build.
+#
+#   Using Ninja:
+#     > cmake -G "Ninja" -DPROJECT_ARCH="arm64" -DCMAKE_BUILD_TYPE=Debug ..
+#     > ninja cefclient cefsimple
+#
 # To perform a Windows build using a 32-bit CEF binary distribution:
 #   Using the Visual Studio 2019 IDE:
 #     > cmake -G "Visual Studio 16" -A Win32 ..

cef_paths2.gypi

@@ -470,6 +470,7 @@
       'tests/ceftests/browser_info_map_unittest.cc',
       'tests/ceftests/command_line_unittest.cc',
       'tests/ceftests/cookie_unittest.cc',
+      'tests/ceftests/cors_unittest.cc',
       'tests/ceftests/devtools_message_unittest.cc',
       'tests/ceftests/dialog_unittest.cc',
       'tests/ceftests/display_unittest.cc',
@@ -520,6 +521,11 @@
       'tests/ceftests/task_unittest.cc',
       'tests/ceftests/test_handler.cc',
       'tests/ceftests/test_handler.h',
+      'tests/ceftests/test_request.cc',
+      'tests/ceftests/test_request.h',
+      'tests/ceftests/test_server.cc',
+      'tests/ceftests/test_server.h',
+      'tests/ceftests/test_server_unittest.cc',
       'tests/ceftests/test_suite.cc',
       'tests/ceftests/test_suite.h',
       'tests/ceftests/test_util.cc',
@@ -528,6 +534,7 @@
       'tests/ceftests/thread_helper.h',
       'tests/ceftests/thread_unittest.cc',
       'tests/ceftests/tracing_unittest.cc',
+      'tests/ceftests/track_callback.h',
       'tests/ceftests/translator_unittest.cc',
       'tests/ceftests/urlrequest_unittest.cc',
       'tests/ceftests/v8_unittest.cc',
@@ -587,10 +594,15 @@
       'tests/ceftests/urlrequest_unittest.cc',
       'tests/ceftests/test_handler.cc',
       'tests/ceftests/test_handler.h',
+      'tests/ceftests/test_request.cc',
+      'tests/ceftests/test_request.h',
+      'tests/ceftests/test_server.cc',
+      'tests/ceftests/test_server.h',
       'tests/ceftests/test_suite.cc',
       'tests/ceftests/test_suite.h',
       'tests/ceftests/test_util.cc',
       'tests/ceftests/test_util.h',
+      'tests/ceftests/track_callback.h',
       'tests/ceftests/thread_helper.cc',
       'tests/ceftests/thread_helper.h',
       'tests/ceftests/thread_unittest.cc',

cef_repack_locales.gni

@@ -34,6 +34,7 @@ template("_repack_one_locale") {
       "${root_gen_dir}/chrome/generated_resources_${locale}.pak",
       "${root_gen_dir}/chrome/locale_settings_${locale}.pak",
       "${root_gen_dir}/chrome/platform_locale_settings_${locale}.pak",
+      "${root_gen_dir}/components/strings/components_chromium_strings_${locale}.pak",
       "${root_gen_dir}/components/strings/components_locale_settings_${locale}.pak",
       "${root_gen_dir}/components/strings/components_strings_${locale}.pak",
       "${root_gen_dir}/extensions/strings/extensions_strings_${locale}.pak",
@@ -52,6 +53,7 @@ template("_repack_one_locale") {
       "//chrome/app:generated_resources",
       "//chrome/app/resources:locale_settings",
       "//chrome/app/resources:platform_locale_settings",
+      "//components/strings:components_chromium_strings",
       "//components/strings:components_locale_settings",
       "//components/strings:components_strings",
       "//extensions/strings",

cmake/cef_macros.cmake.in

@@ -25,7 +25,7 @@ macro(PRINT_CEF_CONFIG)
 
   message(STATUS "Binary distribution root:     ${_CEF_ROOT}")
 
-  if(OS_MACOSX)
+  if(OS_MAC)
     message(STATUS "Base SDK:                     ${CMAKE_OSX_SYSROOT}")
     message(STATUS "Target SDK:                   ${CEF_TARGET_SDK}")
   endif()
@@ -75,8 +75,8 @@ macro(APPEND_PLATFORM_SOURCES name_of_list)
   if(OS_WINDOWS AND ${name_of_list}_WINDOWS)
     list(APPEND ${name_of_list} ${${name_of_list}_WINDOWS})
   endif()
-  if(OS_MACOSX AND ${name_of_list}_MACOSX)
-    list(APPEND ${name_of_list} ${${name_of_list}_MACOSX})
+  if(OS_MAC AND ${name_of_list}_MAC)
+    list(APPEND ${name_of_list} ${${name_of_list}_MAC})
   endif()
 endmacro()
 
@@ -184,10 +184,10 @@ endif(OS_LINUX)
 # Mac OS X macros.
 #
 
-if(OS_MACOSX)
+if(OS_MAC)
 
 # Manually process and copy over resource files.
-macro(COPY_MACOSX_RESOURCES resource_list prefix_list target source_dir app_path)
+macro(COPY_MAC_RESOURCES resource_list prefix_list target source_dir app_path)
   foreach(FILENAME ${resource_list})
     # Remove one or more prefixes from the source paths.
     set(TARGET_FILENAME "${FILENAME}")
@@ -229,7 +229,7 @@ macro(COPY_MACOSX_RESOURCES resource_list prefix_list target source_dir app_path
   endforeach()
 endmacro()
 
-endif(OS_MACOSX)
+endif(OS_MAC)
 
 
 #
@@ -298,7 +298,7 @@ macro(SET_COMMON_TARGET_PROPERTIES target)
     set_property(TARGET ${target} PROPERTY LINK_FLAGS_RELEASE ${_flags_str})
   endif()
 
-  if(OS_MACOSX)
+  if(OS_MAC)
     # Set Xcode target properties.
     set_target_properties(${target} PROPERTIES
       XCODE_ATTRIBUTE_ALWAYS_SEARCH_USER_PATHS                    NO

cmake/cef_variables.cmake.in

@@ -14,7 +14,8 @@ endif()
 
 # Determine the platform.
 if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
-  set(OS_MACOSX 1)
+  set(OS_MAC 1)
+  set(OS_MACOSX 1)  # For backwards compatibility.
   set(OS_POSIX 1)
 elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
   set(OS_LINUX 1)
@@ -31,7 +32,7 @@ if(NOT DEFINED PROJECT_ARCH)
     set(PROJECT_ARCH "x86")
   endif()
 
-  if(OS_MACOSX)
+  if(OS_MAC)
     # PROJECT_ARCH should be specified on Mac OS X.
     message(WARNING "No PROJECT_ARCH value specified, using ${PROJECT_ARCH}")
   endif()
@@ -246,7 +247,7 @@ endif()
 # Mac OS X configuration.
 #
 
-if(OS_MACOSX)
+if(OS_MAC)
   # Platform-specific compiler/linker flags.
   # See also Xcode target properties in cef_macros.cmake.
   set(CEF_LIBTYPE SHARED)
@@ -327,6 +328,8 @@ if(OS_MACOSX)
   # Target architecture.
   if(PROJECT_ARCH STREQUAL "x86_64")
     set(CMAKE_OSX_ARCHITECTURES "x86_64")
+  elseif(PROJECT_ARCH STREQUAL "arm64")
+    set(CMAKE_OSX_ARCHITECTURES "arm64")
   else()
     set(CMAKE_OSX_ARCHITECTURES "i386")
   endif()

include/base/cef_atomicops.h

@@ -180,7 +180,7 @@ Atomic64 Release_Load(volatile const Atomic64* ptr);
 #include "include/base/internal/cef_atomicops_x86_msvc.h"
 #elif defined(OS_WIN) && (defined(__ARM_ARCH_ISA_A64) || defined(_M_ARM64))
 #include "include/base/internal/cef_atomicops_arm64_msvc.h"
-#elif defined(OS_MACOSX)
+#elif defined(OS_MAC)
 #include "include/base/internal/cef_atomicops_mac.h"
 #elif defined(COMPILER_GCC) && defined(ARCH_CPU_X86_FAMILY)
 #include "include/base/internal/cef_atomicops_x86_gcc.h"
@@ -194,7 +194,7 @@ Atomic64 Release_Load(volatile const Atomic64* ptr);
 
 // On some platforms we need additional declarations to make
 // AtomicWord compatible with our other Atomic* types.
-#if defined(OS_MACOSX) || defined(OS_OPENBSD)
+#if defined(OS_MAC) || defined(OS_OPENBSD)
 #include "include/base/internal/cef_atomicops_atomicword_compat.h"
 #endif
 

include/base/cef_basictypes.h

@@ -42,7 +42,7 @@
 //
 // On Mac OS X, |long long| is used for 64-bit types for compatibility with
 // <inttypes.h> format macros even in the LP64 model.
-#if defined(__LP64__) && !defined(OS_MACOSX) && !defined(OS_OPENBSD)
+#if defined(__LP64__) && !defined(OS_MAC) && !defined(OS_OPENBSD)
 typedef long int64;
 typedef unsigned long uint64;
 #else

include/base/cef_build.h

@@ -44,6 +44,14 @@
 #define OS_WIN 1
 #endif
 #elif defined(__APPLE__)
+// New platform defines after https://crbug.com/1105907.
+#ifndef OS_MAC
+#define OS_MAC 1
+#endif
+#ifndef OS_APPLE
+#define OS_APPLE 1
+#endif
+// Old platform defines retained for backwards compatibility.
 #ifndef OS_MACOSX
 #define OS_MACOSX 1
 #endif
@@ -57,7 +65,7 @@
 
 // For access to standard POSIXish features, use OS_POSIX instead of a
 // more specific macro.
-#if defined(OS_MACOSX) || defined(OS_LINUX)
+#if defined(OS_MAC) || defined(OS_LINUX)
 #ifndef OS_POSIX
 #define OS_POSIX 1
 #endif

include/base/cef_logging.h

@@ -136,7 +136,11 @@
 #define CEF_INCLUDE_BASE_CEF_LOGGING_H_
 #pragma once
 
-#if defined(DCHECK)
+#if defined(USING_CHROMIUM_INCLUDES)
+// When building CEF include the Chromium header directly.
+#include "base/logging.h"
+#include "base/notreached.h"
+#elif defined(DCHECK)
 // Do nothing if the macros provided by this header already exist.
 // This can happen in cases where Chromium code is used directly by the
 // client application. When using Chromium code directly always include
@@ -149,10 +153,7 @@
 #define DCHECK_IS_ON() true
 #endif
 
-#elif defined(USING_CHROMIUM_INCLUDES)
-// When building CEF include the Chromium header directly.
-#include "base/logging.h"
-#else  // !USING_CHROMIUM_INCLUDES
+#else  // !defined(DCHECK)
 // 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_weak_ptr.h

@@ -250,11 +250,11 @@ class WeakPtr : public cef_internal::WeakPtrBase {
   T* get() const { return ref_.is_valid() ? ptr_ : NULL; }
 
   T& operator*() const {
-    DCHECK(get() != NULL);
+    CHECK(ref_.is_valid());
     return *get();
   }
   T* operator->() const {
-    DCHECK(get() != NULL);
+    CHECK(ref_.is_valid());
     return get();
   }
 

include/capi/cef_browser_capi.h

@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=6cb00a0fa3631a46903abb3a783f315895511db2$
+// $hash=965eb2e55afec0a4618a7acd9478b9c1215be29d$
 //
 
 #ifndef CEF_INCLUDE_CAPI_CEF_BROWSER_CAPI_H_
@@ -562,19 +562,6 @@ typedef struct _cef_browser_host_t {
       struct _cef_navigation_entry_visitor_t* visitor,
       int current_only);
 
-  ///
-  // Set whether mouse cursor change is disabled.
-  ///
-  void(CEF_CALLBACK* set_mouse_cursor_change_disabled)(
-      struct _cef_browser_host_t* self,
-      int disabled);
-
-  ///
-  // Returns true (1) if mouse cursor change is disabled.
-  ///
-  int(CEF_CALLBACK* is_mouse_cursor_change_disabled)(
-      struct _cef_browser_host_t* self);
-
   ///
   // If a misspelled word is currently selected in an editable node calling this
   // function will replace it with the specified |word|.

include/capi/cef_browser_process_handler_capi.h

@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=b15ba2c750f5227b6b40fea59965817ba4431ee0$
+// $hash=d56cbf83d6faefa9f716c7308bf7007dad98697d$
 //
 
 #ifndef CEF_INCLUDE_CAPI_CEF_BROWSER_PROCESS_HANDLER_CAPI_H_
@@ -41,6 +41,7 @@
 #pragma once
 
 #include "include/capi/cef_base_capi.h"
+#include "include/capi/cef_client_capi.h"
 #include "include/capi/cef_command_line_capi.h"
 #include "include/capi/cef_print_handler_capi.h"
 #include "include/capi/cef_values_capi.h"
@@ -60,6 +61,25 @@ typedef struct _cef_browser_process_handler_t {
   ///
   cef_base_ref_counted_t base;
 
+  ///
+  // Called on the browser process UI thread to retrieve the list of schemes
+  // that should support cookies. If |include_defaults| is true (1) the default
+  // schemes ("http", "https", "ws" and "wss") will also be supported. Providing
+  // an NULL |schemes| value and setting |include_defaults| to false (0) will
+  // disable all loading and saving of cookies.
+  //
+  // This state will apply to the cef_cookie_manager_t associated with the
+  // global cef_request_context_t. It will also be used as the initial state for
+  // any new cef_request_context_ts created by the client. After creating a new
+  // cef_request_context_t the cef_cookie_manager_t::SetSupportedSchemes
+  // function may be called on the associated cef_cookie_manager_t to futher
+  // override these values.
+  ///
+  void(CEF_CALLBACK* get_cookieable_schemes)(
+      struct _cef_browser_process_handler_t* self,
+      cef_string_list_t schemes,
+      int* include_defaults);
+
   ///
   // Called on the browser process UI thread immediately after the CEF context
   // has been initialized.
@@ -78,17 +98,6 @@ typedef struct _cef_browser_process_handler_t {
       struct _cef_browser_process_handler_t* self,
       struct _cef_command_line_t* command_line);
 
-  ///
-  // Called on the browser process IO thread after the main thread has been
-  // created for a new render process. Provides an opportunity to specify extra
-  // information that will be passed to
-  // cef_render_process_handler_t::on_render_thread_created() in the render
-  // process. Do not keep a reference to |extra_info| outside of this function.
-  ///
-  void(CEF_CALLBACK* on_render_process_thread_created)(
-      struct _cef_browser_process_handler_t* self,
-      struct _cef_list_value_t* extra_info);
-
   ///
   // Return the handler for printing on Linux. If a print handler is not
   // provided then printing will not be supported on the Linux platform.
@@ -112,6 +121,16 @@ typedef struct _cef_browser_process_handler_t {
   void(CEF_CALLBACK* on_schedule_message_pump_work)(
       struct _cef_browser_process_handler_t* self,
       int64 delay_ms);
+
+  ///
+  // Return the default client for use with a newly created browser window. If
+  // null is returned the browser will be unmanaged (no callbacks will be
+  // executed for that browser) and application shutdown will be blocked until
+  // the browser window is closed manually. This function is currently only used
+  // with the chrome runtime.
+  ///
+  struct _cef_client_t*(CEF_CALLBACK* get_default_client)(
+      struct _cef_browser_process_handler_t* self);
 } cef_browser_process_handler_t;
 
 #ifdef __cplusplus

include/capi/cef_display_handler_capi.h

@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=951c936c8070dbf9bd246cc766b81cdfe06a3d81$
+// $hash=eada7e92085d96497f4e69f3e8a7e8aa6746b175$
 //
 
 #ifndef CEF_INCLUDE_CAPI_CEF_DISPLAY_HANDLER_CAPI_H_
@@ -141,6 +141,19 @@ typedef struct _cef_display_handler_t {
       struct _cef_display_handler_t* self,
       struct _cef_browser_t* browser,
       double progress);
+
+  ///
+  // Called when the browser's cursor has changed. If |type| is CT_CUSTOM then
+  // |custom_cursor_info| will be populated with the custom cursor information.
+  // Return true (1) if the cursor change was handled or false (0) for default
+  // handling.
+  ///
+  int(CEF_CALLBACK* on_cursor_change)(
+      struct _cef_display_handler_t* self,
+      struct _cef_browser_t* browser,
+      cef_cursor_handle_t cursor,
+      cef_cursor_type_t type,
+      const struct _cef_cursor_info_t* custom_cursor_info);
 } cef_display_handler_t;
 
 #ifdef __cplusplus

include/capi/cef_media_router_capi.h

@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=9d5077fdb3fe7fa0ff1141f839988ac821eba4bf$
+// $hash=4f4a0d76efaf87055ebf5e784f5d1b69fafdabc2$
 //
 
 #ifndef CEF_INCLUDE_CAPI_CEF_MEDIA_ROUTER_CAPI_H_
@@ -247,11 +247,6 @@ typedef struct _cef_media_sink_t {
   // The resulting string must be freed by calling cef_string_userfree_free().
   cef_string_userfree_t(CEF_CALLBACK* get_id)(struct _cef_media_sink_t* self);
 
-  ///
-  // Returns true (1) if this sink is valid.
-  ///
-  int(CEF_CALLBACK* is_valid)(struct _cef_media_sink_t* self);
-
   ///
   // Returns the name of this sink.
   ///
@@ -332,11 +327,6 @@ typedef struct _cef_media_source_t {
   // The resulting string must be freed by calling cef_string_userfree_free().
   cef_string_userfree_t(CEF_CALLBACK* get_id)(struct _cef_media_source_t* self);
 
-  ///
-  // Returns true (1) if this source is valid.
-  ///
-  int(CEF_CALLBACK* is_valid)(struct _cef_media_source_t* self);
-
   ///
   // Returns true (1) if this source outputs its content via Cast.
   ///

include/capi/cef_parser_capi.h

@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=14cf03e02d8ca3416e65f756470afd8185c7bc78$
+// $hash=19337a70a13352e70452be7fcc25ef2de4b1ae4c$
 //
 
 #ifndef CEF_INCLUDE_CAPI_CEF_PARSER_CAPI_H_
@@ -153,13 +153,11 @@ CEF_EXPORT struct _cef_value_t* cef_parse_json_buffer(
 ///
 // Parses the specified |json_string| and returns a dictionary or list
 // representation. If JSON parsing fails this function returns NULL and
-// populates |error_code_out| and |error_msg_out| with an error code and a
-// formatted error message respectively.
+// populates |error_msg_out| with a formatted error message.
 ///
 CEF_EXPORT struct _cef_value_t* cef_parse_jsonand_return_error(
     const cef_string_t* json_string,
     cef_json_parser_options_t options,
-    cef_json_parser_error_t* error_code_out,
     cef_string_t* error_msg_out);
 
 ///

include/capi/cef_render_handler_capi.h

@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=e642fc1fe3b97a90c0eae7f0fc0a5cfd385e3e17$
+// $hash=f9806cd79f33b6a762fff25edd4189ae42bc8fd2$
 //
 
 #ifndef CEF_INCLUDE_CAPI_CEF_RENDER_HANDLER_CAPI_H_
@@ -159,17 +159,6 @@ typedef struct _cef_render_handler_t {
                                            cef_rect_t const* dirtyRects,
                                            void* shared_handle);
 
-  ///
-  // Called when the browser's cursor has changed. If |type| is CT_CUSTOM then
-  // |custom_cursor_info| will be populated with the custom cursor information.
-  ///
-  void(CEF_CALLBACK* on_cursor_change)(
-      struct _cef_render_handler_t* self,
-      struct _cef_browser_t* browser,
-      cef_cursor_handle_t cursor,
-      cef_cursor_type_t type,
-      const struct _cef_cursor_info_t* custom_cursor_info);
-
   ///
   // Called when the user starts dragging content in the web view. Contextual
   // information about the dragged content is supplied by |drag_data|. (|x|,

include/capi/cef_render_process_handler_capi.h

@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=3630a82a4ea731b43ed4ba468a57c5dfe15f8679$
+// $hash=8419eb3eba9dd372b019bd367d4f195433b21c9b$
 //
 
 #ifndef CEF_INCLUDE_CAPI_CEF_RENDER_PROCESS_HANDLER_CAPI_H_
@@ -64,16 +64,6 @@ typedef struct _cef_render_process_handler_t {
   ///
   cef_base_ref_counted_t base;
 
-  ///
-  // Called after the render process main thread has been created. |extra_info|
-  // is a read-only value originating from
-  // cef_browser_process_handler_t::on_render_process_thread_created(). Do not
-  // keep a reference to |extra_info| outside of this function.
-  ///
-  void(CEF_CALLBACK* on_render_thread_created)(
-      struct _cef_render_process_handler_t* self,
-      struct _cef_list_value_t* extra_info);
-
   ///
   // Called after WebKit has been initialized.
   ///

include/capi/cef_thread_capi.h

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

include/capi/cef_urlrequest_capi.h

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

include/capi/views/cef_display_capi.h

@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=422243fda6e1404222aca7bdd4e7b84b961a9626$
+// $hash=652ac7a90c6cd10b1cbc6ae99a549c03f36c794e$
 //
 
 #ifndef CEF_INCLUDE_CAPI_VIEWS_CEF_DISPLAY_CAPI_H_
@@ -50,9 +50,9 @@ extern "C" {
 // This structure typically, but not always, corresponds to a physical display
 // connected to the system. A fake Display may exist on a headless system, or a
 // Display may correspond to a remote, virtual display. All size and position
-// values are in density independent pixels (DIP) unless otherwise indicated.
-// Methods must be called on the browser process UI thread unless otherwise
-// indicated.
+// values are in density independent pixel (DIP) coordinates unless otherwise
+// indicated. Methods must be called on the browser process UI thread unless
+// otherwise indicated.
 ///
 typedef struct _cef_display_t {
   ///
@@ -74,27 +74,28 @@ typedef struct _cef_display_t {
   float(CEF_CALLBACK* get_device_scale_factor)(struct _cef_display_t* self);
 
   ///
-  // Convert |point| from density independent pixels (DIP) to pixel coordinates
-  // using this Display's device scale factor.
+  // Convert |point| from DIP coordinates to pixel coordinates using this
+  // Display's device scale factor.
   ///
   void(CEF_CALLBACK* convert_point_to_pixels)(struct _cef_display_t* self,
                                               cef_point_t* point);
 
   ///
-  // Convert |point| from pixel coordinates to density independent pixels (DIP)
-  // using this Display's device scale factor.
+  // Convert |point| from pixel coordinates to DIP coordinates using this
+  // Display's device scale factor.
   ///
   void(CEF_CALLBACK* convert_point_from_pixels)(struct _cef_display_t* self,
                                                 cef_point_t* point);
 
   ///
-  // Returns this Display's bounds. This is the full size of the display.
+  // Returns this Display's bounds in DIP screen coordinates. This is the full
+  // size of the display.
   ///
   cef_rect_t(CEF_CALLBACK* get_bounds)(struct _cef_display_t* self);
 
   ///
-  // Returns this Display's work area. This excludes areas of the display that
-  // are occupied for window manager toolbars, etc.
+  // Returns this Display's work area in DIP screen coordinates. This excludes
+  // areas of the display that are occupied with window manager toolbars, etc.
   ///
   cef_rect_t(CEF_CALLBACK* get_work_area)(struct _cef_display_t* self);
 
@@ -111,7 +112,7 @@ CEF_EXPORT cef_display_t* cef_display_get_primary();
 
 ///
 // Returns the Display nearest |point|. Set |input_pixel_coords| to true (1) if
-// |point| is in pixel coordinates instead of density independent pixels (DIP).
+// |point| is in pixel screen coordinates instead of DIP screen coordinates.
 ///
 CEF_EXPORT cef_display_t* cef_display_get_nearest_point(
     const cef_point_t* point,
@@ -119,8 +120,8 @@ CEF_EXPORT cef_display_t* cef_display_get_nearest_point(
 
 ///
 // Returns the Display that most closely intersects |bounds|.  Set
-// |input_pixel_coords| to true (1) if |bounds| is in pixel coordinates instead
-// of density independent pixels (DIP).
+// |input_pixel_coords| to true (1) if |bounds| is in pixel screen coordinates
+// instead of DIP screen coordinates.
 ///
 CEF_EXPORT cef_display_t* cef_display_get_matching_bounds(
     const cef_rect_t* bounds,

include/capi/views/cef_view_capi.h

@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=45b421dfcf8ee7cf61b1991a336bc65d33fbe10a$
+// $hash=55be3e44016d9861bb8e9270b52f2bf45c8a53f5$
 //
 
 #ifndef CEF_INCLUDE_CAPI_VIEWS_CEF_VIEW_CAPI_H_
@@ -176,64 +176,72 @@ typedef struct _cef_view_t {
                                                      int id);
 
   ///
-  // Sets the bounds (size and position) of this View. Position is in parent
-  // coordinates.
+  // Sets the bounds (size and position) of this View. |bounds| is in parent
+  // coordinates, or DIP screen coordinates if there is no parent.
   ///
   void(CEF_CALLBACK* set_bounds)(struct _cef_view_t* self,
                                  const cef_rect_t* bounds);
 
   ///
-  // Returns the bounds (size and position) of this View. Position is in parent
-  // coordinates.
+  // Returns the bounds (size and position) of this View in parent coordinates,
+  // or DIP screen coordinates if there is no parent.
   ///
   cef_rect_t(CEF_CALLBACK* get_bounds)(struct _cef_view_t* self);
 
   ///
-  // Returns the bounds (size and position) of this View. Position is in screen
+  // Returns the bounds (size and position) of this View in DIP screen
   // coordinates.
   ///
   cef_rect_t(CEF_CALLBACK* get_bounds_in_screen)(struct _cef_view_t* self);
 
   ///
-  // Sets the size of this View without changing the position.
+  // Sets the size of this View without changing the position. |size| in parent
+  // coordinates, or DIP screen coordinates if there is no parent.
   ///
   void(CEF_CALLBACK* set_size)(struct _cef_view_t* self,
                                const cef_size_t* size);
 
   ///
-  // Returns the size of this View.
+  // Returns the size of this View in parent coordinates, or DIP screen
+  // coordinates if there is no parent.
   ///
   cef_size_t(CEF_CALLBACK* get_size)(struct _cef_view_t* self);
 
   ///
   // Sets the position of this View without changing the size. |position| is in
-  // parent coordinates.
+  // parent coordinates, or DIP screen coordinates if there is no parent.
   ///
   void(CEF_CALLBACK* set_position)(struct _cef_view_t* self,
                                    const cef_point_t* position);
 
   ///
-  // Returns the position of this View. Position is in parent coordinates.
+  // Returns the position of this View. Position is in parent coordinates, or
+  // DIP screen coordinates if there is no parent.
   ///
   cef_point_t(CEF_CALLBACK* get_position)(struct _cef_view_t* self);
 
   ///
   // Returns the size this View would like to be if enough space is available.
+  // Size is in parent coordinates, or DIP screen coordinates if there is no
+  // parent.
   ///
   cef_size_t(CEF_CALLBACK* get_preferred_size)(struct _cef_view_t* self);
 
   ///
-  // Size this View to its preferred size.
+  // Size this View to its preferred size. Size is in parent coordinates, or DIP
+  // screen coordinates if there is no parent.
   ///
   void(CEF_CALLBACK* size_to_preferred_size)(struct _cef_view_t* self);
 
   ///
-  // Returns the minimum size for this View.
+  // Returns the minimum size for this View. Size is in parent coordinates, or
+  // DIP screen coordinates if there is no parent.
   ///
   cef_size_t(CEF_CALLBACK* get_minimum_size)(struct _cef_view_t* self);
 
   ///
-  // Returns the maximum size for this View.
+  // Returns the maximum size for this View. Size is in parent coordinates, or
+  // DIP screen coordinates if there is no parent.
   ///
   cef_size_t(CEF_CALLBACK* get_maximum_size)(struct _cef_view_t* self);
 
@@ -327,21 +335,21 @@ typedef struct _cef_view_t {
   cef_color_t(CEF_CALLBACK* get_background_color)(struct _cef_view_t* self);
 
   ///
-  // Convert |point| from this View's coordinate system to that of the screen.
-  // This View must belong to a Window when calling this function. Returns true
-  // (1) if the conversion is successful or false (0) otherwise. Use
-  // cef_display_t::convert_point_to_pixels() after calling this function if
+  // Convert |point| from this View's coordinate system to DIP screen
+  // coordinates. This View must belong to a Window when calling this function.
+  // Returns true (1) if the conversion is successful or false (0) otherwise.
+  // Use cef_display_t::convert_point_to_pixels() after calling this function if
   // further conversion to display-specific pixel coordinates is desired.
   ///
   int(CEF_CALLBACK* convert_point_to_screen)(struct _cef_view_t* self,
                                              cef_point_t* point);
 
   ///
-  // Convert |point| to this View's coordinate system from that of the screen.
-  // This View must belong to a Window when calling this function. Returns true
-  // (1) if the conversion is successful or false (0) otherwise. Use
-  // cef_display_t::convert_point_from_pixels() before calling this function if
-  // conversion from display-specific pixel coordinates is necessary.
+  // Convert |point| to this View's coordinate system from DIP screen
+  // coordinates. This View must belong to a Window when calling this function.
+  // Returns true (1) if the conversion is successful or false (0) otherwise.
+  // Use cef_display_t::convert_point_from_pixels() before calling this function
+  // if conversion from display-specific pixel coordinates is necessary.
   ///
   int(CEF_CALLBACK* convert_point_from_screen)(struct _cef_view_t* self,
                                                cef_point_t* point);

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=a0cec778fbaf0b1f5c9b3ef75dc7bbeeba777a44$
+// $hash=fee25d300df47c6143b935d0f99d543ea888f55c$
 //
 
 #ifndef CEF_INCLUDE_CAPI_VIEWS_CEF_WINDOW_DELEGATE_CAPI_H_
@@ -87,6 +87,18 @@ typedef struct _cef_window_delegate_t {
       int* is_menu,
       int* can_activate_menu);
 
+  ///
+  // Return the initial bounds for |window| in density independent pixel (DIP)
+  // coordinates. If this function returns an NULL CefRect then
+  // get_preferred_size() will be called to retrieve the size, and the window
+  // will be placed on the screen with origin (0,0). This function can be used
+  // in combination with cef_view_t::get_bounds_in_screen() to restore the
+  // previous window bounds.
+  ///
+  cef_rect_t(CEF_CALLBACK* get_initial_bounds)(
+      struct _cef_window_delegate_t* self,
+      struct _cef_window_t* window);
+
   ///
   // Return true (1) if |window| should be created without a frame or title bar.
   // The window will be resizable if can_resize() returns true (1). Use

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 "63365efe2e93a4e7cc789cbb8f618d61c92c1b6d"
+#define CEF_API_HASH_UNIVERSAL "7f349b7262bfe13bda037370004f56a6081e543b"
 #if defined(OS_WIN)
-#define CEF_API_HASH_PLATFORM "726d42ca7d92188542b433d88d17a87af5b53c05"
-#elif defined(OS_MACOSX)
-#define CEF_API_HASH_PLATFORM "1c8a413434b592d388446e66b54a3f0bfc0d6fff"
+#define CEF_API_HASH_PLATFORM "8a5523fec15255e2fb1de64deaa15dc3554b91e5"
+#elif defined(OS_MAC)
+#define CEF_API_HASH_PLATFORM "f572c8f7d3aee3cd3b85bd398b0ba43eb7fe79a0"
 #elif defined(OS_LINUX)
-#define CEF_API_HASH_PLATFORM "13f7e0e86daab3b1a08d8a31103fc93e45cc508f"
+#define CEF_API_HASH_PLATFORM "abf4cc6ff102e5cd019aaf51f13eb30f9bfeae45"
 #endif
 
 #ifdef __cplusplus

include/cef_application_mac.h

@@ -35,7 +35,7 @@
 #include "include/cef_base.h"
 #endif  // __cplusplus
 
-#if defined(OS_MACOSX) && defined(__OBJC__)
+#if defined(OS_MAC) && defined(__OBJC__)
 
 #ifdef USING_CHROMIUM_INCLUDES
 
@@ -105,6 +105,6 @@ class CefScopedSendingEvent {
 
 #endif  // __cplusplus
 
-#endif  // defined(OS_MACOSX) && defined(__OBJC__)
+#endif  // defined(OS_MAC) && defined(__OBJC__)
 
 #endif  // CEF_INCLUDE_CEF_APPLICATION_MAC_H_

include/cef_base.h

@@ -40,7 +40,7 @@
 #include "include/internal/cef_types_wrappers.h"
 #if defined(OS_WIN)
 #include "include/internal/cef_win.h"
-#elif defined(OS_MACOSX)
+#elif defined(OS_MAC)
 #include "include/internal/cef_mac.h"
 #elif defined(OS_LINUX)
 #include "include/internal/cef_linux.h"

include/cef_browser.h

@@ -592,18 +592,6 @@ class CefBrowserHost : public virtual CefBaseRefCounted {
       CefRefPtr<CefNavigationEntryVisitor> visitor,
       bool current_only) = 0;
 
-  ///
-  // Set whether mouse cursor change is disabled.
-  ///
-  /*--cef()--*/
-  virtual void SetMouseCursorChangeDisabled(bool disabled) = 0;
-
-  ///
-  // Returns true if mouse cursor change is disabled.
-  ///
-  /*--cef()--*/
-  virtual bool IsMouseCursorChangeDisabled() = 0;
-
   ///
   // If a misspelled word is currently selected in an editable node calling
   // this method will replace it with the specified |word|.

include/cef_browser_process_handler.h

@@ -39,6 +39,7 @@
 #pragma once
 
 #include "include/cef_base.h"
+#include "include/cef_client.h"
 #include "include/cef_command_line.h"
 #include "include/cef_print_handler.h"
 #include "include/cef_values.h"
@@ -50,6 +51,23 @@
 /*--cef(source=client,no_debugct_check)--*/
 class CefBrowserProcessHandler : public virtual CefBaseRefCounted {
  public:
+  ///
+  // Called on the browser process UI thread to retrieve the list of schemes
+  // that should support cookies. If |include_defaults| is true the default
+  // schemes ("http", "https", "ws" and "wss") will also be supported. Providing
+  // an empty |schemes| value and setting |include_defaults| to false will
+  // disable all loading and saving of cookies.
+  //
+  // This state will apply to the CefCookieManager associated with the global
+  // CefRequestContext. It will also be used as the initial state for any new
+  // CefRequestContexts created by the client. After creating a new
+  // CefRequestContext the CefCookieManager::SetSupportedSchemes method may be
+  // called on the associated CefCookieManager to futher override these values.
+  ///
+  /*--cef()--*/
+  virtual void GetCookieableSchemes(std::vector<CefString>& schemes,
+                                    bool& include_defaults) {}
+
   ///
   // Called on the browser process UI thread immediately after the CEF context
   // has been initialized.
@@ -68,17 +86,6 @@ class CefBrowserProcessHandler : public virtual CefBaseRefCounted {
   virtual void OnBeforeChildProcessLaunch(
       CefRefPtr<CefCommandLine> command_line) {}
 
-  ///
-  // Called on the browser process IO thread after the main thread has been
-  // created for a new render process. Provides an opportunity to specify extra
-  // information that will be passed to
-  // CefRenderProcessHandler::OnRenderThreadCreated() in the render process. Do
-  // not keep a reference to |extra_info| outside of this method.
-  ///
-  /*--cef()--*/
-  virtual void OnRenderProcessThreadCreated(
-      CefRefPtr<CefListValue> extra_info) {}
-
   ///
   // Return the handler for printing on Linux. If a print handler is not
   // provided then printing will not be supported on the Linux platform.
@@ -101,6 +108,16 @@ class CefBrowserProcessHandler : public virtual CefBaseRefCounted {
   ///
   /*--cef()--*/
   virtual void OnScheduleMessagePumpWork(int64 delay_ms) {}
+
+  ///
+  // Return the default client for use with a newly created browser window. If
+  // null is returned the browser will be unmanaged (no callbacks will be
+  // executed for that browser) and application shutdown will be blocked until
+  // the browser window is closed manually. This method is currently only used
+  // with the chrome runtime.
+  ///
+  /*--cef()--*/
+  virtual CefRefPtr<CefClient> GetDefaultClient() { return nullptr; }
 };
 
 #endif  // CEF_INCLUDE_CEF_BROWSER_PROCESS_HANDLER_H_

include/cef_display_handler.h

@@ -135,6 +135,19 @@ class CefDisplayHandler : public virtual CefBaseRefCounted {
   /*--cef()--*/
   virtual void OnLoadingProgressChange(CefRefPtr<CefBrowser> browser,
                                        double progress) {}
+
+  ///
+  // Called when the browser's cursor has changed. If |type| is CT_CUSTOM then
+  // |custom_cursor_info| will be populated with the custom cursor information.
+  // Return true if the cursor change was handled or false for default handling.
+  ///
+  /*--cef()--*/
+  virtual bool OnCursorChange(CefRefPtr<CefBrowser> browser,
+                              CefCursorHandle cursor,
+                              cef_cursor_type_t type,
+                              const CefCursorInfo& custom_cursor_info) {
+    return false;
+  }
 };
 
 #endif  // CEF_INCLUDE_CEF_DISPLAY_HANDLER_H_

include/cef_media_router.h

@@ -230,12 +230,6 @@ class CefMediaSink : public virtual CefBaseRefCounted {
   /*--cef()--*/
   virtual CefString GetId() = 0;
 
-  ///
-  // Returns true if this sink is valid.
-  ///
-  /*--cef()--*/
-  virtual bool IsValid() = 0;
-
   ///
   // Returns the name of this sink.
   ///
@@ -310,12 +304,6 @@ class CefMediaSource : public virtual CefBaseRefCounted {
   /*--cef()--*/
   virtual CefString GetId() = 0;
 
-  ///
-  // Returns true if this source is valid.
-  ///
-  /*--cef()--*/
-  virtual bool IsValid() = 0;
-
   ///
   // Returns true if this source outputs its content via Cast.
   ///

include/cef_parser.h

@@ -146,14 +146,12 @@ CefRefPtr<CefValue> CefParseJSON(const void* json,
 ///
 // Parses the specified |json_string| and returns a dictionary or list
 // representation. If JSON parsing fails this method returns NULL and populates
-// |error_code_out| and |error_msg_out| with an error code and a formatted error
-// message respectively.
+// |error_msg_out| with a formatted error message.
 ///
 /*--cef()--*/
 CefRefPtr<CefValue> CefParseJSONAndReturnError(
     const CefString& json_string,
     cef_json_parser_options_t options,
-    cef_json_parser_error_t& error_code_out,
     CefString& error_msg_out);
 
 ///

include/cef_render_handler.h

@@ -52,7 +52,6 @@
 /*--cef(source=client)--*/
 class CefRenderHandler : public virtual CefBaseRefCounted {
  public:
-  typedef cef_cursor_type_t CursorType;
   typedef cef_drag_operations_mask_t DragOperation;
   typedef cef_drag_operations_mask_t DragOperationsMask;
   typedef cef_paint_element_type_t PaintElementType;
@@ -162,16 +161,6 @@ class CefRenderHandler : public virtual CefBaseRefCounted {
                                   const RectList& dirtyRects,
                                   void* shared_handle) {}
 
-  ///
-  // Called when the browser's cursor has changed. If |type| is CT_CUSTOM then
-  // |custom_cursor_info| will be populated with the custom cursor information.
-  ///
-  /*--cef()--*/
-  virtual void OnCursorChange(CefRefPtr<CefBrowser> browser,
-                              CefCursorHandle cursor,
-                              CursorType type,
-                              const CefCursorInfo& custom_cursor_info) {}
-
   ///
   // Called when the user starts dragging content in the web view. Contextual
   // information about the dragged content is supplied by |drag_data|.

include/cef_render_process_handler.h

@@ -57,15 +57,6 @@ class CefRenderProcessHandler : public virtual CefBaseRefCounted {
  public:
   typedef cef_navigation_type_t NavigationType;
 
-  ///
-  // Called after the render process main thread has been created. |extra_info|
-  // is a read-only value originating from
-  // CefBrowserProcessHandler::OnRenderProcessThreadCreated(). Do not keep a
-  // reference to |extra_info| outside of this method.
-  ///
-  /*--cef()--*/
-  virtual void OnRenderThreadCreated(CefRefPtr<CefListValue> extra_info) {}
-
   ///
   // Called after WebKit has been initialized.
   ///

include/cef_sandbox_mac.h

@@ -34,7 +34,7 @@
 #include "include/base/cef_build.h"
 #include "include/internal/cef_export.h"
 
-#if defined(OS_MACOSX)
+#if defined(OS_MAC)
 
 #ifdef __cplusplus
 extern "C" {
@@ -83,6 +83,6 @@ class CEF_EXPORT CefScopedSandboxContext {
 };
 #endif  // __cplusplus
 
-#endif  // defined(OS_MACOSX)
+#endif  // defined(OS_MAC)
 
 #endif  // CEF_INCLUDE_CEF_SANDBOX_MAC_H_

include/cef_thread.h

@@ -61,7 +61,7 @@ class CefThread : public CefBaseRefCounted {
   // to identify the thread. |priority| is the thread execution priority.
   // |message_loop_type| indicates the set of asynchronous events that the
   // thread can process. If |stoppable| is true the thread will stopped and
-  // joined on destruction or when Stop() is called; otherwise, the the thread
+  // joined on destruction or when Stop() is called; otherwise, the thread
   // cannot be stopped and will be leaked on shutdown. On Windows the
   // |com_init_mode| value specifies how COM will be initialized for the thread.
   // If |com_init_mode| is set to COM_INIT_MODE_STA then |message_loop_type|

include/cef_urlrequest.h

@@ -63,20 +63,13 @@ class CefURLRequest : public virtual CefBaseRefCounted {
   // Create a new URL request that is not associated with a specific browser or
   // frame. Use CefFrame::CreateURLRequest instead if you want the request to
   // have this association, in which case it may be handled differently (see
-  // documentation on that method). Requests may originate from the both browser
-  // process and the render process.
-  //
-  // For requests originating from the browser process:
+  // documentation on that method). A request created with this method may only
+  // originate from the browser process, and will behave as follows:
   //   - It may be intercepted by the client via CefResourceRequestHandler or
   //     CefSchemeHandlerFactory.
   //   - POST data may only contain only a single element of type PDE_TYPE_FILE
   //     or PDE_TYPE_BYTES.
   //   - If |request_context| is empty the global request context will be used.
-  // For requests originating from the render process:
-  //   - It cannot be intercepted by the client so only http(s) and blob schemes
-  //     are supported.
-  //   - POST data may only contain a single element of type PDE_TYPE_BYTES.
-  //   - The |request_context| parameter must be NULL.
   //
   // The |request| object will be marked as read-only after calling this method.
   ///

include/internal/cef_types.h

@@ -39,7 +39,7 @@
 // Bring in platform-specific definitions.
 #if defined(OS_WIN)
 #include "include/internal/cef_types_win.h"
-#elif defined(OS_MACOSX)
+#elif defined(OS_MAC)
 #include "include/internal/cef_types_mac.h"
 #elif defined(OS_LINUX)
 #include "include/internal/cef_types_linux.h"
@@ -192,6 +192,13 @@ typedef struct _cef_settings_t {
   ///
   cef_string_t main_bundle_path;
 
+  ///
+  // Set to true (1) to enable use of the Chrome runtime in CEF. This feature is
+  // considered experimental and is not recommended for most users at this time.
+  // See issue #2969 for details.
+  ///
+  int chrome_runtime;
+
   ///
   // Set to true (1) to have the browser process message loop run in a separate
   // thread. If false (0) than the CefDoMessageLoopWork() function must be
@@ -1472,7 +1479,7 @@ typedef enum {
   ///
   // The main thread in the renderer. Used for all WebKit and V8 interaction.
   // Tasks may be posted to this thread after
-  // CefRenderProcessHandler::OnRenderThreadCreated but are not guaranteed to
+  // CefRenderProcessHandler::OnWebKitInitialized but are not guaranteed to
   // run before sub-process termination (sub-processes may be killed at any time
   // without warning).
   ///
@@ -2360,22 +2367,6 @@ typedef enum {
   JSON_PARSER_ALLOW_TRAILING_COMMAS = 1 << 0,
 } cef_json_parser_options_t;
 
-///
-// Error codes that can be returned from CefParseJSONAndReturnError.
-///
-typedef enum {
-  JSON_NO_ERROR = 0,
-  JSON_INVALID_ESCAPE,
-  JSON_SYNTAX_ERROR,
-  JSON_UNEXPECTED_TOKEN,
-  JSON_TRAILING_COMMA,
-  JSON_TOO_MUCH_NESTING,
-  JSON_UNEXPECTED_DATA_AFTER_ROOT,
-  JSON_UNSUPPORTED_ENCODING,
-  JSON_UNQUOTED_DICTIONARY_KEY,
-  JSON_PARSE_ERROR_COUNT
-} cef_json_parser_error_t;
-
 ///
 // Options that can be passed to CefWriteJSON.
 ///

include/internal/cef_types_mac.h

@@ -33,7 +33,7 @@
 
 #include "include/base/cef_build.h"
 
-#if defined(OS_MACOSX)
+#if defined(OS_MAC)
 #include "include/internal/cef_string.h"
 
 // Handle types.
@@ -137,6 +137,6 @@ typedef struct _cef_window_info_t {
 }
 #endif
 
-#endif  // OS_MACOSX
+#endif  // OS_MAC
 
 #endif  // CEF_INCLUDE_INTERNAL_CEF_TYPES_MAC_H_

include/internal/cef_types_wrappers.h

@@ -569,6 +569,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);
+    target->chrome_runtime = src->chrome_runtime;
     target->multi_threaded_message_loop = src->multi_threaded_message_loop;
     target->external_message_pump = src->external_message_pump;
     target->windowless_rendering_enabled = src->windowless_rendering_enabled;

include/views/cef_display.h

@@ -46,9 +46,9 @@
 // This class typically, but not always, corresponds to a physical display
 // connected to the system. A fake Display may exist on a headless system, or a
 // Display may correspond to a remote, virtual display. All size and position
-// values are in density independent pixels (DIP) unless otherwise indicated.
-// Methods must be called on the browser process UI thread unless otherwise
-// indicated.
+// values are in density independent pixel (DIP) coordinates unless otherwise
+// indicated. Methods must be called on the browser process UI thread unless
+// otherwise indicated.
 ///
 /*--cef(source=library)--*/
 class CefDisplay : public CefBaseRefCounted {
@@ -61,8 +61,7 @@ class CefDisplay : public CefBaseRefCounted {
 
   ///
   // Returns the Display nearest |point|. Set |input_pixel_coords| to true if
-  // |point| is in pixel coordinates instead of density independent pixels
-  // (DIP).
+  // |point| is in pixel screen coordinates instead of DIP screen coordinates.
   ///
   /*--cef()--*/
   static CefRefPtr<CefDisplay> GetDisplayNearestPoint(const CefPoint& point,
@@ -70,8 +69,8 @@ class CefDisplay : public CefBaseRefCounted {
 
   ///
   // Returns the Display that most closely intersects |bounds|.  Set
-  // |input_pixel_coords| to true if |bounds| is in pixel coordinates instead of
-  // density independent pixels (DIP).
+  // |input_pixel_coords| to true if |bounds| is in pixel screen coordinates
+  // instead of DIP screen coordinates.
   ///
   /*--cef()--*/
   static CefRefPtr<CefDisplay> GetDisplayMatchingBounds(
@@ -108,28 +107,29 @@ class CefDisplay : public CefBaseRefCounted {
   virtual float GetDeviceScaleFactor() = 0;
 
   ///
-  // Convert |point| from density independent pixels (DIP) to pixel coordinates
-  // using this Display's device scale factor.
+  // Convert |point| from DIP coordinates to pixel coordinates using this
+  // Display's device scale factor.
   ///
   /*--cef()--*/
   virtual void ConvertPointToPixels(CefPoint& point) = 0;
 
   ///
-  // Convert |point| from pixel coordinates to density independent pixels (DIP)
-  // using this Display's device scale factor.
+  // Convert |point| from pixel coordinates to DIP coordinates using this
+  // Display's device scale factor.
   ///
   /*--cef()--*/
   virtual void ConvertPointFromPixels(CefPoint& point) = 0;
 
   ///
-  // Returns this Display's bounds. This is the full size of the display.
+  // Returns this Display's bounds in DIP screen coordinates. This is the full
+  // size of the display.
   ///
   /*--cef()--*/
   virtual CefRect GetBounds() = 0;
 
   ///
-  // Returns this Display's work area. This excludes areas of the display that
-  // are occupied for window manager toolbars, etc.
+  // Returns this Display's work area in DIP screen coordinates. This excludes
+  // areas of the display that are occupied with window manager toolbars, etc.
   ///
   /*--cef()--*/
   virtual CefRect GetWorkArea() = 0;

include/views/cef_view.h

@@ -174,71 +174,79 @@ class CefView : public CefBaseRefCounted {
   virtual CefRefPtr<CefView> GetViewForID(int id) = 0;
 
   ///
-  // Sets the bounds (size and position) of this View. Position is in parent
-  // coordinates.
+  // Sets the bounds (size and position) of this View. |bounds| is in parent
+  // coordinates, or DIP screen coordinates if there is no parent.
   ///
   /*--cef()--*/
   virtual void SetBounds(const CefRect& bounds) = 0;
 
   ///
-  // Returns the bounds (size and position) of this View. Position is in parent
-  // coordinates.
+  // Returns the bounds (size and position) of this View in parent coordinates,
+  // or DIP screen coordinates if there is no parent.
   ///
   /*--cef()--*/
   virtual CefRect GetBounds() = 0;
 
   ///
-  // Returns the bounds (size and position) of this View. Position is in screen
+  // Returns the bounds (size and position) of this View in DIP screen
   // coordinates.
   ///
   /*--cef()--*/
   virtual CefRect GetBoundsInScreen() = 0;
 
   ///
-  // Sets the size of this View without changing the position.
+  // Sets the size of this View without changing the position. |size| in
+  // parent coordinates, or DIP screen coordinates if there is no parent.
   ///
   /*--cef()--*/
   virtual void SetSize(const CefSize& size) = 0;
 
   ///
-  // Returns the size of this View.
+  // Returns the size of this View in parent coordinates, or DIP screen
+  // coordinates if there is no parent.
   ///
   /*--cef()--*/
   virtual CefSize GetSize() = 0;
 
   ///
   // Sets the position of this View without changing the size. |position| is in
-  // parent coordinates.
+  // parent coordinates, or DIP screen coordinates if there is no parent.
   ///
   /*--cef()--*/
   virtual void SetPosition(const CefPoint& position) = 0;
 
   ///
-  // Returns the position of this View. Position is in parent coordinates.
+  // Returns the position of this View. Position is in parent coordinates, or
+  // DIP screen coordinates if there is no parent.
   ///
   /*--cef()--*/
   virtual CefPoint GetPosition() = 0;
 
   ///
   // Returns the size this View would like to be if enough space is available.
+  // Size is in parent coordinates, or DIP screen coordinates if there is no
+  // parent.
   ///
   /*--cef()--*/
   virtual CefSize GetPreferredSize() = 0;
 
   ///
-  // Size this View to its preferred size.
+  // Size this View to its preferred size. Size is in parent coordinates, or
+  // DIP screen coordinates if there is no parent.
   ///
   /*--cef()--*/
   virtual void SizeToPreferredSize() = 0;
 
   ///
-  // Returns the minimum size for this View.
+  // Returns the minimum size for this View. Size is in parent coordinates, or
+  // DIP screen coordinates if there is no parent.
   ///
   /*--cef()--*/
   virtual CefSize GetMinimumSize() = 0;
 
   ///
-  // Returns the maximum size for this View.
+  // Returns the maximum size for this View. Size is in parent coordinates, or
+  // DIP screen coordinates if there is no parent.
   ///
   /*--cef()--*/
   virtual CefSize GetMaximumSize() = 0;
@@ -345,9 +353,9 @@ class CefView : public CefBaseRefCounted {
   virtual cef_color_t GetBackgroundColor() = 0;
 
   ///
-  // Convert |point| from this View's coordinate system to that of the screen.
-  // This View must belong to a Window when calling this method. Returns true
-  // if the conversion is successful or false otherwise. Use
+  // Convert |point| from this View's coordinate system to DIP screen
+  // coordinates. This View must belong to a Window when calling this method.
+  // Returns true if the conversion is successful or false otherwise. Use
   // CefDisplay::ConvertPointToPixels() after calling this method if further
   // conversion to display-specific pixel coordinates is desired.
   ///
@@ -355,9 +363,9 @@ class CefView : public CefBaseRefCounted {
   virtual bool ConvertPointToScreen(CefPoint& point) = 0;
 
   ///
-  // Convert |point| to this View's coordinate system from that of the screen.
-  // This View must belong to a Window when calling this method. Returns true if
-  // the conversion is successful or false otherwise. Use
+  // Convert |point| to this View's coordinate system from DIP screen
+  // coordinates. This View must belong to a Window when calling this method.
+  // Returns true if the conversion is successful or false otherwise. Use
   // CefDisplay::ConvertPointFromPixels() before calling this method if
   // conversion from display-specific pixel coordinates is necessary.
   ///

include/views/cef_window_delegate.h

@@ -78,6 +78,19 @@ class CefWindowDelegate : public CefPanelDelegate {
     return nullptr;
   }
 
+  ///
+  // Return the initial bounds for |window| in density independent pixel (DIP)
+  // coordinates. If this method returns an empty CefRect then
+  // GetPreferredSize() will be called to retrieve the size, and the window will
+  // be placed on the screen with origin (0,0). This method can be used in
+  // combination with CefView::GetBoundsInScreen() to restore the previous
+  // window bounds.
+  ///
+  /*--cef()--*/
+  virtual CefRect GetInitialBounds(CefRefPtr<CefWindow> window) {
+    return CefRect();
+  }
+
   ///
   // Return true if |window| should be created without a frame or title bar. The
   // window will be resizable if CanResize() returns true. Use

include/wrapper/cef_helpers.h

@@ -89,6 +89,32 @@ struct CefDeleteOnIOThread : public CefDeleteOnThread<TID_IO> {};
 struct CefDeleteOnFileThread : public CefDeleteOnThread<TID_FILE> {};
 struct CefDeleteOnRendererThread : public CefDeleteOnThread<TID_RENDERER> {};
 
+// Same as IMPLEMENT_REFCOUNTING() but using the specified Destructor.
+#define IMPLEMENT_REFCOUNTING_EX(ClassName, Destructor)              \
+ public:                                                             \
+  void AddRef() const OVERRIDE { ref_count_.AddRef(); }              \
+  bool Release() const OVERRIDE {                                    \
+    if (ref_count_.Release()) {                                      \
+      Destructor::Destruct(this);                                    \
+      return true;                                                   \
+    }                                                                \
+    return false;                                                    \
+  }                                                                  \
+  bool HasOneRef() const OVERRIDE { return ref_count_.HasOneRef(); } \
+  bool HasAtLeastOneRef() const OVERRIDE {                           \
+    return ref_count_.HasAtLeastOneRef();                            \
+  }                                                                  \
+                                                                     \
+ private:                                                            \
+  CefRefCount ref_count_
+
+#define IMPLEMENT_REFCOUNTING_DELETE_ON_UIT(ClassName) \
+  IMPLEMENT_REFCOUNTING_EX(ClassName, CefDeleteOnUIThread)
+
+#define IMPLEMENT_REFCOUNTING_DELETE_ON_IOT(ClassName) \
+  IMPLEMENT_REFCOUNTING_EX(ClassName, CefDeleteOnIOThread)
+
+
 ///
 // Helper class to manage a scoped copy of |argv|.
 ///

include/wrapper/cef_library_loader.h

@@ -56,7 +56,7 @@ int cef_unload_library();
 #ifdef __cplusplus
 }
 
-#if defined(OS_MACOSX)
+#if defined(OS_MAC)
 
 ///
 // Scoped helper for loading and unloading the CEF framework library at
@@ -122,7 +122,7 @@ class CefScopedLibraryLoader {
   DISALLOW_COPY_AND_ASSIGN(CefScopedLibraryLoader);
 };
 
-#endif  // defined(OS_MACOSX)
+#endif  // defined(OS_MAC)
 #endif  // __cplusplus
 
 #endif  // CEF_INCLUDE_WRAPPER_CEF_LIBRARY_LOADER_H_

libcef/browser/alloy/alloy_browser_context.cc

@@ -0,0 +1,456 @@
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "libcef/browser/alloy/alloy_browser_context.h"
+
+#include <map>
+#include <utility>
+
+#include "libcef/browser/download_manager_delegate.h"
+#include "libcef/browser/extensions/extension_system.h"
+#include "libcef/browser/prefs/browser_prefs.h"
+#include "libcef/browser/ssl_host_state_delegate.h"
+#include "libcef/browser/thread_util.h"
+#include "libcef/common/cef_switches.h"
+#include "libcef/common/extensions/extensions_util.h"
+
+#include "base/command_line.h"
+#include "base/files/file_util.h"
+#include "base/lazy_instance.h"
+#include "base/logging.h"
+#include "base/strings/string_util.h"
+#include "chrome/browser/font_family_cache.h"
+#include "chrome/browser/media/media_device_id_salt.h"
+#include "chrome/browser/plugins/chrome_plugin_service_filter.h"
+#include "chrome/browser/profiles/profile_key.h"
+#include "chrome/browser/ui/zoom/chrome_zoom_level_prefs.h"
+#include "chrome/common/pref_names.h"
+#include "components/guest_view/browser/guest_view_manager.h"
+#include "components/keyed_service/content/browser_context_dependency_manager.h"
+#include "components/keyed_service/core/simple_dependency_manager.h"
+#include "components/keyed_service/core/simple_key_map.h"
+#include "components/prefs/pref_service.h"
+#include "components/proxy_config/pref_proxy_config_tracker_impl.h"
+#include "components/user_prefs/user_prefs.h"
+#include "components/visitedlink/browser/visitedlink_event_listener.h"
+#include "components/visitedlink/browser/visitedlink_writer.h"
+#include "components/zoom/zoom_event_manager.h"
+#include "content/public/browser/browser_task_traits.h"
+#include "content/public/browser/browser_thread.h"
+#include "content/public/browser/download_manager.h"
+#include "content/public/browser/resource_context.h"
+#include "content/public/browser/storage_partition.h"
+#include "extensions/browser/extension_protocols.h"
+#include "extensions/browser/process_manager.h"
+#include "extensions/common/constants.h"
+#include "net/proxy_resolution/proxy_config_service.h"
+#include "services/network/public/mojom/cors_origin_pattern.mojom.h"
+
+using content::BrowserThread;
+
+// Creates and manages VisitedLinkEventListener objects for each
+// AlloyBrowserContext sharing the same VisitedLinkWriter.
+class CefVisitedLinkListener : public visitedlink::VisitedLinkWriter::Listener {
+ public:
+  CefVisitedLinkListener() { DCHECK(listener_map_.empty()); }
+
+  void CreateListenerForContext(content::BrowserContext* context) {
+    CEF_REQUIRE_UIT();
+    auto listener =
+        std::make_unique<visitedlink::VisitedLinkEventListener>(context);
+    listener_map_.insert(std::make_pair(context, std::move(listener)));
+  }
+
+  void RemoveListenerForContext(content::BrowserContext* context) {
+    CEF_REQUIRE_UIT();
+    ListenerMap::iterator it = listener_map_.find(context);
+    DCHECK(it != listener_map_.end());
+    listener_map_.erase(it);
+  }
+
+  // visitedlink::VisitedLinkWriter::Listener methods.
+
+  void NewTable(base::ReadOnlySharedMemoryRegion* table_region) override {
+    CEF_REQUIRE_UIT();
+    ListenerMap::iterator it = listener_map_.begin();
+    for (; it != listener_map_.end(); ++it)
+      it->second->NewTable(table_region);
+  }
+
+  void Add(visitedlink::VisitedLinkCommon::Fingerprint fingerprint) override {
+    CEF_REQUIRE_UIT();
+    ListenerMap::iterator it = listener_map_.begin();
+    for (; it != listener_map_.end(); ++it)
+      it->second->Add(fingerprint);
+  }
+
+  void Reset(bool invalidate_hashes) override {
+    CEF_REQUIRE_UIT();
+    ListenerMap::iterator it = listener_map_.begin();
+    for (; it != listener_map_.end(); ++it)
+      it->second->Reset(invalidate_hashes);
+  }
+
+ private:
+  // Map of AlloyBrowserContext to the associated VisitedLinkEventListener.
+  typedef std::map<const content::BrowserContext*,
+                   std::unique_ptr<visitedlink::VisitedLinkEventListener>>
+      ListenerMap;
+  ListenerMap listener_map_;
+
+  DISALLOW_COPY_AND_ASSIGN(CefVisitedLinkListener);
+};
+
+AlloyBrowserContext::AlloyBrowserContext(
+    const CefRequestContextSettings& settings)
+    : CefBrowserContext(settings) {}
+
+AlloyBrowserContext::~AlloyBrowserContext() {
+  if (resource_context_) {
+    content::BrowserThread::DeleteSoon(content::BrowserThread::IO, FROM_HERE,
+                                       resource_context_.release());
+  }
+}
+
+void AlloyBrowserContext::Initialize() {
+  CefBrowserContext::Initialize();
+
+  key_ = std::make_unique<ProfileKey>(cache_path_);
+  SimpleKeyMap::GetInstance()->Associate(this, key_.get());
+
+  // Initialize the PrefService object.
+  pref_service_ = browser_prefs::CreatePrefService(
+      this, cache_path_, !!settings_.persist_user_preferences);
+
+  // This must be called before creating any services to avoid hitting
+  // DependencyManager::AssertContextWasntDestroyed when creating/destroying
+  // multiple browser contexts (due to pointer address reuse).
+  BrowserContextDependencyManager::GetInstance()->CreateBrowserContextServices(
+      this);
+
+  const bool extensions_enabled = extensions::ExtensionsEnabled();
+  if (extensions_enabled) {
+    // Create the custom ExtensionSystem first because other KeyedServices
+    // depend on it.
+    extension_system_ = static_cast<extensions::CefExtensionSystem*>(
+        extensions::ExtensionSystem::Get(this));
+    extension_system_->InitForRegularProfile(true);
+
+    // Make sure the ProcessManager is created so that it receives extension
+    // load notifications. This is necessary for the proper initialization of
+    // background/event pages.
+    extensions::ProcessManager::Get(this);
+  }
+
+  // Initialize visited links management.
+  base::FilePath visited_link_path;
+  if (!cache_path_.empty())
+    visited_link_path = cache_path_.Append(FILE_PATH_LITERAL("Visited Links"));
+  visitedlink_listener_ = new CefVisitedLinkListener;
+  visitedlink_master_.reset(new visitedlink::VisitedLinkWriter(
+      visitedlink_listener_, this, !visited_link_path.empty(), false,
+      visited_link_path, 0));
+  visitedlink_listener_->CreateListenerForContext(this);
+  visitedlink_master_->Init();
+
+  // Initialize proxy configuration tracker.
+  pref_proxy_config_tracker_.reset(new PrefProxyConfigTrackerImpl(
+      GetPrefs(), content::GetIOThreadTaskRunner({})));
+
+  // Spell checking support and possibly other subsystems retrieve the
+  // PrefService associated with a BrowserContext via UserPrefs::Get().
+  PrefService* pref_service = GetPrefs();
+  DCHECK(pref_service);
+  user_prefs::UserPrefs::Set(this, pref_service);
+  key_->SetPrefs(pref_service);
+
+  if (extensions_enabled)
+    extension_system_->Init();
+
+  ChromePluginServiceFilter::GetInstance()->RegisterProfile(this);
+
+  media_device_id_salt_ = new MediaDeviceIDSalt(pref_service);
+}
+
+void AlloyBrowserContext::Shutdown() {
+  CefBrowserContext::Shutdown();
+
+  // Send notifications to clean up objects associated with this Profile.
+  MaybeSendDestroyedNotification();
+
+  ChromePluginServiceFilter::GetInstance()->UnregisterProfile(this);
+
+  // Remove any BrowserContextKeyedServiceFactory associations. This must be
+  // called before the ProxyService owned by AlloyBrowserContext is destroyed.
+  // The SimpleDependencyManager should always be passed after the
+  // BrowserContextDependencyManager. This is because the KeyedService instances
+  // in the BrowserContextDependencyManager's dependency graph can depend on the
+  // ones in the SimpleDependencyManager's graph.
+  DependencyManager::PerformInterlockedTwoPhaseShutdown(
+      BrowserContextDependencyManager::GetInstance(), this,
+      SimpleDependencyManager::GetInstance(), key_.get());
+
+  key_.reset();
+  SimpleKeyMap::GetInstance()->Dissociate(this);
+
+  // Shuts down the storage partitions associated with this browser context.
+  // This must be called before the browser context is actually destroyed
+  // and before a clean-up task for its corresponding IO thread residents
+  // (e.g. ResourceContext) is posted, so that the classes that hung on
+  // StoragePartition can have time to do necessary cleanups on IO thread.
+  ShutdownStoragePartitions();
+
+  visitedlink_listener_->RemoveListenerForContext(this);
+
+  // The FontFamilyCache references the ProxyService so delete it before the
+  // ProxyService is deleted.
+  SetUserData(&kFontFamilyCacheKey, nullptr);
+
+  pref_proxy_config_tracker_->DetachFromPrefService();
+
+  // Delete the download manager delegate here because otherwise we'll crash
+  // when it's accessed from the content::BrowserContext destructor.
+  if (download_manager_delegate_)
+    download_manager_delegate_.reset(nullptr);
+}
+
+void AlloyBrowserContext::RemoveCefRequestContext(
+    CefRequestContextImpl* context) {
+  CEF_REQUIRE_UIT();
+
+  if (extensions::ExtensionsEnabled()) {
+    extension_system()->OnRequestContextDeleted(context);
+  }
+
+  // May result in |this| being deleted.
+  CefBrowserContext::RemoveCefRequestContext(context);
+}
+
+void AlloyBrowserContext::LoadExtension(
+    const CefString& root_directory,
+    CefRefPtr<CefDictionaryValue> manifest,
+    CefRefPtr<CefExtensionHandler> handler,
+    CefRefPtr<CefRequestContext> loader_context) {
+  if (!extensions::ExtensionsEnabled()) {
+    if (handler)
+      handler->OnExtensionLoadFailed(ERR_ABORTED);
+    return;
+  }
+
+  if (manifest && manifest->GetSize() > 0) {
+    CefDictionaryValueImpl* value_impl =
+        static_cast<CefDictionaryValueImpl*>(manifest.get());
+    extension_system()->LoadExtension(base::WrapUnique(value_impl->CopyValue()),
+                                      root_directory, false /* builtin */,
+                                      loader_context, handler);
+  } else {
+    extension_system()->LoadExtension(root_directory, false /* builtin */,
+                                      loader_context, handler);
+  }
+}
+
+bool AlloyBrowserContext::GetExtensions(std::vector<CefString>& extension_ids) {
+  if (!extensions::ExtensionsEnabled())
+    return false;
+
+  extensions::CefExtensionSystem::ExtensionMap extension_map =
+      extension_system()->GetExtensions();
+  extensions::CefExtensionSystem::ExtensionMap::const_iterator it =
+      extension_map.begin();
+  for (; it != extension_map.end(); ++it)
+    extension_ids.push_back(it->second->GetIdentifier());
+
+  return true;
+}
+
+CefRefPtr<CefExtension> AlloyBrowserContext::GetExtension(
+    const CefString& extension_id) {
+  if (!extensions::ExtensionsEnabled())
+    return nullptr;
+
+  return extension_system()->GetExtension(extension_id);
+}
+
+bool AlloyBrowserContext::UnloadExtension(const CefString& extension_id) {
+  DCHECK(extensions::ExtensionsEnabled());
+  return extension_system()->UnloadExtension(extension_id);
+}
+
+bool AlloyBrowserContext::IsPrintPreviewSupported() const {
+  CEF_REQUIRE_UIT();
+  if (!extensions::PrintPreviewEnabled())
+    return false;
+
+  return !GetPrefs()->GetBoolean(prefs::kPrintPreviewDisabled);
+}
+
+content::ResourceContext* AlloyBrowserContext::GetResourceContext() {
+  if (!resource_context_) {
+    resource_context_ = std::make_unique<content::ResourceContext>();
+  }
+  return resource_context_.get();
+}
+
+content::ClientHintsControllerDelegate*
+AlloyBrowserContext::GetClientHintsControllerDelegate() {
+  return nullptr;
+}
+
+void AlloyBrowserContext::SetCorsOriginAccessListForOrigin(
+    const url::Origin& source_origin,
+    std::vector<network::mojom::CorsOriginPatternPtr> allow_patterns,
+    std::vector<network::mojom::CorsOriginPatternPtr> block_patterns,
+    base::OnceClosure closure) {
+  // This method is called for Extension support.
+  base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, std::move(closure));
+}
+
+ChromeZoomLevelPrefs* AlloyBrowserContext::GetZoomLevelPrefs() {
+  return static_cast<ChromeZoomLevelPrefs*>(
+      GetStoragePartition(this, nullptr)->GetZoomLevelDelegate());
+}
+
+scoped_refptr<network::SharedURLLoaderFactory>
+AlloyBrowserContext::GetURLLoaderFactory() {
+  return GetDefaultStoragePartition(this)
+      ->GetURLLoaderFactoryForBrowserProcess();
+}
+
+base::FilePath AlloyBrowserContext::GetPath() {
+  return cache_path_;
+}
+
+base::FilePath AlloyBrowserContext::GetPath() const {
+  return cache_path_;
+}
+
+std::unique_ptr<content::ZoomLevelDelegate>
+AlloyBrowserContext::CreateZoomLevelDelegate(
+    const base::FilePath& partition_path) {
+  if (cache_path_.empty())
+    return std::unique_ptr<content::ZoomLevelDelegate>();
+
+  return base::WrapUnique(new ChromeZoomLevelPrefs(
+      GetPrefs(), cache_path_, partition_path,
+      zoom::ZoomEventManager::GetForBrowserContext(this)->GetWeakPtr()));
+}
+
+bool AlloyBrowserContext::IsOffTheRecord() const {
+  // Alloy contexts are never flagged as off-the-record. It causes problems
+  // for the extension system.
+  return false;
+}
+
+content::DownloadManagerDelegate*
+AlloyBrowserContext::GetDownloadManagerDelegate() {
+  if (!download_manager_delegate_) {
+    content::DownloadManager* manager =
+        BrowserContext::GetDownloadManager(this);
+    download_manager_delegate_.reset(new CefDownloadManagerDelegate(manager));
+  }
+  return download_manager_delegate_.get();
+}
+
+content::BrowserPluginGuestManager* AlloyBrowserContext::GetGuestManager() {
+  DCHECK(extensions::ExtensionsEnabled());
+  return guest_view::GuestViewManager::FromBrowserContext(this);
+}
+
+storage::SpecialStoragePolicy* AlloyBrowserContext::GetSpecialStoragePolicy() {
+  return nullptr;
+}
+
+content::PushMessagingService* AlloyBrowserContext::GetPushMessagingService() {
+  return nullptr;
+}
+
+content::StorageNotificationService*
+AlloyBrowserContext::GetStorageNotificationService() {
+  return nullptr;
+}
+
+content::SSLHostStateDelegate* AlloyBrowserContext::GetSSLHostStateDelegate() {
+  if (!ssl_host_state_delegate_)
+    ssl_host_state_delegate_.reset(new CefSSLHostStateDelegate());
+  return ssl_host_state_delegate_.get();
+}
+
+content::PermissionControllerDelegate*
+AlloyBrowserContext::GetPermissionControllerDelegate() {
+  return nullptr;
+}
+
+content::BackgroundFetchDelegate*
+AlloyBrowserContext::GetBackgroundFetchDelegate() {
+  return nullptr;
+}
+
+content::BackgroundSyncController*
+AlloyBrowserContext::GetBackgroundSyncController() {
+  return nullptr;
+}
+
+content::BrowsingDataRemoverDelegate*
+AlloyBrowserContext::GetBrowsingDataRemoverDelegate() {
+  return nullptr;
+}
+
+std::string AlloyBrowserContext::GetMediaDeviceIDSalt() {
+  return media_device_id_salt_->GetSalt();
+}
+
+PrefService* AlloyBrowserContext::GetPrefs() {
+  return pref_service_.get();
+}
+
+const PrefService* AlloyBrowserContext::GetPrefs() const {
+  return pref_service_.get();
+}
+
+ProfileKey* AlloyBrowserContext::GetProfileKey() const {
+  DCHECK(key_);
+  return key_.get();
+}
+
+policy::SchemaRegistryService*
+AlloyBrowserContext::GetPolicySchemaRegistryService() {
+  NOTREACHED();
+  return nullptr;
+}
+
+policy::UserCloudPolicyManager*
+AlloyBrowserContext::GetUserCloudPolicyManager() {
+  NOTREACHED();
+  return nullptr;
+}
+
+policy::ProfilePolicyConnector*
+AlloyBrowserContext::GetProfilePolicyConnector() {
+  NOTREACHED();
+  return nullptr;
+}
+
+const policy::ProfilePolicyConnector*
+AlloyBrowserContext::GetProfilePolicyConnector() const {
+  NOTREACHED();
+  return nullptr;
+}
+
+void AlloyBrowserContext::RebuildTable(
+    const scoped_refptr<URLEnumerator>& enumerator) {
+  // Called when visited links will not or cannot be loaded from disk.
+  enumerator->OnComplete(true);
+}
+
+DownloadPrefs* AlloyBrowserContext::GetDownloadPrefs() {
+  CEF_REQUIRE_UIT();
+  if (!download_prefs_) {
+    download_prefs_.reset(new DownloadPrefs(this));
+  }
+  return download_prefs_.get();
+}
+
+void AlloyBrowserContext::AddVisitedURLs(const std::vector<GURL>& urls) {
+  visitedlink_master_->AddURLs(urls);
+}

libcef/browser/alloy/alloy_browser_context.h

@@ -0,0 +1,150 @@
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef CEF_LIBCEF_BROWSER_ALLOY_ALLOY_BROWSER_CONTEXT_H_
+#define CEF_LIBCEF_BROWSER_ALLOY_ALLOY_BROWSER_CONTEXT_H_
+#pragma once
+
+#include "include/cef_request_context_handler.h"
+#include "libcef/browser/alloy/chrome_profile_alloy.h"
+#include "libcef/browser/browser_context.h"
+#include "libcef/browser/request_context_handler_map.h"
+
+#include "chrome/browser/download/download_prefs.h"
+#include "components/proxy_config/pref_proxy_config_tracker.h"
+#include "components/visitedlink/browser/visitedlink_delegate.h"
+
+class CefDownloadManagerDelegate;
+class CefSSLHostStateDelegate;
+class CefVisitedLinkListener;
+class MediaDeviceIDSalt;
+class PrefService;
+
+namespace extensions {
+class CefExtensionSystem;
+}
+
+namespace visitedlink {
+class VisitedLinkWriter;
+}
+
+// See CefBrowserContext documentation for usage. Only accessed on the UI thread
+// unless otherwise indicated. ChromeProfileAlloy must be the first listed base
+// class to avoid issues when casting between void* and content::BrowserContext*
+// in Chromium code.
+class AlloyBrowserContext : public ChromeProfileAlloy,
+                            public CefBrowserContext,
+                            public visitedlink::VisitedLinkDelegate {
+ public:
+  explicit AlloyBrowserContext(const CefRequestContextSettings& settings);
+
+  // CefBrowserContext overrides.
+  content::BrowserContext* AsBrowserContext() override { return this; }
+  Profile* AsProfile() override { return this; }
+  void Initialize() override;
+  void Shutdown() override;
+  void RemoveCefRequestContext(CefRequestContextImpl* context) override;
+  void LoadExtension(const CefString& root_directory,
+                     CefRefPtr<CefDictionaryValue> manifest,
+                     CefRefPtr<CefExtensionHandler> handler,
+                     CefRefPtr<CefRequestContext> loader_context) override;
+  bool GetExtensions(std::vector<CefString>& extension_ids) override;
+  CefRefPtr<CefExtension> GetExtension(const CefString& extension_id) override;
+  bool UnloadExtension(const CefString& extension_id) override;
+  bool IsPrintPreviewSupported() const override;
+
+  // content::BrowserContext overrides.
+  content::ResourceContext* GetResourceContext() override;
+  content::ClientHintsControllerDelegate* GetClientHintsControllerDelegate()
+      override;
+  void SetCorsOriginAccessListForOrigin(
+      const url::Origin& source_origin,
+      std::vector<network::mojom::CorsOriginPatternPtr> allow_patterns,
+      std::vector<network::mojom::CorsOriginPatternPtr> block_patterns,
+      base::OnceClosure closure) override;
+  base::FilePath GetPath() override;
+  base::FilePath GetPath() const override;
+  std::unique_ptr<content::ZoomLevelDelegate> CreateZoomLevelDelegate(
+      const base::FilePath& partition_path) override;
+  bool IsOffTheRecord() const override;
+  content::DownloadManagerDelegate* GetDownloadManagerDelegate() override;
+  content::BrowserPluginGuestManager* GetGuestManager() override;
+  storage::SpecialStoragePolicy* GetSpecialStoragePolicy() override;
+  content::PushMessagingService* GetPushMessagingService() override;
+  content::StorageNotificationService* GetStorageNotificationService() override;
+  content::SSLHostStateDelegate* GetSSLHostStateDelegate() override;
+  content::PermissionControllerDelegate* GetPermissionControllerDelegate()
+      override;
+  content::BackgroundFetchDelegate* GetBackgroundFetchDelegate() override;
+  content::BackgroundSyncController* GetBackgroundSyncController() override;
+  content::BrowsingDataRemoverDelegate* GetBrowsingDataRemoverDelegate()
+      override;
+  std::string GetMediaDeviceIDSalt() override;
+
+  // Profile overrides.
+  ChromeZoomLevelPrefs* GetZoomLevelPrefs() override;
+  scoped_refptr<network::SharedURLLoaderFactory> GetURLLoaderFactory() override;
+  PrefService* GetPrefs() override;
+  bool AllowsBrowserWindows() const override { return false; }
+  const PrefService* GetPrefs() const override;
+  ProfileKey* GetProfileKey() const override;
+  policy::SchemaRegistryService* GetPolicySchemaRegistryService() override;
+  policy::UserCloudPolicyManager* GetUserCloudPolicyManager() override;
+  policy::ProfilePolicyConnector* GetProfilePolicyConnector() override;
+  const policy::ProfilePolicyConnector* GetProfilePolicyConnector()
+      const override;
+
+  // Values checked in ProfileNetworkContextService::CreateNetworkContextParams
+  // when creating the NetworkContext.
+  bool ShouldRestoreOldSessionCookies() const override {
+    return ShouldPersistSessionCookies();
+  }
+  bool ShouldPersistSessionCookies() const override {
+    return !!settings_.persist_session_cookies;
+  }
+
+  // visitedlink::VisitedLinkDelegate methods.
+  void RebuildTable(const scoped_refptr<URLEnumerator>& enumerator) override;
+
+  // Manages extensions.
+  extensions::CefExtensionSystem* extension_system() const {
+    return extension_system_;
+  }
+
+  // Called from AlloyBrowserHostImpl::DidFinishNavigation to update the table
+  // of visited links.
+  void AddVisitedURLs(const std::vector<GURL>& urls);
+
+  // Called from DownloadPrefs::FromBrowserContext.
+  DownloadPrefs* GetDownloadPrefs();
+
+ private:
+  ~AlloyBrowserContext() override;
+
+  std::unique_ptr<PrefService> pref_service_;
+  std::unique_ptr<PrefProxyConfigTracker> pref_proxy_config_tracker_;
+
+  std::unique_ptr<CefDownloadManagerDelegate> download_manager_delegate_;
+  std::unique_ptr<CefSSLHostStateDelegate> ssl_host_state_delegate_;
+  std::unique_ptr<visitedlink::VisitedLinkWriter> visitedlink_master_;
+  // |visitedlink_listener_| is owned by visitedlink_master_.
+  CefVisitedLinkListener* visitedlink_listener_ = nullptr;
+
+  // Owned by the KeyedService system.
+  extensions::CefExtensionSystem* extension_system_ = nullptr;
+
+  // The key to index KeyedService instances created by
+  // SimpleKeyedServiceFactory.
+  std::unique_ptr<ProfileKey> key_;
+
+  std::unique_ptr<DownloadPrefs> download_prefs_;
+
+  std::unique_ptr<content::ResourceContext> resource_context_;
+
+  scoped_refptr<MediaDeviceIDSalt> media_device_id_salt_;
+
+  DISALLOW_COPY_AND_ASSIGN(AlloyBrowserContext);
+};
+
+#endif  // CEF_LIBCEF_BROWSER_ALLOY_ALLOY_BROWSER_CONTEXT_H_

libcef/browser/alloy/alloy_browser_host_impl.h

@@ -3,8 +3,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CEF_LIBCEF_BROWSER_BROWSER_HOST_IMPL_H_
-#define CEF_LIBCEF_BROWSER_BROWSER_HOST_IMPL_H_
+#ifndef CEF_LIBCEF_BROWSER_ALLOY_ALLOY_BROWSER_HOST_IMPL_H_
+#define CEF_LIBCEF_BROWSER_ALLOY_ALLOY_BROWSER_HOST_IMPL_H_
 #pragma once
 
 #include <map>
@@ -14,7 +14,7 @@
 #include "include/cef_browser.h"
 #include "include/cef_client.h"
 #include "include/cef_frame.h"
-#include "include/views/cef_browser_view.h"
+#include "libcef/browser/browser_host_base.h"
 #include "libcef/browser/browser_info.h"
 #include "libcef/browser/file_dialog_manager.h"
 #include "libcef/browser/frame_host_impl.h"
@@ -22,58 +22,36 @@
 #include "libcef/browser/menu_manager.h"
 #include "libcef/browser/request_context_impl.h"
 
-#include "base/observer_list.h"
 #include "base/strings/string16.h"
 #include "base/synchronization/lock.h"
-#include "content/public/browser/notification_observer.h"
-#include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "extensions/common/view_type.h"
 
-namespace content {
-struct DragEventSourceInfo;
-class RenderWidgetHostImpl;
-}  // namespace content
-
-namespace extensions {
-class Extension;
-class ExtensionHost;
-}  // namespace extensions
-
-#if defined(USE_AURA)
-namespace views {
-class Widget;
-}
-#endif  // defined(USE_AURA)
-
 class CefAudioCapturer;
 class CefBrowserInfo;
-class CefBrowserPlatformDelegate;
 class CefDevToolsManager;
 class SiteInstance;
 
-// Implementation of CefBrowser.
+// CefBrowser implementation for the alloy runtime. Method calls are delegated
+// to the CefPlatformDelegate or the WebContents as appropriate. All methods are
+// thread-safe unless otherwise indicated.
 //
 // WebContentsDelegate: Interface for handling WebContents delegations. There is
-// a one-to-one relationship between CefBrowserHostImpl and WebContents
+// a one-to-one relationship between AlloyBrowserHostImpl and WebContents
 // instances.
 //
 // WebContentsObserver: Interface for observing WebContents notifications and
 // IPC messages. There is a one-to-one relationship between WebContents and
 // RenderViewHost instances. IPC messages received by the RenderViewHost will be
 // forwarded to this WebContentsObserver implementation via WebContents. IPC
-// messages sent using CefBrowserHostImpl::Send() will be forwarded to the
+// messages sent using AlloyBrowserHostImpl::Send() will be forwarded to the
 // RenderViewHost (after posting to the UI thread if necessary). Use
 // WebContentsObserver::routing_id() when sending IPC messages.
-//
-// NotificationObserver: Interface for observing post-processed notifications.
-class CefBrowserHostImpl : public CefBrowserHost,
-                           public CefBrowser,
-                           public content::WebContentsDelegate,
-                           public content::WebContentsObserver,
-                           public content::NotificationObserver {
+class AlloyBrowserHostImpl : public CefBrowserHostBase,
+                             public content::WebContentsDelegate,
+                             public content::WebContentsObserver {
  public:
   // Used for handling the response to command messages.
   class CommandResponseHandler : public virtual CefBaseRefCounted {
@@ -81,87 +59,36 @@ class CefBrowserHostImpl : public CefBrowserHost,
     virtual void OnResponse(const std::string& response) = 0;
   };
 
-  // Interface to implement for observers that wish to be informed of changes
-  // to the CefBrowserHostImpl. All methods will be called on the UI thread.
-  class Observer {
-   public:
-    // Called before |browser| is destroyed. Any references to |browser| should
-    // be cleared when this method is called.
-    virtual void OnBrowserDestroyed(CefBrowserHostImpl* browser) = 0;
+  ~AlloyBrowserHostImpl() override;
 
-   protected:
-    virtual ~Observer() {}
-  };
-
-  ~CefBrowserHostImpl() override;
-
-  struct CreateParams {
-    // Platform-specific window creation info. Will be nullptr when creating a
-    // views-hosted browser.
-    std::unique_ptr<CefWindowInfo> window_info;
-
-#if defined(USE_AURA)
-    // The BrowserView that will own a views-hosted browser. Will be nullptr for
-    // popup browsers (the BrowserView will be created later in that case).
-    CefRefPtr<CefBrowserView> browser_view;
-#endif
-
-    // Client implementation. May be nullptr.
-    CefRefPtr<CefClient> client;
-
-    // Initial URL to load. May be empty. If this is a valid extension URL then
-    // the browser will be created as an app view extension host.
-    GURL url;
-
-    // Browser settings.
-    CefBrowserSettings settings;
-
-    // Other browser that opened this DevTools browser. Will be nullptr for non-
-    // DevTools browsers.
-    CefRefPtr<CefBrowserHostImpl> devtools_opener;
-
-    // Request context to use when creating the browser. If nullptr the global
-    // request context will be used.
-    CefRefPtr<CefRequestContext> request_context;
-
-    CefRefPtr<CefDictionaryValue> extra_info;
-
-    // Used when explicitly creating the browser as an extension host via
-    // ProcessManager::CreateBackgroundHost.
-    const extensions::Extension* extension = nullptr;
-    extensions::ViewType extension_host_type = extensions::VIEW_TYPE_INVALID;
-  };
-
-  // Create a new CefBrowserHostImpl instance.
-  static CefRefPtr<CefBrowserHostImpl> Create(CreateParams& create_params);
+  // Create a new AlloyBrowserHostImpl instance with owned WebContents.
+  static CefRefPtr<AlloyBrowserHostImpl> Create(
+      CefBrowserCreateParams& create_params);
 
   // Returns the browser associated with the specified RenderViewHost.
-  static CefRefPtr<CefBrowserHostImpl> GetBrowserForHost(
+  static CefRefPtr<AlloyBrowserHostImpl> GetBrowserForHost(
       const content::RenderViewHost* host);
   // Returns the browser associated with the specified RenderFrameHost.
-  static CefRefPtr<CefBrowserHostImpl> GetBrowserForHost(
+  static CefRefPtr<AlloyBrowserHostImpl> GetBrowserForHost(
       const content::RenderFrameHost* host);
   // Returns the browser associated with the specified WebContents.
-  static CefRefPtr<CefBrowserHostImpl> GetBrowserForContents(
+  static CefRefPtr<AlloyBrowserHostImpl> GetBrowserForContents(
       const content::WebContents* contents);
   // Returns the browser associated with the specified FrameTreeNode ID.
-  static CefRefPtr<CefBrowserHostImpl> GetBrowserForFrameTreeNode(
+  static CefRefPtr<AlloyBrowserHostImpl> GetBrowserForFrameTreeNode(
       int frame_tree_node_id);
   // Returns the browser associated with the specified frame routing IDs.
-  static CefRefPtr<CefBrowserHostImpl> GetBrowserForFrameRoute(
+  static CefRefPtr<AlloyBrowserHostImpl> GetBrowserForFrameRoute(
       int render_process_id,
       int render_routing_id);
 
   // CefBrowserHost methods.
-  CefRefPtr<CefBrowser> GetBrowser() override;
   void CloseBrowser(bool force_close) override;
   bool TryCloseBrowser() override;
   void SetFocus(bool focus) override;
   CefWindowHandle GetWindowHandle() override;
   CefWindowHandle GetOpenerWindowHandle() override;
   bool HasView() override;
-  CefRefPtr<CefClient> GetClient() override;
-  CefRefPtr<CefRequestContext> GetRequestContext() override;
   double GetZoomLevel() override;
   void SetZoomLevel(double zoomLevel) override;
   void RunFileDialog(FileDialogMode mode,
@@ -170,12 +97,6 @@ class CefBrowserHostImpl : public CefBrowserHost,
                      const std::vector<CefString>& accept_filters,
                      int selected_accept_filter,
                      CefRefPtr<CefRunFileDialogCallback> callback) override;
-  void StartDownload(const CefString& url) override;
-  void DownloadImage(const CefString& image_url,
-                     bool is_favicon,
-                     uint32 max_image_size,
-                     bool bypass_cache,
-                     CefRefPtr<CefDownloadImageCallback> callback) override;
   void Print() override;
   void PrintToPDF(const CefString& path,
                   const CefPdfPrintSettings& settings,
@@ -198,27 +119,12 @@ class CefBrowserHostImpl : public CefBrowserHost,
                             CefRefPtr<CefDictionaryValue> params) override;
   CefRefPtr<CefRegistration> AddDevToolsMessageObserver(
       CefRefPtr<CefDevToolsMessageObserver> observer) override;
-  void GetNavigationEntries(CefRefPtr<CefNavigationEntryVisitor> visitor,
-                            bool current_only) override;
-  void SetMouseCursorChangeDisabled(bool disabled) override;
-  bool IsMouseCursorChangeDisabled() override;
   bool IsWindowRenderingDisabled() override;
-  void ReplaceMisspelling(const CefString& word) override;
-  void AddWordToDictionary(const CefString& word) override;
   void WasResized() override;
   void WasHidden(bool hidden) override;
   void NotifyScreenInfoChanged() override;
   void Invalidate(PaintElementType type) override;
   void SendExternalBeginFrame() override;
-  void SendKeyEvent(const CefKeyEvent& event) override;
-  void SendMouseClickEvent(const CefMouseEvent& event,
-                           MouseButtonType type,
-                           bool mouseUp,
-                           int clickCount) override;
-  void SendMouseMoveEvent(const CefMouseEvent& event, bool mouseLeave) override;
-  void SendMouseWheelEvent(const CefMouseEvent& event,
-                           int deltaX,
-                           int deltaY) override;
   void SendTouchEvent(const CefTouchEvent& event) override;
   void SendFocusEvent(bool setFocus) override;
   void SendCaptureLostEvent() override;
@@ -245,7 +151,6 @@ class CefBrowserHostImpl : public CefBrowserHost,
   void DragSourceEndedAt(int x, int y, DragOperationsMask op) override;
   void SetAudioMuted(bool mute) override;
   bool IsAudioMuted() override;
-  CefRefPtr<CefNavigationEntry> GetVisibleNavigationEntry() override;
   void SetAccessibilityState(cef_state_t accessibility_state) override;
   void SetAutoResizeEnabled(bool enabled,
                             const CefSize& min_size,
@@ -253,37 +158,12 @@ class CefBrowserHostImpl : public CefBrowserHost,
   CefRefPtr<CefExtension> GetExtension() override;
   bool IsBackgroundHost() override;
 
-  // CefBrowser methods.
-  CefRefPtr<CefBrowserHost> GetHost() override;
-  bool CanGoBack() override;
-  void GoBack() override;
-  bool CanGoForward() override;
-  void GoForward() override;
-  bool IsLoading() override;
-  void Reload() override;
-  void ReloadIgnoreCache() override;
-  void StopLoad() override;
-  int GetIdentifier() override;
-  bool IsSame(CefRefPtr<CefBrowser> that) override;
-  bool IsPopup() override;
-  bool HasDocument() override;
-  CefRefPtr<CefFrame> GetMainFrame() override;
-  CefRefPtr<CefFrame> GetFocusedFrame() override;
-  CefRefPtr<CefFrame> GetFrame(int64 identifier) override;
-  CefRefPtr<CefFrame> GetFrame(const CefString& name) override;
-  size_t GetFrameCount() override;
-  void GetFrameIdentifiers(std::vector<int64>& identifiers) override;
-  void GetFrameNames(std::vector<CefString>& names) override;
-
   // Returns true if windowless rendering is enabled.
   bool IsWindowless() const;
 
   // Returns true if this browser is views-hosted.
   bool IsViewsHosted() const;
 
-  // Returns true if this browser supports print preview.
-  bool IsPrintPreviewSupported() const;
-
   // Returns true if this browser supports picture-in-picture.
   bool IsPictureInPictureSupported() const;
 
@@ -292,7 +172,7 @@ class CefBrowserHostImpl : public CefBrowserHost,
 
   // Destroy the browser members. This method should only be called after the
   // native browser window is not longer processing messages.
-  void DestroyBrowser();
+  void DestroyBrowser() override;
 
   // Cancel display of the context menu, if any.
   void CancelContextMenu();
@@ -307,53 +187,29 @@ class CefBrowserHostImpl : public CefBrowserHost,
   CefRefPtr<CefBrowserView> GetBrowserView() const;
 #endif
 
-  // Returns the frame associated with the specified RenderFrameHost.
-  CefRefPtr<CefFrame> GetFrameForHost(const content::RenderFrameHost* host);
-
-  // Returns the frame associated with the specified FrameTreeNode ID.
-  CefRefPtr<CefFrame> GetFrameForFrameTreeNode(int frame_tree_node_id);
-
-  // Load the specified URL in the main frame.
-  void LoadMainFrameURL(const std::string& url,
-                        const content::Referrer& referrer,
-                        ui::PageTransition transition,
-                        const std::string& extra_headers);
-
-  // Called from CefFrameHostImpl.
-  void OnDidFinishLoad(CefRefPtr<CefFrameHostImpl> frame,
-                       const GURL& validated_url,
-                       int http_status_code);
-
-  // Open the specified text in the default text editor.
-  void ViewText(const std::string& text);
+  bool MaybeAllowNavigation(content::RenderFrameHost* opener,
+                            bool is_guest_view,
+                            const content::OpenURLParams& params) override;
 
   // Convert from view coordinates to screen coordinates. Potential display
   // scaling will be applied to the result.
   gfx::Point GetScreenPoint(const gfx::Point& view) const;
 
   void StartDragging(const content::DropData& drop_data,
-                     blink::WebDragOperationsMask allowed_ops,
+                     blink::DragOperationsMask allowed_ops,
                      const gfx::ImageSkia& image,
                      const gfx::Vector2d& image_offset,
-                     const content::DragEventSourceInfo& event_info,
+                     const blink::mojom::DragEventSourceInfo& event_info,
                      content::RenderWidgetHostImpl* source_rwh);
-  void UpdateDragCursor(blink::WebDragOperation operation);
+  void UpdateDragCursor(blink::DragOperation operation);
 
   // Thread safe accessors.
-  const CefBrowserSettings& settings() const { return settings_; }
   SkColor GetBackgroundColor() const;
-  CefRefPtr<CefClient> client() const { return client_; }
-  scoped_refptr<CefBrowserInfo> browser_info() const { return browser_info_; }
-  int browser_id() const;
-  CefRefPtr<CefRequestContextImpl> request_context() const {
-    return request_context_;
-  }
 
   // Accessors that must be called on the UI thread.
-  content::BrowserContext* GetBrowserContext();
-  extensions::ExtensionHost* extension_host() const { return extension_host_; }
+  extensions::ExtensionHost* GetExtensionHost() const;
 
-  void OnSetFocus(cef_focus_source_t source);
+  void OnSetFocus(cef_focus_source_t source) override;
 
   // Run the file chooser dialog specified by |params|. Only a single dialog may
   // be pending at any given time. |callback| will be executed asynchronously
@@ -364,12 +220,6 @@ class CefBrowserHostImpl : public CefBrowserHost,
   bool HandleContextMenu(content::WebContents* web_contents,
                          const content::ContextMenuParams& params);
 
-  // Returns the WebContents most likely to handle an action. If extensions are
-  // enabled and this browser has a full-page guest (for example, a full-page
-  // PDF viewer extension) then the guest's WebContents will be returned.
-  // Otherwise, the browser's WebContents will be returned.
-  content::WebContents* GetActionableWebContents() const;
-
   enum DestructionState {
     DESTRUCTION_STATE_NONE = 0,
     DESTRUCTION_STATE_PENDING,
@@ -392,7 +242,6 @@ class CefBrowserHostImpl : public CefBrowserHost,
                       bool* was_blocked) override;
   void LoadingStateChanged(content::WebContents* source,
                            bool to_different_document) override;
-  void LoadProgressChanged(double progress) override;
   void CloseContents(content::WebContents* source) override;
   void UpdateTargetURL(content::WebContents* source, const GURL& url) override;
   bool DidAddMessageToConsole(content::WebContents* source,
@@ -404,7 +253,6 @@ class CefBrowserHostImpl : public CefBrowserHost,
                          bool proceed,
                          bool* proceed_to_fire_unload) override;
   bool TakeFocus(content::WebContents* source, bool reverse) override;
-
   bool HandleContextMenu(content::RenderFrameHost* render_frame_host,
                          const content::ContextMenuParams& params) override;
   content::KeyboardEventProcessingResult PreHandleKeyboardEvent(
@@ -417,7 +265,7 @@ class CefBrowserHostImpl : public CefBrowserHost,
                              const blink::WebGestureEvent& event) override;
   bool CanDragEnter(content::WebContents* source,
                     const content::DropData& data,
-                    blink::WebDragOperationsMask operations_allowed) override;
+                    blink::DragOperationsMask operations_allowed) override;
   void GetCustomWebContentsView(
       content::WebContents* web_contents,
       const GURL& target_url,
@@ -436,12 +284,11 @@ class CefBrowserHostImpl : public CefBrowserHost,
   content::JavaScriptDialogManager* GetJavaScriptDialogManager(
       content::WebContents* source) override;
   void RunFileChooser(content::RenderFrameHost* render_frame_host,
-                      std::unique_ptr<content::FileSelectListener> listener,
+                      scoped_refptr<content::FileSelectListener> listener,
                       const blink::mojom::FileChooserParams& params) override;
   bool EmbedsFullscreenWidget() override;
   void EnterFullscreenModeForTab(
-      content::WebContents* web_contents,
-      const GURL& origin,
+      content::RenderFrameHost* requesting_frame,
       const blink::mojom::FullscreenOptions& options) override;
   void ExitFullscreenModeForTab(content::WebContents* web_contents) override;
   bool IsFullscreenForTabOrPending(
@@ -474,122 +321,49 @@ class CefBrowserHostImpl : public CefBrowserHost,
 
   // content::WebContentsObserver methods.
   using content::WebContentsObserver::BeforeUnloadFired;
-  void RenderFrameCreated(content::RenderFrameHost* render_frame_host) override;
-  void RenderFrameHostChanged(content::RenderFrameHost* old_host,
-                              content::RenderFrameHost* new_host) override;
-  void RenderFrameDeleted(content::RenderFrameHost* render_frame_host) override;
   void RenderViewCreated(content::RenderViewHost* render_view_host) override;
-  void RenderViewDeleted(content::RenderViewHost* render_view_host) override;
   void RenderViewReady() override;
-  void RenderProcessGone(base::TerminationStatus status) override;
   void DidFinishNavigation(
       content::NavigationHandle* navigation_handle) override;
-  void DidStopLoading() override;
-  void DocumentAvailableInMainFrame() override;
-  void DidFailLoad(content::RenderFrameHost* render_frame_host,
-                   const GURL& validated_url,
-                   int error_code) override;
-  void TitleWasSet(content::NavigationEntry* entry) override;
-  void PluginCrashed(const base::FilePath& plugin_path,
-                     base::ProcessId plugin_pid) override;
-  void DidUpdateFaviconURL(
-      const std::vector<blink::mojom::FaviconURLPtr>& candidates) override;
   void OnAudioStateChanged(bool audible) override;
-  bool OnMessageReceived(const IPC::Message& message,
-                         content::RenderFrameHost* render_frame_host) override;
-  void OnFrameFocused(content::RenderFrameHost* render_frame_host) override;
   void AccessibilityEventReceived(
       const content::AXEventNotificationDetails& content_event_bundle) override;
   void AccessibilityLocationChangesReceived(
       const std::vector<content::AXLocationChangeNotificationDetails>& locData)
       override;
-
-  void OnWebContentsFocused(
-      content::RenderWidgetHost* render_widget_host) override;
-
-  // Manage observer objects. The observer must either outlive this object or
-  // remove itself before destruction. These methods can only be called on the
-  // UI thread.
-  void AddObserver(Observer* observer);
-  void RemoveObserver(Observer* observer);
-  bool HasObserver(Observer* observer) const;
-
-  class NavigationLock final {
-   private:
-    friend class CefBrowserHostImpl;
-    friend std::unique_ptr<NavigationLock>::deleter_type;
-
-    explicit NavigationLock(CefRefPtr<CefBrowserHostImpl> browser);
-    ~NavigationLock();
-
-    CefRefPtr<CefBrowserHostImpl> browser_;
-  };
-
-  // Block navigation-related events on NavigationLock life span.
-  std::unique_ptr<NavigationLock> CreateNavigationLock();
+  void WebContentsDestroyed() override;
 
  private:
-  static CefRefPtr<CefBrowserHostImpl> CreateInternal(
+  friend class CefBrowserPlatformDelegateAlloy;
+
+  static CefRefPtr<AlloyBrowserHostImpl> CreateInternal(
       const CefBrowserSettings& settings,
       CefRefPtr<CefClient> client,
       content::WebContents* web_contents,
       bool own_web_contents,
       scoped_refptr<CefBrowserInfo> browser_info,
-      CefRefPtr<CefBrowserHostImpl> opener,
+      CefRefPtr<AlloyBrowserHostImpl> opener,
       bool is_devtools_popup,
       CefRefPtr<CefRequestContextImpl> request_context,
       std::unique_ptr<CefBrowserPlatformDelegate> platform_delegate,
       CefRefPtr<CefExtension> extension);
 
-  // content::NotificationObserver methods.
-  void Observe(int type,
-               const content::NotificationSource& source,
-               const content::NotificationDetails& details) override;
-
-  CefBrowserHostImpl(
+  AlloyBrowserHostImpl(
       const CefBrowserSettings& settings,
       CefRefPtr<CefClient> client,
       content::WebContents* web_contents,
       scoped_refptr<CefBrowserInfo> browser_info,
-      CefRefPtr<CefBrowserHostImpl> opener,
+      CefRefPtr<AlloyBrowserHostImpl> opener,
       CefRefPtr<CefRequestContextImpl> request_context,
       std::unique_ptr<CefBrowserPlatformDelegate> platform_delegate,
       CefRefPtr<CefExtension> extension);
 
-  void set_owned_web_contents(content::WebContents* owned_contents);
-
   // Give the platform delegate an opportunity to create the host window.
   bool CreateHostWindow();
 
-  // Create/delete the host for extensions.
-  void CreateExtensionHost(const extensions::Extension* extension,
-                           content::BrowserContext* browser_context,
-                           content::WebContents* host_contents,
-                           const GURL& url,
-                           extensions::ViewType host_type);
-  void DestroyExtensionHost();
-  void OnExtensionHostDeleted();
-
-  // Returns true if navigation actions are currently locked.
-  bool navigation_locked() const;
-  // Action to be executed once the navigation lock is released.
-  void set_pending_navigation_action(base::OnceClosure action);
-
-  void OnAddressChange(const GURL& url);
-  void OnLoadStart(CefRefPtr<CefFrame> frame,
-                   ui::PageTransition transition_type);
-  void OnLoadError(CefRefPtr<CefFrame> frame, const GURL& url, int error_code);
-  void OnLoadEnd(CefRefPtr<CefFrame> frame,
-                 const GURL& url,
-                 int http_status_code);
-  void OnFullscreenModeChange(bool fullscreen);
-  void OnTitleChange(const base::string16& title);
-
   // Create the CefFileDialogManager if it doesn't already exist.
   void EnsureFileDialogManager();
 
-  void ConfigureAutoResize();
-
   void StartAudioCapturer();
   void OnRecentlyAudibleTimerFired();
 
@@ -597,61 +371,23 @@ class CefBrowserHostImpl : public CefBrowserHost,
   void InitializeDevToolsRegistrationOnUIThread(
       CefRefPtr<CefRegistration> registration);
 
-  CefBrowserSettings settings_;
-  CefRefPtr<CefClient> client_;
-  scoped_refptr<CefBrowserInfo> browser_info_;
+  void SetFocusInternal(bool focus);
+
   CefWindowHandle opener_;
-  CefRefPtr<CefRequestContextImpl> request_context_;
-  std::unique_ptr<CefBrowserPlatformDelegate> platform_delegate_;
   const bool is_windowless_;
   const bool is_views_hosted_;
   CefWindowHandle host_window_handle_ = kNullWindowHandle;
-
-  // Non-nullptr if this object owns the WebContents. Will be nullptr for popup
-  // browsers between the calls to WebContentsCreated() and AddNewContents(),
-  // and may never be set if the parent browser is destroyed during popup
-  // creation.
-  std::unique_ptr<content::WebContents> owned_web_contents_;
-
-  // Volatile state information. All access must be protected by the state lock.
-  base::Lock state_lock_;
-  bool is_loading_ = false;
-  bool can_go_back_ = false;
-  bool can_go_forward_ = false;
-  bool has_document_ = false;
-  bool is_fullscreen_ = false;
-
-  // The currently focused frame, or nullptr if the main frame is focused.
-  CefRefPtr<CefFrameHostImpl> focused_frame_;
+  CefRefPtr<CefExtension> extension_;
+  bool is_background_host_ = false;
 
   // Represents the current browser destruction state. Only accessed on the UI
   // thread.
   DestructionState destruction_state_ = DESTRUCTION_STATE_NONE;
 
-  // Navigation will not occur while |navigation_lock_count_| > 0.
-  // |pending_navigation_action_| will be executed when the lock is released.
-  // Only accessed on the UI thread.
-  int navigation_lock_count_ = 0;
-  base::OnceClosure pending_navigation_action_;
-
   // True if the OS window hosting the browser has been destroyed. Only accessed
   // on the UI thread.
   bool window_destroyed_ = false;
 
-  // True if currently in the OnSetFocus callback. Only accessed on the UI
-  // thread.
-  bool is_in_onsetfocus_ = false;
-
-  // True if the focus is currently on an editable field on the page. Only
-  // accessed on the UI thread.
-  bool focus_on_editable_field_ = false;
-
-  // True if mouse cursor change is disabled.
-  bool mouse_cursor_change_disabled_ = false;
-
-  // Used for managing notification subscriptions.
-  std::unique_ptr<content::NotificationRegistrar> registrar_;
-
   // Used for creating and managing file dialogs.
   std::unique_ptr<CefFileDialogManager> file_dialog_manager_;
 
@@ -664,17 +400,6 @@ class CefBrowserHostImpl : public CefBrowserHost,
   // Used for creating and managing DevTools instances.
   std::unique_ptr<CefDevToolsManager> devtools_manager_;
 
-  // Observers that want to be notified of changes to this object.
-  base::ObserverList<Observer>::Unchecked observers_;
-
-  // Used to provide unique incremental IDs for each find request.
-  int find_request_id_counter_ = 0;
-
-  // Used when the browser is hosting an extension.
-  extensions::ExtensionHost* extension_host_ = nullptr;
-  CefRefPtr<CefExtension> extension_;
-  bool is_background_host_ = false;
-
   // Used for capturing audio for CefAudioHandler.
   std::unique_ptr<CefAudioCapturer> audio_capturer_;
 
@@ -682,14 +407,6 @@ class CefBrowserHostImpl : public CefBrowserHost,
   // starts running when a tab stops being audible, and is canceled if it starts
   // being audible again before it fires.
   base::OneShotTimer recently_audible_timer_;
-
-  // Used with auto-resize.
-  bool auto_resize_enabled_ = false;
-  gfx::Size auto_resize_min_;
-  gfx::Size auto_resize_max_;
-
-  IMPLEMENT_REFCOUNTING(CefBrowserHostImpl);
-  DISALLOW_COPY_AND_ASSIGN(CefBrowserHostImpl);
 };
 
-#endif  // CEF_LIBCEF_BROWSER_BROWSER_HOST_IMPL_H_
+#endif  // CEF_LIBCEF_BROWSER_ALLOY_ALLOY_BROWSER_HOST_IMPL_H_

libcef/browser/alloy/alloy_browser_main.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "libcef/browser/browser_main.h"
+#include "libcef/browser/alloy/alloy_browser_main.h"
 
 #include <stdint.h>
 
@@ -10,7 +10,6 @@
 
 #include "libcef/browser/browser_context.h"
 #include "libcef/browser/browser_context_keyed_service_factories.h"
-#include "libcef/browser/content_browser_client.h"
 #include "libcef/browser/context.h"
 #include "libcef/browser/devtools/devtools_manager_delegate.h"
 #include "libcef/browser/extensions/extension_system_factory.h"
@@ -19,24 +18,25 @@
 #include "libcef/browser/printing/constrained_window_views_client.h"
 #include "libcef/browser/printing/printing_message_filter.h"
 #include "libcef/browser/thread_util.h"
+#include "libcef/common/app_manager.h"
 #include "libcef/common/extensions/extensions_client.h"
 #include "libcef/common/extensions/extensions_util.h"
 #include "libcef/common/net/net_resource_provider.h"
 
 #include "base/bind.h"
-#include "base/message_loop/message_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/task/post_task.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/media/router/chrome_media_router_factory.h"
 #include "chrome/browser/net/system_network_context_manager.h"
 #include "chrome/browser/plugins/plugin_finder.h"
 #include "components/constrained_window/constrained_window_views.h"
 #include "content/public/browser/gpu_data_manager.h"
 #include "content/public/browser/network_service_instance.h"
+#include "content/public/common/result_codes.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/constants.h"
 #include "net/base/net_module.h"
-#include "services/service_manager/embedder/result_codes.h"
 #include "ui/base/resource/resource_bundle.h"
 
 #if defined(USE_AURA) && defined(USE_X11)
@@ -58,7 +58,7 @@
 #endif  // defined(USE_AURA)
 
 #if defined(TOOLKIT_VIEWS)
-#if defined(OS_MACOSX)
+#if defined(OS_MAC)
 #include "chrome/browser/ui/views/chrome_layout_provider.h"
 #include "chrome/browser/ui/views/chrome_views_delegate.h"
 #else
@@ -74,25 +74,25 @@
 #include "libcef/browser/printing/print_dialog_linux.h"
 #endif
 
-CefBrowserMainParts::CefBrowserMainParts(
+AlloyBrowserMainParts::AlloyBrowserMainParts(
     const content::MainFunctionParams& parameters)
     : BrowserMainParts(), devtools_delegate_(nullptr) {}
 
-CefBrowserMainParts::~CefBrowserMainParts() {
+AlloyBrowserMainParts::~AlloyBrowserMainParts() {
   constrained_window::SetConstrainedWindowViewsClient(nullptr);
 }
 
-int CefBrowserMainParts::PreEarlyInitialization() {
+int AlloyBrowserMainParts::PreEarlyInitialization() {
 #if defined(USE_AURA) && defined(OS_LINUX)
   // TODO(linux): Consider using a real input method or
   // views::LinuxUI::SetInstance.
   ui::InitializeInputMethodForTesting();
 #endif
 
-  return service_manager::RESULT_CODE_NORMAL_EXIT;
+  return content::RESULT_CODE_NORMAL_EXIT;
 }
 
-void CefBrowserMainParts::ToolkitInitialized() {
+void AlloyBrowserMainParts::ToolkitInitialized() {
   SetConstrainedWindowViewsClient(CreateCefConstrainedWindowViewsClient());
 #if defined(USE_AURA)
   CHECK(aura::Env::GetInstance());
@@ -101,12 +101,12 @@ void CefBrowserMainParts::ToolkitInitialized() {
 
 #if defined(OS_WIN)
   ui::CursorLoaderWin::SetCursorResourceModule(
-      CefContentBrowserClient::Get()->GetResourceDllName());
+      CefAppManager::Get()->GetResourceDllName());
 #endif
 #endif  // defined(USE_AURA)
 
 #if defined(TOOLKIT_VIEWS)
-#if defined(OS_MACOSX)
+#if defined(OS_MAC)
   views_delegate_ = std::make_unique<ChromeViewsDelegate>();
   layout_provider_ = ChromeLayoutProvider::CreateLayoutProvider();
 #else
@@ -115,7 +115,7 @@ void CefBrowserMainParts::ToolkitInitialized() {
 #endif  // defined(TOOLKIT_VIEWS)
 }
 
-void CefBrowserMainParts::PreMainMessageLoopStart() {
+void AlloyBrowserMainParts::PreMainMessageLoopStart() {
 #if defined(USE_AURA) && defined(USE_X11)
   ui::TouchFactory::SetTouchDeviceListFromCommandLine();
 #endif
@@ -131,9 +131,11 @@ void CefBrowserMainParts::PreMainMessageLoopStart() {
   // setup.exe.  In Chrome, these strings are in the locale files.
   ChromeBrowserMainPartsWin::SetupInstallerUtilStrings();
 #endif  // defined(OS_WIN)
+
+  media_router::ChromeMediaRouterFactory::DoPlatformInit();
 }
 
-void CefBrowserMainParts::PostMainMessageLoopStart() {
+void AlloyBrowserMainParts::PostMainMessageLoopStart() {
 #if defined(OS_LINUX)
   printing::PrintingContextLinux::SetCreatePrintDialogFunction(
       &CefPrintDialogLinux::CreatePrintDialog);
@@ -142,7 +144,7 @@ void CefBrowserMainParts::PostMainMessageLoopStart() {
 #endif
 }
 
-int CefBrowserMainParts::PreCreateThreads() {
+int AlloyBrowserMainParts::PreCreateThreads() {
 #if defined(OS_WIN)
   PlatformInitialize();
 #endif
@@ -157,7 +159,7 @@ int CefBrowserMainParts::PreCreateThreads() {
   return 0;
 }
 
-void CefBrowserMainParts::PreMainMessageLoopRun() {
+void AlloyBrowserMainParts::PreMainMessageLoopRun() {
 #if defined(USE_AURA)
   display::Screen::SetScreenInstance(views::CreateDesktopScreen());
 #endif
@@ -196,8 +198,8 @@ void CefBrowserMainParts::PreMainMessageLoopRun() {
   // Create the global RequestContext.
   global_request_context_ =
       CefRequestContextImpl::CreateGlobalRequestContext(settings);
-  CefBrowserContext* browser_context = static_cast<CefBrowserContext*>(
-      global_request_context_->GetBrowserContext());
+  auto browser_context =
+      global_request_context_->GetBrowserContext()->AsBrowserContext();
 
   CefDevToolsManagerDelegate::StartHttpHandler(browser_context);
 
@@ -213,7 +215,7 @@ void CefBrowserMainParts::PreMainMessageLoopRun() {
   scheme::RegisterWebUIControllerFactory();
 }
 
-void CefBrowserMainParts::PostMainMessageLoopRun() {
+void AlloyBrowserMainParts::PostMainMessageLoopRun() {
   // NOTE: Destroy objects in reverse order of creation.
   CefDevToolsManagerDelegate::StopHttpHandler();
 
@@ -223,7 +225,7 @@ void CefBrowserMainParts::PostMainMessageLoopRun() {
   global_request_context_ = nullptr;
 }
 
-void CefBrowserMainParts::PostDestroyThreads() {
+void AlloyBrowserMainParts::PostDestroyThreads() {
   if (extensions::ExtensionsEnabled()) {
     extensions::ExtensionsBrowserClient::Set(nullptr);
     extensions_browser_client_.reset();
@@ -231,7 +233,7 @@ void CefBrowserMainParts::PostDestroyThreads() {
 
 #if defined(TOOLKIT_VIEWS)
   views_delegate_.reset();
-#if defined(OS_MACOSX)
+#if defined(OS_MAC)
   layout_provider_.reset();
 #endif
 #endif  // defined(TOOLKIT_VIEWS)

libcef/browser/alloy/alloy_browser_main.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CEF_LIBCEF_BROWSER_BROWSER_MAIN_H_
-#define CEF_LIBCEF_BROWSER_BROWSER_MAIN_H_
+#ifndef CEF_LIBCEF_BROWSER_ALLOY_ALLOY_BROWSER_MAIN_H_
+#define CEF_LIBCEF_BROWSER_ALLOY_ALLOY_BROWSER_MAIN_H_
 #pragma once
 
 #include "libcef/browser/request_context_impl.h"
@@ -32,18 +32,18 @@ class WMState;
 #if defined(TOOLKIT_VIEWS)
 namespace views {
 class ViewsDelegate;
-#if defined(OS_MACOSX)
+#if defined(OS_MAC)
 class LayoutProvider;
 #endif
-}
+}  // namespace views
 #endif  // defined(TOOLKIT_VIEWS)
 
 class CefDevToolsDelegate;
 
-class CefBrowserMainParts : public content::BrowserMainParts {
+class AlloyBrowserMainParts : public content::BrowserMainParts {
  public:
-  explicit CefBrowserMainParts(const content::MainFunctionParams& parameters);
-  ~CefBrowserMainParts() override;
+  explicit AlloyBrowserMainParts(const content::MainFunctionParams& parameters);
+  ~AlloyBrowserMainParts() override;
 
   int PreEarlyInitialization() override;
   void ToolkitInitialized() override;
@@ -96,12 +96,12 @@ class CefBrowserMainParts : public content::BrowserMainParts {
 
 #if defined(TOOLKIT_VIEWS)
   std::unique_ptr<views::ViewsDelegate> views_delegate_;
-#if defined(OS_MACOSX)
+#if defined(OS_MAC)
   std::unique_ptr<views::LayoutProvider> layout_provider_;
 #endif
 #endif  // defined(TOOLKIT_VIEWS)
 
-  DISALLOW_COPY_AND_ASSIGN(CefBrowserMainParts);
+  DISALLOW_COPY_AND_ASSIGN(AlloyBrowserMainParts);
 };
 
-#endif  // CEF_LIBCEF_BROWSER_BROWSER_MAIN_H_
+#endif  // CEF_LIBCEF_BROWSER_ALLOY_ALLOY_BROWSER_MAIN_H_

libcef/browser/alloy/alloy_browser_main_win.cc

@@ -6,11 +6,11 @@
 #include <commctrl.h>
 #include <windows.h>
 
-#include "libcef/browser/browser_main.h"
+#include "libcef/browser/alloy/alloy_browser_main.h"
 
 #include "base/logging.h"
 
-void CefBrowserMainParts::PlatformInitialize() {
+void AlloyBrowserMainParts::PlatformInitialize() {
   HRESULT res;
 
   // Initialize common controls.

libcef/browser/alloy/alloy_content_browser_client.cc

@@ -2,17 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "libcef/browser/content_browser_client.h"
+#include "libcef/browser/alloy/alloy_content_browser_client.h"
 
 #include <algorithm>
 #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/browser_context.h"
-#include "libcef/browser/browser_host_impl.h"
 #include "libcef/browser/browser_info.h"
 #include "libcef/browser/browser_info_manager.h"
-#include "libcef/browser/browser_main.h"
 #include "libcef/browser/browser_message_filter.h"
 #include "libcef/browser/browser_platform_delegate.h"
 #include "libcef/browser/context.h"
@@ -21,6 +22,8 @@
 #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"
@@ -31,14 +34,14 @@
 #include "libcef/browser/ssl_info_impl.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_messages.h"
 #include "libcef/common/cef_switches.h"
 #include "libcef/common/command_line_impl.h"
-#include "libcef/common/content_client.h"
 #include "libcef/common/extensions/extensions_util.h"
 #include "libcef/common/net/scheme_registration.h"
 #include "libcef/common/request_impl.h"
-#include "libcef/common/service_manifests/cef_content_browser_overlay_manifest.h"
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
@@ -50,6 +53,7 @@
 #include "cef/grit/cef_resources.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_content_browser_client.h"
+#include "chrome/browser/content_settings/cookie_settings_factory.h"
 #include "chrome/browser/net/system_network_context_manager.h"
 #include "chrome/browser/plugins/plugin_info_host_impl.h"
 #include "chrome/browser/plugins/plugin_response_interceptor_url_loader_throttle.h"
@@ -68,13 +72,11 @@
 #include "chrome/grit/browser_resources.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/services/printing/printing_service.h"
-#include "components/navigation_interception/intercept_navigation_throttle.h"
-#include "components/navigation_interception/navigation_params.h"
+#include "components/content_settings/core/browser/cookie_settings.h"
 #include "components/spellcheck/common/spellcheck.mojom.h"
-#include "components/variations/variations_http_header_provider.h"
 #include "components/version_info/version_info.h"
-#include "content/browser/frame_host/render_frame_host_impl.h"
 #include "content/browser/plugin_service_impl.h"
+#include "content/browser/renderer_host/render_frame_host_impl.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_ppapi_host.h"
 #include "content/public/browser/browser_thread.h"
@@ -95,13 +97,14 @@
 #include "content/public/common/storage_quota_params.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/common/user_agent.h"
-#include "content/public/common/web_preferences.h"
 #include "extensions/browser/extension_message_filter.h"
 #include "extensions/browser/extension_protocols.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extensions_browser_client.h"
 #include "extensions/browser/guest_view/extensions_guest_view_message_filter.h"
 #include "extensions/browser/guest_view/web_view/web_view_guest.h"
+#include "extensions/browser/info_map.h"
+#include "extensions/browser/process_map.h"
 #include "extensions/browser/url_loader_factory_manager.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/switches.h"
@@ -110,12 +113,12 @@
 #include "net/base/auth.h"
 #include "net/ssl/ssl_cert_request_info.h"
 #include "ppapi/host/ppapi_host.h"
+#include "sandbox/policy/switches.h"
 #include "services/network/public/cpp/network_switches.h"
 #include "services/proxy_resolver/public/mojom/proxy_resolver.mojom.h"
-#include "services/service_manager/embedder/switches.h"
 #include "services/service_manager/public/mojom/connector.mojom.h"
-#include "services/service_manager/sandbox/switches.h"
 #include "storage/browser/quota/quota_settings.h"
+#include "third_party/blink/public/common/web_preferences/web_preferences.h"
 #include "third_party/blink/public/mojom/insecure_input/insecure_input_service.mojom.h"
 #include "third_party/blink/public/mojom/prerender/prerender.mojom.h"
 #include "third_party/blink/public/web/web_window_features.h"
@@ -129,7 +132,7 @@
 #include "libcef/common/widevine_loader.h"
 #endif
 
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
+#if defined(OS_POSIX) && !defined(OS_MAC)
 #include "base/debug/leak_annotations.h"
 #include "chrome/common/chrome_paths.h"
 #include "components/crash/content/browser/crash_handler_host_linux.h"
@@ -137,7 +140,7 @@
 #include "content/public/common/content_descriptors.h"
 #endif
 
-#if defined(OS_MACOSX)
+#if defined(OS_MAC)
 #include "net/ssl/client_cert_store_mac.h"
 #include "services/video_capture/public/mojom/constants.mojom.h"
 #endif
@@ -345,9 +348,9 @@ class CefQuotaPermissionContext : public content::QuotaPermissionContext {
 
     bool handled = false;
 
-    CefRefPtr<CefBrowserHostImpl> browser =
-        CefBrowserHostImpl::GetBrowserForFrameRoute(render_process_id,
-                                                    params.render_frame_id);
+    CefRefPtr<AlloyBrowserHostImpl> browser =
+        AlloyBrowserHostImpl::GetBrowserForFrameRoute(render_process_id,
+                                                      params.render_frame_id);
     if (browser.get()) {
       CefRefPtr<CefClient> client = browser->GetClient();
       if (client.get()) {
@@ -379,7 +382,7 @@ class CefQuotaPermissionContext : public content::QuotaPermissionContext {
   DISALLOW_COPY_AND_ASSIGN(CefQuotaPermissionContext);
 };
 
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
+#if defined(OS_POSIX) && !defined(OS_MAC)
 breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost(
     const std::string& process_type) {
   base::FilePath dumps_path;
@@ -387,7 +390,7 @@ breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost(
   {
     ANNOTATE_SCOPED_MEMORY_LEAK;
     // Uploads will only occur if a non-empty crash URL is specified in
-    // CefMainDelegate::InitCrashReporter.
+    // AlloyMainDelegate::InitCrashReporter.
     breakpad::CrashHandlerHostLinux* crash_handler =
         new breakpad::CrashHandlerHostLinux(process_type, dumps_path,
                                             true /* upload */);
@@ -434,73 +437,7 @@ int GetCrashSignalFD(const base::CommandLine& command_line) {
 
   return -1;
 }
-#endif  // defined(OS_POSIX) && !defined(OS_MACOSX)
-
-// TODO(cef): We can't currently trust NavigationParams::is_main_frame() because
-// it's always set to true in
-// InterceptNavigationThrottle::CheckIfShouldIgnoreNavigation. Remove the
-// |is_main_frame| argument once this problem is fixed.
-bool NavigationOnUIThread(
-    bool is_main_frame,
-    int64_t frame_id,
-    int64_t parent_frame_id,
-    int frame_tree_node_id,
-    content::WebContents* source,
-    const navigation_interception::NavigationParams& params) {
-  CEF_REQUIRE_UIT();
-
-  content::OpenURLParams open_params(
-      params.url(), params.referrer(), WindowOpenDisposition::CURRENT_TAB,
-      params.transition_type(), params.is_renderer_initiated());
-  open_params.user_gesture = params.has_user_gesture();
-
-  CefRefPtr<CefBrowserHostImpl> browser;
-  if (!CefBrowserInfoManager::GetInstance()->MaybeAllowNavigation(
-          source->GetMainFrame(), open_params, browser)) {
-    // Cancel the navigation.
-    return true;
-  }
-
-  bool ignore_navigation = false;
-
-  if (browser.get()) {
-    CefRefPtr<CefClient> client = browser->GetClient();
-    if (client.get()) {
-      CefRefPtr<CefRequestHandler> handler = client->GetRequestHandler();
-      if (handler.get()) {
-        CefRefPtr<CefFrame> frame;
-        if (is_main_frame) {
-          frame = browser->GetMainFrame();
-        } else if (frame_id >= 0) {
-          frame = browser->GetFrame(frame_id);
-        }
-        if (!frame && frame_tree_node_id >= 0) {
-          frame = browser->GetFrameForFrameTreeNode(frame_tree_node_id);
-        }
-        if (!frame) {
-          // Create a temporary frame object for navigation of sub-frames that
-          // don't yet exist.
-          frame = browser->browser_info()->CreateTempSubFrame(parent_frame_id);
-        }
-
-        CefRefPtr<CefRequestImpl> request = new CefRequestImpl();
-        request->Set(params, is_main_frame);
-        request->SetReadOnly(true);
-
-        // Initiating a new navigation in OnBeforeBrowse will delete the
-        // InterceptNavigationThrottle that currently owns this callback,
-        // resulting in a crash. Use the lock to prevent that.
-        std::unique_ptr<CefBrowserHostImpl::NavigationLock> navigation_lock =
-            browser->CreateNavigationLock();
-        ignore_navigation = handler->OnBeforeBrowse(
-            browser.get(), frame, request.get(), params.has_user_gesture(),
-            params.is_redirect());
-      }
-    }
-  }
-
-  return ignore_navigation;
-}
+#endif  // defined(OS_POSIX) && !defined(OS_MAC)
 
 // From chrome/browser/plugins/chrome_content_browser_client_plugins_part.cc.
 void BindPluginInfoHost(
@@ -544,31 +481,22 @@ void PopulateChromeFrameBinders(
 
 }  // namespace
 
-CefContentBrowserClient::CefContentBrowserClient()
-    : browser_main_parts_(nullptr) {
+AlloyContentBrowserClient::AlloyContentBrowserClient() {
   plugin_service_filter_.reset(new CefPluginServiceFilter);
   content::PluginServiceImpl::GetInstance()->SetFilter(
       plugin_service_filter_.get());
 }
 
-CefContentBrowserClient::~CefContentBrowserClient() {}
-
-// static
-CefContentBrowserClient* CefContentBrowserClient::Get() {
-  if (!CefContentClient::Get())
-    return nullptr;
-  return static_cast<CefContentBrowserClient*>(
-      CefContentClient::Get()->browser());
-}
+AlloyContentBrowserClient::~AlloyContentBrowserClient() {}
 
 std::unique_ptr<content::BrowserMainParts>
-CefContentBrowserClient::CreateBrowserMainParts(
+AlloyContentBrowserClient::CreateBrowserMainParts(
     const content::MainFunctionParams& parameters) {
-  browser_main_parts_ = new CefBrowserMainParts(parameters);
+  browser_main_parts_ = new AlloyBrowserMainParts(parameters);
   return base::WrapUnique(browser_main_parts_);
 }
 
-void CefContentBrowserClient::RenderProcessWillLaunch(
+void AlloyContentBrowserClient::RenderProcessWillLaunch(
     content::RenderProcessHost* host) {
   const int id = host->GetID();
   Profile* profile = Profile::FromBrowserContext(host->GetBrowserContext());
@@ -594,7 +522,7 @@ void CefContentBrowserClient::RenderProcessWillLaunch(
       ->InitializeRenderer(host);
 }
 
-bool CefContentBrowserClient::ShouldUseProcessPerSite(
+bool AlloyContentBrowserClient::ShouldUseProcessPerSite(
     content::BrowserContext* browser_context,
     const GURL& effective_url) {
   if (!extensions::ExtensionsEnabled())
@@ -623,7 +551,7 @@ bool CefContentBrowserClient::ShouldUseProcessPerSite(
 
 // Based on
 // ChromeContentBrowserClientExtensionsPart::DoesSiteRequireDedicatedProcess.
-bool CefContentBrowserClient::DoesSiteRequireDedicatedProcess(
+bool AlloyContentBrowserClient::DoesSiteRequireDedicatedProcess(
     content::BrowserContext* browser_context,
     const GURL& effective_site_url) {
   if (!extensions::ExtensionsEnabled())
@@ -637,7 +565,7 @@ bool CefContentBrowserClient::DoesSiteRequireDedicatedProcess(
   return extension != nullptr;
 }
 
-void CefContentBrowserClient::OverrideURLLoaderFactoryParams(
+void AlloyContentBrowserClient::OverrideURLLoaderFactoryParams(
     content::BrowserContext* browser_context,
     const url::Origin& origin,
     bool is_for_isolated_world,
@@ -648,21 +576,21 @@ void CefContentBrowserClient::OverrideURLLoaderFactoryParams(
   }
 }
 
-void CefContentBrowserClient::GetAdditionalWebUISchemes(
+void AlloyContentBrowserClient::GetAdditionalWebUISchemes(
     std::vector<std::string>* additional_schemes) {
   // Any schemes listed here are treated as WebUI schemes but do not get WebUI
   // bindings. Also, view-source is allowed for these schemes. WebUI schemes
   // will not be passed to HandleExternalProtocol.
 }
 
-void CefContentBrowserClient::GetAdditionalViewSourceSchemes(
+void AlloyContentBrowserClient::GetAdditionalViewSourceSchemes(
     std::vector<std::string>* additional_schemes) {
   GetAdditionalWebUISchemes(additional_schemes);
 
   additional_schemes->push_back(extensions::kExtensionScheme);
 }
 
-void CefContentBrowserClient::GetAdditionalAllowedSchemesForFileSystem(
+void AlloyContentBrowserClient::GetAdditionalAllowedSchemesForFileSystem(
     std::vector<std::string>* additional_allowed_schemes) {
   ContentBrowserClient::GetAdditionalAllowedSchemesForFileSystem(
       additional_allowed_schemes);
@@ -670,12 +598,12 @@ void CefContentBrowserClient::GetAdditionalAllowedSchemesForFileSystem(
   additional_allowed_schemes->push_back(content::kChromeUIScheme);
 }
 
-bool CefContentBrowserClient::IsWebUIAllowedToMakeNetworkRequests(
+bool AlloyContentBrowserClient::IsWebUIAllowedToMakeNetworkRequests(
     const url::Origin& origin) {
   return scheme::IsWebUIAllowedToMakeNetworkRequests(origin);
 }
 
-bool CefContentBrowserClient::IsHandledURL(const GURL& url) {
+bool AlloyContentBrowserClient::IsHandledURL(const GURL& url) {
   if (!url.is_valid())
     return false;
   const std::string& scheme = url.scheme();
@@ -684,10 +612,10 @@ bool CefContentBrowserClient::IsHandledURL(const GURL& url) {
   if (scheme::IsInternalHandledScheme(scheme))
     return true;
 
-  return CefContentClient::Get()->HasCustomScheme(scheme);
+  return CefAppManager::Get()->HasCustomScheme(scheme);
 }
 
-void CefContentBrowserClient::SiteInstanceGotProcess(
+void AlloyContentBrowserClient::SiteInstanceGotProcess(
     content::SiteInstance* site_instance) {
   if (!extensions::ExtensionsEnabled())
     return;
@@ -697,21 +625,15 @@ void CefContentBrowserClient::SiteInstanceGotProcess(
   if (!extension)
     return;
 
-  CefBrowserContext* browser_context =
-      static_cast<CefBrowserContext*>(site_instance->GetBrowserContext());
+  auto browser_context =
+      static_cast<AlloyBrowserContext*>(site_instance->GetBrowserContext());
 
   extensions::ProcessMap::Get(browser_context)
       ->Insert(extension->id(), site_instance->GetProcess()->GetID(),
                site_instance->GetId());
-
-  CEF_POST_TASK(
-      CEF_IOT, base::Bind(&extensions::InfoMap::RegisterExtensionProcess,
-                          browser_context->extension_system()->info_map(),
-                          extension->id(), site_instance->GetProcess()->GetID(),
-                          site_instance->GetId()));
 }
 
-void CefContentBrowserClient::SiteInstanceDeleting(
+void AlloyContentBrowserClient::SiteInstanceDeleting(
     content::SiteInstance* site_instance) {
   if (!extensions::ExtensionsEnabled())
     return;
@@ -729,21 +651,15 @@ void CefContentBrowserClient::SiteInstanceDeleting(
   if (!extension)
     return;
 
-  CefBrowserContext* browser_context =
-      static_cast<CefBrowserContext*>(site_instance->GetBrowserContext());
+  auto browser_context =
+      static_cast<AlloyBrowserContext*>(site_instance->GetBrowserContext());
 
   extensions::ProcessMap::Get(browser_context)
       ->Remove(extension->id(), site_instance->GetProcess()->GetID(),
                site_instance->GetId());
-
-  CEF_POST_TASK(
-      CEF_IOT, base::Bind(&extensions::InfoMap::UnregisterExtensionProcess,
-                          browser_context->extension_system()->info_map(),
-                          extension->id(), site_instance->GetProcess()->GetID(),
-                          site_instance->GetId()));
 }
 
-void CefContentBrowserClient::BindHostReceiverForRenderer(
+void AlloyContentBrowserClient::BindHostReceiverForRenderer(
     content::RenderProcessHost* render_process_host,
     mojo::GenericPendingReceiver receiver) {
   if (auto host_receiver = receiver.As<spellcheck::mojom::SpellCheckHost>()) {
@@ -762,16 +678,7 @@ void CefContentBrowserClient::BindHostReceiverForRenderer(
 #endif  // BUILDFLAG(HAS_SPELLCHECK_PANEL)
 }
 
-base::Optional<service_manager::Manifest>
-CefContentBrowserClient::GetServiceManifestOverlay(base::StringPiece name) {
-  if (name == content::mojom::kBrowserServiceName) {
-    return GetCefContentBrowserOverlayManifest();
-  }
-
-  return base::nullopt;
-}
-
-void CefContentBrowserClient::AppendExtraCommandLineSwitches(
+void AlloyContentBrowserClient::AppendExtraCommandLineSwitches(
     base::CommandLine* command_line,
     int child_process_id) {
   const base::CommandLine* browser_cmd = base::CommandLine::ForCurrentProcess();
@@ -781,7 +688,7 @@ void CefContentBrowserClient::AppendExtraCommandLineSwitches(
     // associated values) if present in the browser command line.
     static const char* const kSwitchNames[] = {
       switches::kDisablePackLoading,
-#if defined(OS_MACOSX)
+#if defined(OS_MAC)
       switches::kFrameworkDirPath,
       switches::kMainBundlePath,
 #endif
@@ -822,18 +729,19 @@ void CefContentBrowserClient::AppendExtraCommandLineSwitches(
     if (extensions::ExtensionsEnabled()) {
       content::RenderProcessHost* process =
           content::RenderProcessHost::FromID(child_process_id);
-      CefBrowserContext* context =
-          process
-              ? CefBrowserContext::GetForContext(process->GetBrowserContext())
-              : nullptr;
-      if (context) {
-        if (context->IsPrintPreviewSupported()) {
+      auto browser_context = process->GetBrowserContext();
+      CefBrowserContext* cef_browser_context =
+          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(context)->Contains(process->GetID())) {
+        if (extensions::ProcessMap::Get(browser_context)
+                ->Contains(process->GetID())) {
           command_line->AppendSwitch(extensions::switches::kExtensionProcess);
         }
       }
@@ -849,7 +757,7 @@ void CefContentBrowserClient::AppendExtraCommandLineSwitches(
   }
 
 #if defined(OS_LINUX)
-  if (process_type == service_manager::switches::kZygoteProcess) {
+  if (process_type == switches::kZygoteProcess) {
     // Propagate the following switches to the zygote command line (along with
     // any associated values) if present in the browser command line.
     static const char* const kSwitchNames[] = {
@@ -860,7 +768,7 @@ void CefContentBrowserClient::AppendExtraCommandLineSwitches(
                                    base::size(kSwitchNames));
 
 #if BUILDFLAG(ENABLE_WIDEVINE) && BUILDFLAG(ENABLE_LIBRARY_CDMS)
-    if (!browser_cmd->HasSwitch(service_manager::switches::kNoSandbox)) {
+    if (!browser_cmd->HasSwitch(sandbox::policy::switches::kNoSandbox)) {
       // Pass the Widevine CDM path to the Zygote process. See comments in
       // CefWidevineLoader::AddContentDecryptionModules.
       const base::FilePath& cdm_path = CefWidevineLoader::GetInstance()->path();
@@ -879,7 +787,7 @@ void CefContentBrowserClient::AppendExtraCommandLineSwitches(
   }
 #endif  // defined(OS_LINUX)
 
-  CefRefPtr<CefApp> app = CefContentClient::Get()->application();
+  CefRefPtr<CefApp> app = CefAppManager::Get()->GetApplication();
   if (app.get()) {
     CefRefPtr<CefBrowserProcessHandler> handler =
         app->GetBrowserProcessHandler();
@@ -892,12 +800,12 @@ void CefContentBrowserClient::AppendExtraCommandLineSwitches(
   }
 }
 
-std::string CefContentBrowserClient::GetApplicationLocale() {
+std::string AlloyContentBrowserClient::GetApplicationLocale() {
   return g_browser_process->GetApplicationLocale();
 }
 
 scoped_refptr<network::SharedURLLoaderFactory>
-CefContentBrowserClient::GetSystemSharedURLLoaderFactory() {
+AlloyContentBrowserClient::GetSystemSharedURLLoaderFactory() {
   DCHECK(
       content::BrowserThread::CurrentlyOn(content::BrowserThread::UI) ||
       !content::BrowserThread::IsThreadInitialized(content::BrowserThread::UI));
@@ -910,23 +818,23 @@ CefContentBrowserClient::GetSystemSharedURLLoaderFactory() {
 }
 
 network::mojom::NetworkContext*
-CefContentBrowserClient::GetSystemNetworkContext() {
+AlloyContentBrowserClient::GetSystemNetworkContext() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   DCHECK(SystemNetworkContextManager::GetInstance());
   return SystemNetworkContextManager::GetInstance()->GetContext();
 }
 
 scoped_refptr<content::QuotaPermissionContext>
-CefContentBrowserClient::CreateQuotaPermissionContext() {
+AlloyContentBrowserClient::CreateQuotaPermissionContext() {
   return new CefQuotaPermissionContext();
 }
 
-content::MediaObserver* CefContentBrowserClient::GetMediaObserver() {
+content::MediaObserver* AlloyContentBrowserClient::GetMediaObserver() {
   return CefMediaCaptureDevicesDispatcher::GetInstance();
 }
 
 content::SpeechRecognitionManagerDelegate*
-CefContentBrowserClient::CreateSpeechRecognitionManagerDelegate() {
+AlloyContentBrowserClient::CreateSpeechRecognitionManagerDelegate() {
   const base::CommandLine* command_line =
       base::CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(switches::kEnableSpeechInput))
@@ -936,7 +844,7 @@ CefContentBrowserClient::CreateSpeechRecognitionManagerDelegate() {
 }
 
 content::GeneratedCodeCacheSettings
-CefContentBrowserClient::GetGeneratedCodeCacheSettings(
+AlloyContentBrowserClient::GetGeneratedCodeCacheSettings(
     content::BrowserContext* context) {
   // If we pass 0 for size, disk_cache will pick a default size using the
   // heuristics based on available disk size. These are implemented in
@@ -946,7 +854,7 @@ CefContentBrowserClient::GetGeneratedCodeCacheSettings(
                                              0 /* size */, cache_path);
 }
 
-void CefContentBrowserClient::AllowCertificateError(
+void AlloyContentBrowserClient::AllowCertificateError(
     content::WebContents* web_contents,
     int cert_error,
     const net::SSLInfo& ssl_info,
@@ -964,8 +872,8 @@ void CefContentBrowserClient::AllowCertificateError(
     return;
   }
 
-  CefRefPtr<CefBrowserHostImpl> browser =
-      CefBrowserHostImpl::GetBrowserForContents(web_contents);
+  CefRefPtr<AlloyBrowserHostImpl> browser =
+      AlloyBrowserHostImpl::GetBrowserForContents(web_contents);
   if (!browser.get())
     return;
   CefRefPtr<CefClient> client = browser->GetClient();
@@ -992,7 +900,7 @@ void CefContentBrowserClient::AllowCertificateError(
   }
 }
 
-base::OnceClosure CefContentBrowserClient::SelectClientCertificate(
+base::OnceClosure AlloyContentBrowserClient::SelectClientCertificate(
     content::WebContents* web_contents,
     net::SSLCertRequestInfo* cert_request_info,
     net::ClientCertIdentityList client_certs,
@@ -1000,8 +908,8 @@ base::OnceClosure CefContentBrowserClient::SelectClientCertificate(
   CEF_REQUIRE_UIT();
 
   CefRefPtr<CefRequestHandler> handler;
-  CefRefPtr<CefBrowserHostImpl> browser =
-      CefBrowserHostImpl::GetBrowserForContents(web_contents);
+  CefRefPtr<AlloyBrowserHostImpl> browser =
+      AlloyBrowserHostImpl::GetBrowserForContents(web_contents);
   if (browser.get()) {
     CefRefPtr<CefClient> client = browser->GetClient();
     if (client.get())
@@ -1033,7 +941,7 @@ base::OnceClosure CefContentBrowserClient::SelectClientCertificate(
   return base::OnceClosure();
 }
 
-bool CefContentBrowserClient::CanCreateWindow(
+bool AlloyContentBrowserClient::CanCreateWindow(
     content::RenderFrameHost* opener,
     const GURL& opener_url,
     const GURL& opener_top_level_frame_url,
@@ -1055,9 +963,9 @@ bool CefContentBrowserClient::CanCreateWindow(
       user_gesture, opener_suppressed, no_javascript_access);
 }
 
-void CefContentBrowserClient::OverrideWebkitPrefs(
+void AlloyContentBrowserClient::OverrideWebkitPrefs(
     content::RenderViewHost* rvh,
-    content::WebPreferences* prefs) {
+    blink::web_pref::WebPreferences* prefs) {
   // Using RVH instead of RFH here because rvh->GetMainFrame() may be nullptr
   // when this method is called.
   renderer_prefs::PopulateWebPreferences(rvh, *prefs);
@@ -1068,16 +976,23 @@ void CefContentBrowserClient::OverrideWebkitPrefs(
   }
 }
 
-void CefContentBrowserClient::BrowserURLHandlerCreated(
+bool AlloyContentBrowserClient::OverrideWebPreferencesAfterNavigation(
+    content::WebContents* web_contents,
+    blink::web_pref::WebPreferences* prefs) {
+  return renderer_prefs::PopulateWebPreferencesAfterNavigation(web_contents,
+                                                               *prefs);
+}
+
+void AlloyContentBrowserClient::BrowserURLHandlerCreated(
     content::BrowserURLHandler* handler) {
   scheme::BrowserURLHandlerCreated(handler);
 }
 
-std::string CefContentBrowserClient::GetDefaultDownloadName() {
+std::string AlloyContentBrowserClient::GetDefaultDownloadName() {
   return "download";
 }
 
-void CefContentBrowserClient::DidCreatePpapiPlugin(
+void AlloyContentBrowserClient::DidCreatePpapiPlugin(
     content::BrowserPpapiHost* browser_host) {
   browser_host->GetPpapiHost()->AddHostFactoryFilter(
       std::unique_ptr<ppapi::host::HostFactory>(
@@ -1085,45 +1000,20 @@ void CefContentBrowserClient::DidCreatePpapiPlugin(
 }
 
 content::DevToolsManagerDelegate*
-CefContentBrowserClient::GetDevToolsManagerDelegate() {
+AlloyContentBrowserClient::GetDevToolsManagerDelegate() {
   return new CefDevToolsManagerDelegate();
 }
 
 std::vector<std::unique_ptr<content::NavigationThrottle>>
-CefContentBrowserClient::CreateThrottlesForNavigation(
+AlloyContentBrowserClient::CreateThrottlesForNavigation(
     content::NavigationHandle* navigation_handle) {
-  CEF_REQUIRE_UIT();
-
-  std::vector<std::unique_ptr<content::NavigationThrottle>> throttles;
-
-  const bool is_main_frame = navigation_handle->IsInMainFrame();
-
-  // Identify the RenderFrameHost that originated the navigation.
-  const int64_t parent_frame_id =
-      !is_main_frame
-          ? CefFrameHostImpl::MakeFrameId(navigation_handle->GetParentFrame())
-          : CefFrameHostImpl::kInvalidFrameId;
-
-  const int64_t frame_id = !is_main_frame && navigation_handle->HasCommitted()
-                               ? CefFrameHostImpl::MakeFrameId(
-                                     navigation_handle->GetRenderFrameHost())
-                               : CefFrameHostImpl::kInvalidFrameId;
-
-  // Must use SynchronyMode::kSync to ensure that OnBeforeBrowse is always
-  // called before OnBeforeResourceLoad.
-  std::unique_ptr<content::NavigationThrottle> throttle =
-      std::make_unique<navigation_interception::InterceptNavigationThrottle>(
-          navigation_handle,
-          base::Bind(&NavigationOnUIThread, is_main_frame, frame_id,
-                     parent_frame_id, navigation_handle->GetFrameTreeNodeId()),
-          navigation_interception::SynchronyMode::kSync);
-  throttles.push_back(std::move(throttle));
-
+  throttle::NavigationThrottleList throttles;
+  throttle::CreateThrottlesForNavigation(navigation_handle, throttles);
   return throttles;
 }
 
 std::vector<std::unique_ptr<blink::URLLoaderThrottle>>
-CefContentBrowserClient::CreateURLLoaderThrottles(
+AlloyContentBrowserClient::CreateURLLoaderThrottles(
     const network::ResourceRequest& request,
     content::BrowserContext* browser_context,
     const base::RepeatingCallback<content::WebContents*()>& wc_getter,
@@ -1148,41 +1038,25 @@ CefContentBrowserClient::CreateURLLoaderThrottles(
 }
 
 #if defined(OS_LINUX)
-void CefContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
+void AlloyContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
     const base::CommandLine& command_line,
     int child_process_id,
     content::PosixFileDescriptorInfo* mappings) {
   int crash_signal_fd = GetCrashSignalFD(command_line);
   if (crash_signal_fd >= 0) {
-    mappings->Share(service_manager::kCrashDumpSignal, crash_signal_fd);
+    mappings->Share(kCrashDumpSignal, crash_signal_fd);
   }
 }
 #endif  // defined(OS_LINUX)
 
 #if defined(OS_WIN)
-const wchar_t* CefContentBrowserClient::GetResourceDllName() {
-  static wchar_t file_path[MAX_PATH + 1] = {0};
-
-  if (file_path[0] == 0) {
-    // Retrieve the module path (usually libcef.dll).
-    base::FilePath module;
-    base::PathService::Get(base::FILE_MODULE, &module);
-    const std::wstring wstr = module.value();
-    size_t count = std::min(static_cast<size_t>(MAX_PATH), wstr.size());
-    wcsncpy(file_path, wstr.c_str(), count);
-    file_path[count] = 0;
-  }
-
-  return file_path;
-}
-
-bool CefContentBrowserClient::PreSpawnRenderer(sandbox::TargetPolicy* policy,
-                                               RendererSpawnFlags flags) {
+bool AlloyContentBrowserClient::PreSpawnRenderer(sandbox::TargetPolicy* policy,
+                                                 RendererSpawnFlags flags) {
   return true;
 }
 #endif  // defined(OS_WIN)
 
-void CefContentBrowserClient::ExposeInterfacesToRenderer(
+void AlloyContentBrowserClient::ExposeInterfacesToRenderer(
     service_manager::BinderRegistry* registry,
     blink::AssociatedInterfaceRegistry* associated_registry,
     content::RenderProcessHost* host) {
@@ -1191,7 +1065,7 @@ void CefContentBrowserClient::ExposeInterfacesToRenderer(
 }
 
 std::unique_ptr<net::ClientCertStore>
-CefContentBrowserClient::CreateClientCertStore(
+AlloyContentBrowserClient::CreateClientCertStore(
     content::BrowserContext* browser_context) {
   // Match the logic in ProfileNetworkContextService::CreateClientCertStore.
 #if defined(USE_NSS_CERTS)
@@ -1200,7 +1074,7 @@ CefContentBrowserClient::CreateClientCertStore(
       net::ClientCertStoreNSS::PasswordDelegateFactory()));
 #elif defined(OS_WIN)
   return std::unique_ptr<net::ClientCertStore>(new net::ClientCertStoreWin());
-#elif defined(OS_MACOSX)
+#elif defined(OS_MAC)
   return std::unique_ptr<net::ClientCertStore>(new net::ClientCertStoreMac());
 #else
 #error Unknown platform.
@@ -1208,7 +1082,7 @@ CefContentBrowserClient::CreateClientCertStore(
 }
 
 std::unique_ptr<content::LoginDelegate>
-CefContentBrowserClient::CreateLoginDelegate(
+AlloyContentBrowserClient::CreateLoginDelegate(
     const net::AuthChallengeInfo& auth_info,
     content::WebContents* web_contents,
     const content::GlobalRequestID& request_id,
@@ -1222,8 +1096,10 @@ CefContentBrowserClient::CreateLoginDelegate(
       std::move(auth_required_callback));
 }
 
-void CefContentBrowserClient::RegisterNonNetworkNavigationURLLoaderFactories(
+void AlloyContentBrowserClient::RegisterNonNetworkNavigationURLLoaderFactories(
     int frame_tree_node_id,
+    base::UkmSourceId ukm_source_id,
+    NonNetworkURLLoaderFactoryDeprecatedMap* uniquely_owned_factories,
     NonNetworkURLLoaderFactoryMap* factories) {
   if (!extensions::ExtensionsEnabled())
     return;
@@ -1233,13 +1109,14 @@ void CefContentBrowserClient::RegisterNonNetworkNavigationURLLoaderFactories(
   factories->emplace(
       extensions::kExtensionScheme,
       extensions::CreateExtensionNavigationURLLoaderFactory(
-          web_contents->GetBrowserContext(),
+          web_contents->GetBrowserContext(), ukm_source_id,
           !!extensions::WebViewGuest::FromWebContents(web_contents)));
 }
 
-void CefContentBrowserClient::RegisterNonNetworkSubresourceURLLoaderFactories(
+void AlloyContentBrowserClient::RegisterNonNetworkSubresourceURLLoaderFactories(
     int render_process_id,
     int render_frame_id,
+    NonNetworkURLLoaderFactoryDeprecatedMap* uniquely_owned_factories,
     NonNetworkURLLoaderFactoryMap* factories) {
   if (!extensions::ExtensionsEnabled())
     return;
@@ -1276,24 +1153,26 @@ void CefContentBrowserClient::RegisterNonNetworkSubresourceURLLoaderFactories(
       extensions::Manifest::IsComponentLocation(extension->location())) {
     // Components of chrome that are implemented as extensions or platform apps
     // are allowed to use chrome://resources/ and chrome://theme/ URLs.
+    // See also HasCrossOriginWhitelistEntry.
     allowed_webui_hosts.emplace_back(content::kChromeUIResourcesHost);
     allowed_webui_hosts.emplace_back(chrome::kChromeUIThemeHost);
   }
   if (!allowed_webui_hosts.empty()) {
-    factories->emplace(
-        content::kChromeUIScheme,
-        content::CreateWebUIURLLoader(frame_host, content::kChromeUIScheme,
-                                      std::move(allowed_webui_hosts)));
+    factories->emplace(content::kChromeUIScheme,
+                       content::CreateWebUIURLLoaderFactory(
+                           frame_host, content::kChromeUIScheme,
+                           std::move(allowed_webui_hosts)));
   }
 }
 
-bool CefContentBrowserClient::WillCreateURLLoaderFactory(
+bool AlloyContentBrowserClient::WillCreateURLLoaderFactory(
     content::BrowserContext* browser_context,
     content::RenderFrameHost* frame,
     int render_process_id,
     URLLoaderFactoryType type,
     const url::Origin& request_initiator,
     base::Optional<int64_t> navigation_id,
+    base::UkmSourceId ukm_source_id,
     mojo::PendingReceiver<network::mojom::URLLoaderFactory>* factory_receiver,
     mojo::PendingRemote<network::mojom::TrustedURLLoaderHeaderClient>*
         header_client,
@@ -1311,7 +1190,7 @@ bool CefContentBrowserClient::WillCreateURLLoaderFactory(
   return true;
 }
 
-void CefContentBrowserClient::OnNetworkServiceCreated(
+void AlloyContentBrowserClient::OnNetworkServiceCreated(
     network::mojom::NetworkService* network_service) {
   DCHECK(g_browser_process);
   PrefService* local_state = g_browser_process->local_state();
@@ -1323,7 +1202,7 @@ void CefContentBrowserClient::OnNetworkServiceCreated(
       network_service);
 }
 
-void CefContentBrowserClient::ConfigureNetworkContextParams(
+void AlloyContentBrowserClient::ConfigureNetworkContextParams(
     content::BrowserContext* context,
     bool in_memory,
     const base::FilePath& relative_partition_path,
@@ -1338,10 +1217,16 @@ void CefContentBrowserClient::ConfigureNetworkContextParams(
     return;
   }
 
-  Profile* profile = Profile::FromBrowserContext(context);
+  auto cef_context = CefBrowserContext::FromBrowserContext(context);
+
+  Profile* profile = cef_context->AsProfile();
   profile->ConfigureNetworkContextParams(in_memory, relative_partition_path,
                                          network_context_params,
                                          cert_verifier_creation_params);
+
+  network_context_params->cookieable_schemes =
+      cef_context->GetCookieableSchemes();
+
   // TODO(cef): Remove this and add required NetworkIsolationKeys,
   // this is currently not the case and this was not required pre M84.
   network_context_params->require_network_isolation_key = false;
@@ -1350,7 +1235,7 @@ void CefContentBrowserClient::ConfigureNetworkContextParams(
 // The sandbox may block read/write access from the NetworkService to
 // directories that are not returned by this method.
 std::vector<base::FilePath>
-CefContentBrowserClient::GetNetworkContextsParentDirectory() {
+AlloyContentBrowserClient::GetNetworkContextsParentDirectory() {
   base::FilePath user_data_path;
   base::PathService::Get(chrome::DIR_USER_DATA, &user_data_path);
   DCHECK(!user_data_path.empty());
@@ -1366,9 +1251,9 @@ CefContentBrowserClient::GetNetworkContextsParentDirectory() {
   return {user_data_path, root_cache_path};
 }
 
-bool CefContentBrowserClient::HandleExternalProtocol(
+bool AlloyContentBrowserClient::HandleExternalProtocol(
     const GURL& url,
-    base::OnceCallback<content::WebContents*()> web_contents_getter,
+    content::WebContents::OnceGetter web_contents_getter,
     int child_id,
     content::NavigationUIData* navigation_data,
     bool is_main_frame,
@@ -1380,7 +1265,7 @@ bool CefContentBrowserClient::HandleExternalProtocol(
   return false;
 }
 
-bool CefContentBrowserClient::HandleExternalProtocol(
+bool AlloyContentBrowserClient::HandleExternalProtocol(
     content::WebContents::Getter web_contents_getter,
     int frame_tree_node_id,
     content::NavigationUIData* navigation_data,
@@ -1388,37 +1273,21 @@ bool CefContentBrowserClient::HandleExternalProtocol(
     mojo::PendingRemote<network::mojom::URLLoaderFactory>* out_factory) {
   mojo::PendingReceiver<network::mojom::URLLoaderFactory> receiver =
       out_factory->InitWithNewPipeAndPassReceiver();
+
   // CefBrowserPlatformDelegate::HandleExternalProtocol may be called if
   // nothing handles the request.
-  if (CEF_CURRENTLY_ON_IOT()) {
-    auto request_handler = net_service::CreateInterceptedRequestHandler(
-        web_contents_getter, frame_tree_node_id, resource_request);
-    net_service::ProxyURLLoaderFactory::CreateProxy(
-        web_contents_getter, std::move(receiver), std::move(request_handler));
-  } else {
-    auto request_handler = net_service::CreateInterceptedRequestHandler(
-        web_contents_getter, frame_tree_node_id, resource_request);
-    CEF_POST_TASK(
-        CEF_IOT,
-        base::BindOnce(
-            [](mojo::PendingReceiver<network::mojom::URLLoaderFactory> receiver,
-               std::unique_ptr<net_service::InterceptedRequestHandler>
-                   request_handler,
-               content::WebContents::Getter web_contents_getter) {
-              // Manages its own lifetime.
+  auto request_handler = net_service::CreateInterceptedRequestHandler(
+      web_contents_getter, frame_tree_node_id, resource_request,
+      base::Bind(CefBrowserPlatformDelegate::HandleExternalProtocol,
+                 resource_request.url));
 
-              net_service::ProxyURLLoaderFactory::CreateProxy(
-                  web_contents_getter, std::move(receiver),
-                  std::move(request_handler));
-            },
-            std::move(receiver), std::move(request_handler),
-            std::move(web_contents_getter)));
-  }
+  net_service::ProxyURLLoaderFactory::CreateProxy(
+      web_contents_getter, std::move(receiver), std::move(request_handler));
   return true;
 }
 
 std::unique_ptr<content::OverlayWindow>
-CefContentBrowserClient::CreateWindowForPictureInPicture(
+AlloyContentBrowserClient::CreateWindowForPictureInPicture(
     content::PictureInPictureWindowController* controller) {
   // Note: content::OverlayWindow::Create() is defined by platform-specific
   // implementation in chrome/browser/ui/views. This layering hack, which goes
@@ -1429,7 +1298,7 @@ CefContentBrowserClient::CreateWindowForPictureInPicture(
   return content::OverlayWindow::Create(controller);
 }
 
-void CefContentBrowserClient::RegisterBrowserInterfaceBindersForFrame(
+void AlloyContentBrowserClient::RegisterBrowserInterfaceBindersForFrame(
     content::RenderFrameHost* render_frame_host,
     mojo::BinderMapWithContext<content::RenderFrameHost*>* map) {
   PopulateChromeFrameBinders(map);
@@ -1459,25 +1328,25 @@ void CefContentBrowserClient::RegisterBrowserInterfaceBindersForFrame(
 }
 
 base::FilePath
-CefContentBrowserClient::GetSandboxedStorageServiceDataDirectory() {
+AlloyContentBrowserClient::GetSandboxedStorageServiceDataDirectory() {
   return GetRootCachePath();
 }
 
-std::string CefContentBrowserClient::GetProduct() {
+std::string AlloyContentBrowserClient::GetProduct() {
   // Match the logic in chrome_content_browser_client.cc GetProduct().
   return ::GetProduct();
 }
 
-std::string CefContentBrowserClient::GetChromeProduct() {
+std::string AlloyContentBrowserClient::GetChromeProduct() {
   return version_info::GetProductNameAndVersionForUserAgent();
 }
 
-std::string CefContentBrowserClient::GetUserAgent() {
+std::string AlloyContentBrowserClient::GetUserAgent() {
   // Match the logic in chrome_content_browser_client.cc GetUserAgent().
   return ::GetUserAgent();
 }
 
-blink::UserAgentMetadata CefContentBrowserClient::GetUserAgentMetadata() {
+blink::UserAgentMetadata AlloyContentBrowserClient::GetUserAgentMetadata() {
   blink::UserAgentMetadata metadata;
 
   metadata.brand_version_list = {blink::UserAgentBrandVersion{
@@ -1493,7 +1362,7 @@ blink::UserAgentMetadata CefContentBrowserClient::GetUserAgentMetadata() {
 }
 
 base::flat_set<std::string>
-CefContentBrowserClient::GetPluginMimeTypesWithExternalHandlers(
+AlloyContentBrowserClient::GetPluginMimeTypesWithExternalHandlers(
     content::BrowserContext* browser_context) {
   base::flat_set<std::string> mime_types;
   auto map = PluginUtils::GetMimeTypeToExtensionIdMap(browser_context);
@@ -1502,7 +1371,18 @@ CefContentBrowserClient::GetPluginMimeTypesWithExternalHandlers(
   return mime_types;
 }
 
-bool CefContentBrowserClient::ShouldAllowPluginCreation(
+bool AlloyContentBrowserClient::ArePersistentMediaDeviceIDsAllowed(
+    content::BrowserContext* browser_context,
+    const GURL& url,
+    const GURL& site_for_cookies,
+    const base::Optional<url::Origin>& top_frame_origin) {
+  // Persistent MediaDevice IDs are allowed if cookies are allowed.
+  return CookieSettingsFactory::GetForProfile(
+             Profile::FromBrowserContext(browser_context))
+      ->IsCookieAccessAllowed(url, site_for_cookies, top_frame_origin);
+}
+
+bool AlloyContentBrowserClient::ShouldAllowPluginCreation(
     const url::Origin& embedder_origin,
     const content::PepperPluginInfo& plugin_info) {
   if (plugin_info.name == ChromeContentClient::kPDFInternalPluginName) {
@@ -1527,31 +1407,31 @@ bool CefContentBrowserClient::ShouldAllowPluginCreation(
   return true;
 }
 
-CefRefPtr<CefRequestContextImpl> CefContentBrowserClient::request_context()
+CefRefPtr<CefRequestContextImpl> AlloyContentBrowserClient::request_context()
     const {
   return browser_main_parts_->request_context();
 }
 
-CefDevToolsDelegate* CefContentBrowserClient::devtools_delegate() const {
+CefDevToolsDelegate* AlloyContentBrowserClient::devtools_delegate() const {
   return browser_main_parts_->devtools_delegate();
 }
 
 scoped_refptr<base::SingleThreadTaskRunner>
-CefContentBrowserClient::background_task_runner() const {
+AlloyContentBrowserClient::background_task_runner() const {
   return browser_main_parts_->background_task_runner();
 }
 
 scoped_refptr<base::SingleThreadTaskRunner>
-CefContentBrowserClient::user_visible_task_runner() const {
+AlloyContentBrowserClient::user_visible_task_runner() const {
   return browser_main_parts_->user_visible_task_runner();
 }
 
 scoped_refptr<base::SingleThreadTaskRunner>
-CefContentBrowserClient::user_blocking_task_runner() const {
+AlloyContentBrowserClient::user_blocking_task_runner() const {
   return browser_main_parts_->user_blocking_task_runner();
 }
 
-const extensions::Extension* CefContentBrowserClient::GetExtension(
+const extensions::Extension* AlloyContentBrowserClient::GetExtension(
     content::SiteInstance* site_instance) {
   extensions::ExtensionRegistry* registry =
       extensions::ExtensionRegistry::Get(site_instance->GetBrowserContext());

libcef/browser/alloy/alloy_content_browser_client.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CEF_LIBCEF_BROWSER_CONTENT_BROWSER_CLIENT_H_
-#define CEF_LIBCEF_BROWSER_CONTENT_BROWSER_CLIENT_H_
+#ifndef CEF_LIBCEF_BROWSER_ALLOY_ALLOY_CONTENT_BROWSER_CLIENT_H_
+#define CEF_LIBCEF_BROWSER_ALLOY_ALLOY_CONTENT_BROWSER_CLIENT_H_
 #pragma once
 
 #include <string>
@@ -18,7 +18,7 @@
 #include "content/public/browser/content_browser_client.h"
 #include "third_party/skia/include/core/SkColor.h"
 
-class CefBrowserMainParts;
+class AlloyBrowserMainParts;
 class CefDevToolsDelegate;
 
 namespace content {
@@ -30,13 +30,10 @@ namespace extensions {
 class Extension;
 }
 
-class CefContentBrowserClient : public content::ContentBrowserClient {
+class AlloyContentBrowserClient : public content::ContentBrowserClient {
  public:
-  CefContentBrowserClient();
-  ~CefContentBrowserClient() override;
-
-  // Returns the singleton CefContentBrowserClient instance.
-  static CefContentBrowserClient* Get();
+  AlloyContentBrowserClient();
+  ~AlloyContentBrowserClient() override;
 
   // ContentBrowserClient implementation.
   std::unique_ptr<content::BrowserMainParts> CreateBrowserMainParts(
@@ -64,8 +61,6 @@ class CefContentBrowserClient : public content::ContentBrowserClient {
   void BindHostReceiverForRenderer(
       content::RenderProcessHost* render_process_host,
       mojo::GenericPendingReceiver receiver) override;
-  base::Optional<service_manager::Manifest> GetServiceManifestOverlay(
-      base::StringPiece name) override;
   void AppendExtraCommandLineSwitches(base::CommandLine* command_line,
                                       int child_process_id) override;
   std::string GetApplicationLocale() override;
@@ -107,7 +102,10 @@ class CefContentBrowserClient : public content::ContentBrowserClient {
                        bool opener_suppressed,
                        bool* no_javascript_access) override;
   void OverrideWebkitPrefs(content::RenderViewHost* rvh,
-                           content::WebPreferences* prefs) override;
+                           blink::web_pref::WebPreferences* prefs) override;
+  bool OverrideWebPreferencesAfterNavigation(
+      content::WebContents* web_contents,
+      blink::web_pref::WebPreferences* prefs) override;
   void BrowserURLHandlerCreated(content::BrowserURLHandler* handler) override;
   std::string GetDefaultDownloadName() override;
   void DidCreatePpapiPlugin(content::BrowserPpapiHost* browser_host) override;
@@ -131,7 +129,6 @@ class CefContentBrowserClient : public content::ContentBrowserClient {
 #endif
 
 #if defined(OS_WIN)
-  const wchar_t* GetResourceDllName();
   bool PreSpawnRenderer(sandbox::TargetPolicy* policy,
                         RendererSpawnFlags flags) override;
 #endif
@@ -153,10 +150,13 @@ class CefContentBrowserClient : public content::ContentBrowserClient {
       LoginAuthRequiredCallback auth_required_callback) override;
   void RegisterNonNetworkNavigationURLLoaderFactories(
       int frame_tree_node_id,
+      base::UkmSourceId ukm_source_id,
+      NonNetworkURLLoaderFactoryDeprecatedMap* uniquely_owned_factories,
       NonNetworkURLLoaderFactoryMap* factories) override;
   void RegisterNonNetworkSubresourceURLLoaderFactories(
       int render_process_id,
       int render_frame_id,
+      NonNetworkURLLoaderFactoryDeprecatedMap* uniquely_owned_factories,
       NonNetworkURLLoaderFactoryMap* factories) override;
   bool WillCreateURLLoaderFactory(
       content::BrowserContext* browser_context,
@@ -165,6 +165,7 @@ class CefContentBrowserClient : public content::ContentBrowserClient {
       URLLoaderFactoryType type,
       const url::Origin& request_initiator,
       base::Optional<int64_t> navigation_id,
+      base::UkmSourceId ukm_source_id,
       mojo::PendingReceiver<network::mojom::URLLoaderFactory>* factory_receiver,
       mojo::PendingRemote<network::mojom::TrustedURLLoaderHeaderClient>*
           header_client,
@@ -183,7 +184,7 @@ class CefContentBrowserClient : public content::ContentBrowserClient {
   std::vector<base::FilePath> GetNetworkContextsParentDirectory() override;
   bool HandleExternalProtocol(
       const GURL& url,
-      base::OnceCallback<content::WebContents*()> web_contents_getter,
+      content::WebContents::OnceGetter web_contents_getter,
       int child_id,
       content::NavigationUIData* navigation_data,
       bool is_main_frame,
@@ -211,6 +212,11 @@ class CefContentBrowserClient : public content::ContentBrowserClient {
   blink::UserAgentMetadata GetUserAgentMetadata() override;
   base::flat_set<std::string> GetPluginMimeTypesWithExternalHandlers(
       content::BrowserContext* browser_context) override;
+  bool ArePersistentMediaDeviceIDsAllowed(
+      content::BrowserContext* browser_context,
+      const GURL& scope,
+      const GURL& site_for_cookies,
+      const base::Optional<url::Origin>& top_frame_origin) override;
   bool ShouldAllowPluginCreation(
       const url::Origin& embedder_origin,
       const content::PepperPluginInfo& plugin_info) override;
@@ -227,9 +233,9 @@ class CefContentBrowserClient : public content::ContentBrowserClient {
   const extensions::Extension* GetExtension(
       content::SiteInstance* site_instance);
 
-  CefBrowserMainParts* browser_main_parts_;
+  AlloyBrowserMainParts* browser_main_parts_ = nullptr;
 
   std::unique_ptr<content::PluginServiceFilter> plugin_service_filter_;
 };
 
-#endif  // CEF_LIBCEF_BROWSER_CONTENT_BROWSER_CLIENT_H_
+#endif  // CEF_LIBCEF_BROWSER_ALLOY_ALLOY_CONTENT_BROWSER_CLIENT_H_

libcef/browser/alloy/browser_platform_delegate_alloy.cc

@@ -0,0 +1,470 @@
+// Copyright 2015 The Chromium Embedded Framework Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "libcef/browser/alloy/browser_platform_delegate_alloy.h"
+
+#include "libcef/browser/alloy/alloy_browser_host_impl.h"
+#include "libcef/browser/extensions/browser_extensions_util.h"
+#include "libcef/browser/extensions/extension_background_host.h"
+#include "libcef/browser/extensions/extension_system.h"
+#include "libcef/browser/extensions/extension_view_host.h"
+#include "libcef/browser/extensions/extension_web_contents_observer.h"
+#include "libcef/browser/printing/print_view_manager.h"
+#include "libcef/common/extensions/extensions_util.h"
+#include "libcef/features/runtime_checks.h"
+
+#include "base/logging.h"
+#include "chrome/browser/printing/print_view_manager.h"
+#include "chrome/browser/ui/prefs/prefs_tab_helper.h"
+#include "components/zoom/zoom_controller.h"
+#include "content/browser/renderer_host/render_widget_host_impl.h"
+#include "content/browser/web_contents/web_contents_impl.h"
+#include "content/public/browser/render_view_host.h"
+#include "content/public/browser/render_widget_host.h"
+#include "extensions/browser/process_manager.h"
+#include "third_party/blink/public/mojom/frame/find_in_page.mojom.h"
+
+namespace {
+
+printing::CefPrintViewManager* GetPrintViewManager(
+    content::WebContents* web_contents) {
+  return printing::CefPrintViewManager::FromWebContents(web_contents);
+}
+
+}  // namespace
+
+CefBrowserPlatformDelegateAlloy::CefBrowserPlatformDelegateAlloy()
+    : weak_ptr_factory_(this) {}
+
+content::WebContents* CefBrowserPlatformDelegateAlloy::CreateWebContents(
+    CefBrowserCreateParams& create_params,
+    bool& own_web_contents) {
+  REQUIRE_ALLOY_RUNTIME();
+  DCHECK(primary_);
+
+  // Get or create the request context and browser context.
+  CefRefPtr<CefRequestContextImpl> request_context_impl =
+      CefRequestContextImpl::GetOrCreateForRequestContext(
+          create_params.request_context);
+  CHECK(request_context_impl);
+  auto cef_browser_context = request_context_impl->GetBrowserContext();
+  CHECK(cef_browser_context);
+  auto browser_context = cef_browser_context->AsBrowserContext();
+
+  if (!create_params.request_context) {
+    // Using the global request context.
+    create_params.request_context = request_context_impl.get();
+  }
+
+  scoped_refptr<content::SiteInstance> site_instance;
+  if (extensions::ExtensionsEnabled() && !create_params.url.is_empty()) {
+    if (!create_params.extension) {
+      // We might be loading an extension app view where the extension URL is
+      // provided by the client.
+      create_params.extension =
+          extensions::GetExtensionForUrl(browser_context, create_params.url);
+    }
+    if (create_params.extension) {
+      if (create_params.extension_host_type == extensions::VIEW_TYPE_INVALID) {
+        // Default to dialog behavior.
+        create_params.extension_host_type =
+            extensions::VIEW_TYPE_EXTENSION_DIALOG;
+      }
+
+      // Extension resources will fail to load if we don't use a SiteInstance
+      // associated with the extension.
+      // (AlloyContentBrowserClient::SiteInstanceGotProcess won't find the
+      // extension to register with InfoMap, and AllowExtensionResourceLoad in
+      // ExtensionProtocolHandler::MaybeCreateJob will return false resulting in
+      // ERR_BLOCKED_BY_CLIENT).
+      site_instance = extensions::ProcessManager::Get(browser_context)
+                          ->GetSiteInstanceForURL(create_params.url);
+      DCHECK(site_instance);
+    }
+  }
+
+  content::WebContents::CreateParams wc_create_params(browser_context,
+                                                      site_instance);
+
+  if (IsWindowless()) {
+    // Create the OSR view for the WebContents.
+    CreateViewForWebContents(&wc_create_params.view,
+                             &wc_create_params.delegate_view);
+  }
+
+  auto web_contents = content::WebContents::Create(wc_create_params);
+  CHECK(web_contents);
+
+  own_web_contents = true;
+  return web_contents.release();
+}
+
+void CefBrowserPlatformDelegateAlloy::WebContentsCreated(
+    content::WebContents* web_contents,
+    bool owned) {
+  CefBrowserPlatformDelegate::WebContentsCreated(web_contents, owned);
+
+  if (owned) {
+    SetOwnedWebContents(web_contents);
+  }
+}
+
+void CefBrowserPlatformDelegateAlloy::AddNewContents(
+    content::WebContents* source,
+    std::unique_ptr<content::WebContents> new_contents,
+    const GURL& target_url,
+    WindowOpenDisposition disposition,
+    const gfx::Rect& initial_rect,
+    bool user_gesture,
+    bool* was_blocked) {
+  REQUIRE_ALLOY_RUNTIME();
+  DCHECK(primary_);
+
+  CefRefPtr<AlloyBrowserHostImpl> owner =
+      AlloyBrowserHostImpl::GetBrowserForContents(new_contents.get());
+  if (owner) {
+    // Taking ownership of |new_contents|.
+    static_cast<CefBrowserPlatformDelegateAlloy*>(
+        owner->platform_delegate_.get())
+        ->SetOwnedWebContents(new_contents.release());
+    return;
+  }
+
+  if (extension_host_) {
+    extension_host_->AddNewContents(source, std::move(new_contents), target_url,
+                                    disposition, initial_rect, user_gesture,
+                                    was_blocked);
+  }
+}
+
+bool CefBrowserPlatformDelegateAlloy::ShouldTransferNavigation(
+    bool is_main_frame_navigation) {
+  if (extension_host_) {
+    return extension_host_->ShouldTransferNavigation(is_main_frame_navigation);
+  }
+  return true;
+}
+
+void CefBrowserPlatformDelegateAlloy::RenderViewCreated(
+    content::RenderViewHost* render_view_host) {
+  // Indicate that the view has an external parent (namely us). This changes the
+  // default view behavior in some cases (e.g. focus handling on Linux).
+  if (!IsViewsHosted() && render_view_host->GetWidget()->GetView())
+    render_view_host->GetWidget()->GetView()->SetHasExternalParent(true);
+}
+
+void CefBrowserPlatformDelegateAlloy::RenderViewReady() {
+  ConfigureAutoResize();
+}
+
+void CefBrowserPlatformDelegateAlloy::BrowserCreated(
+    CefBrowserHostBase* browser) {
+  CefBrowserPlatformDelegate::BrowserCreated(browser);
+
+  // Only register WebContents delegate/observers if we're the primary delegate.
+  if (!primary_)
+    return;
+
+  DCHECK(!web_contents_->GetDelegate());
+  web_contents_->SetDelegate(static_cast<AlloyBrowserHostImpl*>(browser));
+
+  PrefsTabHelper::CreateForWebContents(web_contents_);
+  printing::CefPrintViewManager::CreateForWebContents(web_contents_);
+
+  if (extensions::ExtensionsEnabled()) {
+    extensions::CefExtensionWebContentsObserver::CreateForWebContents(
+        web_contents_);
+
+    // Used by the tabs extension API.
+    zoom::ZoomController::CreateForWebContents(web_contents_);
+  }
+
+  if (IsPrintPreviewSupported()) {
+    web_contents_dialog_helper_.reset(
+        new CefWebContentsDialogHelper(web_contents_, this));
+  }
+}
+
+void CefBrowserPlatformDelegateAlloy::CreateExtensionHost(
+    const extensions::Extension* extension,
+    const GURL& url,
+    extensions::ViewType host_type) {
+  REQUIRE_ALLOY_RUNTIME();
+  DCHECK(primary_);
+
+  // Should get WebContentsCreated and BrowserCreated calls first.
+  DCHECK(web_contents_);
+  DCHECK(browser_);
+  DCHECK(!extension_host_);
+
+  auto alloy_browser = static_cast<AlloyBrowserHostImpl*>(browser_);
+
+  if (host_type == extensions::VIEW_TYPE_EXTENSION_DIALOG ||
+      host_type == extensions::VIEW_TYPE_EXTENSION_POPUP) {
+    // Create an extension host that we own.
+    extension_host_ = new extensions::CefExtensionViewHost(
+        alloy_browser, extension, web_contents_, url, host_type);
+    // Trigger load of the extension URL.
+    extension_host_->CreateRenderViewSoon();
+  } else if (host_type == extensions::VIEW_TYPE_EXTENSION_BACKGROUND_PAGE) {
+    is_background_host_ = true;
+    alloy_browser->is_background_host_ = true;
+    // Create an extension host that will be owned by ProcessManager.
+    extension_host_ = new extensions::CefExtensionBackgroundHost(
+        alloy_browser,
+        base::BindOnce(&CefBrowserPlatformDelegateAlloy::OnExtensionHostDeleted,
+                       weak_ptr_factory_.GetWeakPtr()),
+        extension, web_contents_, url, host_type);
+    // Load will be triggered by ProcessManager::CreateBackgroundHost.
+  } else {
+    NOTREACHED() << " Unsupported extension host type: " << host_type;
+  }
+}
+
+extensions::ExtensionHost* CefBrowserPlatformDelegateAlloy::GetExtensionHost()
+    const {
+  return extension_host_;
+}
+
+void CefBrowserPlatformDelegateAlloy::BrowserDestroyed(
+    CefBrowserHostBase* browser) {
+  if (primary_) {
+    DestroyExtensionHost();
+    owned_web_contents_.reset();
+  }
+
+  CefBrowserPlatformDelegate::BrowserDestroyed(browser);
+}
+
+void CefBrowserPlatformDelegateAlloy::SendCaptureLostEvent() {
+  if (!web_contents_)
+    return;
+  content::RenderViewHost* host = web_contents_->GetRenderViewHost();
+  if (!host)
+    return;
+
+  content::RenderWidgetHostImpl* widget =
+      content::RenderWidgetHostImpl::From(host->GetWidget());
+  if (widget)
+    widget->LostCapture();
+}
+
+#if defined(OS_WIN) || (defined(OS_POSIX) && !defined(OS_MAC))
+void CefBrowserPlatformDelegateAlloy::NotifyMoveOrResizeStarted() {
+  if (!web_contents_)
+    return;
+
+  // Dismiss any existing popups.
+  content::RenderViewHost* host = web_contents_->GetRenderViewHost();
+  if (host)
+    host->NotifyMoveOrResizeStarted();
+}
+#endif
+
+bool CefBrowserPlatformDelegateAlloy::PreHandleGestureEvent(
+    content::WebContents* source,
+    const blink::WebGestureEvent& event) {
+  if (extension_host_)
+    return extension_host_->PreHandleGestureEvent(source, event);
+  return false;
+}
+
+bool CefBrowserPlatformDelegateAlloy::IsNeverComposited(
+    content::WebContents* web_contents) {
+  if (extension_host_)
+    return extension_host_->IsNeverComposited(web_contents);
+  return false;
+}
+
+void CefBrowserPlatformDelegateAlloy::SetAutoResizeEnabled(
+    bool enabled,
+    const CefSize& min_size,
+    const CefSize& max_size) {
+  if (enabled == auto_resize_enabled_)
+    return;
+
+  auto_resize_enabled_ = enabled;
+  if (enabled) {
+    auto_resize_min_ = gfx::Size(min_size.width, min_size.height);
+    auto_resize_max_ = gfx::Size(max_size.width, max_size.height);
+  } else {
+    auto_resize_min_ = auto_resize_max_ = gfx::Size();
+  }
+  ConfigureAutoResize();
+}
+
+void CefBrowserPlatformDelegateAlloy::ConfigureAutoResize() {
+  if (!web_contents_ || !web_contents_->GetRenderWidgetHostView()) {
+    return;
+  }
+
+  if (auto_resize_enabled_) {
+    web_contents_->GetRenderWidgetHostView()->EnableAutoResize(
+        auto_resize_min_, auto_resize_max_);
+  } else {
+    web_contents_->GetRenderWidgetHostView()->DisableAutoResize(gfx::Size());
+  }
+}
+
+void CefBrowserPlatformDelegateAlloy::SetAccessibilityState(
+    cef_state_t accessibility_state) {
+  // Do nothing if state is set to default. It'll be disabled by default and
+  // controlled by the commmand-line flags "force-renderer-accessibility" and
+  // "disable-renderer-accessibility".
+  if (accessibility_state == STATE_DEFAULT)
+    return;
+
+  content::WebContentsImpl* web_contents_impl =
+      static_cast<content::WebContentsImpl*>(web_contents_);
+
+  if (!web_contents_impl)
+    return;
+
+  ui::AXMode accMode;
+  // In windowless mode set accessibility to TreeOnly mode. Else native
+  // accessibility APIs, specific to each platform, are also created.
+  if (accessibility_state == STATE_ENABLED) {
+    accMode = IsWindowless() ? ui::kAXModeWebContentsOnly : ui::kAXModeComplete;
+  }
+  web_contents_impl->SetAccessibilityMode(accMode);
+}
+
+bool CefBrowserPlatformDelegateAlloy::IsPrintPreviewSupported() const {
+  REQUIRE_ALLOY_RUNTIME();
+
+  auto actionable_contents = GetActionableWebContents();
+  if (!actionable_contents)
+    return false;
+
+  auto cef_browser_context = CefBrowserContext::FromBrowserContext(
+      actionable_contents->GetBrowserContext());
+  if (!cef_browser_context->IsPrintPreviewSupported()) {
+    return false;
+  }
+
+  // Print preview is not currently supported with OSR.
+  return !IsWindowless();
+}
+
+void CefBrowserPlatformDelegateAlloy::Print() {
+  REQUIRE_ALLOY_RUNTIME();
+
+  auto actionable_contents = GetActionableWebContents();
+  if (!actionable_contents)
+    return;
+
+  auto rfh = actionable_contents->GetMainFrame();
+
+  if (IsPrintPreviewSupported()) {
+    GetPrintViewManager(actionable_contents)->PrintPreviewNow(rfh, false);
+  } else {
+    GetPrintViewManager(actionable_contents)->PrintNow(rfh);
+  }
+}
+
+void CefBrowserPlatformDelegateAlloy::PrintToPDF(
+    const CefString& path,
+    const CefPdfPrintSettings& settings,
+    CefRefPtr<CefPdfPrintCallback> callback) {
+  REQUIRE_ALLOY_RUNTIME();
+
+  content::WebContents* actionable_contents = GetActionableWebContents();
+  if (!actionable_contents)
+    return;
+  printing::CefPrintViewManager::PdfPrintCallback pdf_callback;
+  if (callback.get()) {
+    pdf_callback = base::Bind(&CefPdfPrintCallback::OnPdfPrintFinished,
+                              callback.get(), path);
+  }
+  GetPrintViewManager(actionable_contents)
+      ->PrintToPDF(actionable_contents->GetMainFrame(), base::FilePath(path),
+                   settings, pdf_callback);
+}
+
+void CefBrowserPlatformDelegateAlloy::Find(int identifier,
+                                           const CefString& searchText,
+                                           bool forward,
+                                           bool matchCase,
+                                           bool findNext) {
+  if (!web_contents_)
+    return;
+
+  // Every find request must have a unique ID and these IDs must strictly
+  // increase so that newer requests always have greater IDs than older
+  // requests.
+  if (identifier <= find_request_id_counter_)
+    identifier = ++find_request_id_counter_;
+  else
+    find_request_id_counter_ = identifier;
+
+  auto options = blink::mojom::FindOptions::New();
+  options->forward = forward;
+  options->match_case = matchCase;
+  options->find_match = findNext;
+  web_contents_->Find(identifier, searchText, std::move(options));
+}
+
+void CefBrowserPlatformDelegateAlloy::StopFinding(bool clearSelection) {
+  if (!web_contents_)
+    return;
+
+  content::StopFindAction action =
+      clearSelection ? content::STOP_FIND_ACTION_CLEAR_SELECTION
+                     : content::STOP_FIND_ACTION_KEEP_SELECTION;
+  web_contents_->StopFinding(action);
+}
+
+base::RepeatingClosure
+CefBrowserPlatformDelegateAlloy::GetBoundsChangedCallback() {
+  if (web_contents_dialog_helper_) {
+    return web_contents_dialog_helper_->GetBoundsChangedCallback();
+  }
+
+  return base::RepeatingClosure();
+}
+
+content::WebContents*
+CefBrowserPlatformDelegateAlloy::GetActionableWebContents() const {
+  if (web_contents_ && extensions::ExtensionsEnabled()) {
+    content::WebContents* guest_contents =
+        extensions::GetFullPageGuestForOwnerContents(web_contents_);
+    if (guest_contents)
+      return guest_contents;
+  }
+  return web_contents_;
+}
+
+void CefBrowserPlatformDelegateAlloy::SetOwnedWebContents(
+    content::WebContents* owned_contents) {
+  DCHECK(primary_);
+
+  // Should not currently own a WebContents.
+  CHECK(!owned_web_contents_);
+  owned_web_contents_.reset(owned_contents);
+}
+
+void CefBrowserPlatformDelegateAlloy::DestroyExtensionHost() {
+  if (!extension_host_)
+    return;
+  if (extension_host_->extension_host_type() ==
+      extensions::VIEW_TYPE_EXTENSION_BACKGROUND_PAGE) {
+    DCHECK(is_background_host_);
+    // Close notification for background pages arrives via CloseContents.
+    // The extension host will be deleted by
+    // ProcessManager::CloseBackgroundHost and OnExtensionHostDeleted will be
+    // called to notify us.
+    extension_host_->Close();
+  } else {
+    DCHECK(!is_background_host_);
+    // We own the extension host and must delete it.
+    delete extension_host_;
+    extension_host_ = nullptr;
+  }
+}
+
+void CefBrowserPlatformDelegateAlloy::OnExtensionHostDeleted() {
+  DCHECK(is_background_host_);
+  DCHECK(extension_host_);
+  extension_host_ = nullptr;
+}

libcef/browser/alloy/browser_platform_delegate_alloy.h

@@ -0,0 +1,114 @@
+// Copyright (c) 2015 The Chromium Embedded Framework Authors.
+// Portions copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef CEF_LIBCEF_BROWSER_ALLOY_BROWSER_PLATFORM_DELEGATE_ALLOY_H_
+#define CEF_LIBCEF_BROWSER_ALLOY_BROWSER_PLATFORM_DELEGATE_ALLOY_H_
+
+#include "libcef/browser/browser_platform_delegate.h"
+#include "libcef/browser/web_contents_dialog_helper.h"
+
+#include "base/memory/weak_ptr.h"
+#include "content/public/browser/web_contents.h"
+#include "ui/gfx/geometry/size.h"
+
+// Implementation of Alloy-based browser functionality.
+class CefBrowserPlatformDelegateAlloy : public CefBrowserPlatformDelegate {
+ public:
+  content::WebContents* CreateWebContents(CefBrowserCreateParams& create_params,
+                                          bool& own_web_contents) override;
+  void WebContentsCreated(content::WebContents* web_contents,
+                          bool owned) override;
+  void AddNewContents(content::WebContents* source,
+                      std::unique_ptr<content::WebContents> new_contents,
+                      const GURL& target_url,
+                      WindowOpenDisposition disposition,
+                      const gfx::Rect& initial_rect,
+                      bool user_gesture,
+                      bool* was_blocked) override;
+  bool ShouldTransferNavigation(bool is_main_frame_navigation) override;
+  void RenderViewCreated(content::RenderViewHost* render_view_host) override;
+  void RenderViewReady() override;
+  void BrowserCreated(CefBrowserHostBase* browser) override;
+  void CreateExtensionHost(const extensions::Extension* extension,
+                           const GURL& url,
+                           extensions::ViewType host_type) override;
+  extensions::ExtensionHost* GetExtensionHost() const override;
+  void BrowserDestroyed(CefBrowserHostBase* browser) override;
+  void SendCaptureLostEvent() override;
+#if defined(OS_WIN) || (defined(OS_POSIX) && !defined(OS_MAC))
+  void NotifyMoveOrResizeStarted() override;
+#endif
+  bool PreHandleGestureEvent(content::WebContents* source,
+                             const blink::WebGestureEvent& event) override;
+  bool IsNeverComposited(content::WebContents* web_contents) override;
+  void SetAutoResizeEnabled(bool enabled,
+                            const CefSize& min_size,
+                            const CefSize& max_size) override;
+  void SetAccessibilityState(cef_state_t accessibility_state) override;
+  bool IsPrintPreviewSupported() const override;
+  void Print() override;
+  void PrintToPDF(const CefString& path,
+                  const CefPdfPrintSettings& settings,
+                  CefRefPtr<CefPdfPrintCallback> callback) override;
+  void Find(int identifier,
+            const CefString& searchText,
+            bool forward,
+            bool matchCase,
+            bool findNext) override;
+  void StopFinding(bool clearSelection) override;
+
+ protected:
+  CefBrowserPlatformDelegateAlloy();
+
+  base::RepeatingClosure GetBoundsChangedCallback();
+
+  // Returns the WebContents most likely to handle an action. If extensions are
+  // enabled and this browser has a full-page guest (for example, a full-page
+  // PDF viewer extension) then the guest's WebContents will be returned.
+  // Otherwise, the browser's WebContents will be returned.
+  content::WebContents* GetActionableWebContents() const;
+
+  // Called from BrowserPlatformDelegateNative::set_windowless_handler().
+  void set_as_secondary() { primary_ = false; }
+
+ private:
+  void SetOwnedWebContents(content::WebContents* owned_contents);
+
+  void DestroyExtensionHost();
+  void OnExtensionHostDeleted();
+
+  void ConfigureAutoResize();
+
+  // Non-nullptr if this object owns the WebContents. Will be nullptr for popup
+  // browsers between the calls to WebContentsCreated() and AddNewContents(),
+  // and may never be set if the parent browser is destroyed during popup
+  // creation.
+  std::unique_ptr<content::WebContents> owned_web_contents_;
+
+  // Used for the print preview dialog.
+  std::unique_ptr<CefWebContentsDialogHelper> web_contents_dialog_helper_;
+
+  // Used to provide unique incremental IDs for each find request.
+  int find_request_id_counter_ = 0;
+
+  // Used when the browser is hosting an extension.
+  extensions::ExtensionHost* extension_host_ = nullptr;
+  bool is_background_host_ = false;
+
+  // Used with auto-resize.
+  bool auto_resize_enabled_ = false;
+  gfx::Size auto_resize_min_;
+  gfx::Size auto_resize_max_;
+
+  // True if this is the primary platform delegate, in which case it will
+  // register WebContents delegate/observers.
+  bool primary_ = true;
+
+  base::WeakPtrFactory<CefBrowserPlatformDelegateAlloy> weak_ptr_factory_;
+
+  DISALLOW_COPY_AND_ASSIGN(CefBrowserPlatformDelegateAlloy);
+};
+
+#endif  // CEF_LIBCEF_BROWSER_ALLOY_BROWSER_PLATFORM_DELEGATE_ALLOY_H_

libcef/browser/alloy/chrome_browser_process_alloy.cc

@@ -3,10 +3,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "libcef/browser/chrome_browser_process_stub.h"
+#include "libcef/browser/alloy/chrome_browser_process_alloy.h"
 
+#include "libcef/browser/alloy/chrome_profile_manager_alloy.h"
 #include "libcef/browser/browser_context.h"
-#include "libcef/browser/chrome_profile_manager_stub.h"
 #include "libcef/browser/context.h"
 #include "libcef/browser/prefs/browser_prefs.h"
 #include "libcef/browser/thread_util.h"
@@ -27,17 +27,17 @@
 #include "services/network/public/cpp/network_switches.h"
 #include "services/network/public/cpp/shared_url_loader_factory.h"
 
-ChromeBrowserProcessStub::ChromeBrowserProcessStub()
+ChromeBrowserProcessAlloy::ChromeBrowserProcessAlloy()
     : initialized_(false),
       context_initialized_(false),
       shutdown_(false),
       locale_("en-US") {}
 
-ChromeBrowserProcessStub::~ChromeBrowserProcessStub() {
+ChromeBrowserProcessAlloy::~ChromeBrowserProcessAlloy() {
   DCHECK((!initialized_ && !context_initialized_) || shutdown_);
 }
 
-void ChromeBrowserProcessStub::Initialize() {
+void ChromeBrowserProcessAlloy::Initialize() {
   DCHECK(!initialized_);
   DCHECK(!context_initialized_);
   DCHECK(!shutdown_);
@@ -49,7 +49,7 @@ void ChromeBrowserProcessStub::Initialize() {
   initialized_ = true;
 }
 
-void ChromeBrowserProcessStub::OnContextInitialized() {
+void ChromeBrowserProcessAlloy::OnContextInitialized() {
   CEF_REQUIRE_UIT();
   DCHECK(initialized_);
   DCHECK(!context_initialized_);
@@ -57,12 +57,12 @@ void ChromeBrowserProcessStub::OnContextInitialized() {
 
   // Must be created after the NotificationService.
   print_job_manager_.reset(new printing::PrintJobManager());
-  profile_manager_.reset(new ChromeProfileManagerStub());
+  profile_manager_.reset(new ChromeProfileManagerAlloy());
   event_router_forwarder_ = new extensions::EventRouterForwarder();
   context_initialized_ = true;
 }
 
-void ChromeBrowserProcessStub::Shutdown() {
+void ChromeBrowserProcessAlloy::CleanupOnUIThread() {
   CEF_REQUIRE_UIT();
   DCHECK(initialized_);
   DCHECK(context_initialized_);
@@ -84,8 +84,9 @@ void ChromeBrowserProcessStub::Shutdown() {
 
   // Release any references held by objects associated with a Profile. The
   // Profile will be deleted later.
-  for (const auto& profile : CefBrowserContext::GetAll()) {
+  for (const auto& browser_context : CefBrowserContext::GetAll()) {
     // Release any references to |local_state_|.
+    auto profile = browser_context->AsProfile();
     PrefWatcher* pref_watcher = PrefWatcher::Get(profile);
     if (pref_watcher)
       pref_watcher->Shutdown();
@@ -107,54 +108,54 @@ void ChromeBrowserProcessStub::Shutdown() {
   shutdown_ = true;
 }
 
-void ChromeBrowserProcessStub::EndSession() {
+void ChromeBrowserProcessAlloy::EndSession() {
   NOTREACHED();
 }
 
-void ChromeBrowserProcessStub::FlushLocalStateAndReply(
+void ChromeBrowserProcessAlloy::FlushLocalStateAndReply(
     base::OnceClosure reply) {
   NOTREACHED();
 }
 
 metrics_services_manager::MetricsServicesManager*
-ChromeBrowserProcessStub::GetMetricsServicesManager() {
+ChromeBrowserProcessAlloy::GetMetricsServicesManager() {
   NOTREACHED();
   return nullptr;
 }
 
-metrics::MetricsService* ChromeBrowserProcessStub::metrics_service() {
+metrics::MetricsService* ChromeBrowserProcessAlloy::metrics_service() {
   NOTREACHED();
   return nullptr;
 }
 
-rappor::RapporServiceImpl* ChromeBrowserProcessStub::rappor_service() {
+rappor::RapporServiceImpl* ChromeBrowserProcessAlloy::rappor_service() {
   // Called from PluginInfoHostImpl::ReportMetrics.
   return nullptr;
 }
 
 SystemNetworkContextManager*
-ChromeBrowserProcessStub::system_network_context_manager() {
+ChromeBrowserProcessAlloy::system_network_context_manager() {
   DCHECK(SystemNetworkContextManager::GetInstance());
   return SystemNetworkContextManager::GetInstance();
 }
 
 network::NetworkQualityTracker*
-ChromeBrowserProcessStub::network_quality_tracker() {
+ChromeBrowserProcessAlloy::network_quality_tracker() {
   NOTREACHED();
   return nullptr;
 }
 
-WatchDogThread* ChromeBrowserProcessStub::watchdog_thread() {
+WatchDogThread* ChromeBrowserProcessAlloy::watchdog_thread() {
   NOTREACHED();
   return nullptr;
 }
 
-ProfileManager* ChromeBrowserProcessStub::profile_manager() {
+ProfileManager* ChromeBrowserProcessAlloy::profile_manager() {
   DCHECK(context_initialized_);
   return profile_manager_.get();
 }
 
-PrefService* ChromeBrowserProcessStub::local_state() {
+PrefService* ChromeBrowserProcessAlloy::local_state() {
   DCHECK(initialized_);
   if (!local_state_) {
     // Use a location that is shared by all request contexts.
@@ -173,40 +174,40 @@ PrefService* ChromeBrowserProcessStub::local_state() {
 }
 
 scoped_refptr<network::SharedURLLoaderFactory>
-ChromeBrowserProcessStub::shared_url_loader_factory() {
+ChromeBrowserProcessAlloy::shared_url_loader_factory() {
   NOTREACHED();
   return nullptr;
 }
 
-variations::VariationsService* ChromeBrowserProcessStub::variations_service() {
+variations::VariationsService* ChromeBrowserProcessAlloy::variations_service() {
   NOTREACHED();
   return nullptr;
 }
 
-BrowserProcessPlatformPart* ChromeBrowserProcessStub::platform_part() {
+BrowserProcessPlatformPart* ChromeBrowserProcessAlloy::platform_part() {
   NOTREACHED();
   return nullptr;
 }
 
 extensions::EventRouterForwarder*
-ChromeBrowserProcessStub::extension_event_router_forwarder() {
+ChromeBrowserProcessAlloy::extension_event_router_forwarder() {
   DCHECK(context_initialized_);
   return event_router_forwarder_.get();
 }
 
-NotificationUIManager* ChromeBrowserProcessStub::notification_ui_manager() {
+NotificationUIManager* ChromeBrowserProcessAlloy::notification_ui_manager() {
   NOTREACHED();
   return nullptr;
 }
 
 NotificationPlatformBridge*
-ChromeBrowserProcessStub::notification_platform_bridge() {
+ChromeBrowserProcessAlloy::notification_platform_bridge() {
   NOTREACHED();
   return nullptr;
 }
 
 policy::ChromeBrowserPolicyConnector*
-ChromeBrowserProcessStub::browser_policy_connector() {
+ChromeBrowserProcessAlloy::browser_policy_connector() {
   if (!browser_policy_connector_) {
     browser_policy_connector_ =
         std::make_unique<policy::ChromeBrowserPolicyConnector>();
@@ -214,40 +215,40 @@ ChromeBrowserProcessStub::browser_policy_connector() {
   return browser_policy_connector_.get();
 }
 
-policy::PolicyService* ChromeBrowserProcessStub::policy_service() {
+policy::PolicyService* ChromeBrowserProcessAlloy::policy_service() {
   return browser_policy_connector()->GetPolicyService();
 }
 
-IconManager* ChromeBrowserProcessStub::icon_manager() {
+IconManager* ChromeBrowserProcessAlloy::icon_manager() {
   NOTREACHED();
   return nullptr;
 }
 
-GpuModeManager* ChromeBrowserProcessStub::gpu_mode_manager() {
+GpuModeManager* ChromeBrowserProcessAlloy::gpu_mode_manager() {
   NOTREACHED();
   return nullptr;
 }
 
-void ChromeBrowserProcessStub::CreateDevToolsProtocolHandler() {
+void ChromeBrowserProcessAlloy::CreateDevToolsProtocolHandler() {
   NOTREACHED();
 }
 
-void ChromeBrowserProcessStub::CreateDevToolsAutoOpener() {
+void ChromeBrowserProcessAlloy::CreateDevToolsAutoOpener() {
   NOTREACHED();
 }
 
-bool ChromeBrowserProcessStub::IsShuttingDown() {
+bool ChromeBrowserProcessAlloy::IsShuttingDown() {
   NOTREACHED();
   return false;
 }
 
-printing::PrintJobManager* ChromeBrowserProcessStub::print_job_manager() {
+printing::PrintJobManager* ChromeBrowserProcessAlloy::print_job_manager() {
   DCHECK(context_initialized_);
   return print_job_manager_.get();
 }
 
 printing::PrintPreviewDialogController*
-ChromeBrowserProcessStub::print_preview_dialog_controller() {
+ChromeBrowserProcessAlloy::print_preview_dialog_controller() {
   if (!print_preview_dialog_controller_.get()) {
     print_preview_dialog_controller_ =
         new printing::PrintPreviewDialogController();
@@ -256,7 +257,7 @@ ChromeBrowserProcessStub::print_preview_dialog_controller() {
 }
 
 printing::BackgroundPrintingManager*
-ChromeBrowserProcessStub::background_printing_manager() {
+ChromeBrowserProcessAlloy::background_printing_manager() {
   if (!background_printing_manager_.get()) {
     background_printing_manager_.reset(
         new printing::BackgroundPrintingManager());
@@ -265,111 +266,126 @@ ChromeBrowserProcessStub::background_printing_manager() {
 }
 
 IntranetRedirectDetector*
-ChromeBrowserProcessStub::intranet_redirect_detector() {
+ChromeBrowserProcessAlloy::intranet_redirect_detector() {
   NOTREACHED();
   return nullptr;
 }
 
-const std::string& ChromeBrowserProcessStub::GetApplicationLocale() {
+const std::string& ChromeBrowserProcessAlloy::GetApplicationLocale() {
   DCHECK(!locale_.empty());
   return locale_;
 }
 
-void ChromeBrowserProcessStub::SetApplicationLocale(const std::string& locale) {
+void ChromeBrowserProcessAlloy::SetApplicationLocale(
+    const std::string& locale) {
   locale_ = locale;
 }
 
-DownloadStatusUpdater* ChromeBrowserProcessStub::download_status_updater() {
+DownloadStatusUpdater* ChromeBrowserProcessAlloy::download_status_updater() {
   NOTREACHED();
   return nullptr;
 }
 
-DownloadRequestLimiter* ChromeBrowserProcessStub::download_request_limiter() {
+DownloadRequestLimiter* ChromeBrowserProcessAlloy::download_request_limiter() {
   NOTREACHED();
   return nullptr;
 }
 
-BackgroundModeManager* ChromeBrowserProcessStub::background_mode_manager() {
+#if BUILDFLAG(ENABLE_BACKGROUND_MODE)
+BackgroundModeManager* ChromeBrowserProcessAlloy::background_mode_manager() {
   NOTREACHED();
   return nullptr;
 }
 
-void ChromeBrowserProcessStub::set_background_mode_manager_for_test(
+void ChromeBrowserProcessAlloy::set_background_mode_manager_for_test(
     std::unique_ptr<BackgroundModeManager> manager) {
   NOTREACHED();
 }
+#endif
 
-StatusTray* ChromeBrowserProcessStub::status_tray() {
+StatusTray* ChromeBrowserProcessAlloy::status_tray() {
   NOTREACHED();
   return nullptr;
 }
 
 safe_browsing::SafeBrowsingService*
-ChromeBrowserProcessStub::safe_browsing_service() {
+ChromeBrowserProcessAlloy::safe_browsing_service() {
   return nullptr;
 }
 
 subresource_filter::RulesetService*
-ChromeBrowserProcessStub::subresource_filter_ruleset_service() {
+ChromeBrowserProcessAlloy::subresource_filter_ruleset_service() {
+  NOTREACHED();
+  return nullptr;
+}
+
+federated_learning::FlocBlocklistService*
+ChromeBrowserProcessAlloy::floc_blocklist_service() {
+  NOTREACHED();
+  return nullptr;
+}
+
+federated_learning::FlocSortingLshClustersService*
+ChromeBrowserProcessAlloy::floc_sorting_lsh_clusters_service() {
   NOTREACHED();
   return nullptr;
 }
 
 optimization_guide::OptimizationGuideService*
-ChromeBrowserProcessStub::optimization_guide_service() {
+ChromeBrowserProcessAlloy::optimization_guide_service() {
   NOTREACHED();
   return nullptr;
 }
 
-StartupData* ChromeBrowserProcessStub::startup_data() {
+StartupData* ChromeBrowserProcessAlloy::startup_data() {
   NOTREACHED();
   return nullptr;
 }
 
 #if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
-void ChromeBrowserProcessStub::StartAutoupdateTimer() {}
+void ChromeBrowserProcessAlloy::StartAutoupdateTimer() {}
 #endif
 
 component_updater::ComponentUpdateService*
-ChromeBrowserProcessStub::component_updater() {
+ChromeBrowserProcessAlloy::component_updater() {
   NOTREACHED();
   return nullptr;
 }
 
 MediaFileSystemRegistry*
-ChromeBrowserProcessStub::media_file_system_registry() {
+ChromeBrowserProcessAlloy::media_file_system_registry() {
   NOTREACHED();
   return nullptr;
 }
 
-WebRtcLogUploader* ChromeBrowserProcessStub::webrtc_log_uploader() {
+WebRtcLogUploader* ChromeBrowserProcessAlloy::webrtc_log_uploader() {
   NOTREACHED();
   return nullptr;
 }
 
 network_time::NetworkTimeTracker*
-ChromeBrowserProcessStub::network_time_tracker() {
+ChromeBrowserProcessAlloy::network_time_tracker() {
   NOTREACHED();
   return nullptr;
 }
 
-gcm::GCMDriver* ChromeBrowserProcessStub::gcm_driver() {
+gcm::GCMDriver* ChromeBrowserProcessAlloy::gcm_driver() {
   NOTREACHED();
   return nullptr;
 }
 
-resource_coordinator::TabManager* ChromeBrowserProcessStub::GetTabManager() {
+resource_coordinator::TabManager* ChromeBrowserProcessAlloy::GetTabManager() {
   NOTREACHED();
   return nullptr;
 }
 
 resource_coordinator::ResourceCoordinatorParts*
-ChromeBrowserProcessStub::resource_coordinator_parts() {
+ChromeBrowserProcessAlloy::resource_coordinator_parts() {
   NOTREACHED();
   return nullptr;
 }
 
-BuildState* ChromeBrowserProcessStub::GetBuildState() {
+BuildState* ChromeBrowserProcessAlloy::GetBuildState() {
   NOTREACHED();
   return nullptr;
 }

libcef/browser/alloy/chrome_browser_process_alloy.h

@@ -6,8 +6,8 @@
 // This file provides a stub implementation of Chrome's BrowserProcess object
 // for use as an interop layer between CEF and files that live in chrome/.
 
-#ifndef CEF_LIBCEF_BROWSER_CHROME_BROWSER_PROCESS_STUB_H_
-#define CEF_LIBCEF_BROWSER_CHROME_BROWSER_PROCESS_STUB_H_
+#ifndef CEF_LIBCEF_BROWSER_ALLOY_CHROME_BROWSER_PROCESS_ALLOY_H_
+#define CEF_LIBCEF_BROWSER_ALLOY_CHROME_BROWSER_PROCESS_ALLOY_H_
 
 #include <memory>
 #include <string>
@@ -18,7 +18,7 @@
 #include "chrome/browser/extensions/event_router_forwarder.h"
 #include "media/media_buildflags.h"
 
-class ChromeProfileManagerStub;
+class ChromeProfileManagerAlloy;
 
 class BackgroundModeManager {
  public:
@@ -29,14 +29,14 @@ class BackgroundModeManager {
   DISALLOW_COPY_AND_ASSIGN(BackgroundModeManager);
 };
 
-class ChromeBrowserProcessStub : public BrowserProcess {
+class ChromeBrowserProcessAlloy : public BrowserProcess {
  public:
-  ChromeBrowserProcessStub();
-  ~ChromeBrowserProcessStub() override;
+  ChromeBrowserProcessAlloy();
+  ~ChromeBrowserProcessAlloy() override;
 
   void Initialize();
   void OnContextInitialized();
-  void Shutdown();
+  void CleanupOnUIThread();
 
   // BrowserProcess implementation.
   void EndSession() override;
@@ -73,13 +73,18 @@ class ChromeBrowserProcessStub : public BrowserProcess {
   void SetApplicationLocale(const std::string& locale) override;
   DownloadStatusUpdater* download_status_updater() override;
   DownloadRequestLimiter* download_request_limiter() override;
+#if BUILDFLAG(ENABLE_BACKGROUND_MODE)
   BackgroundModeManager* background_mode_manager() override;
   void set_background_mode_manager_for_test(
       std::unique_ptr<BackgroundModeManager> manager) override;
+#endif
   StatusTray* status_tray() override;
   safe_browsing::SafeBrowsingService* safe_browsing_service() override;
   subresource_filter::RulesetService* subresource_filter_ruleset_service()
       override;
+  federated_learning::FlocBlocklistService* floc_blocklist_service() override;
+  federated_learning::FlocSortingLshClustersService*
+  floc_sorting_lsh_clusters_service() override;
   optimization_guide::OptimizationGuideService* optimization_guide_service()
       override;
   StartupData* startup_data() override;
@@ -105,7 +110,7 @@ class ChromeBrowserProcessStub : public BrowserProcess {
 
   std::string locale_;
   std::unique_ptr<printing::PrintJobManager> print_job_manager_;
-  std::unique_ptr<ChromeProfileManagerStub> profile_manager_;
+  std::unique_ptr<ChromeProfileManagerAlloy> profile_manager_;
   scoped_refptr<extensions::EventRouterForwarder> event_router_forwarder_;
   scoped_refptr<printing::PrintPreviewDialogController>
       print_preview_dialog_controller_;
@@ -117,7 +122,7 @@ class ChromeBrowserProcessStub : public BrowserProcess {
       browser_policy_connector_;
   std::unique_ptr<base::FieldTrialList> field_trial_list_;
 
-  DISALLOW_COPY_AND_ASSIGN(ChromeBrowserProcessStub);
+  DISALLOW_COPY_AND_ASSIGN(ChromeBrowserProcessAlloy);
 };
 
-#endif  // CEF_LIBCEF_BROWSER_CHROME_BROWSER_PROCESS_STUB_H_
+#endif  // CEF_LIBCEF_BROWSER_ALLOY_CHROME_BROWSER_PROCESS_ALLOY_H_

libcef/browser/alloy/chrome_profile_alloy.cc

@@ -0,0 +1,178 @@
+// Copyright (c) 2015 The Chromium Embedded Framework Authors.
+// Portions copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "libcef/browser/alloy/chrome_profile_alloy.h"
+
+#include "base/no_destructor.h"
+#include "components/variations/variations_client.h"
+#include "components/variations/variations_ids_provider.h"
+#include "net/url_request/url_request_context.h"
+
+namespace {
+
+class CefVariationsClient : public variations::VariationsClient {
+ public:
+  explicit CefVariationsClient(content::BrowserContext* browser_context)
+      : browser_context_(browser_context) {}
+
+  ~CefVariationsClient() override = default;
+
+  bool IsOffTheRecord() const override {
+    return browser_context_->IsOffTheRecord();
+  }
+
+  variations::mojom::VariationsHeadersPtr GetVariationsHeaders()
+      const override {
+    return variations::VariationsIdsProvider::GetInstance()
+        ->GetClientDataHeaders(false /* is_signed_in */);
+  }
+
+ private:
+  content::BrowserContext* browser_context_;
+};
+
+}  // namespace
+
+ChromeProfileAlloy::ChromeProfileAlloy() {}
+
+ChromeProfileAlloy::~ChromeProfileAlloy() {}
+
+bool ChromeProfileAlloy::IsOffTheRecord() {
+  return false;
+}
+
+bool ChromeProfileAlloy::IsOffTheRecord() const {
+  return false;
+}
+
+const Profile::OTRProfileID& ChromeProfileAlloy::GetOTRProfileID() const {
+  NOTREACHED();
+  static base::NoDestructor<Profile::OTRProfileID> otr_profile_id(
+      "ProfileImp::NoOTRProfileID");
+  return *otr_profile_id;
+}
+
+variations::VariationsClient* ChromeProfileAlloy::GetVariationsClient() {
+  if (!variations_client_)
+    variations_client_ = std::make_unique<CefVariationsClient>(this);
+  return variations_client_.get();
+}
+
+scoped_refptr<base::SequencedTaskRunner> ChromeProfileAlloy::GetIOTaskRunner() {
+  NOTREACHED();
+  return scoped_refptr<base::SequencedTaskRunner>();
+}
+
+std::string ChromeProfileAlloy::GetProfileUserName() const {
+  NOTREACHED();
+  return std::string();
+}
+
+Profile* ChromeProfileAlloy::GetOffTheRecordProfile(
+    const Profile::OTRProfileID& otr_profile_id) {
+  NOTREACHED();
+  return nullptr;
+}
+
+std::vector<Profile*> ChromeProfileAlloy::GetAllOffTheRecordProfiles() {
+  return {};
+}
+
+void ChromeProfileAlloy::DestroyOffTheRecordProfile(Profile* otr_profile) {
+  NOTREACHED();
+}
+
+bool ChromeProfileAlloy::HasOffTheRecordProfile(
+    const Profile::OTRProfileID& otr_profile_id) {
+  return false;
+}
+
+bool ChromeProfileAlloy::HasAnyOffTheRecordProfile() {
+  return false;
+}
+
+Profile* ChromeProfileAlloy::GetOriginalProfile() {
+  return this;
+}
+
+const Profile* ChromeProfileAlloy::GetOriginalProfile() const {
+  return this;
+}
+
+bool ChromeProfileAlloy::IsSupervised() const {
+  return false;
+}
+
+bool ChromeProfileAlloy::IsChild() const {
+  return false;
+}
+
+bool ChromeProfileAlloy::IsLegacySupervised() const {
+  return false;
+}
+
+ExtensionSpecialStoragePolicy*
+ChromeProfileAlloy::GetExtensionSpecialStoragePolicy() {
+  NOTREACHED();
+  return nullptr;
+}
+
+PrefService* ChromeProfileAlloy::GetOffTheRecordPrefs() {
+  NOTREACHED();
+  return nullptr;
+}
+
+bool ChromeProfileAlloy::IsSameOrParent(Profile* profile) {
+  NOTREACHED();
+  return false;
+}
+
+base::Time ChromeProfileAlloy::GetStartTime() const {
+  NOTREACHED();
+  return base::Time();
+}
+
+base::FilePath ChromeProfileAlloy::last_selected_directory() {
+  NOTREACHED();
+  return base::FilePath();
+}
+
+void ChromeProfileAlloy::set_last_selected_directory(
+    const base::FilePath& path) {
+  NOTREACHED();
+}
+
+GURL ChromeProfileAlloy::GetHomePage() {
+  NOTREACHED();
+  return GURL();
+}
+
+bool ChromeProfileAlloy::WasCreatedByVersionOrLater(
+    const std::string& version) {
+  NOTREACHED();
+  return false;
+}
+
+void ChromeProfileAlloy::SetExitType(ExitType exit_type) {
+  NOTREACHED();
+}
+
+Profile::ExitType ChromeProfileAlloy::GetLastSessionExitType() const {
+  NOTREACHED();
+  return EXIT_NORMAL;
+}
+
+base::Time ChromeProfileAlloy::GetCreationTime() const {
+  NOTREACHED();
+  return base::Time();
+}
+
+void ChromeProfileAlloy::SetCreationTimeForTesting(base::Time creation_time) {
+  NOTREACHED();
+}
+
+void ChromeProfileAlloy::RecordMainFrameNavigation() {
+  NOTREACHED();
+}

libcef/browser/alloy/chrome_profile_alloy.h

@@ -5,18 +5,18 @@
 
 // This class gathers state related to a single user profile.
 
-#ifndef CEF_LIBCEF_BROWSER_CHROME_PROFILE_STUB_H_
-#define CEF_LIBCEF_BROWSER_CHROME_PROFILE_STUB_H_
+#ifndef CEF_LIBCEF_BROWSER_ALLOY_CHROME_PROFILE_ALLOY_H_
+#define CEF_LIBCEF_BROWSER_ALLOY_CHROME_PROFILE_ALLOY_H_
 
 #include "chrome/browser/profiles/profile.h"
 
 // This file provides a stub implementation of Chrome's Profile object for use
 // as an interop layer between CEF and files that live in chrome/.
 
-class ChromeProfileStub : public Profile {
+class ChromeProfileAlloy : public Profile {
  public:
-  ChromeProfileStub();
-  ~ChromeProfileStub() override;
+  ChromeProfileAlloy();
+  ~ChromeProfileAlloy() override;
 
  protected:
   // Profile methods.
@@ -26,7 +26,6 @@ class ChromeProfileStub : public Profile {
   variations::VariationsClient* GetVariationsClient() override;
   scoped_refptr<base::SequencedTaskRunner> GetIOTaskRunner() override;
   std::string GetProfileUserName() const override;
-  ProfileType GetProfileType() const override;
   Profile* GetOffTheRecordProfile(
       const Profile::OTRProfileID& otr_profile_id) override;
   std::vector<Profile*> GetAllOffTheRecordProfiles() override;
@@ -41,21 +40,22 @@ class ChromeProfileStub : public Profile {
   bool IsLegacySupervised() const override;
   ExtensionSpecialStoragePolicy* GetExtensionSpecialStoragePolicy() override;
   PrefService* GetOffTheRecordPrefs() override;
-  bool IsSameProfile(Profile* profile) override;
+  bool IsSameOrParent(Profile* profile) override;
   base::Time GetStartTime() const override;
   base::FilePath last_selected_directory() override;
   void set_last_selected_directory(const base::FilePath& path) override;
   GURL GetHomePage() override;
   bool WasCreatedByVersionOrLater(const std::string& version) override;
   void SetExitType(ExitType exit_type) override;
-  ExitType GetLastSessionExitType() override;
+  ExitType GetLastSessionExitType() const override;
   base::Time GetCreationTime() const override;
   void SetCreationTimeForTesting(base::Time creation_time) override;
+  void RecordMainFrameNavigation() override;
 
  private:
   std::unique_ptr<variations::VariationsClient> variations_client_;
 
-  DISALLOW_COPY_AND_ASSIGN(ChromeProfileStub);
+  DISALLOW_COPY_AND_ASSIGN(ChromeProfileAlloy);
 };
 
-#endif  // CEF_LIBCEF_BROWSER_CHROME_PROFILE_STUB_H_
+#endif  // CEF_LIBCEF_BROWSER_ALLOY_CHROME_PROFILE_ALLOY_H_

libcef/browser/alloy/chrome_profile_manager_alloy.cc

@@ -3,10 +3,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "libcef/browser/chrome_profile_manager_stub.h"
+#include "libcef/browser/alloy/chrome_profile_manager_alloy.h"
 
 #include "libcef/browser/browser_context.h"
-#include "libcef/browser/content_browser_client.h"
+#include "libcef/browser/request_context_impl.h"
+#include "libcef/common/app_manager.h"
 
 namespace {
 
@@ -21,21 +22,22 @@ namespace {
 // Return the main context for now since we don't currently have a good way to
 // determine that.
 CefBrowserContext* GetActiveBrowserContext() {
-  return static_cast<CefBrowserContext*>(
-      CefContentBrowserClient::Get()->request_context()->GetBrowserContext());
+  auto request_context = static_cast<CefRequestContextImpl*>(
+      CefAppManager::Get()->GetGlobalRequestContext().get());
+  return request_context->GetBrowserContext();
 }
 
 }  // namespace
 
-ChromeProfileManagerStub::ChromeProfileManagerStub()
+ChromeProfileManagerAlloy::ChromeProfileManagerAlloy()
     : ProfileManager(base::FilePath()) {}
 
-ChromeProfileManagerStub::~ChromeProfileManagerStub() {}
+ChromeProfileManagerAlloy::~ChromeProfileManagerAlloy() {}
 
-Profile* ChromeProfileManagerStub::GetProfile(
+Profile* ChromeProfileManagerAlloy::GetProfile(
     const base::FilePath& profile_dir) {
   CefBrowserContext* browser_context =
-      CefBrowserContext::GetForCachePath(profile_dir);
+      CefBrowserContext::FromCachePath(profile_dir);
   if (!browser_context) {
     // ProfileManager makes assumptions about profile directory paths that do
     // not match CEF usage. For example, the default Chrome profile name is
@@ -45,19 +47,19 @@ Profile* ChromeProfileManagerStub::GetProfile(
     // asking for.
     browser_context = GetActiveBrowserContext();
   }
-  return browser_context;
+  return browser_context->AsProfile();
 }
 
-bool ChromeProfileManagerStub::IsValidProfile(const void* profile) {
+bool ChromeProfileManagerAlloy::IsValidProfile(const void* profile) {
   if (!profile)
     return false;
-  return !!CefBrowserContext::GetForContext(
-      reinterpret_cast<content::BrowserContext*>(const_cast<void*>(profile)));
+  return !!CefBrowserContext::FromBrowserContext(
+      static_cast<const content::BrowserContext*>(profile));
 }
 
-Profile* ChromeProfileManagerStub::GetLastUsedProfile(
+Profile* ChromeProfileManagerAlloy::GetLastUsedProfile(
     const base::FilePath& user_data_dir) {
   // Override this method to avoid having to register prefs::kProfileLastUsed,
   // usage of which doesn't make sense for CEF.
-  return GetActiveBrowserContext();
+  return GetActiveBrowserContext()->AsProfile();
 }

libcef/browser/alloy/chrome_profile_manager_alloy.h

@@ -6,22 +6,22 @@
 // This file provides a stub implementation of Chrome's ProfileManager object
 // for use as an interop layer between CEF and files that live in chrome/.
 
-#ifndef CEF_LIBCEF_BROWSER_CHROME_PROFILE_MANAGER_STUB_H_
-#define CEF_LIBCEF_BROWSER_CHROME_PROFILE_MANAGER_STUB_H_
+#ifndef CEF_LIBCEF_BROWSER_ALLOY_CHROME_PROFILE_MANAGER_ALLOY_H_
+#define CEF_LIBCEF_BROWSER_ALLOY_CHROME_PROFILE_MANAGER_ALLOY_H_
 
 #include "chrome/browser/profiles/profile_manager.h"
 
-class ChromeProfileManagerStub : public ProfileManager {
+class ChromeProfileManagerAlloy : public ProfileManager {
  public:
-  ChromeProfileManagerStub();
-  ~ChromeProfileManagerStub() override;
+  ChromeProfileManagerAlloy();
+  ~ChromeProfileManagerAlloy() override;
 
   Profile* GetProfile(const base::FilePath& profile_dir) override;
   bool IsValidProfile(const void* profile) override;
   Profile* GetLastUsedProfile(const base::FilePath& user_data_dir) override;
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(ChromeProfileManagerStub);
+  DISALLOW_COPY_AND_ASSIGN(ChromeProfileManagerAlloy);
 };
 
-#endif  // CEF_LIBCEF_BROWSER_CHROME_PROFILE_MANAGER_STUB_H_
+#endif  // CEF_LIBCEF_BROWSER_ALLOY_CHROME_PROFILE_MANAGER_ALLOY_H_

libcef/browser/audio_capturer.cc

@@ -4,7 +4,7 @@
 // found in the LICENSE file.
 
 #include "libcef/browser/audio_capturer.h"
-#include "libcef/browser/browser_host_impl.h"
+#include "libcef/browser/alloy/alloy_browser_host_impl.h"
 
 #include "components/mirroring/service/captured_audio_input.h"
 #include "content/public/browser/audio_loopback_stream_creator.h"
@@ -51,7 +51,7 @@ void StreamCreatorHelper(
 }  // namespace
 
 CefAudioCapturer::CefAudioCapturer(const CefAudioParameters& params,
-                                   CefRefPtr<CefBrowserHostImpl> browser,
+                                   CefRefPtr<AlloyBrowserHostImpl> browser,
                                    CefRefPtr<CefAudioHandler> audio_handler)
     : params_(params),
       browser_(browser),
@@ -77,7 +77,8 @@ CefAudioCapturer::CefAudioCapturer(const CefAudioParameters& params,
       std::make_unique<mirroring::CapturedAudioInput>(base::BindRepeating(
           &StreamCreatorHelper, base::Unretained(browser_->web_contents()),
           base::Unretained(audio_stream_creator_.get()))),
-      media::AudioInputDevice::kLoopback);
+      media::AudioInputDevice::kLoopback,
+      media::AudioInputDevice::DeadStreamDetection::kEnabled);
 
   audio_input_device_->Initialize(audio_params, this);
   audio_input_device_->Start();

libcef/browser/audio_capturer.h

@@ -21,12 +21,12 @@ class AudioInputDevice;
 }  // namespace media
 
 class CefAudioHandler;
-class CefBrowserHostImpl;
+class AlloyBrowserHostImpl;
 
 class CefAudioCapturer : public media::AudioCapturerSource::CaptureCallback {
  public:
   CefAudioCapturer(const CefAudioParameters& params,
-                   CefRefPtr<CefBrowserHostImpl> browser,
+                   CefRefPtr<AlloyBrowserHostImpl> browser,
                    CefRefPtr<CefAudioHandler> audio_handler);
   ~CefAudioCapturer() override;
 
@@ -42,7 +42,7 @@ class CefAudioCapturer : public media::AudioCapturerSource::CaptureCallback {
   void StopStream();
 
   CefAudioParameters params_;
-  CefRefPtr<CefBrowserHostImpl> browser_;
+  CefRefPtr<AlloyBrowserHostImpl> browser_;
   CefRefPtr<CefAudioHandler> audio_handler_;
   std::unique_ptr<content::AudioLoopbackStreamCreator> audio_stream_creator_;
   scoped_refptr<media::AudioInputDevice> audio_input_device_;

libcef/browser/browser_contents_delegate.cc

@@ -0,0 +1,616 @@
+// Copyright 2020 The Chromium Embedded Framework Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "libcef/browser/browser_contents_delegate.h"
+
+#include "libcef/browser/browser_host_base.h"
+#include "libcef/browser/browser_platform_delegate.h"
+#include "libcef/browser/browser_util.h"
+
+#include "content/public/browser/keyboard_event_processing_result.h"
+#include "content/public/browser/native_web_keyboard_event.h"
+#include "content/public/browser/navigation_entry.h"
+#include "content/public/browser/navigation_handle.h"
+#include "content/public/browser/notification_details.h"
+#include "content/public/browser/notification_source.h"
+#include "content/public/browser/notification_types.h"
+#include "content/public/browser/render_view_host.h"
+
+using content::KeyboardEventProcessingResult;
+
+CefBrowserContentsDelegate::CefBrowserContentsDelegate(
+    scoped_refptr<CefBrowserInfo> browser_info)
+    : browser_info_(browser_info) {
+  DCHECK(browser_info_->browser());
+}
+
+void CefBrowserContentsDelegate::ObserveWebContents(
+    content::WebContents* new_contents) {
+  WebContentsObserver::Observe(new_contents);
+
+  if (new_contents) {
+    registrar_.reset(new content::NotificationRegistrar);
+
+    // When navigating through the history, the restored NavigationEntry's title
+    // will be used. If the entry ends up having the same title after we return
+    // to it, as will usually be the case, the
+    // NOTIFICATION_WEB_CONTENTS_TITLE_UPDATED will then be suppressed, since
+    // the NavigationEntry's title hasn't changed.
+    registrar_->Add(this, content::NOTIFICATION_LOAD_STOP,
+                    content::Source<content::NavigationController>(
+                        &new_contents->GetController()));
+
+    // Make sure RenderViewCreated is called at least one time.
+    RenderViewCreated(new_contents->GetRenderViewHost());
+
+    // Create the frame representation before OnAfterCreated is called for a new
+    // browser. Additionally, RenderFrameCreated is otherwise not called at all
+    // for new popup browsers.
+    RenderFrameCreated(new_contents->GetMainFrame());
+  } else {
+    registrar_.reset();
+  }
+}
+
+void CefBrowserContentsDelegate::AddObserver(Observer* observer) {
+  observers_.AddObserver(observer);
+}
+
+void CefBrowserContentsDelegate::RemoveObserver(Observer* observer) {
+  observers_.RemoveObserver(observer);
+}
+
+// |source| may be NULL for navigations in the current tab, or if the
+// navigation originates from a guest view via MaybeAllowNavigation.
+content::WebContents* CefBrowserContentsDelegate::OpenURLFromTab(
+    content::WebContents* source,
+    const content::OpenURLParams& params) {
+  bool cancel = false;
+
+  if (auto c = client()) {
+    if (auto handler = c->GetRequestHandler()) {
+      cancel = handler->OnOpenURLFromTab(
+          browser(), browser()->GetFrame(params.frame_tree_node_id),
+          params.url.spec(),
+          static_cast<cef_window_open_disposition_t>(params.disposition),
+          params.user_gesture);
+    }
+  }
+
+  // Returning nullptr will cancel the navigation.
+  return cancel ? nullptr : web_contents();
+}
+
+void CefBrowserContentsDelegate::LoadingStateChanged(
+    content::WebContents* source,
+    bool to_different_document) {
+  const int current_index =
+      source->GetController().GetLastCommittedEntryIndex();
+  const int max_index = source->GetController().GetEntryCount() - 1;
+
+  const bool is_loading = source->IsLoading();
+  const bool can_go_back = (current_index > 0);
+  const bool can_go_forward = (current_index < max_index);
+
+  // This method may be called multiple times in a row with |is_loading|
+  // true as a result of https://crrev.com/5e750ad0. Ignore the 2nd+ times.
+  if (is_loading_ == is_loading && can_go_back_ == can_go_back &&
+      can_go_forward_ == can_go_forward) {
+    return;
+  }
+
+  is_loading_ = is_loading;
+  can_go_back_ = can_go_back;
+  can_go_forward_ = can_go_forward;
+  OnStateChanged(State::kNavigation);
+
+  if (auto c = client()) {
+    if (auto handler = c->GetLoadHandler()) {
+      handler->OnLoadingStateChange(browser(), is_loading, can_go_back,
+                                    can_go_forward);
+    }
+  }
+}
+
+void CefBrowserContentsDelegate::UpdateTargetURL(content::WebContents* source,
+                                                 const GURL& url) {
+  if (auto c = client()) {
+    if (auto handler = c->GetDisplayHandler()) {
+      handler->OnStatusMessage(browser(), url.spec());
+    }
+  }
+}
+
+bool CefBrowserContentsDelegate::DidAddMessageToConsole(
+    content::WebContents* source,
+    blink::mojom::ConsoleMessageLevel log_level,
+    const base::string16& message,
+    int32_t line_no,
+    const base::string16& source_id) {
+  if (auto c = client()) {
+    if (auto handler = c->GetDisplayHandler()) {
+      // Use LOGSEVERITY_DEBUG for unrecognized |level| values.
+      cef_log_severity_t cef_level = LOGSEVERITY_DEBUG;
+      switch (log_level) {
+        case blink::mojom::ConsoleMessageLevel::kVerbose:
+          cef_level = LOGSEVERITY_DEBUG;
+          break;
+        case blink::mojom::ConsoleMessageLevel::kInfo:
+          cef_level = LOGSEVERITY_INFO;
+          break;
+        case blink::mojom::ConsoleMessageLevel::kWarning:
+          cef_level = LOGSEVERITY_WARNING;
+          break;
+        case blink::mojom::ConsoleMessageLevel::kError:
+          cef_level = LOGSEVERITY_ERROR;
+          break;
+      }
+
+      return handler->OnConsoleMessage(browser(), cef_level, message, source_id,
+                                       line_no);
+    }
+  }
+
+  return false;
+}
+
+void CefBrowserContentsDelegate::DidNavigateMainFramePostCommit(
+    content::WebContents* web_contents) {
+  has_document_ = false;
+  OnStateChanged(State::kDocument);
+}
+
+void CefBrowserContentsDelegate::EnterFullscreenModeForTab(
+    content::RenderFrameHost* requesting_frame,
+    const blink::mojom::FullscreenOptions& options) {
+  OnFullscreenModeChange(/*fullscreen=*/true);
+}
+
+void CefBrowserContentsDelegate::ExitFullscreenModeForTab(
+    content::WebContents* web_contents) {
+  OnFullscreenModeChange(/*fullscreen=*/false);
+}
+
+KeyboardEventProcessingResult
+CefBrowserContentsDelegate::PreHandleKeyboardEvent(
+    content::WebContents* source,
+    const content::NativeWebKeyboardEvent& event) {
+  if (auto delegate = platform_delegate()) {
+    if (auto c = client()) {
+      if (auto handler = c->GetKeyboardHandler()) {
+        CefKeyEvent cef_event;
+        if (browser_util::GetCefKeyEvent(event, cef_event)) {
+          cef_event.focus_on_editable_field = focus_on_editable_field_;
+
+          auto event_handle = delegate->GetEventHandle(event);
+          bool is_keyboard_shortcut = false;
+          bool result = handler->OnPreKeyEvent(
+              browser(), cef_event, event_handle, &is_keyboard_shortcut);
+          if (result) {
+            return KeyboardEventProcessingResult::HANDLED;
+          } else if (is_keyboard_shortcut) {
+            return KeyboardEventProcessingResult::NOT_HANDLED_IS_SHORTCUT;
+          }
+        }
+      }
+    }
+  }
+
+  return KeyboardEventProcessingResult::NOT_HANDLED;
+}
+
+bool CefBrowserContentsDelegate::HandleKeyboardEvent(
+    content::WebContents* source,
+    const content::NativeWebKeyboardEvent& event) {
+  // Check to see if event should be ignored.
+  if (event.skip_in_browser)
+    return false;
+
+  if (auto delegate = platform_delegate()) {
+    if (auto c = client()) {
+      if (auto handler = c->GetKeyboardHandler()) {
+        CefKeyEvent cef_event;
+        if (browser_util::GetCefKeyEvent(event, cef_event)) {
+          cef_event.focus_on_editable_field = focus_on_editable_field_;
+
+          auto event_handle = delegate->GetEventHandle(event);
+          if (handler->OnKeyEvent(browser(), cef_event, event_handle)) {
+            return true;
+          }
+        }
+      }
+    }
+  }
+
+  return false;
+}
+
+void CefBrowserContentsDelegate::RenderFrameCreated(
+    content::RenderFrameHost* render_frame_host) {
+  browser_info_->MaybeCreateFrame(render_frame_host, false /* is_guest_view */);
+}
+
+void CefBrowserContentsDelegate::RenderFrameHostChanged(
+    content::RenderFrameHost* old_host,
+    content::RenderFrameHost* new_host) {
+  // Just in case RenderFrameCreated wasn't called for some reason.
+  RenderFrameCreated(new_host);
+}
+
+void CefBrowserContentsDelegate::RenderFrameDeleted(
+    content::RenderFrameHost* render_frame_host) {
+  const auto frame_id = CefFrameHostImpl::MakeFrameId(render_frame_host);
+  browser_info_->RemoveFrame(render_frame_host);
+
+  if (focused_frame_ && focused_frame_->GetIdentifier() == frame_id) {
+    focused_frame_ = nullptr;
+    OnStateChanged(State::kFocusedFrame);
+  }
+}
+
+void CefBrowserContentsDelegate::RenderViewCreated(
+    content::RenderViewHost* render_view_host) {
+  // May be already registered if the renderer crashed previously.
+  if (!registrar_->IsRegistered(
+          this, content::NOTIFICATION_FOCUS_CHANGED_IN_PAGE,
+          content::Source<content::RenderViewHost>(render_view_host))) {
+    registrar_->Add(this, content::NOTIFICATION_FOCUS_CHANGED_IN_PAGE,
+                    content::Source<content::RenderViewHost>(render_view_host));
+  }
+}
+
+void CefBrowserContentsDelegate::RenderViewDeleted(
+    content::RenderViewHost* render_view_host) {
+  if (registrar_->IsRegistered(
+          this, content::NOTIFICATION_FOCUS_CHANGED_IN_PAGE,
+          content::Source<content::RenderViewHost>(render_view_host))) {
+    registrar_->Remove(
+        this, content::NOTIFICATION_FOCUS_CHANGED_IN_PAGE,
+        content::Source<content::RenderViewHost>(render_view_host));
+  }
+}
+
+void CefBrowserContentsDelegate::RenderViewReady() {
+  if (auto c = client()) {
+    if (auto handler = c->GetRequestHandler()) {
+      handler->OnRenderViewReady(browser());
+    }
+  }
+}
+
+void CefBrowserContentsDelegate::RenderProcessGone(
+    base::TerminationStatus status) {
+  cef_termination_status_t ts = TS_ABNORMAL_TERMINATION;
+  if (status == base::TERMINATION_STATUS_PROCESS_WAS_KILLED)
+    ts = TS_PROCESS_WAS_KILLED;
+  else if (status == base::TERMINATION_STATUS_PROCESS_CRASHED)
+    ts = TS_PROCESS_CRASHED;
+  else if (status == base::TERMINATION_STATUS_OOM)
+    ts = TS_PROCESS_OOM;
+  else if (status != base::TERMINATION_STATUS_ABNORMAL_TERMINATION)
+    return;
+
+  if (auto c = client()) {
+    if (auto handler = c->GetRequestHandler()) {
+      auto navigation_lock = browser_info_->CreateNavigationLock();
+      handler->OnRenderProcessTerminated(browser(), ts);
+    }
+  }
+}
+
+void CefBrowserContentsDelegate::OnFrameFocused(
+    content::RenderFrameHost* render_frame_host) {
+  CefRefPtr<CefFrameHostImpl> frame = static_cast<CefFrameHostImpl*>(
+      browser_info_->GetFrameForHost(render_frame_host).get());
+  if (!frame || frame->IsFocused())
+    return;
+
+  CefRefPtr<CefFrameHostImpl> previous_frame = focused_frame_;
+  if (frame->IsMain())
+    focused_frame_ = nullptr;
+  else
+    focused_frame_ = frame;
+
+  if (!previous_frame) {
+    // The main frame is focused by default.
+    previous_frame = browser_info_->GetMainFrame();
+  }
+
+  if (previous_frame->GetIdentifier() != frame->GetIdentifier()) {
+    previous_frame->SetFocused(false);
+    frame->SetFocused(true);
+  }
+
+  OnStateChanged(State::kFocusedFrame);
+}
+
+void CefBrowserContentsDelegate::DocumentAvailableInMainFrame() {
+  has_document_ = true;
+  OnStateChanged(State::kDocument);
+
+  if (auto c = client()) {
+    if (auto handler = c->GetRequestHandler()) {
+      handler->OnDocumentAvailableInMainFrame(browser());
+    }
+  }
+}
+
+void CefBrowserContentsDelegate::LoadProgressChanged(double progress) {
+  if (auto c = client()) {
+    if (auto handler = c->GetDisplayHandler()) {
+      handler->OnLoadingProgressChange(browser(), progress);
+    }
+  }
+}
+
+void CefBrowserContentsDelegate::DidStopLoading() {
+  // Notify all renderers that loading has stopped. We used to use
+  // RenderFrameObserver::DidStopLoading in the renderer process but that was
+  // removed in https://crrev.com/3e37dd0ead. However, that callback wasn't
+  // necessarily accurate because it wasn't called in all of the cases where
+  // RenderFrameImpl sends the FrameHostMsg_DidStopLoading message. This adds
+  // an additional round trip but should provide the same or improved
+  // functionality.
+  for (const auto& frame : browser_info_->GetAllFrames()) {
+    frame->MaybeSendDidStopLoading();
+  }
+}
+
+void CefBrowserContentsDelegate::DidFinishNavigation(
+    content::NavigationHandle* navigation_handle) {
+  const net::Error error_code = navigation_handle->GetNetErrorCode();
+
+  // Skip calls where the navigation has not yet committed and there is no
+  // error code. For example, when creating a browser without loading a URL.
+  if (!navigation_handle->HasCommitted() && error_code == net::OK)
+    return;
+
+  const bool is_main_frame = navigation_handle->IsInMainFrame();
+  const GURL& url =
+      (error_code == net::OK ? navigation_handle->GetURL() : GURL());
+
+  auto browser_info = browser_info_;
+
+  // May return NULL when starting a new navigation if the previous navigation
+  // caused the renderer process to crash during load.
+  CefRefPtr<CefFrameHostImpl> frame = browser_info->GetFrameForFrameTreeNode(
+      navigation_handle->GetFrameTreeNodeId());
+  if (!frame) {
+    if (is_main_frame) {
+      frame = browser_info->GetMainFrame();
+    } else {
+      frame =
+          browser_info->CreateTempSubFrame(CefFrameHostImpl::kInvalidFrameId);
+    }
+  }
+  frame->RefreshAttributes();
+
+  if (error_code == net::OK) {
+    // The navigation has been committed and there is no error.
+    DCHECK(navigation_handle->HasCommitted());
+
+    // Don't call OnLoadStart for same page navigations (fragments,
+    // history state).
+    if (!navigation_handle->IsSameDocument()) {
+      OnLoadStart(frame.get(), navigation_handle->GetPageTransition());
+    }
+
+    if (is_main_frame) {
+      OnAddressChange(url);
+    }
+  } else {
+    // The navigation failed with an error. This may happen before commit
+    // (e.g. network error) or after commit (e.g. response filter error).
+    // If the error happened before commit then this call will originate from
+    // RenderFrameHostImpl::OnDidFailProvisionalLoadWithError.
+    // OnLoadStart/OnLoadEnd will not be called.
+    OnLoadError(frame.get(), navigation_handle->GetURL(), error_code);
+  }
+}
+
+void CefBrowserContentsDelegate::DidFailLoad(
+    content::RenderFrameHost* render_frame_host,
+    const GURL& validated_url,
+    int error_code) {
+  // The navigation failed after commit. OnLoadStart was called so we also
+  // call OnLoadEnd.
+  auto frame = browser_info_->GetFrameForHost(render_frame_host);
+  frame->RefreshAttributes();
+  OnLoadError(frame, validated_url, error_code);
+  OnLoadEnd(frame, validated_url, error_code);
+}
+
+bool CefBrowserContentsDelegate::OnMessageReceived(
+    const IPC::Message& message,
+    content::RenderFrameHost* render_frame_host) {
+  // Messages may arrive after a frame is detached. Ignore those messages.
+  auto frame = browser_info_->GetFrameForHost(render_frame_host);
+  if (frame) {
+    return static_cast<CefFrameHostImpl*>(frame.get())
+        ->OnMessageReceived(message);
+  }
+  return false;
+}
+
+void CefBrowserContentsDelegate::TitleWasSet(content::NavigationEntry* entry) {
+  // |entry| may be NULL if a popup is created via window.open and never
+  // navigated.
+  if (entry)
+    OnTitleChange(entry->GetTitle());
+  else if (web_contents())
+    OnTitleChange(web_contents()->GetTitle());
+}
+
+void CefBrowserContentsDelegate::PluginCrashed(
+    const base::FilePath& plugin_path,
+    base::ProcessId plugin_pid) {
+  if (auto c = client()) {
+    if (auto handler = c->GetRequestHandler()) {
+      handler->OnPluginCrashed(browser(), plugin_path.value());
+    }
+  }
+}
+
+void CefBrowserContentsDelegate::DidUpdateFaviconURL(
+    content::RenderFrameHost* render_frame_host,
+    const std::vector<blink::mojom::FaviconURLPtr>& candidates) {
+  if (auto c = client()) {
+    if (auto handler = c->GetDisplayHandler()) {
+      std::vector<CefString> icon_urls;
+      for (const auto& icon : candidates) {
+        if (icon->icon_type == blink::mojom::FaviconIconType::kFavicon) {
+          icon_urls.push_back(icon->icon_url.spec());
+        }
+      }
+      if (!icon_urls.empty()) {
+        handler->OnFaviconURLChange(browser(), icon_urls);
+      }
+    }
+  }
+}
+
+void CefBrowserContentsDelegate::OnWebContentsFocused(
+    content::RenderWidgetHost* render_widget_host) {
+  if (auto c = client()) {
+    if (auto handler = c->GetFocusHandler()) {
+      handler->OnGotFocus(browser());
+    }
+  }
+}
+
+void CefBrowserContentsDelegate::WebContentsDestroyed() {
+  auto wc = web_contents();
+  ObserveWebContents(nullptr);
+  for (auto& observer : observers_) {
+    observer.OnWebContentsDestroyed(wc);
+  }
+}
+
+void CefBrowserContentsDelegate::Observe(
+    int type,
+    const content::NotificationSource& source,
+    const content::NotificationDetails& details) {
+  DCHECK(type == content::NOTIFICATION_LOAD_STOP ||
+         type == content::NOTIFICATION_FOCUS_CHANGED_IN_PAGE);
+
+  if (type == content::NOTIFICATION_LOAD_STOP) {
+    content::NavigationController* controller =
+        content::Source<content::NavigationController>(source).ptr();
+    OnTitleChange(controller->GetWebContents()->GetTitle());
+  } else if (type == content::NOTIFICATION_FOCUS_CHANGED_IN_PAGE) {
+    focus_on_editable_field_ = *content::Details<bool>(details).ptr();
+  }
+}
+
+void CefBrowserContentsDelegate::OnLoadEnd(CefRefPtr<CefFrame> frame,
+                                           const GURL& url,
+                                           int http_status_code) {
+  if (auto c = client()) {
+    if (auto handler = c->GetLoadHandler()) {
+      handler->OnLoadEnd(browser(), frame, http_status_code);
+    }
+  }
+}
+
+bool CefBrowserContentsDelegate::OnSetFocus(cef_focus_source_t source) {
+  // SetFocus() might be called while inside the OnSetFocus() callback. If
+  // so, don't re-enter the callback.
+  if (is_in_onsetfocus_)
+    return true;
+
+  if (auto c = client()) {
+    if (auto handler = c->GetFocusHandler()) {
+      is_in_onsetfocus_ = true;
+      bool handled = handler->OnSetFocus(browser(), source);
+      is_in_onsetfocus_ = false;
+
+      return handled;
+    }
+  }
+
+  return false;
+}
+
+CefRefPtr<CefClient> CefBrowserContentsDelegate::client() const {
+  if (auto b = browser()) {
+    return b->GetHost()->GetClient();
+  }
+  return nullptr;
+}
+
+CefRefPtr<CefBrowser> CefBrowserContentsDelegate::browser() const {
+  return browser_info_->browser();
+}
+
+CefBrowserPlatformDelegate* CefBrowserContentsDelegate::platform_delegate()
+    const {
+  auto browser = browser_info_->browser();
+  if (browser)
+    return browser->platform_delegate();
+  return nullptr;
+}
+
+void CefBrowserContentsDelegate::OnAddressChange(const GURL& url) {
+  if (auto c = client()) {
+    if (auto handler = c->GetDisplayHandler()) {
+      // On the handler of an address change.
+      handler->OnAddressChange(browser(), browser_info_->GetMainFrame(),
+                               url.spec());
+    }
+  }
+}
+
+void CefBrowserContentsDelegate::OnLoadStart(
+    CefRefPtr<CefFrame> frame,
+    ui::PageTransition transition_type) {
+  if (auto c = client()) {
+    if (auto handler = c->GetLoadHandler()) {
+      // On the handler that loading has started.
+      handler->OnLoadStart(browser(), frame,
+                           static_cast<cef_transition_type_t>(transition_type));
+    }
+  }
+}
+
+void CefBrowserContentsDelegate::OnLoadError(CefRefPtr<CefFrame> frame,
+                                             const GURL& url,
+                                             int error_code) {
+  if (auto c = client()) {
+    if (auto handler = c->GetLoadHandler()) {
+      auto navigation_lock = browser_info_->CreateNavigationLock();
+      // On the handler that loading has failed.
+      handler->OnLoadError(browser(), frame,
+                           static_cast<cef_errorcode_t>(error_code),
+                           net::ErrorToShortString(error_code), url.spec());
+    }
+  }
+}
+
+void CefBrowserContentsDelegate::OnTitleChange(const base::string16& title) {
+  if (auto c = client()) {
+    if (auto handler = c->GetDisplayHandler()) {
+      handler->OnTitleChange(browser(), title);
+    }
+  }
+}
+
+void CefBrowserContentsDelegate::OnFullscreenModeChange(bool fullscreen) {
+  if (fullscreen == is_fullscreen_)
+    return;
+
+  is_fullscreen_ = fullscreen;
+  OnStateChanged(State::kFullscreen);
+
+  if (auto c = client()) {
+    if (auto handler = c->GetDisplayHandler()) {
+      handler->OnFullscreenModeChange(browser(), fullscreen);
+    }
+  }
+}
+
+void CefBrowserContentsDelegate::OnStateChanged(State state_changed) {
+  for (auto& observer : observers_) {
+    observer.OnStateChanged(state_changed);
+  }
+}

libcef/browser/browser_contents_delegate.h

@@ -0,0 +1,198 @@
+// Copyright 2020 The Chromium Embedded Framework Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef CEF_LIBCEF_BROWSER_BROWSER_CONTENTS_DELEGATE_H_
+#define CEF_LIBCEF_BROWSER_BROWSER_CONTENTS_DELEGATE_H_
+#pragma once
+
+#include <memory>
+
+#include "libcef/browser/frame_host_impl.h"
+
+#include "base/observer_list.h"
+#include "content/public/browser/notification_observer.h"
+#include "content/public/browser/notification_registrar.h"
+#include "content/public/browser/web_contents_delegate.h"
+#include "content/public/browser/web_contents_observer.h"
+
+class CefBrowser;
+class CefBrowserInfo;
+class CefBrowserPlatformDelegate;
+class CefClient;
+
+// Flags that represent which states have changed.
+enum class CefBrowserContentsState : uint8_t {
+  kNone = 0,
+  kNavigation = (1 << 0),
+  kDocument = (1 << 1),
+  kFullscreen = (1 << 2),
+  kFocusedFrame = (1 << 3),
+};
+
+constexpr inline CefBrowserContentsState operator&(
+    CefBrowserContentsState lhs,
+    CefBrowserContentsState rhs) {
+  return static_cast<CefBrowserContentsState>(static_cast<int>(lhs) &
+                                              static_cast<int>(rhs));
+}
+
+constexpr inline CefBrowserContentsState operator|(
+    CefBrowserContentsState lhs,
+    CefBrowserContentsState rhs) {
+  return static_cast<CefBrowserContentsState>(static_cast<int>(lhs) |
+                                              static_cast<int>(rhs));
+}
+
+// Tracks state and executes client callbacks based on WebContents callbacks.
+// Includes functionality that is shared by the alloy and chrome runtimes.
+// Only accessed on the UI thread.
+class CefBrowserContentsDelegate : public content::WebContentsDelegate,
+                                   public content::WebContentsObserver,
+                                   public content::NotificationObserver {
+ public:
+  using State = CefBrowserContentsState;
+
+  // Interface to implement for observers that wish to be informed of changes
+  // to the delegate. All methods will be called on the UI thread.
+  class Observer : public base::CheckedObserver {
+   public:
+    // Called after state has changed and before the associated CefClient
+    // callback is executed.
+    virtual void OnStateChanged(State state_changed) = 0;
+
+    // Called when the associated WebContents is destroyed.
+    virtual void OnWebContentsDestroyed(content::WebContents* web_contents) = 0;
+
+   protected:
+    ~Observer() override {}
+  };
+
+  explicit CefBrowserContentsDelegate(
+      scoped_refptr<CefBrowserInfo> browser_info);
+
+  void ObserveWebContents(content::WebContents* new_contents);
+
+  // Manage observer objects. The observer must either outlive this object or
+  // be removed before destruction.
+  void AddObserver(Observer* observer);
+  void RemoveObserver(Observer* observer);
+
+  // WebContentsDelegate methods:
+  content::WebContents* OpenURLFromTab(
+      content::WebContents* source,
+      const content::OpenURLParams& params) override;
+  void LoadingStateChanged(content::WebContents* source,
+                           bool to_different_document) override;
+  void UpdateTargetURL(content::WebContents* source, const GURL& url) override;
+  bool DidAddMessageToConsole(content::WebContents* source,
+                              blink::mojom::ConsoleMessageLevel log_level,
+                              const base::string16& message,
+                              int32_t line_no,
+                              const base::string16& source_id) override;
+  void DidNavigateMainFramePostCommit(
+      content::WebContents* web_contents) override;
+  void EnterFullscreenModeForTab(
+      content::RenderFrameHost* requesting_frame,
+      const blink::mojom::FullscreenOptions& options) override;
+  void ExitFullscreenModeForTab(content::WebContents* web_contents) override;
+  content::KeyboardEventProcessingResult PreHandleKeyboardEvent(
+      content::WebContents* source,
+      const content::NativeWebKeyboardEvent& event) override;
+  bool HandleKeyboardEvent(
+      content::WebContents* source,
+      const content::NativeWebKeyboardEvent& event) override;
+
+  // WebContentsObserver methods:
+  void RenderFrameCreated(content::RenderFrameHost* render_frame_host) override;
+  void RenderFrameHostChanged(content::RenderFrameHost* old_host,
+                              content::RenderFrameHost* new_host) override;
+  void RenderFrameDeleted(content::RenderFrameHost* render_frame_host) override;
+  void RenderViewCreated(content::RenderViewHost* render_view_host) override;
+  void RenderViewDeleted(content::RenderViewHost* render_view_host) override;
+  void RenderViewReady() override;
+  void RenderProcessGone(base::TerminationStatus status) override;
+  void OnFrameFocused(content::RenderFrameHost* render_frame_host) override;
+  void DocumentAvailableInMainFrame() override;
+  void LoadProgressChanged(double progress) override;
+  void DidStopLoading() override;
+  void DidFinishNavigation(
+      content::NavigationHandle* navigation_handle) override;
+  void DidFailLoad(content::RenderFrameHost* render_frame_host,
+                   const GURL& validated_url,
+                   int error_code) override;
+  bool OnMessageReceived(const IPC::Message& message,
+                         content::RenderFrameHost* render_frame_host) override;
+  void TitleWasSet(content::NavigationEntry* entry) override;
+  void PluginCrashed(const base::FilePath& plugin_path,
+                     base::ProcessId plugin_pid) override;
+  void DidUpdateFaviconURL(
+      content::RenderFrameHost* render_frame_host,
+      const std::vector<blink::mojom::FaviconURLPtr>& candidates) override;
+  void OnWebContentsFocused(
+      content::RenderWidgetHost* render_widget_host) override;
+  void WebContentsDestroyed() override;
+
+  // NotificationObserver methods.
+  void Observe(int type,
+               const content::NotificationSource& source,
+               const content::NotificationDetails& details) override;
+
+  // Accessors for state information. Changes will be signaled to
+  // Observer::OnStateChanged.
+  bool is_loading() const { return is_loading_; }
+  bool can_go_back() const { return can_go_back_; }
+  bool can_go_forward() const { return can_go_forward_; }
+  bool has_document() const { return has_document_; }
+  bool is_fullscreen() const { return is_fullscreen_; }
+  CefRefPtr<CefFrameHostImpl> focused_frame() const { return focused_frame_; }
+
+  // Helpers for executing client callbacks.
+  // TODO(cef): Make this private if/when possible.
+  void OnLoadEnd(CefRefPtr<CefFrame> frame,
+                 const GURL& url,
+                 int http_status_code);
+  bool OnSetFocus(cef_focus_source_t source);
+
+ private:
+  CefRefPtr<CefClient> client() const;
+  CefRefPtr<CefBrowser> browser() const;
+  CefBrowserPlatformDelegate* platform_delegate() const;
+
+  // Helpers for executing client callbacks.
+  void OnAddressChange(const GURL& url);
+  void OnLoadStart(CefRefPtr<CefFrame> frame,
+                   ui::PageTransition transition_type);
+  void OnLoadError(CefRefPtr<CefFrame> frame, const GURL& url, int error_code);
+  void OnTitleChange(const base::string16& title);
+  void OnFullscreenModeChange(bool fullscreen);
+
+  void OnStateChanged(State state_changed);
+
+  scoped_refptr<CefBrowserInfo> browser_info_;
+
+  bool is_loading_ = false;
+  bool can_go_back_ = false;
+  bool can_go_forward_ = false;
+  bool has_document_ = false;
+  bool is_fullscreen_ = false;
+
+  // The currently focused frame, or nullptr if the main frame is focused.
+  CefRefPtr<CefFrameHostImpl> focused_frame_;
+
+  // True if currently in the OnSetFocus callback.
+  bool is_in_onsetfocus_ = false;
+
+  // Observers that want to be notified of changes to this object.
+  base::ObserverList<Observer> observers_;
+
+  // Used for managing notification subscriptions.
+  std::unique_ptr<content::NotificationRegistrar> registrar_;
+
+  // True if the focus is currently on an editable field on the page.
+  bool focus_on_editable_field_ = false;
+
+  DISALLOW_COPY_AND_ASSIGN(CefBrowserContentsDelegate);
+};
+
+#endif  // CEF_LIBCEF_BROWSER_BROWSER_CONTENTS_DELEGATE_H_

libcef/browser/browser_context.cc

@@ -7,47 +7,20 @@
 #include <map>
 #include <utility>
 
-#include "libcef/browser/content_browser_client.h"
-#include "libcef/browser/download_manager_delegate.h"
-#include "libcef/browser/extensions/extension_system.h"
+#include "libcef/browser/iothread_state.h"
 #include "libcef/browser/media_router/media_router_manager.h"
-#include "libcef/browser/prefs/browser_prefs.h"
 #include "libcef/browser/request_context_impl.h"
-#include "libcef/browser/ssl_host_state_delegate.h"
 #include "libcef/browser/thread_util.h"
 #include "libcef/common/cef_switches.h"
-#include "libcef/common/extensions/extensions_util.h"
 
-#include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/strings/string_util.h"
-#include "chrome/browser/font_family_cache.h"
-#include "chrome/browser/plugins/chrome_plugin_service_filter.h"
-#include "chrome/browser/profiles/profile_key.h"
-#include "chrome/browser/ui/zoom/chrome_zoom_level_prefs.h"
-#include "chrome/common/pref_names.h"
-#include "components/content_settings/core/browser/host_content_settings_map.h"
-#include "components/guest_view/browser/guest_view_manager.h"
-#include "components/keyed_service/content/browser_context_dependency_manager.h"
-#include "components/keyed_service/core/simple_dependency_manager.h"
-#include "components/keyed_service/core/simple_key_map.h"
-#include "components/prefs/pref_service.h"
-#include "components/proxy_config/pref_proxy_config_tracker_impl.h"
-#include "components/user_prefs/user_prefs.h"
-#include "components/visitedlink/browser/visitedlink_event_listener.h"
-#include "components/visitedlink/browser/visitedlink_writer.h"
-#include "components/zoom/zoom_event_manager.h"
+#include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
-#include "content/public/browser/download_manager.h"
 #include "content/public/browser/storage_partition.h"
-#include "extensions/browser/extension_protocols.h"
-#include "extensions/browser/process_manager.h"
-#include "extensions/common/constants.h"
-#include "net/proxy_resolution/proxy_config_service.h"
-#include "services/network/public/mojom/cors_origin_pattern.mojom.h"
 
 using content::BrowserThread;
 
@@ -90,10 +63,10 @@ class ImplManager {
     return GetImplPos(impl) != all_.end();
   }
 
-  CefBrowserContext* GetImplForIDs(int render_process_id,
-                                   int render_frame_id,
-                                   int frame_tree_node_id,
-                                   bool require_frame_match) {
+  CefBrowserContext* GetImplFromIDs(int render_process_id,
+                                    int render_frame_id,
+                                    int frame_tree_node_id,
+                                    bool require_frame_match) {
     CEF_REQUIRE_UIT();
     for (const auto& context : all_) {
       if (context->IsAssociatedContext(render_process_id, render_frame_id,
@@ -105,15 +78,15 @@ class ImplManager {
     return nullptr;
   }
 
-  CefBrowserContext* GetImplForContext(const content::BrowserContext* context) {
+  CefBrowserContext* GetImplFromBrowserContext(
+      const content::BrowserContext* context) {
     CEF_REQUIRE_UIT();
     if (!context)
       return nullptr;
 
-    Vector::iterator it = all_.begin();
-    for (; it != all_.end(); ++it) {
-      if (*it == context)
-        return *it;
+    for (const auto& bc : all_) {
+      if (bc->AsBrowserContext() == context)
+        return bc;
     }
     return nullptr;
   }
@@ -122,11 +95,11 @@ class ImplManager {
     CEF_REQUIRE_UIT();
     DCHECK(!path.empty());
     DCHECK(IsValidImpl(impl));
-    DCHECK(GetImplForPath(path) == nullptr);
+    DCHECK(GetImplFromPath(path) == nullptr);
     map_.insert(std::make_pair(path, impl));
   }
 
-  CefBrowserContext* GetImplForPath(const base::FilePath& path) {
+  CefBrowserContext* GetImplFromPath(const base::FilePath& path) {
     CEF_REQUIRE_UIT();
     DCHECK(!path.empty());
     PathMap::const_iterator it = map_.find(path);
@@ -170,59 +143,6 @@ CefBrowserContext* GetSelf(base::WeakPtr<CefBrowserContext> self) {
 
 }  // namespace
 
-// Creates and manages VisitedLinkEventListener objects for each
-// CefBrowserContext sharing the same VisitedLinkWriter.
-class CefVisitedLinkListener : public visitedlink::VisitedLinkWriter::Listener {
- public:
-  CefVisitedLinkListener() { DCHECK(listener_map_.empty()); }
-
-  void CreateListenerForContext(const CefBrowserContext* context) {
-    CEF_REQUIRE_UIT();
-    auto listener = std::make_unique<visitedlink::VisitedLinkEventListener>(
-        const_cast<CefBrowserContext*>(context));
-    listener_map_.insert(std::make_pair(context, std::move(listener)));
-  }
-
-  void RemoveListenerForContext(const CefBrowserContext* context) {
-    CEF_REQUIRE_UIT();
-    ListenerMap::iterator it = listener_map_.find(context);
-    DCHECK(it != listener_map_.end());
-    listener_map_.erase(it);
-  }
-
-  // visitedlink::VisitedLinkWriter::Listener methods.
-
-  void NewTable(base::ReadOnlySharedMemoryRegion* table_region) override {
-    CEF_REQUIRE_UIT();
-    ListenerMap::iterator it = listener_map_.begin();
-    for (; it != listener_map_.end(); ++it)
-      it->second->NewTable(table_region);
-  }
-
-  void Add(visitedlink::VisitedLinkCommon::Fingerprint fingerprint) override {
-    CEF_REQUIRE_UIT();
-    ListenerMap::iterator it = listener_map_.begin();
-    for (; it != listener_map_.end(); ++it)
-      it->second->Add(fingerprint);
-  }
-
-  void Reset(bool invalidate_hashes) override {
-    CEF_REQUIRE_UIT();
-    ListenerMap::iterator it = listener_map_.begin();
-    for (; it != listener_map_.end(); ++it)
-      it->second->Reset(invalidate_hashes);
-  }
-
- private:
-  // Map of CefBrowserContext to the associated VisitedLinkEventListener.
-  typedef std::map<const CefBrowserContext*,
-                   std::unique_ptr<visitedlink::VisitedLinkEventListener>>
-      ListenerMap;
-  ListenerMap listener_map_;
-
-  DISALLOW_COPY_AND_ASSIGN(CefVisitedLinkListener);
-};
-
 CefBrowserContext::CefBrowserContext(const CefRequestContextSettings& settings)
     : settings_(settings), weak_ptr_factory_(this) {
   g_manager.Get().AddImpl(this);
@@ -231,6 +151,33 @@ CefBrowserContext::CefBrowserContext(const CefRequestContextSettings& settings)
 
 CefBrowserContext::~CefBrowserContext() {
   CEF_REQUIRE_UIT();
+#if DCHECK_IS_ON()
+  DCHECK(is_shutdown_);
+#endif
+
+  if (iothread_state_) {
+    // Destruction of the CefIOThreadState will trigger destruction of all
+    // associated network requests.
+    content::BrowserThread::DeleteSoon(content::BrowserThread::IO, FROM_HERE,
+                                       iothread_state_.release());
+  }
+}
+
+void CefBrowserContext::Initialize() {
+  cache_path_ = base::FilePath(CefString(&settings_.cache_path));
+
+  if (!cache_path_.empty())
+    g_manager.Get().SetImplPath(this, cache_path_);
+
+  iothread_state_ = std::make_unique<CefIOThreadState>();
+}
+
+void CefBrowserContext::Shutdown() {
+  CEF_REQUIRE_UIT();
+
+#if DCHECK_IS_ON()
+  is_shutdown_ = true;
+#endif
 
   // No CefRequestContext should be referencing this object any longer.
   DCHECK(request_context_set_.empty());
@@ -240,121 +187,6 @@ CefBrowserContext::~CefBrowserContext() {
 
   // Destroy objects that may hold references to the MediaRouter.
   media_router_manager_.reset();
-
-  // Send notifications to clean up objects associated with this Profile.
-  MaybeSendDestroyedNotification();
-
-  ChromePluginServiceFilter::GetInstance()->UnregisterProfile(this);
-
-  // Remove any BrowserContextKeyedServiceFactory associations. This must be
-  // called before the ProxyService owned by CefBrowserContext is destroyed.
-  // The SimpleDependencyManager should always be passed after the
-  // BrowserContextDependencyManager. This is because the KeyedService instances
-  // in the BrowserContextDependencyManager's dependency graph can depend on the
-  // ones in the SimpleDependencyManager's graph.
-  DependencyManager::PerformInterlockedTwoPhaseShutdown(
-      BrowserContextDependencyManager::GetInstance(), this,
-      SimpleDependencyManager::GetInstance(), key_.get());
-
-  key_.reset();
-  SimpleKeyMap::GetInstance()->Dissociate(this);
-
-  // Shuts down the storage partitions associated with this browser context.
-  // This must be called before the browser context is actually destroyed
-  // and before a clean-up task for its corresponding IO thread residents
-  // (e.g. ResourceContext) is posted, so that the classes that hung on
-  // StoragePartition can have time to do necessary cleanups on IO thread.
-  ShutdownStoragePartitions();
-
-  if (resource_context_.get()) {
-    // Destruction of the ResourceContext will trigger destruction of all
-    // associated network requests.
-    content::BrowserThread::DeleteSoon(content::BrowserThread::IO, FROM_HERE,
-                                       resource_context_.release());
-  }
-
-  visitedlink_listener_->RemoveListenerForContext(this);
-
-  // The FontFamilyCache references the ProxyService so delete it before the
-  // ProxyService is deleted.
-  SetUserData(&kFontFamilyCacheKey, nullptr);
-
-  pref_proxy_config_tracker_->DetachFromPrefService();
-
-  if (host_content_settings_map_)
-    host_content_settings_map_->ShutdownOnUIThread();
-
-  // Delete the download manager delegate here because otherwise we'll crash
-  // when it's accessed from the content::BrowserContext destructor.
-  if (download_manager_delegate_)
-    download_manager_delegate_.reset(nullptr);
-}
-
-void CefBrowserContext::Initialize() {
-  cache_path_ = base::FilePath(CefString(&settings_.cache_path));
-
-  if (!cache_path_.empty())
-    g_manager.Get().SetImplPath(this, cache_path_);
-
-  if (!!settings_.persist_session_cookies) {
-    set_should_persist_session_cookies(true);
-  }
-
-  key_ = std::make_unique<ProfileKey>(cache_path_);
-  SimpleKeyMap::GetInstance()->Associate(this, key_.get());
-
-  // Initialize the PrefService object.
-  pref_service_ = browser_prefs::CreatePrefService(
-      this, cache_path_, !!settings_.persist_user_preferences);
-
-  resource_context_.reset(new CefResourceContext(IsOffTheRecord()));
-
-  // This must be called before creating any services to avoid hitting
-  // DependencyManager::AssertContextWasntDestroyed when creating/destroying
-  // multiple browser contexts (due to pointer address reuse).
-  BrowserContextDependencyManager::GetInstance()->CreateBrowserContextServices(
-      this);
-
-  const bool extensions_enabled = extensions::ExtensionsEnabled();
-  if (extensions_enabled) {
-    // Create the custom ExtensionSystem first because other KeyedServices
-    // depend on it.
-    extension_system_ = static_cast<extensions::CefExtensionSystem*>(
-        extensions::ExtensionSystem::Get(this));
-    extension_system_->InitForRegularProfile(true);
-
-    // Make sure the ProcessManager is created so that it receives extension
-    // load notifications. This is necessary for the proper initialization of
-    // background/event pages.
-    extensions::ProcessManager::Get(this);
-  }
-
-  // Initialize visited links management.
-  base::FilePath visited_link_path;
-  if (!cache_path_.empty())
-    visited_link_path = cache_path_.Append(FILE_PATH_LITERAL("Visited Links"));
-  visitedlink_listener_ = new CefVisitedLinkListener;
-  visitedlink_master_.reset(new visitedlink::VisitedLinkWriter(
-      visitedlink_listener_, this, !visited_link_path.empty(), false,
-      visited_link_path, 0));
-  visitedlink_listener_->CreateListenerForContext(this);
-  visitedlink_master_->Init();
-
-  // Initialize proxy configuration tracker.
-  pref_proxy_config_tracker_.reset(new PrefProxyConfigTrackerImpl(
-      GetPrefs(), base::CreateSingleThreadTaskRunner({BrowserThread::IO})));
-
-  // Spell checking support and possibly other subsystems retrieve the
-  // PrefService associated with a BrowserContext via UserPrefs::Get().
-  PrefService* pref_service = GetPrefs();
-  DCHECK(pref_service);
-  user_prefs::UserPrefs::Set(this, pref_service);
-  key_->SetPrefs(pref_service);
-
-  if (extensions_enabled)
-    extension_system_->Init();
-
-  ChromePluginServiceFilter::GetInstance()->RegisterProfile(this);
 }
 
 void CefBrowserContext::AddCefRequestContext(CefRequestContextImpl* context) {
@@ -366,36 +198,35 @@ void CefBrowserContext::RemoveCefRequestContext(
     CefRequestContextImpl* context) {
   CEF_REQUIRE_UIT();
 
-  if (extensions::ExtensionsEnabled()) {
-    extension_system()->OnRequestContextDeleted(context);
-  }
-
   request_context_set_.erase(context);
 
   // Delete ourselves when the reference count reaches zero.
-  if (request_context_set_.empty())
+  if (request_context_set_.empty()) {
+    Shutdown();
     delete this;
+  }
 }
 
 // static
-CefBrowserContext* CefBrowserContext::GetForCachePath(
+CefBrowserContext* CefBrowserContext::FromCachePath(
     const base::FilePath& cache_path) {
-  return g_manager.Get().GetImplForPath(cache_path);
+  return g_manager.Get().GetImplFromPath(cache_path);
 }
 
 // static
-CefBrowserContext* CefBrowserContext::GetForIDs(int render_process_id,
-                                                int render_frame_id,
-                                                int frame_tree_node_id,
-                                                bool require_frame_match) {
-  return g_manager.Get().GetImplForIDs(render_process_id, render_frame_id,
-                                       frame_tree_node_id, require_frame_match);
+CefBrowserContext* CefBrowserContext::FromIDs(int render_process_id,
+                                              int render_frame_id,
+                                              int frame_tree_node_id,
+                                              bool require_frame_match) {
+  return g_manager.Get().GetImplFromIDs(render_process_id, render_frame_id,
+                                        frame_tree_node_id,
+                                        require_frame_match);
 }
 
 // static
-CefBrowserContext* CefBrowserContext::GetForContext(
-    content::BrowserContext* context) {
-  return g_manager.Get().GetImplForContext(context);
+CefBrowserContext* CefBrowserContext::FromBrowserContext(
+    const content::BrowserContext* context) {
+  return g_manager.Get().GetImplFromBrowserContext(context);
 }
 
 // static
@@ -403,194 +234,6 @@ std::vector<CefBrowserContext*> CefBrowserContext::GetAll() {
   return g_manager.Get().GetAllImpl();
 }
 
-content::ResourceContext* CefBrowserContext::GetResourceContext() {
-  return resource_context_.get();
-}
-
-content::ClientHintsControllerDelegate*
-CefBrowserContext::GetClientHintsControllerDelegate() {
-  return nullptr;
-}
-
-void CefBrowserContext::SetCorsOriginAccessListForOrigin(
-    const url::Origin& source_origin,
-    std::vector<network::mojom::CorsOriginPatternPtr> allow_patterns,
-    std::vector<network::mojom::CorsOriginPatternPtr> block_patterns,
-    base::OnceClosure closure) {
-  // This method is called for Extension support.
-  base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, std::move(closure));
-}
-
-ChromeZoomLevelPrefs* CefBrowserContext::GetZoomLevelPrefs() {
-  return static_cast<ChromeZoomLevelPrefs*>(
-      GetStoragePartition(this, nullptr)->GetZoomLevelDelegate());
-}
-
-scoped_refptr<network::SharedURLLoaderFactory>
-CefBrowserContext::GetURLLoaderFactory() {
-  return GetDefaultStoragePartition(this)
-      ->GetURLLoaderFactoryForBrowserProcess();
-}
-
-base::FilePath CefBrowserContext::GetPath() {
-  return cache_path_;
-}
-
-base::FilePath CefBrowserContext::GetPath() const {
-  return cache_path_;
-}
-
-std::unique_ptr<content::ZoomLevelDelegate>
-CefBrowserContext::CreateZoomLevelDelegate(
-    const base::FilePath& partition_path) {
-  if (cache_path_.empty())
-    return std::unique_ptr<content::ZoomLevelDelegate>();
-
-  return base::WrapUnique(new ChromeZoomLevelPrefs(
-      GetPrefs(), cache_path_, partition_path,
-      zoom::ZoomEventManager::GetForBrowserContext(this)->GetWeakPtr()));
-}
-
-bool CefBrowserContext::IsOffTheRecord() const {
-  // CEF contexts are never flagged as off-the-record. It causes problems
-  // for the extension system.
-  return false;
-}
-
-content::DownloadManagerDelegate*
-CefBrowserContext::GetDownloadManagerDelegate() {
-  if (!download_manager_delegate_) {
-    content::DownloadManager* manager =
-        BrowserContext::GetDownloadManager(this);
-    download_manager_delegate_.reset(new CefDownloadManagerDelegate(manager));
-  }
-  return download_manager_delegate_.get();
-}
-
-content::BrowserPluginGuestManager* CefBrowserContext::GetGuestManager() {
-  DCHECK(extensions::ExtensionsEnabled());
-  return guest_view::GuestViewManager::FromBrowserContext(this);
-}
-
-storage::SpecialStoragePolicy* CefBrowserContext::GetSpecialStoragePolicy() {
-  return nullptr;
-}
-
-content::PushMessagingService* CefBrowserContext::GetPushMessagingService() {
-  return nullptr;
-}
-
-content::StorageNotificationService*
-CefBrowserContext::GetStorageNotificationService() {
-  return nullptr;
-}
-
-content::SSLHostStateDelegate* CefBrowserContext::GetSSLHostStateDelegate() {
-  if (!ssl_host_state_delegate_.get())
-    ssl_host_state_delegate_.reset(new CefSSLHostStateDelegate());
-  return ssl_host_state_delegate_.get();
-}
-
-content::PermissionControllerDelegate*
-CefBrowserContext::GetPermissionControllerDelegate() {
-  return nullptr;
-}
-
-content::BackgroundFetchDelegate*
-CefBrowserContext::GetBackgroundFetchDelegate() {
-  return nullptr;
-}
-
-content::BackgroundSyncController*
-CefBrowserContext::GetBackgroundSyncController() {
-  return nullptr;
-}
-
-content::BrowsingDataRemoverDelegate*
-CefBrowserContext::GetBrowsingDataRemoverDelegate() {
-  return nullptr;
-}
-
-PrefService* CefBrowserContext::GetPrefs() {
-  return pref_service_.get();
-}
-
-const PrefService* CefBrowserContext::GetPrefs() const {
-  return pref_service_.get();
-}
-
-ProfileKey* CefBrowserContext::GetProfileKey() const {
-  DCHECK(key_);
-  return key_.get();
-}
-
-policy::SchemaRegistryService*
-CefBrowserContext::GetPolicySchemaRegistryService() {
-  NOTREACHED();
-  return nullptr;
-}
-
-policy::UserCloudPolicyManager* CefBrowserContext::GetUserCloudPolicyManager() {
-  NOTREACHED();
-  return nullptr;
-}
-
-policy::ProfilePolicyConnector* CefBrowserContext::GetProfilePolicyConnector() {
-  NOTREACHED();
-  return nullptr;
-}
-
-const policy::ProfilePolicyConnector*
-CefBrowserContext::GetProfilePolicyConnector() const {
-  NOTREACHED();
-  return nullptr;
-}
-
-const CefRequestContextSettings& CefBrowserContext::GetSettings() const {
-  return settings_;
-}
-
-HostContentSettingsMap* CefBrowserContext::GetHostContentSettingsMap() {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  if (!host_content_settings_map_.get()) {
-    // The |is_incognito_profile| and |is_guest_profile| arguments are
-    // intentionally set to false as they otherwise limit the types of values
-    // that can be stored in the settings map (for example, default values set
-    // via DefaultProvider::SetWebsiteSetting).
-    host_content_settings_map_ =
-        new HostContentSettingsMap(GetPrefs(), false, false, false, false);
-
-    // Change the default plugin policy.
-    const base::CommandLine* command_line =
-        base::CommandLine::ForCurrentProcess();
-    const std::string& plugin_policy_str =
-        command_line->GetSwitchValueASCII(switches::kPluginPolicy);
-    if (!plugin_policy_str.empty()) {
-      ContentSetting plugin_policy = CONTENT_SETTING_ALLOW;
-      if (base::LowerCaseEqualsASCII(plugin_policy_str,
-                                     switches::kPluginPolicy_Detect)) {
-        plugin_policy = CONTENT_SETTING_DETECT_IMPORTANT_CONTENT;
-      } else if (base::LowerCaseEqualsASCII(plugin_policy_str,
-                                            switches::kPluginPolicy_Block)) {
-        plugin_policy = CONTENT_SETTING_BLOCK;
-      }
-      host_content_settings_map_->SetDefaultContentSetting(
-          ContentSettingsType::PLUGINS, plugin_policy);
-    }
-  }
-  return host_content_settings_map_.get();
-}
-
-void CefBrowserContext::AddVisitedURLs(const std::vector<GURL>& urls) {
-  visitedlink_master_->AddURLs(urls);
-}
-
-void CefBrowserContext::RebuildTable(
-    const scoped_refptr<URLEnumerator>& enumerator) {
-  // Called when visited links will not or cannot be loaded from disk.
-  enumerator->OnComplete(true);
-}
-
 void CefBrowserContext::OnRenderFrameCreated(
     CefRequestContextImpl* request_context,
     int render_process_id,
@@ -611,15 +254,14 @@ void CefBrowserContext::OnRenderFrameCreated(
     handler_map_.AddHandler(render_process_id, render_frame_id,
                             frame_tree_node_id, handler);
 
-    if (resource_context_) {
+    if (iothread_state_) {
       // Using base::Unretained() is safe because both this callback and
-      // possible deletion of |resource_context_| will execute on the IO thread,
+      // possible deletion of |iothread_state_| will execute on the IO thread,
       // and this callback will be executed first.
-      CEF_POST_TASK(CEF_IOT,
-                    base::Bind(&CefResourceContext::AddHandler,
-                               base::Unretained(resource_context_.get()),
-                               render_process_id, render_frame_id,
-                               frame_tree_node_id, handler));
+      CEF_POST_TASK(CEF_IOT, base::Bind(&CefIOThreadState::AddHandler,
+                                        base::Unretained(iothread_state_.get()),
+                                        render_process_id, render_frame_id,
+                                        frame_tree_node_id, handler));
     }
   }
 }
@@ -650,15 +292,14 @@ void CefBrowserContext::OnRenderFrameDeleted(
     handler_map_.RemoveHandler(render_process_id, render_frame_id,
                                frame_tree_node_id);
 
-    if (resource_context_) {
+    if (iothread_state_) {
       // Using base::Unretained() is safe because both this callback and
-      // possible deletion of |resource_context_| will execute on the IO thread,
+      // possible deletion of |iothread_state_| will execute on the IO thread,
       // and this callback will be executed first.
-      CEF_POST_TASK(
-          CEF_IOT,
-          base::Bind(&CefResourceContext::RemoveHandler,
-                     base::Unretained(resource_context_.get()),
-                     render_process_id, render_frame_id, frame_tree_node_id));
+      CEF_POST_TASK(CEF_IOT, base::Bind(&CefIOThreadState::RemoveHandler,
+                                        base::Unretained(iothread_state_.get()),
+                                        render_process_id, render_frame_id,
+                                        frame_tree_node_id));
     }
   }
 
@@ -760,56 +401,81 @@ void CefBrowserContext::ClearPluginLoadDecision(int render_process_id) {
 }
 
 void CefBrowserContext::RegisterSchemeHandlerFactory(
-    const std::string& scheme_name,
-    const std::string& domain_name,
+    const CefString& scheme_name,
+    const CefString& domain_name,
     CefRefPtr<CefSchemeHandlerFactory> factory) {
-  if (resource_context_) {
+  if (iothread_state_) {
     // Using base::Unretained() is safe because both this callback and possible
-    // deletion of |resource_context_| will execute on the IO thread, and this
+    // deletion of |iothread_state_| will execute on the IO thread, and this
     // callback will be executed first.
     CEF_POST_TASK(CEF_IOT,
-                  base::Bind(&CefResourceContext::RegisterSchemeHandlerFactory,
-                             base::Unretained(resource_context_.get()),
+                  base::Bind(&CefIOThreadState::RegisterSchemeHandlerFactory,
+                             base::Unretained(iothread_state_.get()),
                              scheme_name, domain_name, factory));
   }
 }
 
 void CefBrowserContext::ClearSchemeHandlerFactories() {
-  if (resource_context_) {
+  if (iothread_state_) {
     // Using base::Unretained() is safe because both this callback and possible
-    // deletion of |resource_context_| will execute on the IO thread, and this
+    // deletion of |iothread_state_| will execute on the IO thread, and this
     // callback will be executed first.
     CEF_POST_TASK(CEF_IOT,
-                  base::Bind(&CefResourceContext::ClearSchemeHandlerFactories,
-                             base::Unretained(resource_context_.get())));
+                  base::Bind(&CefIOThreadState::ClearSchemeHandlerFactories,
+                             base::Unretained(iothread_state_.get())));
   }
 }
 
+void CefBrowserContext::LoadExtension(
+    const CefString& root_directory,
+    CefRefPtr<CefDictionaryValue> manifest,
+    CefRefPtr<CefExtensionHandler> handler,
+    CefRefPtr<CefRequestContext> loader_context) {
+  NOTIMPLEMENTED();
+  if (handler)
+    handler->OnExtensionLoadFailed(ERR_ABORTED);
+}
+
+bool CefBrowserContext::GetExtensions(std::vector<CefString>& extension_ids) {
+  NOTIMPLEMENTED();
+  return false;
+}
+
+CefRefPtr<CefExtension> CefBrowserContext::GetExtension(
+    const CefString& extension_id) {
+  NOTIMPLEMENTED();
+  return nullptr;
+}
+
+bool CefBrowserContext::UnloadExtension(const CefString& extension_id) {
+  NOTIMPLEMENTED();
+  return false;
+}
+
+bool CefBrowserContext::IsPrintPreviewSupported() const {
+  return true;
+}
+
 network::mojom::NetworkContext* CefBrowserContext::GetNetworkContext() {
   CEF_REQUIRE_UIT();
-  return GetDefaultStoragePartition(this)->GetNetworkContext();
-}
-
-DownloadPrefs* CefBrowserContext::GetDownloadPrefs() {
-  CEF_REQUIRE_UIT();
-  if (!download_prefs_) {
-    download_prefs_.reset(new DownloadPrefs(this));
-  }
-  return download_prefs_.get();
-}
-
-bool CefBrowserContext::IsPrintPreviewSupported() const {
-  CEF_REQUIRE_UIT();
-  if (!extensions::PrintPreviewEnabled())
-    return false;
-
-  return !GetPrefs()->GetBoolean(prefs::kPrintPreviewDisabled);
+  auto browser_context = AsBrowserContext();
+  return browser_context->GetDefaultStoragePartition(browser_context)
+      ->GetNetworkContext();
 }
 
 CefMediaRouterManager* CefBrowserContext::GetMediaRouterManager() {
   CEF_REQUIRE_UIT();
   if (!media_router_manager_) {
-    media_router_manager_.reset(new CefMediaRouterManager(this));
+    media_router_manager_.reset(new CefMediaRouterManager(AsBrowserContext()));
   }
   return media_router_manager_.get();
 }
+
+CefBrowserContext::CookieableSchemes CefBrowserContext::GetCookieableSchemes()
+    const {
+  CEF_REQUIRE_UIT();
+  if (cookieable_schemes_)
+    return cookieable_schemes_;
+
+  return CefCookieManagerImpl::GetGlobalCookieableSchemes();
+}

libcef/browser/browser_context.h

@@ -7,23 +7,17 @@
 #pragma once
 
 #include <set>
+#include <vector>
 
 #include "include/cef_request_context_handler.h"
-#include "libcef/browser/chrome_profile_stub.h"
 #include "libcef/browser/request_context_handler_map.h"
-#include "libcef/browser/resource_context.h"
 
 #include "base/callback.h"
 #include "base/files/file_path.h"
-#include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
-#include "chrome/browser/download/download_prefs.h"
+#include "base/optional.h"
 #include "chrome/common/plugin.mojom.h"
-#include "components/proxy_config/pref_proxy_config_tracker.h"
-#include "components/visitedlink/browser/visitedlink_delegate.h"
-#include "content/public/browser/browser_context.h"
-#include "content/public/browser/browser_thread.h"
-#include "content/public/browser/content_browser_client.h"
+#include "services/network/public/mojom/network_context.mojom.h"
 #include "url/origin.h"
 
 /*
@@ -31,31 +25,30 @@
 //
 // WC = WebContents
 //  Content API representation of a browser. Created by BHI or the system (for
-//  popups) and owned by BHI. Keeps a pointer to BC.
+//  popups) and owned by BHI. Keeps a pointer to the content::BrowserContext.
 //
-// BHI = CefBrowserHostImpl
+// BHI = AlloyBrowserHostImpl
 //  Implements the CefBrowser and CefBrowserHost interfaces which are exposed
-//  to clients. References an RCI instance. Owns a WC. Life span is controlled
-//  by client references and CefContentBrowserClient.
+//  to clients. References an RCI instance. Owns a WC. Lifespan is controlled
+//  by client references and CefBrowserInfoManager (until the browser has
+//  closed).
 //
 // RCI = CefRequestContextImpl
 //  Implements the CefRequestContext interface which is exposed to clients.
-//  References the isolated BC.
+//  Creates or references a BC. Lifespan is controlled by client references and
+//  BrowserMainParts (for the global RCI).
 //
 // BC = CefBrowserContext
-//   Entry point from WC when using an isolated RCI. Owns the RC and creates the
-//   SPI indirectly. Owned by CefBrowserMainParts for the global context or RCI
-//   for non-global contexts.
+//   Is/owns the content::BrowserContext which is the entry point from WC.
+//   Owns the IOTS and creates the SPI indirectly. Potentially shared by
+//   multiple RCI. Deletes itself when no longer needed by RCI.
 //
 // SPI = content::StoragePartitionImpl
 //   Owns storage-related objects like Quota, IndexedDB, Cache, etc. Created by
-//   StoragePartitionImplMap::Get(). Provides access to the URCG. Life span is
-//   controlled indirectly by BC.
+//   StoragePartitionImplMap::Get(). Life span is controlled indirectly by BC.
 //
-// RC = CefResourceContext
-//   Acts as a bridge for resource loading. Network request life span is tied to
-//   this object. Must be destroyed before the associated URCG. Life span is
-//   controlled by BC.
+// IOTS = CefIOThreadState
+//   Stores state for access on the IO thread. Life span is controlled by BC.
 //
 //
 // Relationship diagram:
@@ -63,142 +56,65 @@
 //   own = ownership (std::unique_ptr)
 //   ptr = raw pointer
 //
-//               CefBrowserMainParts
-//                       |
-//                      own
-//                       v
-// BHI -own-> WC -ptr-> BC -own-> SPI
-//
-// BHI -ref-> RCI -own-> BC -own-> RC
+// BHI -ref-> RCI -ptr-> BC -own-> SPI, IOTS
+//                      ^
+// BHI -own-> WC -ptr--/
 //
 //
 // How shutdown works:
-// 1. CefBrowserHostImpl is destroyed on any thread due to browser close,
-//    ref release, etc.
+// 1. AlloyBrowserHostImpl::DestroyBrowser is called on the UI thread after the
+//    browser is closed and deletes the WebContents.
+// 1. AlloyBrowserHostImpl is destroyed on any thread when the last reference
+//    is released.
 // 2. CefRequestContextImpl is destroyed (possibly asynchronously) on the UI
-//    thread due to CefBrowserHostImpl destruction, ref release, etc.
-// 3. CefBrowserContext is destroyed on the UI thread due to
-//    CefRequestContextImpl destruction or deletion in
-//    CefBrowserMainParts::PostMainMessageLoopRun().
-// 4. CefResourceContext is destroyed asynchronously on the IO thread due to
-//    CefBrowserContext destruction. This cancels/destroys any pending
-//    network requests.
+//    thread when the last reference is released.
+// 3. CefBrowserContext is destroyed on the UI thread when no longer needed
+//    by any CefRequestContextImpl (via RemoveCefRequestContext).
+// 4. CefIOThreadState is destroyed asynchronously on the IO thread after
+//    the owning CefBrowserContext is destroyed.
 */
 
-class CefDownloadManagerDelegate;
+namespace content {
+class BrowserContext;
+}
+
 class CefMediaRouterManager;
 class CefRequestContextImpl;
-class CefSSLHostStateDelegate;
-class CefVisitedLinkListener;
-class HostContentSettingsMap;
-class PrefService;
+class CefIOThreadState;
+class Profile;
 
-namespace extensions {
-class CefExtensionSystem;
-}
-
-namespace visitedlink {
-class VisitedLinkWriter;
-}
-
-// Main entry point for configuring behavior on a per-browser basis. An instance
-// of this class is passed to WebContents::Create in CefBrowserHostImpl::
-// CreateInternal. Only accessed on the UI thread unless otherwise indicated.
-class CefBrowserContext : public ChromeProfileStub,
-                          public visitedlink::VisitedLinkDelegate {
+// Main entry point for configuring behavior on a per-RequestContext basis. The
+// content::BrowserContext represented by this class is passed to
+// WebContents::Create in AlloyBrowserHostImpl::CreateInternal. Only accessed on
+// the UI thread unless otherwise indicated.
+class CefBrowserContext {
  public:
-  explicit CefBrowserContext(const CefRequestContextSettings& settings);
-
   // Returns the existing instance, if any, associated with the specified
   // |cache_path|.
-  static CefBrowserContext* GetForCachePath(const base::FilePath& cache_path);
+  static CefBrowserContext* FromCachePath(const base::FilePath& cache_path);
 
   // Returns the existing instance, if any, associated with the specified IDs.
   // See comments on IsAssociatedContext() for usage.
-  static CefBrowserContext* GetForIDs(int render_process_id,
-                                      int render_frame_id,
-                                      int frame_tree_node_id,
-                                      bool require_frame_match);
+  static CefBrowserContext* FromIDs(int render_process_id,
+                                    int render_frame_id,
+                                    int frame_tree_node_id,
+                                    bool require_frame_match);
 
   // Returns the underlying CefBrowserContext if any.
-  static CefBrowserContext* GetForContext(content::BrowserContext* context);
+  static CefBrowserContext* FromBrowserContext(
+      const content::BrowserContext* context);
 
   // Returns all existing CefBrowserContext.
   static std::vector<CefBrowserContext*> GetAll();
 
-  // Must be called immediately after this object is created.
-  void Initialize();
+  // Returns the content and chrome layer representations of the context.
+  virtual content::BrowserContext* AsBrowserContext() = 0;
+  virtual Profile* AsProfile() = 0;
 
-  // Track associated CefRequestContextImpl objects. This object will delete
-  // itself when the count reaches zero.
+  // Called from CefRequestContextImpl to track associated objects. This
+  // object will delete itself when the count reaches zero.
   void AddCefRequestContext(CefRequestContextImpl* context);
-  void RemoveCefRequestContext(CefRequestContextImpl* context);
-
-  // BrowserContext methods.
-  content::ResourceContext* GetResourceContext() override;
-  content::ClientHintsControllerDelegate* GetClientHintsControllerDelegate()
-      override;
-  void SetCorsOriginAccessListForOrigin(
-      const url::Origin& source_origin,
-      std::vector<network::mojom::CorsOriginPatternPtr> allow_patterns,
-      std::vector<network::mojom::CorsOriginPatternPtr> block_patterns,
-      base::OnceClosure closure) override;
-  base::FilePath GetPath() override;
-  base::FilePath GetPath() const override;
-  std::unique_ptr<content::ZoomLevelDelegate> CreateZoomLevelDelegate(
-      const base::FilePath& partition_path) override;
-  bool IsOffTheRecord() const override;
-  content::DownloadManagerDelegate* GetDownloadManagerDelegate() override;
-  content::BrowserPluginGuestManager* GetGuestManager() override;
-  storage::SpecialStoragePolicy* GetSpecialStoragePolicy() override;
-  content::PushMessagingService* GetPushMessagingService() override;
-  content::StorageNotificationService* GetStorageNotificationService() override;
-  content::SSLHostStateDelegate* GetSSLHostStateDelegate() override;
-  content::PermissionControllerDelegate* GetPermissionControllerDelegate()
-      override;
-  content::BackgroundFetchDelegate* GetBackgroundFetchDelegate() override;
-  content::BackgroundSyncController* GetBackgroundSyncController() override;
-  content::BrowsingDataRemoverDelegate* GetBrowsingDataRemoverDelegate()
-      override;
-
-  // Profile methods.
-  ChromeZoomLevelPrefs* GetZoomLevelPrefs() override;
-  scoped_refptr<network::SharedURLLoaderFactory> GetURLLoaderFactory() override;
-  PrefService* GetPrefs() override;
-  bool AllowsBrowserWindows() const override { return false; }
-  const PrefService* GetPrefs() const override;
-  ProfileKey* GetProfileKey() const override;
-  policy::SchemaRegistryService* GetPolicySchemaRegistryService() override;
-  policy::UserCloudPolicyManager* GetUserCloudPolicyManager() override;
-  policy::ProfilePolicyConnector* GetProfilePolicyConnector() override;
-  const policy::ProfilePolicyConnector* GetProfilePolicyConnector()
-      const override;
-
-  // Values checked in ProfileNetworkContextService::CreateNetworkContextParams
-  // when creating the NetworkContext.
-  bool ShouldRestoreOldSessionCookies() override {
-    return should_persist_session_cookies_;
-  }
-  bool ShouldPersistSessionCookies() override {
-    return should_persist_session_cookies_;
-  }
-  base::Optional<std::vector<std::string>> GetCookieableSchemes() override {
-    return cookieable_schemes_;
-  }
-
-  // visitedlink::VisitedLinkDelegate methods.
-  void RebuildTable(const scoped_refptr<URLEnumerator>& enumerator) override;
-
-  // Returns the settings associated with this object. Safe to call from any
-  // thread.
-  const CefRequestContextSettings& GetSettings() const;
-
-  // Settings for plugins and extensions.
-  HostContentSettingsMap* GetHostContentSettingsMap();
-
-  // Called from CefBrowserHostImpl::DidNavigateAnyFrame to update the table of
-  // visited links.
-  void AddVisitedURLs(const std::vector<GURL>& urls);
+  virtual void RemoveCefRequestContext(CefRequestContextImpl* context);
 
   // Called from CefRequestContextImpl::OnRenderFrameCreated.
   void OnRenderFrameCreated(CefRequestContextImpl* request_context,
@@ -254,79 +170,73 @@ class CefBrowserContext : public ChromeProfileStub,
   void ClearPluginLoadDecision(int render_process_id);
 
   // Called from CefRequestContextImpl methods of the same name.
-  void RegisterSchemeHandlerFactory(const std::string& scheme_name,
-                                    const std::string& domain_name,
+  void RegisterSchemeHandlerFactory(const CefString& scheme_name,
+                                    const CefString& domain_name,
                                     CefRefPtr<CefSchemeHandlerFactory> factory);
   void ClearSchemeHandlerFactories();
+  // TODO(chrome-runtime): Make these extension methods pure virtual.
+  virtual void LoadExtension(const CefString& root_directory,
+                             CefRefPtr<CefDictionaryValue> manifest,
+                             CefRefPtr<CefExtensionHandler> handler,
+                             CefRefPtr<CefRequestContext> loader_context);
+  virtual bool GetExtensions(std::vector<CefString>& extension_ids);
+  virtual CefRefPtr<CefExtension> GetExtension(const CefString& extension_id);
+
+  // Called from CefExtensionImpl::Unload().
+  virtual bool UnloadExtension(const CefString& extension_id);
+
+  // Returns true if this context supports print preview.
+  virtual bool IsPrintPreviewSupported() const;
 
   network::mojom::NetworkContext* GetNetworkContext();
 
-  void set_should_persist_session_cookies(bool value) {
-    should_persist_session_cookies_ = value;
-  }
-  void set_cookieable_schemes(
-      base::Optional<std::vector<std::string>> schemes) {
+  CefMediaRouterManager* GetMediaRouterManager();
+
+  using CookieableSchemes = base::Optional<std::vector<std::string>>;
+
+  // Returns the schemes associated with this context specifically, or the
+  // global configuration if unset.
+  CookieableSchemes GetCookieableSchemes() const;
+
+  // Set the schemes associated with this context specifically.
+  void set_cookieable_schemes(const CookieableSchemes& schemes) {
     cookieable_schemes_ = schemes;
   }
 
-  CefResourceContext* resource_context() const {
-    return resource_context_.get();
-  }
-  extensions::CefExtensionSystem* extension_system() const {
-    return extension_system_;
-  }
+  // These accessors are safe to call from any thread because the values don't
+  // change during this object's lifespan.
+  const CefRequestContextSettings& settings() const { return settings_; }
+  base::FilePath cache_path() const { return cache_path_; }
+  CefIOThreadState* iothread_state() const { return iothread_state_.get(); }
 
-  // Called from DownloadPrefs::FromBrowserContext.
-  DownloadPrefs* GetDownloadPrefs();
-
-  // Returns true if this context supports print preview.
-  bool IsPrintPreviewSupported() const;
-
-  CefMediaRouterManager* GetMediaRouterManager();
-
-  // Returns the BrowserContext, or nullptr if the BrowserContext has already
-  // been destroyed.
+  // Used to hold a WeakPtr reference to this this object. The Getter returns
+  // nullptr if this object has already been destroyed.
   using Getter = base::RepeatingCallback<CefBrowserContext*()>;
   Getter getter() const { return getter_; }
 
- private:
-  // Allow deletion via std::unique_ptr().
-  friend std::default_delete<CefBrowserContext>;
+ protected:
+  explicit CefBrowserContext(const CefRequestContextSettings& settings);
+  virtual ~CefBrowserContext();
 
-  ~CefBrowserContext() override;
+  // Will be called immediately after this object is created.
+  virtual void Initialize();
 
-  // Members initialized during construction are safe to access from any thread.
+  // Will be called immediately before this object is deleted.
+  virtual void Shutdown();
+
+  // Members initialized during construction or Initialize() are safe to access
+  // from any thread.
   const CefRequestContextSettings settings_;
   base::FilePath cache_path_;
 
+ private:
+  std::unique_ptr<CefIOThreadState> iothread_state_;
+  CookieableSchemes cookieable_schemes_;
+  std::unique_ptr<CefMediaRouterManager> media_router_manager_;
+
   // CefRequestContextImpl objects referencing this object.
   std::set<CefRequestContextImpl*> request_context_set_;
 
-  std::unique_ptr<PrefService> pref_service_;
-  std::unique_ptr<PrefProxyConfigTracker> pref_proxy_config_tracker_;
-
-  std::unique_ptr<CefDownloadManagerDelegate> download_manager_delegate_;
-  std::unique_ptr<CefSSLHostStateDelegate> ssl_host_state_delegate_;
-  scoped_refptr<HostContentSettingsMap> host_content_settings_map_;
-  std::unique_ptr<visitedlink::VisitedLinkWriter> visitedlink_master_;
-  // |visitedlink_listener_| is owned by visitedlink_master_.
-  CefVisitedLinkListener* visitedlink_listener_;
-  bool should_persist_session_cookies_ = false;
-  base::Optional<std::vector<std::string>> cookieable_schemes_;
-
-  std::unique_ptr<CefResourceContext> resource_context_;
-
-  // Owned by the KeyedService system.
-  extensions::CefExtensionSystem* extension_system_ = nullptr;
-
-  // The key to index KeyedService instances created by
-  // SimpleKeyedServiceFactory.
-  std::unique_ptr<ProfileKey> key_;
-
-  std::unique_ptr<DownloadPrefs> download_prefs_;
-
-  std::unique_ptr<CefMediaRouterManager> media_router_manager_;
-
   // Map IDs to CefRequestContextHandler objects.
   CefRequestContextHandlerMap handler_map_;
 
@@ -350,6 +260,10 @@ class CefBrowserContext : public ChromeProfileStub,
   typedef std::set<int> NodeIdSet;
   NodeIdSet node_id_set_;
 
+#if DCHECK_IS_ON()
+  bool is_shutdown_ = false;
+#endif
+
   Getter getter_;
   base::WeakPtrFactory<CefBrowserContext> weak_ptr_factory_;
 

libcef/browser/browser_context_keyed_service_factories.cc

@@ -6,6 +6,7 @@
 #include "libcef/common/extensions/extensions_util.h"
 
 #include "chrome/browser/content_settings/cookie_settings_factory.h"
+#include "chrome/browser/media/router/chrome_media_router_factory.h"
 #include "chrome/browser/plugins/plugin_prefs_factory.h"
 #include "chrome/browser/profiles/renderer_updater_factory.h"
 #include "chrome/browser/spellchecker/spellcheck_factory.h"
@@ -19,6 +20,7 @@ namespace cef {
 
 void EnsureBrowserContextKeyedServiceFactoriesBuilt() {
   CookieSettingsFactory::GetInstance();
+  media_router::ChromeMediaRouterFactory::GetInstance();
   PluginPrefsFactory::GetInstance();
   PrefsTabHelper::GetServiceInstance();
   RendererUpdaterFactory::GetInstance();

libcef/browser/browser_host_base.cc

@@ -0,0 +1,789 @@
+// Copyright 2020 The Chromium Embedded Framework Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "libcef/browser/browser_host_base.h"
+
+#include "libcef/browser/browser_info_manager.h"
+#include "libcef/browser/browser_platform_delegate.h"
+#include "libcef/browser/image_impl.h"
+#include "libcef/browser/navigation_entry_impl.h"
+#include "libcef/browser/net/scheme_handler.h"
+#include "libcef/browser/thread_util.h"
+
+#include "base/logging.h"
+#include "chrome/browser/spellchecker/spellcheck_factory.h"
+#include "chrome/browser/spellchecker/spellcheck_service.h"
+#include "components/favicon/core/favicon_url.h"
+#include "components/spellcheck/common/spellcheck_features.h"
+#include "content/public/browser/browser_context.h"
+#include "content/public/browser/download_manager.h"
+#include "content/public/browser/download_request_utils.h"
+#include "content/public/browser/navigation_entry.h"
+#include "ui/gfx/image/image_skia.h"
+
+#if defined(OS_MAC)
+#include "components/spellcheck/browser/spellcheck_platform.h"
+#endif
+
+namespace {
+
+// Associates a CefBrowserHostBase instance with a WebContents. This object will
+// be deleted automatically when the WebContents is destroyed.
+class WebContentsUserDataAdapter : public base::SupportsUserData::Data {
+ public:
+  static void Register(CefRefPtr<CefBrowserHostBase> browser) {
+    new WebContentsUserDataAdapter(browser);
+  }
+
+  static CefRefPtr<CefBrowserHostBase> Get(
+      const content::WebContents* web_contents) {
+    WebContentsUserDataAdapter* adapter =
+        static_cast<WebContentsUserDataAdapter*>(
+            web_contents->GetUserData(UserDataKey()));
+    if (adapter)
+      return adapter->browser_;
+    return nullptr;
+  }
+
+ private:
+  WebContentsUserDataAdapter(CefRefPtr<CefBrowserHostBase> browser)
+      : browser_(browser) {
+    auto web_contents = browser->GetWebContents();
+    DCHECK(web_contents);
+    web_contents->SetUserData(UserDataKey(), base::WrapUnique(this));
+  }
+
+  static void* UserDataKey() {
+    // We just need a unique constant. Use the address of a static that
+    // COMDAT folding won't touch in an optimizing linker.
+    static int data_key = 0;
+    return reinterpret_cast<void*>(&data_key);
+  }
+
+  CefRefPtr<CefBrowserHostBase> browser_;
+};
+
+}  // namespace
+
+// static
+CefRefPtr<CefBrowserHostBase> CefBrowserHostBase::GetBrowserForHost(
+    const content::RenderViewHost* host) {
+  DCHECK(host);
+  CEF_REQUIRE_UIT();
+  content::WebContents* web_contents = content::WebContents::FromRenderViewHost(
+      const_cast<content::RenderViewHost*>(host));
+  if (web_contents)
+    return GetBrowserForContents(web_contents);
+  return nullptr;
+}
+
+// static
+CefRefPtr<CefBrowserHostBase> CefBrowserHostBase::GetBrowserForHost(
+    const content::RenderFrameHost* host) {
+  DCHECK(host);
+  CEF_REQUIRE_UIT();
+  content::WebContents* web_contents =
+      content::WebContents::FromRenderFrameHost(
+          const_cast<content::RenderFrameHost*>(host));
+  if (web_contents)
+    return GetBrowserForContents(web_contents);
+  return nullptr;
+}
+
+// static
+CefRefPtr<CefBrowserHostBase> CefBrowserHostBase::GetBrowserForContents(
+    const content::WebContents* contents) {
+  DCHECK(contents);
+  CEF_REQUIRE_UIT();
+  return WebContentsUserDataAdapter::Get(contents);
+}
+
+// static
+CefRefPtr<CefBrowserHostBase> CefBrowserHostBase::GetBrowserForFrameTreeNode(
+    int frame_tree_node_id) {
+  // Use the thread-safe approach.
+  auto info =
+      CefBrowserInfoManager::GetInstance()->GetBrowserInfoForFrameTreeNode(
+          frame_tree_node_id);
+  if (info) {
+    auto browser = info->browser();
+    if (!browser) {
+      LOG(WARNING) << "Found browser id " << info->browser_id()
+                   << " but no browser object matching frame tree node id "
+                   << frame_tree_node_id;
+    }
+    return browser;
+  }
+
+  return nullptr;
+}
+
+// static
+CefRefPtr<CefBrowserHostBase> CefBrowserHostBase::GetBrowserForFrameRoute(
+    int render_process_id,
+    int render_routing_id) {
+  if (render_process_id == -1 || render_routing_id == MSG_ROUTING_NONE)
+    return nullptr;
+
+  if (CEF_CURRENTLY_ON_UIT()) {
+    // Use the non-thread-safe but potentially faster approach.
+    content::RenderFrameHost* render_frame_host =
+        content::RenderFrameHost::FromID(render_process_id, render_routing_id);
+    if (!render_frame_host)
+      return nullptr;
+    return GetBrowserForHost(render_frame_host);
+  } else {
+    // Use the thread-safe approach.
+    bool is_guest_view = false;
+    auto info =
+        CefBrowserInfoManager::GetInstance()->GetBrowserInfoForFrameRoute(
+            render_process_id, render_routing_id, &is_guest_view);
+    if (info && !is_guest_view) {
+      auto browser = info->browser();
+      if (!browser) {
+        LOG(WARNING) << "Found browser id " << info->browser_id()
+                     << " but no browser object matching frame process id "
+                     << render_process_id << " and routing id "
+                     << render_routing_id;
+      }
+      return browser;
+    }
+    return nullptr;
+  }
+}
+
+CefBrowserHostBase::CefBrowserHostBase(
+    const CefBrowserSettings& settings,
+    CefRefPtr<CefClient> client,
+    std::unique_ptr<CefBrowserPlatformDelegate> platform_delegate,
+    scoped_refptr<CefBrowserInfo> browser_info,
+    CefRefPtr<CefRequestContextImpl> request_context)
+    : settings_(settings),
+      client_(client),
+      platform_delegate_(std::move(platform_delegate)),
+      browser_info_(browser_info),
+      request_context_(request_context) {
+  CEF_REQUIRE_UIT();
+  DCHECK(!browser_info_->browser().get());
+  browser_info_->SetBrowser(this);
+
+  contents_delegate_ =
+      std::make_unique<CefBrowserContentsDelegate>(browser_info_);
+  contents_delegate_->AddObserver(this);
+}
+
+void CefBrowserHostBase::InitializeBrowser() {
+  CEF_REQUIRE_UIT();
+
+  // Associate the WebContents with this browser object.
+  DCHECK(GetWebContents());
+  WebContentsUserDataAdapter::Register(this);
+}
+
+void CefBrowserHostBase::DestroyBrowser() {
+  CEF_REQUIRE_UIT();
+
+  platform_delegate_.reset(nullptr);
+
+  contents_delegate_->RemoveObserver(this);
+  contents_delegate_->ObserveWebContents(nullptr);
+
+  CefBrowserInfoManager::GetInstance()->RemoveBrowserInfo(browser_info_);
+  browser_info_->SetBrowser(nullptr);
+}
+
+CefRefPtr<CefBrowser> CefBrowserHostBase::GetBrowser() {
+  return this;
+}
+
+CefRefPtr<CefClient> CefBrowserHostBase::GetClient() {
+  return client_;
+}
+
+CefRefPtr<CefRequestContext> CefBrowserHostBase::GetRequestContext() {
+  return request_context_;
+}
+
+void CefBrowserHostBase::StartDownload(const CefString& url) {
+  if (!CEF_CURRENTLY_ON_UIT()) {
+    CEF_POST_TASK(
+        CEF_UIT, base::BindOnce(&CefBrowserHostBase::StartDownload, this, url));
+    return;
+  }
+
+  GURL gurl = GURL(url.ToString());
+  if (gurl.is_empty() || !gurl.is_valid())
+    return;
+
+  auto web_contents = GetWebContents();
+  if (!web_contents)
+    return;
+
+  auto browser_context = web_contents->GetBrowserContext();
+  if (!browser_context)
+    return;
+
+  content::DownloadManager* manager =
+      content::BrowserContext::GetDownloadManager(browser_context);
+  if (!manager)
+    return;
+
+  std::unique_ptr<download::DownloadUrlParameters> params(
+      content::DownloadRequestUtils::CreateDownloadForWebContentsMainFrame(
+          web_contents, gurl, MISSING_TRAFFIC_ANNOTATION));
+  manager->DownloadUrl(std::move(params));
+}
+
+void CefBrowserHostBase::DownloadImage(
+    const CefString& image_url,
+    bool is_favicon,
+    uint32 max_image_size,
+    bool bypass_cache,
+    CefRefPtr<CefDownloadImageCallback> callback) {
+  if (!CEF_CURRENTLY_ON_UIT()) {
+    CEF_POST_TASK(
+        CEF_UIT,
+        base::BindOnce(&CefBrowserHostBase::DownloadImage, this, image_url,
+                       is_favicon, max_image_size, bypass_cache, callback));
+    return;
+  }
+
+  if (!callback)
+    return;
+
+  GURL gurl = GURL(image_url.ToString());
+  if (gurl.is_empty() || !gurl.is_valid())
+    return;
+
+  auto web_contents = GetWebContents();
+  if (!web_contents)
+    return;
+
+  web_contents->DownloadImage(
+      gurl, is_favicon, max_image_size,
+      max_image_size * gfx::ImageSkia::GetMaxSupportedScale(), bypass_cache,
+      base::BindOnce(
+          [](uint32 max_image_size,
+             CefRefPtr<CefDownloadImageCallback> callback, int id,
+             int http_status_code, const GURL& image_url,
+             const std::vector<SkBitmap>& bitmaps,
+             const std::vector<gfx::Size>& sizes) {
+            CEF_REQUIRE_UIT();
+
+            CefRefPtr<CefImageImpl> image_impl;
+
+            if (!bitmaps.empty()) {
+              image_impl = new CefImageImpl();
+              image_impl->AddBitmaps(max_image_size, bitmaps);
+            }
+
+            callback->OnDownloadImageFinished(
+                image_url.spec(), http_status_code, image_impl.get());
+          },
+          max_image_size, callback));
+}
+
+void CefBrowserHostBase::GetNavigationEntries(
+    CefRefPtr<CefNavigationEntryVisitor> visitor,
+    bool current_only) {
+  DCHECK(visitor.get());
+  if (!visitor.get())
+    return;
+
+  if (!CEF_CURRENTLY_ON_UIT()) {
+    CEF_POST_TASK(
+        CEF_UIT, base::BindOnce(&CefBrowserHostBase::GetNavigationEntries, this,
+                                visitor, current_only));
+    return;
+  }
+
+  auto web_contents = GetWebContents();
+  if (!web_contents)
+    return;
+
+  content::NavigationController& controller = web_contents->GetController();
+  const int total = controller.GetEntryCount();
+  const int current = controller.GetCurrentEntryIndex();
+
+  if (current_only) {
+    // Visit only the current entry.
+    CefRefPtr<CefNavigationEntryImpl> entry =
+        new CefNavigationEntryImpl(controller.GetEntryAtIndex(current));
+    visitor->Visit(entry.get(), true, current, total);
+    entry->Detach(nullptr);
+  } else {
+    // Visit all entries.
+    bool cont = true;
+    for (int i = 0; i < total && cont; ++i) {
+      CefRefPtr<CefNavigationEntryImpl> entry =
+          new CefNavigationEntryImpl(controller.GetEntryAtIndex(i));
+      cont = visitor->Visit(entry.get(), (i == current), i, total);
+      entry->Detach(nullptr);
+    }
+  }
+}
+
+CefRefPtr<CefNavigationEntry> CefBrowserHostBase::GetVisibleNavigationEntry() {
+  if (!CEF_CURRENTLY_ON_UIT()) {
+    NOTREACHED() << "called on invalid thread";
+    return nullptr;
+  }
+
+  content::NavigationEntry* entry = nullptr;
+  auto web_contents = GetWebContents();
+  if (web_contents)
+    entry = web_contents->GetController().GetVisibleEntry();
+
+  if (!entry)
+    return nullptr;
+
+  return new CefNavigationEntryImpl(entry);
+}
+
+void CefBrowserHostBase::ReplaceMisspelling(const CefString& word) {
+  if (!CEF_CURRENTLY_ON_UIT()) {
+    CEF_POST_TASK(
+        CEF_UIT,
+        base::BindOnce(&CefBrowserHostBase::ReplaceMisspelling, this, word));
+    return;
+  }
+
+  auto web_contents = GetWebContents();
+  if (web_contents)
+    web_contents->ReplaceMisspelling(word);
+}
+
+void CefBrowserHostBase::AddWordToDictionary(const CefString& word) {
+  if (!CEF_CURRENTLY_ON_UIT()) {
+    CEF_POST_TASK(
+        CEF_UIT,
+        base::BindOnce(&CefBrowserHostBase::AddWordToDictionary, this, word));
+    return;
+  }
+
+  auto web_contents = GetWebContents();
+  if (!web_contents)
+    return;
+
+  SpellcheckService* spellcheck = nullptr;
+  content::BrowserContext* browser_context = web_contents->GetBrowserContext();
+  if (browser_context) {
+    spellcheck = SpellcheckServiceFactory::GetForContext(browser_context);
+    if (spellcheck)
+      spellcheck->GetCustomDictionary()->AddWord(word);
+  }
+#if defined(OS_MAC)
+  if (spellcheck && spellcheck::UseBrowserSpellChecker()) {
+    spellcheck_platform::AddWord(spellcheck->platform_spell_checker(), word);
+  }
+#endif
+}
+
+void CefBrowserHostBase::SendKeyEvent(const CefKeyEvent& event) {
+  if (!CEF_CURRENTLY_ON_UIT()) {
+    CEF_POST_TASK(CEF_UIT, base::BindOnce(&CefBrowserHostBase::SendKeyEvent,
+                                          this, event));
+    return;
+  }
+
+  if (platform_delegate_)
+    platform_delegate_->SendKeyEvent(event);
+}
+
+void CefBrowserHostBase::SendMouseClickEvent(const CefMouseEvent& event,
+                                             MouseButtonType type,
+                                             bool mouseUp,
+                                             int clickCount) {
+  if (!CEF_CURRENTLY_ON_UIT()) {
+    CEF_POST_TASK(CEF_UIT,
+                  base::BindOnce(&CefBrowserHostBase::SendMouseClickEvent, this,
+                                 event, type, mouseUp, clickCount));
+    return;
+  }
+
+  if (platform_delegate_) {
+    platform_delegate_->SendMouseClickEvent(event, type, mouseUp, clickCount);
+  }
+}
+
+void CefBrowserHostBase::SendMouseMoveEvent(const CefMouseEvent& event,
+                                            bool mouseLeave) {
+  if (!CEF_CURRENTLY_ON_UIT()) {
+    CEF_POST_TASK(CEF_UIT,
+                  base::BindOnce(&CefBrowserHostBase::SendMouseMoveEvent, this,
+                                 event, mouseLeave));
+    return;
+  }
+
+  if (platform_delegate_) {
+    platform_delegate_->SendMouseMoveEvent(event, mouseLeave);
+  }
+}
+
+void CefBrowserHostBase::SendMouseWheelEvent(const CefMouseEvent& event,
+                                             int deltaX,
+                                             int deltaY) {
+  if (deltaX == 0 && deltaY == 0) {
+    // Nothing to do.
+    return;
+  }
+
+  if (!CEF_CURRENTLY_ON_UIT()) {
+    CEF_POST_TASK(CEF_UIT,
+                  base::BindOnce(&CefBrowserHostBase::SendMouseWheelEvent, this,
+                                 event, deltaX, deltaY));
+    return;
+  }
+
+  if (platform_delegate_) {
+    platform_delegate_->SendMouseWheelEvent(event, deltaX, deltaY);
+  }
+}
+
+CefRefPtr<CefBrowserHost> CefBrowserHostBase::GetHost() {
+  return this;
+}
+
+bool CefBrowserHostBase::CanGoBack() {
+  base::AutoLock lock_scope(state_lock_);
+  return can_go_back_;
+}
+
+void CefBrowserHostBase::GoBack() {
+  auto callback = base::BindOnce(&CefBrowserHostBase::GoBack, this);
+  if (!CEF_CURRENTLY_ON_UIT()) {
+    CEF_POST_TASK(CEF_UIT, std::move(callback));
+    return;
+  }
+
+  if (browser_info_->IsNavigationLocked(std::move(callback))) {
+    return;
+  }
+
+  auto wc = GetWebContents();
+  if (wc && wc->GetController().CanGoBack()) {
+    wc->GetController().GoBack();
+  }
+}
+
+bool CefBrowserHostBase::CanGoForward() {
+  base::AutoLock lock_scope(state_lock_);
+  return can_go_forward_;
+}
+
+void CefBrowserHostBase::GoForward() {
+  auto callback = base::BindOnce(&CefBrowserHostBase::GoForward, this);
+  if (!CEF_CURRENTLY_ON_UIT()) {
+    CEF_POST_TASK(CEF_UIT, std::move(callback));
+    return;
+  }
+
+  if (browser_info_->IsNavigationLocked(std::move(callback))) {
+    return;
+  }
+
+  auto wc = GetWebContents();
+  if (wc && wc->GetController().CanGoForward()) {
+    wc->GetController().GoForward();
+  }
+}
+
+bool CefBrowserHostBase::IsLoading() {
+  base::AutoLock lock_scope(state_lock_);
+  return is_loading_;
+}
+
+void CefBrowserHostBase::Reload() {
+  auto callback = base::BindOnce(&CefBrowserHostBase::Reload, this);
+  if (!CEF_CURRENTLY_ON_UIT()) {
+    CEF_POST_TASK(CEF_UIT, std::move(callback));
+    return;
+  }
+
+  if (browser_info_->IsNavigationLocked(std::move(callback))) {
+    return;
+  }
+
+  auto wc = GetWebContents();
+  if (wc) {
+    wc->GetController().Reload(content::ReloadType::NORMAL, true);
+  }
+}
+
+void CefBrowserHostBase::ReloadIgnoreCache() {
+  auto callback = base::BindOnce(&CefBrowserHostBase::ReloadIgnoreCache, this);
+  if (!CEF_CURRENTLY_ON_UIT()) {
+    CEF_POST_TASK(CEF_UIT, std::move(callback));
+    return;
+  }
+
+  if (browser_info_->IsNavigationLocked(std::move(callback))) {
+    return;
+  }
+
+  auto wc = GetWebContents();
+  if (wc) {
+    wc->GetController().Reload(content::ReloadType::BYPASSING_CACHE, true);
+  }
+}
+
+void CefBrowserHostBase::StopLoad() {
+  auto callback = base::BindOnce(&CefBrowserHostBase::StopLoad, this);
+  if (!CEF_CURRENTLY_ON_UIT()) {
+    CEF_POST_TASK(CEF_UIT, std::move(callback));
+    return;
+  }
+
+  if (browser_info_->IsNavigationLocked(std::move(callback))) {
+    return;
+  }
+
+  auto wc = GetWebContents();
+  if (wc) {
+    wc->Stop();
+  }
+}
+
+int CefBrowserHostBase::GetIdentifier() {
+  return browser_id();
+}
+
+bool CefBrowserHostBase::IsSame(CefRefPtr<CefBrowser> that) {
+  auto impl = static_cast<CefBrowserHostBase*>(that.get());
+  return (impl == this);
+}
+
+bool CefBrowserHostBase::HasDocument() {
+  base::AutoLock lock_scope(state_lock_);
+  return has_document_;
+}
+
+bool CefBrowserHostBase::IsPopup() {
+  return browser_info_->is_popup();
+}
+
+CefRefPtr<CefFrame> CefBrowserHostBase::GetMainFrame() {
+  return GetFrame(CefFrameHostImpl::kMainFrameId);
+}
+
+CefRefPtr<CefFrame> CefBrowserHostBase::GetFocusedFrame() {
+  return GetFrame(CefFrameHostImpl::kFocusedFrameId);
+}
+
+CefRefPtr<CefFrame> CefBrowserHostBase::GetFrame(int64 identifier) {
+  if (identifier == CefFrameHostImpl::kInvalidFrameId) {
+    return nullptr;
+  } else if (identifier == CefFrameHostImpl::kMainFrameId) {
+    return browser_info_->GetMainFrame();
+  } else if (identifier == CefFrameHostImpl::kFocusedFrameId) {
+    base::AutoLock lock_scope(state_lock_);
+    if (!focused_frame_) {
+      // The main frame is focused by default.
+      return browser_info_->GetMainFrame();
+    }
+    return focused_frame_;
+  }
+
+  return browser_info_->GetFrameForId(identifier);
+}
+
+CefRefPtr<CefFrame> CefBrowserHostBase::GetFrame(const CefString& name) {
+  for (const auto& frame : browser_info_->GetAllFrames()) {
+    if (frame->GetName() == name)
+      return frame;
+  }
+  return nullptr;
+}
+
+size_t CefBrowserHostBase::GetFrameCount() {
+  return browser_info_->GetAllFrames().size();
+}
+
+void CefBrowserHostBase::GetFrameIdentifiers(std::vector<int64>& identifiers) {
+  if (identifiers.size() > 0)
+    identifiers.clear();
+
+  const auto frames = browser_info_->GetAllFrames();
+  if (frames.empty())
+    return;
+
+  identifiers.reserve(frames.size());
+  for (const auto& frame : frames) {
+    identifiers.push_back(frame->GetIdentifier());
+  }
+}
+
+void CefBrowserHostBase::GetFrameNames(std::vector<CefString>& names) {
+  if (names.size() > 0)
+    names.clear();
+
+  const auto frames = browser_info_->GetAllFrames();
+  if (frames.empty())
+    return;
+
+  names.reserve(frames.size());
+  for (const auto& frame : frames) {
+    names.push_back(frame->GetName());
+  }
+}
+
+void CefBrowserHostBase::OnStateChanged(CefBrowserContentsState state_changed) {
+  // Make sure that CefBrowser state is consistent before the associated
+  // CefClient callback is executed.
+  base::AutoLock lock_scope(state_lock_);
+  if ((state_changed & CefBrowserContentsState::kNavigation) ==
+      CefBrowserContentsState::kNavigation) {
+    is_loading_ = contents_delegate_->is_loading();
+    can_go_back_ = contents_delegate_->can_go_back();
+    can_go_forward_ = contents_delegate_->can_go_forward();
+  }
+  if ((state_changed & CefBrowserContentsState::kDocument) ==
+      CefBrowserContentsState::kDocument) {
+    has_document_ = contents_delegate_->has_document();
+  }
+  if ((state_changed & CefBrowserContentsState::kFullscreen) ==
+      CefBrowserContentsState::kFullscreen) {
+    is_fullscreen_ = contents_delegate_->is_fullscreen();
+  }
+  if ((state_changed & CefBrowserContentsState::kFocusedFrame) ==
+      CefBrowserContentsState::kFocusedFrame) {
+    focused_frame_ = contents_delegate_->focused_frame();
+  }
+}
+
+void CefBrowserHostBase::OnWebContentsDestroyed(
+    content::WebContents* web_contents) {}
+
+CefRefPtr<CefFrame> CefBrowserHostBase::GetFrameForHost(
+    const content::RenderFrameHost* host) {
+  CEF_REQUIRE_UIT();
+  if (!host)
+    return nullptr;
+
+  return browser_info_->GetFrameForHost(host);
+}
+
+CefRefPtr<CefFrame> CefBrowserHostBase::GetFrameForFrameTreeNode(
+    int frame_tree_node_id) {
+  return browser_info_->GetFrameForFrameTreeNode(frame_tree_node_id, nullptr);
+}
+
+void CefBrowserHostBase::AddObserver(Observer* observer) {
+  CEF_REQUIRE_UIT();
+  observers_.AddObserver(observer);
+}
+
+void CefBrowserHostBase::RemoveObserver(Observer* observer) {
+  CEF_REQUIRE_UIT();
+  observers_.RemoveObserver(observer);
+}
+
+bool CefBrowserHostBase::HasObserver(Observer* observer) const {
+  CEF_REQUIRE_UIT();
+  return observers_.HasObserver(observer);
+}
+
+void CefBrowserHostBase::LoadMainFrameURL(
+    const content::OpenURLParams& params) {
+  if (!params.url.is_valid()) {
+    LOG(ERROR) << "Invalid URL: " << params.url.spec();
+    return;
+  }
+
+  auto callback =
+      base::BindOnce(&CefBrowserHostBase::LoadMainFrameURL, this, params);
+  if (!CEF_CURRENTLY_ON_UIT()) {
+    CEF_POST_TASK(CEF_UIT, std::move(callback));
+    return;
+  }
+
+  if (browser_info_->IsNavigationLocked(std::move(callback))) {
+    return;
+  }
+
+  if (Navigate(params)) {
+    OnSetFocus(FOCUS_SOURCE_NAVIGATION);
+  }
+}
+
+bool CefBrowserHostBase::Navigate(const content::OpenURLParams& params) {
+  CEF_REQUIRE_UIT();
+  auto web_contents = GetWebContents();
+  if (web_contents) {
+    web_contents->GetController().LoadURL(
+        params.url, params.referrer, params.transition, params.extra_headers);
+    return true;
+  }
+  return false;
+}
+
+void CefBrowserHostBase::OnDidFinishLoad(CefRefPtr<CefFrameHostImpl> frame,
+                                         const GURL& validated_url,
+                                         int http_status_code) {
+  frame->RefreshAttributes();
+
+  // Give internal scheme handlers an opportunity to update content.
+  scheme::DidFinishLoad(frame, validated_url);
+
+  contents_delegate_->OnLoadEnd(frame, validated_url, http_status_code);
+}
+
+void CefBrowserHostBase::ViewText(const std::string& text) {
+  if (!CEF_CURRENTLY_ON_UIT()) {
+    CEF_POST_TASK(CEF_UIT,
+                  base::BindOnce(&CefBrowserHostBase::ViewText, this, text));
+    return;
+  }
+
+  if (platform_delegate_)
+    platform_delegate_->ViewText(text);
+}
+
+bool CefBrowserHostBase::MaybeAllowNavigation(
+    content::RenderFrameHost* opener,
+    bool is_guest_view,
+    const content::OpenURLParams& params) {
+  return true;
+}
+
+void CefBrowserHostBase::OnAfterCreated() {
+  CEF_REQUIRE_UIT();
+  if (client_) {
+    if (auto handler = client_->GetLifeSpanHandler()) {
+      handler->OnAfterCreated(this);
+    }
+  }
+}
+
+void CefBrowserHostBase::OnBeforeClose() {
+  CEF_REQUIRE_UIT();
+  if (client_) {
+    if (auto handler = client_->GetLifeSpanHandler()) {
+      handler->OnBeforeClose(this);
+    }
+  }
+}
+
+void CefBrowserHostBase::OnBrowserDestroyed() {
+  CEF_REQUIRE_UIT();
+  for (auto& observer : observers_)
+    observer.OnBrowserDestroyed(this);
+}
+
+int CefBrowserHostBase::browser_id() const {
+  return browser_info_->browser_id();
+}
+
+content::WebContents* CefBrowserHostBase::GetWebContents() const {
+  CEF_REQUIRE_UIT();
+  return contents_delegate_->web_contents();
+}
+
+content::BrowserContext* CefBrowserHostBase::GetBrowserContext() const {
+  CEF_REQUIRE_UIT();
+  auto web_contents = GetWebContents();
+  if (web_contents)
+    return web_contents->GetBrowserContext();
+  return nullptr;
+}

libcef/browser/browser_host_base.h

@@ -0,0 +1,268 @@
+// Copyright 2020 The Chromium Embedded Framework Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef CEF_LIBCEF_BROWSER_BROWSER_HOST_BASE_H_
+#define CEF_LIBCEF_BROWSER_BROWSER_HOST_BASE_H_
+#pragma once
+
+#include "include/cef_browser.h"
+#include "include/cef_client.h"
+#include "include/views/cef_browser_view.h"
+#include "libcef/browser/browser_contents_delegate.h"
+#include "libcef/browser/browser_info.h"
+#include "libcef/browser/browser_platform_delegate.h"
+#include "libcef/browser/frame_host_impl.h"
+#include "libcef/browser/request_context_impl.h"
+
+#include "base/observer_list.h"
+#include "base/synchronization/lock.h"
+#include "extensions/common/view_type.h"
+
+namespace extensions {
+class Extension;
+}
+
+// Parameters that are passed to the runtime-specific Create methods.
+struct CefBrowserCreateParams {
+  CefBrowserCreateParams() {}
+
+  // Copy constructor used with the chrome runtime only.
+  CefBrowserCreateParams(const CefBrowserCreateParams& that) {
+    operator=(that);
+  }
+  CefBrowserCreateParams& operator=(const CefBrowserCreateParams& that) {
+    // Not all parameters can be copied.
+    client = that.client;
+    url = that.url;
+    settings = that.settings;
+    request_context = that.request_context;
+    extra_info = that.extra_info;
+    return *this;
+  }
+
+  // Platform-specific window creation info. Will be nullptr when creating a
+  // views-hosted browser. Currently used with the alloy runtime only.
+  std::unique_ptr<CefWindowInfo> window_info;
+
+#if defined(USE_AURA)
+  // The BrowserView that will own a views-hosted browser. Will be nullptr for
+  // popup browsers (the BrowserView will be created later in that case).
+  // Currently used with the alloy runtime only.
+  CefRefPtr<CefBrowserView> browser_view;
+#endif
+
+  // Client implementation. May be nullptr.
+  CefRefPtr<CefClient> client;
+
+  // Initial URL to load. May be empty. If this is a valid extension URL then
+  // the browser will be created as an app view extension host.
+  GURL url;
+
+  // Browser settings.
+  CefBrowserSettings settings;
+
+  // Other browser that opened this DevTools browser. Will be nullptr for non-
+  // DevTools browsers. Currently used with the alloy runtime only.
+  CefRefPtr<CefBrowserHostBase> devtools_opener;
+
+  // Request context to use when creating the browser. If nullptr the global
+  // request context will be used.
+  CefRefPtr<CefRequestContext> request_context;
+
+  // Extra information that will be passed to
+  // CefRenderProcessHandler::OnBrowserCreated.
+  CefRefPtr<CefDictionaryValue> extra_info;
+
+  // Used when explicitly creating the browser as an extension host via
+  // ProcessManager::CreateBackgroundHost. Currently used with the alloy
+  // runtime only.
+  const extensions::Extension* extension = nullptr;
+  extensions::ViewType extension_host_type = extensions::VIEW_TYPE_INVALID;
+};
+
+// Base class for CefBrowserHost implementations. Includes functionality that is
+// shared by the alloy and chrome runtimes. All methods are thread-safe unless
+// otherwise indicated.
+class CefBrowserHostBase : public CefBrowserHost,
+                           public CefBrowser,
+                           public CefBrowserContentsDelegate::Observer {
+ public:
+  // Interface to implement for observers that wish to be informed of changes
+  // to the CefBrowserHostBase. All methods will be called on the UI thread.
+  class Observer : public base::CheckedObserver {
+   public:
+    // Called before |browser| is destroyed. Any references to |browser| should
+    // be cleared when this method is called.
+    virtual void OnBrowserDestroyed(CefBrowserHostBase* browser) = 0;
+
+   protected:
+    virtual ~Observer() {}
+  };
+
+  // Returns the browser associated with the specified RenderViewHost.
+  static CefRefPtr<CefBrowserHostBase> GetBrowserForHost(
+      const content::RenderViewHost* host);
+  // Returns the browser associated with the specified RenderFrameHost.
+  static CefRefPtr<CefBrowserHostBase> GetBrowserForHost(
+      const content::RenderFrameHost* host);
+  // Returns the browser associated with the specified WebContents.
+  static CefRefPtr<CefBrowserHostBase> GetBrowserForContents(
+      const content::WebContents* contents);
+  // Returns the browser associated with the specified FrameTreeNode ID.
+  static CefRefPtr<CefBrowserHostBase> GetBrowserForFrameTreeNode(
+      int frame_tree_node_id);
+  // Returns the browser associated with the specified frame routing IDs.
+  static CefRefPtr<CefBrowserHostBase> GetBrowserForFrameRoute(
+      int render_process_id,
+      int render_routing_id);
+
+  CefBrowserHostBase(
+      const CefBrowserSettings& settings,
+      CefRefPtr<CefClient> client,
+      std::unique_ptr<CefBrowserPlatformDelegate> platform_delegate,
+      scoped_refptr<CefBrowserInfo> browser_info,
+      CefRefPtr<CefRequestContextImpl> request_context);
+
+  // Called on the UI thread after the associated WebContents is created.
+  virtual void InitializeBrowser();
+
+  // Called on the UI thread after the associated WebContents is destroyed.
+  // Also called from CefBrowserInfoManager::DestroyAllBrowsers if the browser
+  // was not properly shut down.
+  virtual void DestroyBrowser();
+
+  // CefBrowserHost methods:
+  CefRefPtr<CefBrowser> GetBrowser() override;
+  CefRefPtr<CefClient> GetClient() override;
+  CefRefPtr<CefRequestContext> GetRequestContext() override;
+  void StartDownload(const CefString& url) override;
+  void DownloadImage(const CefString& image_url,
+                     bool is_favicon,
+                     uint32 max_image_size,
+                     bool bypass_cache,
+                     CefRefPtr<CefDownloadImageCallback> callback) override;
+  void ReplaceMisspelling(const CefString& word) override;
+  void AddWordToDictionary(const CefString& word) override;
+  void SendKeyEvent(const CefKeyEvent& event) override;
+  void SendMouseClickEvent(const CefMouseEvent& event,
+                           MouseButtonType type,
+                           bool mouseUp,
+                           int clickCount) override;
+  void SendMouseMoveEvent(const CefMouseEvent& event, bool mouseLeave) override;
+  void SendMouseWheelEvent(const CefMouseEvent& event,
+                           int deltaX,
+                           int deltaY) override;
+  void GetNavigationEntries(CefRefPtr<CefNavigationEntryVisitor> visitor,
+                            bool current_only) override;
+  CefRefPtr<CefNavigationEntry> GetVisibleNavigationEntry() override;
+
+  // CefBrowser methods:
+  CefRefPtr<CefBrowserHost> GetHost() override;
+  bool CanGoBack() override;
+  void GoBack() override;
+  bool CanGoForward() override;
+  void GoForward() override;
+  bool IsLoading() override;
+  void Reload() override;
+  void ReloadIgnoreCache() override;
+  void StopLoad() override;
+  int GetIdentifier() override;
+  bool IsSame(CefRefPtr<CefBrowser> that) override;
+  bool HasDocument() override;
+  bool IsPopup() override;
+  CefRefPtr<CefFrame> GetMainFrame() override;
+  CefRefPtr<CefFrame> GetFocusedFrame() override;
+  CefRefPtr<CefFrame> GetFrame(int64 identifier) override;
+  CefRefPtr<CefFrame> GetFrame(const CefString& name) override;
+  size_t GetFrameCount() override;
+  void GetFrameIdentifiers(std::vector<int64>& identifiers) override;
+  void GetFrameNames(std::vector<CefString>& names) override;
+
+  // CefBrowserContentsDelegate::Observer methods:
+  void OnStateChanged(CefBrowserContentsState state_changed) override;
+  void OnWebContentsDestroyed(content::WebContents* web_contents) override;
+
+  // Returns the frame associated with the specified RenderFrameHost.
+  CefRefPtr<CefFrame> GetFrameForHost(const content::RenderFrameHost* host);
+
+  // Returns the frame associated with the specified FrameTreeNode ID.
+  CefRefPtr<CefFrame> GetFrameForFrameTreeNode(int frame_tree_node_id);
+
+  // Manage observer objects. The observer must either outlive this object or
+  // be removed before destruction. Must be called on the UI thread.
+  void AddObserver(Observer* observer);
+  void RemoveObserver(Observer* observer);
+  bool HasObserver(Observer* observer) const;
+
+  // Methods called from CefFrameHostImpl.
+  void LoadMainFrameURL(const content::OpenURLParams& params);
+  void OnDidFinishLoad(CefRefPtr<CefFrameHostImpl> frame,
+                       const GURL& validated_url,
+                       int http_status_code);
+  virtual void OnSetFocus(cef_focus_source_t source) = 0;
+  void ViewText(const std::string& text);
+
+  // Called from CefBrowserInfoManager::MaybeAllowNavigation.
+  virtual bool MaybeAllowNavigation(content::RenderFrameHost* opener,
+                                    bool is_guest_view,
+                                    const content::OpenURLParams& params);
+
+  // Helpers for executing client callbacks. Must be called on the UI thread.
+  void OnAfterCreated();
+  void OnBeforeClose();
+  void OnBrowserDestroyed();
+
+  // Thread-safe accessors.
+  const CefBrowserSettings& settings() const { return settings_; }
+  CefRefPtr<CefClient> client() const { return client_; }
+  scoped_refptr<CefBrowserInfo> browser_info() const { return browser_info_; }
+  int browser_id() const;
+  CefRefPtr<CefRequestContextImpl> request_context() const {
+    return request_context_;
+  }
+
+  // Accessors that must be called on the UI thread.
+  content::WebContents* GetWebContents() const;
+  content::BrowserContext* GetBrowserContext() const;
+  CefBrowserPlatformDelegate* platform_delegate() const {
+    return platform_delegate_.get();
+  }
+  CefBrowserContentsDelegate* contents_delegate() const {
+    return contents_delegate_.get();
+  }
+
+ protected:
+  // Called from LoadMainFrameURL to perform the actual navigation.
+  virtual bool Navigate(const content::OpenURLParams& params);
+
+  // Thread-safe members.
+  CefBrowserSettings settings_;
+  CefRefPtr<CefClient> client_;
+  std::unique_ptr<CefBrowserPlatformDelegate> platform_delegate_;
+  scoped_refptr<CefBrowserInfo> browser_info_;
+  CefRefPtr<CefRequestContextImpl> request_context_;
+
+  // Only accessed on the UI thread.
+  std::unique_ptr<CefBrowserContentsDelegate> contents_delegate_;
+
+  // Observers that want to be notified of changes to this object.
+  // Only accessed on the UI thread.
+  base::ObserverList<Observer> observers_;
+
+  // Volatile state accessed from multiple threads. All access must be protected
+  // by |state_lock_|.
+  base::Lock state_lock_;
+  bool is_loading_ = false;
+  bool can_go_back_ = false;
+  bool can_go_forward_ = false;
+  bool has_document_ = false;
+  bool is_fullscreen_ = false;
+  CefRefPtr<CefFrameHostImpl> focused_frame_;
+
+ private:
+  IMPLEMENT_REFCOUNTING(CefBrowserHostBase);
+  DISALLOW_COPY_AND_ASSIGN(CefBrowserHostBase);
+};
+
+#endif  // CEF_LIBCEF_BROWSER_BROWSER_HOST_BASE_H_

libcef/browser/browser_host_create.cc

@@ -0,0 +1,144 @@
+// Copyright (c) 2012 The Chromium Embedded Framework Authors.
+// Portions copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "include/cef_browser.h"
+#include "libcef/browser/alloy/alloy_browser_host_impl.h"
+#include "libcef/browser/chrome/chrome_browser_host_impl.h"
+#include "libcef/browser/context.h"
+#include "libcef/browser/thread_util.h"
+#include "libcef/features/runtime.h"
+
+namespace {
+
+class CreateBrowserHelper {
+ public:
+  CreateBrowserHelper(const CefWindowInfo& windowInfo,
+                      CefRefPtr<CefClient> client,
+                      const CefString& url,
+                      const CefBrowserSettings& settings,
+                      CefRefPtr<CefDictionaryValue> extra_info,
+                      CefRefPtr<CefRequestContext> request_context)
+      : window_info_(windowInfo),
+        client_(client),
+        url_(url),
+        settings_(settings),
+        extra_info_(extra_info),
+        request_context_(request_context) {}
+
+  CefWindowInfo window_info_;
+  CefRefPtr<CefClient> client_;
+  CefString url_;
+  CefBrowserSettings settings_;
+  CefRefPtr<CefDictionaryValue> extra_info_;
+  CefRefPtr<CefRequestContext> request_context_;
+};
+
+}  // namespace
+
+// static
+bool CefBrowserHost::CreateBrowser(
+    const CefWindowInfo& windowInfo,
+    CefRefPtr<CefClient> client,
+    const CefString& url,
+    const CefBrowserSettings& settings,
+    CefRefPtr<CefDictionaryValue> extra_info,
+    CefRefPtr<CefRequestContext> request_context) {
+  // Verify that the context is in a valid state.
+  if (!CONTEXT_STATE_VALID()) {
+    NOTREACHED() << "context not valid";
+    return false;
+  }
+
+  // Verify that the settings structure is a valid size.
+  if (settings.size != sizeof(cef_browser_settings_t)) {
+    NOTREACHED() << "invalid CefBrowserSettings structure size";
+    return false;
+  }
+
+  // Verify windowless rendering requirements.
+  if (windowInfo.windowless_rendering_enabled &&
+      !client->GetRenderHandler().get()) {
+    NOTREACHED() << "CefRenderHandler implementation is required";
+    return false;
+  }
+
+  if (windowInfo.windowless_rendering_enabled &&
+      !CefContext::Get()->settings().windowless_rendering_enabled) {
+    LOG(ERROR) << "Creating a windowless browser without setting "
+                  "CefSettings.windowless_rendering_enabled may result in "
+                  "reduced performance or runtime errors.";
+  }
+
+  // Create the browser on the UI thread.
+  CreateBrowserHelper* helper = new CreateBrowserHelper(
+      windowInfo, client, url, settings, extra_info, request_context);
+  CEF_POST_TASK(CEF_UIT, base::BindOnce(
+                             [](CreateBrowserHelper* helper) {
+                               CefBrowserHost::CreateBrowserSync(
+                                   helper->window_info_, helper->client_,
+                                   helper->url_, helper->settings_,
+                                   helper->extra_info_,
+                                   helper->request_context_);
+                               delete helper;
+                             },
+                             helper));
+
+  return true;
+}
+
+// static
+CefRefPtr<CefBrowser> CefBrowserHost::CreateBrowserSync(
+    const CefWindowInfo& windowInfo,
+    CefRefPtr<CefClient> client,
+    const CefString& url,
+    const CefBrowserSettings& settings,
+    CefRefPtr<CefDictionaryValue> extra_info,
+    CefRefPtr<CefRequestContext> request_context) {
+  // Verify that the context is in a valid state.
+  if (!CONTEXT_STATE_VALID()) {
+    NOTREACHED() << "context not valid";
+    return nullptr;
+  }
+
+  // Verify that the settings structure is a valid size.
+  if (settings.size != sizeof(cef_browser_settings_t)) {
+    NOTREACHED() << "invalid CefBrowserSettings structure size";
+    return nullptr;
+  }
+
+  // Verify that this method is being called on the UI thread.
+  if (!CEF_CURRENTLY_ON_UIT()) {
+    NOTREACHED() << "called on invalid thread";
+    return nullptr;
+  }
+
+  // Verify windowless rendering requirements.
+  if (windowInfo.windowless_rendering_enabled &&
+      !client->GetRenderHandler().get()) {
+    NOTREACHED() << "CefRenderHandler implementation is required";
+    return nullptr;
+  }
+
+  CefBrowserCreateParams create_params;
+  create_params.window_info.reset(new CefWindowInfo(windowInfo));
+  create_params.client = client;
+  create_params.url = GURL(url.ToString());
+  if (!url.empty() && !create_params.url.is_valid() &&
+      !create_params.url.has_scheme()) {
+    std::string new_url = std::string("http://") + url.ToString();
+    create_params.url = GURL(new_url);
+  }
+  create_params.settings = settings;
+  create_params.extra_info = extra_info;
+  create_params.request_context = request_context;
+
+  if (cef::IsChromeRuntimeEnabled()) {
+    auto browser = ChromeBrowserHostImpl::Create(create_params);
+    return browser.get();
+  }
+
+  auto browser = AlloyBrowserHostImpl::Create(create_params);
+  return browser.get();
+}

libcef/browser/browser_info.cc

@@ -4,13 +4,13 @@
 
 #include "libcef/browser/browser_info.h"
 
-#include "libcef/browser/browser_host_impl.h"
+#include "libcef/browser/browser_host_base.h"
 #include "libcef/browser/thread_util.h"
 #include "libcef/common/values_impl.h"
 
 #include "base/logging.h"
-#include "content/browser/frame_host/frame_tree_node.h"
-#include "content/browser/frame_host/render_frame_host_impl.h"
+#include "content/browser/renderer_host/frame_tree_node.h"
+#include "content/browser/renderer_host/render_frame_host_impl.h"
 #include "content/public/browser/render_process_host.h"
 #include "ipc/ipc_message.h"
 
@@ -34,12 +34,12 @@ CefBrowserInfo::CefBrowserInfo(int browser_id,
 
 CefBrowserInfo::~CefBrowserInfo() {}
 
-CefRefPtr<CefBrowserHostImpl> CefBrowserInfo::browser() const {
+CefRefPtr<CefBrowserHostBase> CefBrowserInfo::browser() const {
   base::AutoLock lock_scope(lock_);
   return browser_;
 }
 
-void CefBrowserInfo::SetBrowser(CefRefPtr<CefBrowserHostImpl> browser) {
+void CefBrowserInfo::SetBrowser(CefRefPtr<CefBrowserHostBase> browser) {
   base::AutoLock lock_scope(lock_);
   browser_ = browser;
 
@@ -297,6 +297,37 @@ CefBrowserInfo::FrameHostList CefBrowserInfo::GetAllFrames() const {
   return frames;
 }
 
+CefBrowserInfo::NavigationLock::NavigationLock() : weak_ptr_factory_(this) {}
+
+CefBrowserInfo::NavigationLock::~NavigationLock() {
+  CEF_REQUIRE_UIT();
+  if (pending_action_) {
+    CEF_POST_TASK(CEF_UIT, std::move(pending_action_));
+  }
+}
+
+scoped_refptr<CefBrowserInfo::NavigationLock>
+CefBrowserInfo::CreateNavigationLock() {
+  CEF_REQUIRE_UIT();
+  scoped_refptr<NavigationLock> lock;
+  if (!navigation_lock_) {
+    lock = new NavigationLock();
+    navigation_lock_ = lock->weak_ptr_factory_.GetWeakPtr();
+  } else {
+    lock = navigation_lock_.get();
+  }
+  return lock;
+}
+
+bool CefBrowserInfo::IsNavigationLocked(base::OnceClosure pending_action) {
+  CEF_REQUIRE_UIT();
+  if (navigation_lock_) {
+    navigation_lock_->pending_action_ = std::move(pending_action);
+    return true;
+  }
+  return false;
+}
+
 void CefBrowserInfo::MaybeUpdateFrameTreeNodeIdMap(FrameInfo* info) {
   lock_.AssertAcquired();
 

libcef/browser/browser_info.h

@@ -12,8 +12,10 @@
 #include "include/internal/cef_ptr.h"
 #include "libcef/common/values_impl.h"
 
+#include "base/callback.h"
 #include "base/containers/unique_ptr_adapters.h"
 #include "base/memory/ref_counted.h"
+#include "base/memory/weak_ptr.h"
 #include "base/synchronization/lock.h"
 #include "base/values.h"
 
@@ -21,12 +23,12 @@ namespace content {
 class RenderFrameHost;
 }
 
-class CefBrowserHostImpl;
+class CefBrowserHostBase;
 class CefFrameHostImpl;
 
 // CefBrowserInfo is used to associate a browser ID and render view/process
-// IDs with a particular CefBrowserHostImpl. Render view/process IDs may change
-// during the lifetime of a single CefBrowserHostImpl.
+// IDs with a particular CefBrowserHostBase. Render view/process IDs may change
+// during the lifetime of a single CefBrowserHostBase.
 //
 // CefBrowserInfo objects are managed by CefBrowserInfoManager and should not be
 // created directly.
@@ -44,23 +46,24 @@ class CefBrowserInfo : public base::RefCountedThreadSafe<CefBrowserInfo> {
 
   // May return NULL if the browser has not yet been created or if the browser
   // has been destroyed.
-  CefRefPtr<CefBrowserHostImpl> browser() const;
+  CefRefPtr<CefBrowserHostBase> browser() const;
 
-  // Set or clear the browser. Called from the CefBrowserHostImpl constructor
+  // Set or clear the browser. Called from CefBrowserHostBase InitializeBrowser
   // (to set) and DestroyBrowser (to clear).
-  void SetBrowser(CefRefPtr<CefBrowserHostImpl> browser);
+  void SetBrowser(CefRefPtr<CefBrowserHostBase> browser);
 
   // Ensure that a frame record exists for |host|. Called for the main frame
   // when the RenderView is created, or for a sub-frame when the associated
   // RenderFrame is created in the renderer process.
-  // Called from CefBrowserHostImpl::RenderFrameCreated (is_guest_view = false)
-  // or CefMimeHandlerViewGuestDelegate::OnGuestAttached (is_guest_view = true).
+  // Called from CefBrowserContentsDelegate::RenderFrameCreated (is_guest_view =
+  // false) or CefMimeHandlerViewGuestDelegate::OnGuestAttached (is_guest_view =
+  // true).
   void MaybeCreateFrame(content::RenderFrameHost* host, bool is_guest_view);
 
   // Remove the frame record for |host|. Called for the main frame when the
   // RenderView is destroyed, or for a sub-frame when the associated RenderFrame
   // is destroyed in the renderer process.
-  // Called from CefBrowserHostImpl::FrameDeleted or
+  // Called from CefBrowserContentsDelegate::RenderFrameDeleted or
   // CefMimeHandlerViewGuestDelegate::OnGuestDetached.
   void RemoveFrame(content::RenderFrameHost* host);
 
@@ -121,6 +124,28 @@ class CefBrowserInfo : public base::RefCountedThreadSafe<CefBrowserInfo> {
   typedef std::set<CefRefPtr<CefFrameHostImpl>> FrameHostList;
   FrameHostList GetAllFrames() const;
 
+  class NavigationLock final : public base::RefCounted<NavigationLock> {
+   private:
+    friend class CefBrowserInfo;
+    friend class base::RefCounted<NavigationLock>;
+
+    NavigationLock();
+    ~NavigationLock();
+
+    base::OnceClosure pending_action_;
+    base::WeakPtrFactory<NavigationLock> weak_ptr_factory_;
+  };
+
+  // Block navigation actions on NavigationLock life span. Must be called on the
+  // UI thread.
+  scoped_refptr<NavigationLock> CreateNavigationLock();
+
+  // Returns true if navigation actions are currently blocked. If this method
+  // returns true the most recent |pending_action| will be executed on the UI
+  // thread once the navigation lock is released. Must be called on the UI
+  // thread.
+  bool IsNavigationLocked(base::OnceClosure pending_action);
+
  private:
   friend class base::RefCountedThreadSafe<CefBrowserInfo>;
 
@@ -151,11 +176,15 @@ class CefBrowserInfo : public base::RefCountedThreadSafe<CefBrowserInfo> {
   bool is_windowless_;
   CefRefPtr<CefDictionaryValue> extra_info_;
 
+  // Navigation will be blocked while |navigation_lock_| exists.
+  // Only accessed on the UI thread.
+  base::WeakPtr<NavigationLock> navigation_lock_;
+
   mutable base::Lock lock_;
 
   // The below members must be protected by |lock_|.
 
-  CefRefPtr<CefBrowserHostImpl> browser_;
+  CefRefPtr<CefBrowserHostBase> browser_;
 
   // Owner of FrameInfo structs.
   typedef std::set<std::unique_ptr<FrameInfo>, base::UniquePtrComparator>

libcef/browser/browser_info_manager.cc

@@ -6,7 +6,7 @@
 
 #include <utility>
 
-#include "libcef/browser/browser_host_impl.h"
+#include "libcef/browser/browser_host_base.h"
 #include "libcef/browser/browser_platform_delegate.h"
 #include "libcef/browser/extensions/browser_extensions_util.h"
 #include "libcef/browser/thread_util.h"
@@ -14,6 +14,7 @@
 #include "libcef/common/cef_switches.h"
 #include "libcef/common/extensions/extensions_util.h"
 #include "libcef/common/values_impl.h"
+#include "libcef/features/runtime_checks.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ -23,7 +24,6 @@
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/child_process_host.h"
 #include "content/public/common/url_constants.h"
-#include "extensions/common/constants.h"
 
 namespace {
 
@@ -122,7 +122,7 @@ bool CefBrowserInfoManager::CanCreateWindow(
                                 /*is_renderer_initiated=*/true);
   params.user_gesture = user_gesture;
 
-  CefRefPtr<CefBrowserHostImpl> browser;
+  CefRefPtr<CefBrowserHostBase> browser;
   if (!MaybeAllowNavigation(opener, params, browser) || !browser) {
     // Cancel the popup.
     return false;
@@ -157,7 +157,7 @@ bool CefBrowserInfoManager::CanCreateWindow(
       CefPopupFeatures cef_features;
       TranslatePopupFeatures(features, cef_features);
 
-#if (defined(OS_WIN) || defined(OS_MACOSX))
+#if (defined(OS_WIN) || defined(OS_MAC))
       // Default to the size from the popup features.
       if (cef_features.xSet)
         window_info->x = cef_features.x;
@@ -180,9 +180,9 @@ bool CefBrowserInfoManager::CanCreateWindow(
   }
 
   if (allow) {
-    CefBrowserHostImpl::CreateParams create_params;
+    CefBrowserCreateParams create_params;
 
-    if (!browser->IsViewsHosted())
+    if (!browser->HasView())
       create_params.window_info = std::move(window_info);
 
     create_params.settings = pending_popup->settings;
@@ -213,6 +213,7 @@ void CefBrowserInfoManager::GetCustomWebContentsView(
     content::WebContentsView** view,
     content::RenderViewHostDelegateView** delegate_view) {
   CEF_REQUIRE_UIT();
+  REQUIRE_ALLOY_RUNTIME();
 
   std::unique_ptr<CefBrowserInfoManager::PendingPopup> pending_popup =
       PopPendingPopup(CefBrowserInfoManager::PendingPopup::CAN_CREATE_WINDOW,
@@ -241,10 +242,15 @@ void CefBrowserInfoManager::WebContentsCreated(
     CefRefPtr<CefDictionaryValue>& extra_info) {
   CEF_REQUIRE_UIT();
 
+  // GET_CUSTOM_WEB_CONTENTS_VIEW is only used with the alloy runtime.
+  const auto previous_step =
+      cef::IsAlloyRuntimeEnabled()
+          ? CefBrowserInfoManager::PendingPopup::GET_CUSTOM_WEB_CONTENTS_VIEW
+          : CefBrowserInfoManager::PendingPopup::CAN_CREATE_WINDOW;
+
   std::unique_ptr<CefBrowserInfoManager::PendingPopup> pending_popup =
-      PopPendingPopup(
-          CefBrowserInfoManager::PendingPopup::GET_CUSTOM_WEB_CONTENTS_VIEW,
-          opener_render_process_id, opener_render_routing_id, target_url);
+      PopPendingPopup(previous_step, opener_render_process_id,
+                      opener_render_routing_id, target_url);
   DCHECK(pending_popup.get());
   DCHECK(pending_popup->platform_delegate.get());
 
@@ -332,7 +338,7 @@ void CefBrowserInfoManager::DestroyAllBrowsers() {
   if (!list.empty()) {
     BrowserInfoList::iterator it = list.begin();
     for (; it != list.end(); ++it) {
-      CefRefPtr<CefBrowserHostImpl> browser = (*it)->browser();
+      CefRefPtr<CefBrowserHostBase> browser = (*it)->browser();
       DCHECK(browser.get());
       if (browser.get()) {
         // DestroyBrowser will call RemoveBrowserInfo.
@@ -361,28 +367,18 @@ CefBrowserInfoManager::GetBrowserInfoForFrameRoute(int render_process_id,
 bool CefBrowserInfoManager::MaybeAllowNavigation(
     content::RenderFrameHost* opener,
     const content::OpenURLParams& params,
-    CefRefPtr<CefBrowserHostImpl>& browser_out) const {
+    CefRefPtr<CefBrowserHostBase>& browser_out) const {
   CEF_REQUIRE_UIT();
 
   bool is_guest_view = false;
-  CefRefPtr<CefBrowserHostImpl> browser =
-      extensions::GetOwnerBrowserForHost(opener, &is_guest_view);
+  auto browser = extensions::GetOwnerBrowserForHost(opener, &is_guest_view);
   if (!browser) {
     // Print preview uses a modal dialog where we don't own the WebContents.
     // Allow that navigation to proceed.
     return true;
   }
 
-  if (is_guest_view && !params.url.SchemeIs(extensions::kExtensionScheme) &&
-      !params.url.SchemeIs(content::kChromeUIScheme)) {
-    // The PDF viewer will load the PDF extension in the guest view, and print
-    // preview will load chrome://print in the guest view. All other navigations
-    // are passed to the owner browser.
-    CEF_POST_TASK(
-        CEF_UIT,
-        base::Bind(base::IgnoreResult(&CefBrowserHostImpl::OpenURLFromTab),
-                   browser.get(), nullptr, params));
-
+  if (!browser->MaybeAllowNavigation(opener, is_guest_view, params)) {
     return false;
   }
 

libcef/browser/browser_info_manager.h

@@ -37,6 +37,7 @@ namespace IPC {
 class Message;
 }
 
+class CefBrowserHostBase;
 class CefBrowserPlatformDelegate;
 
 // Singleton object for managing BrowserInfo instances.
@@ -48,14 +49,14 @@ class CefBrowserInfoManager : public content::RenderProcessHostObserver {
   // Returns this singleton instance of this class.
   static CefBrowserInfoManager* GetInstance();
 
-  // Called from CefBrowserHostImpl::Create when a new browser is being created
+  // Called immediately before a new CefBrowserHost implementation is created
   // directly. In this case |is_popup| will be true only for DevTools browsers.
   scoped_refptr<CefBrowserInfo> CreateBrowserInfo(
       bool is_popup,
       bool is_windowless,
       CefRefPtr<CefDictionaryValue> extra_info);
 
-  // Called from CefBrowserHostImpl::WebContentsCreated when a new browser is
+  // Called from WebContentsDelegate::WebContentsCreated when a new browser is
   // being created for a traditional popup (e.g. window.open() or targeted
   // link). If any OnGetNewBrowserInfo requests are pending for the popup the
   // response will be sent when this method is called.
@@ -64,7 +65,7 @@ class CefBrowserInfoManager : public content::RenderProcessHostObserver {
       bool is_windowless,
       CefRefPtr<CefDictionaryValue> extra_info);
 
-  // Called from CefContentBrowserClient::CanCreateWindow. See comments on
+  // Called from ContentBrowserClient::CanCreateWindow. See comments on
   // PendingPopup for more information.
   bool CanCreateWindow(content::RenderFrameHost* opener,
                        const GURL& target_url,
@@ -76,8 +77,8 @@ class CefBrowserInfoManager : public content::RenderProcessHostObserver {
                        bool opener_suppressed,
                        bool* no_javascript_access);
 
-  // Called from CefBrowserHostImpl::GetCustomWebContentsView. See comments on
-  // PendingPopup for more information.
+  // Called from WebContentsDelegate::GetCustomWebContentsView (alloy runtime
+  // only). See comments on PendingPopup for more information.
   void GetCustomWebContentsView(
       const GURL& target_url,
       int opener_render_process_id,
@@ -85,7 +86,7 @@ class CefBrowserInfoManager : public content::RenderProcessHostObserver {
       content::WebContentsView** view,
       content::RenderViewHostDelegateView** delegate_view);
 
-  // Called from CefBrowserHostImpl::WebContentsCreated. See comments on
+  // Called from WebContentsDelegate::WebContentsCreated. See comments on
   // PendingPopup for more information.
   void WebContentsCreated(
       const GURL& target_url,
@@ -107,7 +108,7 @@ class CefBrowserInfoManager : public content::RenderProcessHostObserver {
                            int render_routing_id,
                            IPC::Message* reply_msg);
 
-  // Called from CefBrowserHostImpl::DestroyBrowser() when a browser is
+  // Called from CefBrowserHostBase::DestroyBrowser() when a browser is
   // destroyed.
   void RemoveBrowserInfo(scoped_refptr<CefBrowserInfo> browser_info);
 
@@ -116,7 +117,7 @@ class CefBrowserInfoManager : public content::RenderProcessHostObserver {
 
   // Returns the CefBrowserInfo matching the specified IDs or nullptr if no
   // match is found. It is allowed to add new callers of this method but
-  // consider using CefBrowserHostImpl::GetBrowserForFrameRoute() or
+  // consider using CefBrowserHostBase::GetBrowserForFrameRoute() or
   // extensions::GetOwnerBrowserForFrameRoute() instead. If |is_guest_view| is
   // non-nullptr it will be set to true if the IDs match a guest view associated
   // with the returned browser info instead of the browser itself.
@@ -127,7 +128,7 @@ class CefBrowserInfoManager : public content::RenderProcessHostObserver {
 
   // Returns the CefBrowserInfo matching the specified ID or nullptr if no match
   // is found. It is allowed to add new callers of this method but consider
-  // using CefBrowserHostImpl::GetBrowserForFrameTreeNode() instead. If
+  // using CefBrowserHostBase::GetBrowserForFrameTreeNode() instead. If
   // |is_guest_view| is non-nullptr it will be set to true if the IDs match a
   // guest view associated with the returned browser info instead of the browser
   // itself.
@@ -144,23 +145,24 @@ class CefBrowserInfoManager : public content::RenderProcessHostObserver {
   // |browser| will be set to the target browser if any.
   bool MaybeAllowNavigation(content::RenderFrameHost* opener,
                             const content::OpenURLParams& params,
-                            CefRefPtr<CefBrowserHostImpl>& browser) const;
+                            CefRefPtr<CefBrowserHostBase>& browser) const;
 
  private:
   // RenderProcessHostObserver methods:
   void RenderProcessHostDestroyed(content::RenderProcessHost* host) override;
 
   // Store state information about pending popups. Call order is:
-  // - CefContentBrowserClient::CanCreateWindow (UIT)
+  // - CanCreateWindow (UIT):
   //   Provides an opportunity to cancel the popup (calls OnBeforePopup) and
   //   creates the new platform delegate for the popup. If the popup owner is
   //   an extension guest view then the popup is canceled and
-  //   CefBrowserHostImpl::OpenURLFromTab is called.
+  //   WebContentsDelegate::OpenURLFromTab is called via the
+  //   CefBrowserHostBase::MaybeAllowNavigation implementation.
   // And then the following calls may occur at the same time:
-  // - CefBrowserHostImpl::GetCustomWebContentsView (UIT)
+  // - GetCustomWebContentsView (UIT) (alloy runtime only):
   //   Creates the OSR views for windowless popups.
-  // - CefBrowserHostImpl::WebContentsCreated (UIT)
-  //   Creates the CefBrowserHostImpl representation for the popup.
+  // - WebContentsCreated (UIT):
+  //   Creates the CefBrowserHost representation for the popup.
   // - CefBrowserMessageFilter::OnGetNewBrowserInfo (IOT)
   //   Passes information about the popup to the renderer process.
   struct PendingPopup {

libcef/browser/browser_message_filter.cc

@@ -7,8 +7,8 @@
 
 #include "libcef/browser/browser_info_manager.h"
 #include "libcef/browser/origin_whitelist_impl.h"
+#include "libcef/common/app_manager.h"
 #include "libcef/common/cef_messages.h"
-#include "libcef/common/content_client.h"
 #include "libcef/common/values_impl.h"
 
 #include "base/bind.h"
@@ -42,18 +42,6 @@ bool CefBrowserMessageFilter::OnMessageReceived(const IPC::Message& message) {
 void CefBrowserMessageFilter::OnGetNewRenderThreadInfo(
     CefProcessHostMsg_GetNewRenderThreadInfo_Params* params) {
   GetCrossOriginWhitelistEntries(&params->cross_origin_whitelist_entries);
-
-  CefRefPtr<CefApp> app = CefContentClient::Get()->application();
-  if (app.get()) {
-    CefRefPtr<CefBrowserProcessHandler> handler =
-        app->GetBrowserProcessHandler();
-    if (handler.get()) {
-      CefRefPtr<CefListValueImpl> listValuePtr(
-          new CefListValueImpl(&params->extra_info, false, false));
-      handler->OnRenderProcessThreadCreated(listValuePtr.get());
-      listValuePtr->Detach(nullptr);
-    }
-  }
 }
 
 void CefBrowserMessageFilter::OnGetNewBrowserInfo(int render_frame_routing_id,

libcef/browser/browser_message_loop.cc

@@ -3,14 +3,13 @@
 // be found in the LICENSE file.
 
 #include "libcef/browser/browser_message_loop.h"
-#include "libcef/browser/context.h"
-#include "libcef/common/content_client.h"
+#include "libcef/common/app_manager.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_pump.h"
 #include "base/message_loop/message_pump_for_ui.h"
 
-#if defined(OS_MACOSX)
+#if defined(OS_MAC)
 #include "base/mac/scoped_nsautorelease_pool.h"
 #include "base/message_loop/message_pump_mac.h"
 #endif
@@ -30,7 +29,7 @@ class MessagePumpExternal : public base::MessagePumpForUI {
   void Run(Delegate* delegate) override {
     base::TimeTicks start = base::TimeTicks::Now();
     while (true) {
-#if defined(OS_MACOSX)
+#if defined(OS_MAC)
       base::mac::ScopedNSAutoreleasePool autorelease_pool;
 #endif
 
@@ -94,7 +93,7 @@ class MessagePumpExternal : public base::MessagePumpForUI {
 };
 
 CefRefPtr<CefBrowserProcessHandler> GetBrowserProcessHandler() {
-  CefRefPtr<CefApp> app = CefContentClient::Get()->application();
+  CefRefPtr<CefApp> app = CefAppManager::Get()->GetApplication();
   if (app)
     return app->GetBrowserProcessHandler();
   return nullptr;
@@ -109,7 +108,7 @@ std::unique_ptr<base::MessagePump> MessagePumpFactoryForUI() {
       return std::make_unique<MessagePumpExternal>(0.01f, handler);
   }
 
-#if defined(OS_MACOSX)
+#if defined(OS_MAC)
   return base::MessagePumpMac::Create();
 #else
   return std::make_unique<base::MessagePumpForUI>();
@@ -118,9 +117,6 @@ std::unique_ptr<base::MessagePump> MessagePumpFactoryForUI() {
 
 }  // namespace
 
-void InitMessagePumpFactoryForUI() {
-  const CefSettings& settings = CefContext::Get()->settings();
-  if (settings.external_message_pump) {
-    base::MessagePump::OverrideMessagePumpForUIFactory(MessagePumpFactoryForUI);
-  }
+void InitExternalMessagePumpFactoryForUI() {
+  base::MessagePump::OverrideMessagePumpForUIFactory(MessagePumpFactoryForUI);
 }

libcef/browser/browser_message_loop.h

@@ -5,6 +5,6 @@
 #ifndef CEF_LIBCEF_BROWSER_BROWSER_MESSAGE_LOOP_H_
 #define CEF_LIBCEF_BROWSER_BROWSER_MESSAGE_LOOP_H_
 
-void InitMessagePumpFactoryForUI();
+void InitExternalMessagePumpFactoryForUI();
 
 #endif  // CEF_LIBCEF_BROWSER_BROWSER_MESSAGE_LOOP_H_

libcef/browser/browser_platform_delegate.cc

@@ -4,22 +4,23 @@
 
 #include "libcef/browser/browser_platform_delegate.h"
 
-#include "libcef/browser/browser_host_impl.h"
-#include "libcef/browser/osr/browser_platform_delegate_osr.h"
-#include "libcef/browser/web_contents_dialog_helper.h"
-#include "libcef/common/extensions/extensions_util.h"
+#include "libcef/browser/alloy/alloy_browser_host_impl.h"
 
 #include "base/logging.h"
-#include "content/browser/renderer_host/render_widget_host_impl.h"
-#include "content/public/browser/render_view_host.h"
-#include "content/public/browser/render_widget_host.h"
 
-CefBrowserPlatformDelegate::CefBrowserPlatformDelegate() {}
+CefBrowserPlatformDelegate::CefBrowserPlatformDelegate() = default;
 
 CefBrowserPlatformDelegate::~CefBrowserPlatformDelegate() {
   DCHECK(!browser_);
 }
 
+content::WebContents* CefBrowserPlatformDelegate::CreateWebContents(
+    CefBrowserCreateParams& create_params,
+    bool& own_web_contents) {
+  NOTREACHED();
+  return nullptr;
+}
+
 void CefBrowserPlatformDelegate::CreateViewForWebContents(
     content::WebContentsView** view,
     content::RenderViewHostDelegateView** delegate_view) {
@@ -27,32 +28,72 @@ void CefBrowserPlatformDelegate::CreateViewForWebContents(
 }
 
 void CefBrowserPlatformDelegate::WebContentsCreated(
-    content::WebContents* web_contents) {}
+    content::WebContents* web_contents,
+    bool owned) {
+  // We should not have a browser at this point.
+  DCHECK(!browser_);
 
-void CefBrowserPlatformDelegate::RenderViewCreated(
-    content::RenderViewHost* render_view_host) {
-  // Indicate that the view has an external parent (namely us). This changes the
-  // default view behavior in some cases (e.g. focus handling on Linux).
-  if (!IsViewsHosted() && render_view_host->GetWidget()->GetView())
-    render_view_host->GetWidget()->GetView()->SetHasExternalParent(true);
+  DCHECK(!web_contents_);
+  web_contents_ = web_contents;
 }
 
-void CefBrowserPlatformDelegate::BrowserCreated(CefBrowserHostImpl* browser) {
+void CefBrowserPlatformDelegate::AddNewContents(
+    content::WebContents* source,
+    std::unique_ptr<content::WebContents> new_contents,
+    const GURL& target_url,
+    WindowOpenDisposition disposition,
+    const gfx::Rect& initial_rect,
+    bool user_gesture,
+    bool* was_blocked) {
+  NOTREACHED();
+}
+
+void CefBrowserPlatformDelegate::WebContentsDestroyed(
+    content::WebContents* web_contents) {
+  DCHECK(web_contents_ && web_contents_ == web_contents);
+  web_contents_ = nullptr;
+}
+
+bool CefBrowserPlatformDelegate::ShouldTransferNavigation(
+    bool is_main_frame_navigation) {
+  return true;
+}
+
+void CefBrowserPlatformDelegate::RenderViewCreated(
+    content::RenderViewHost* render_view_host) {}
+
+void CefBrowserPlatformDelegate::RenderViewReady() {}
+
+void CefBrowserPlatformDelegate::BrowserCreated(CefBrowserHostBase* browser) {
+  // We should have an associated WebContents at this point.
+  DCHECK(web_contents_);
+
   DCHECK(!browser_);
   DCHECK(browser);
   browser_ = browser;
+}
 
-  if (browser_->IsPrintPreviewSupported()) {
-    web_contents_dialog_helper_.reset(
-        new CefWebContentsDialogHelper(browser_->web_contents(), this));
-  }
+void CefBrowserPlatformDelegate::CreateExtensionHost(
+    const extensions::Extension* extension,
+    const GURL& url,
+    extensions::ViewType host_type) {
+  NOTREACHED();
+}
+
+extensions::ExtensionHost* CefBrowserPlatformDelegate::GetExtensionHost()
+    const {
+  NOTREACHED();
+  return nullptr;
 }
 
 void CefBrowserPlatformDelegate::NotifyBrowserCreated() {}
 
 void CefBrowserPlatformDelegate::NotifyBrowserDestroyed() {}
 
-void CefBrowserPlatformDelegate::BrowserDestroyed(CefBrowserHostImpl* browser) {
+void CefBrowserPlatformDelegate::BrowserDestroyed(CefBrowserHostBase* browser) {
+  // WebContentsDestroyed should already be called.
+  DCHECK(!web_contents_);
+
   DCHECK(browser_ && browser_ == browser);
   browser_ = nullptr;
 }
@@ -66,6 +107,11 @@ void CefBrowserPlatformDelegate::CloseHostWindow() {
   NOTREACHED();
 }
 
+CefWindowHandle CefBrowserPlatformDelegate::GetHostWindowHandle() const {
+  NOTREACHED();
+  return kNullWindowHandle;
+}
+
 #if defined(USE_AURA)
 views::Widget* CefBrowserPlatformDelegate::GetWindowWidget() const {
   NOTREACHED();
@@ -86,37 +132,117 @@ void CefBrowserPlatformDelegate::PopupWebContentsCreated(
     bool is_devtools) {}
 
 void CefBrowserPlatformDelegate::PopupBrowserCreated(
-    CefBrowserHostImpl* new_browser,
+    CefBrowserHostBase* new_browser,
     bool is_devtools) {}
 
-void CefBrowserPlatformDelegate::SendCaptureLostEvent() {
-  content::RenderWidgetHostImpl* widget = content::RenderWidgetHostImpl::From(
-      browser_->web_contents()->GetRenderViewHost()->GetWidget());
-  if (widget)
-    widget->LostCapture();
+SkColor CefBrowserPlatformDelegate::GetBackgroundColor() const {
+  NOTREACHED();
+  return SkColor();
 }
 
-#if defined(OS_WIN) || (defined(OS_POSIX) && !defined(OS_MACOSX))
-void CefBrowserPlatformDelegate::NotifyMoveOrResizeStarted() {
-  // Dismiss any existing popups.
-  content::RenderViewHost* host = browser_->web_contents()->GetRenderViewHost();
-  if (host)
-    host->NotifyMoveOrResizeStarted();
+void CefBrowserPlatformDelegate::WasResized() {
+  NOTREACHED();
 }
 
+void CefBrowserPlatformDelegate::SendKeyEvent(const CefKeyEvent& event) {
+  NOTIMPLEMENTED();
+}
+
+void CefBrowserPlatformDelegate::SendMouseClickEvent(
+    const CefMouseEvent& event,
+    CefBrowserHost::MouseButtonType type,
+    bool mouseUp,
+    int clickCount) {
+  NOTIMPLEMENTED();
+}
+
+void CefBrowserPlatformDelegate::SendMouseMoveEvent(const CefMouseEvent& event,
+                                                    bool mouseLeave) {
+  NOTIMPLEMENTED();
+}
+
+void CefBrowserPlatformDelegate::SendMouseWheelEvent(const CefMouseEvent& event,
+                                                     int deltaX,
+                                                     int deltaY) {
+  NOTIMPLEMENTED();
+}
+
+void CefBrowserPlatformDelegate::SendTouchEvent(const CefTouchEvent& event) {
+  NOTIMPLEMENTED();
+}
+
+void CefBrowserPlatformDelegate::SendFocusEvent(bool setFocus) {
+  NOTIMPLEMENTED();
+}
+
+void CefBrowserPlatformDelegate::SendCaptureLostEvent() {
+  NOTIMPLEMENTED();
+}
+
+#if defined(OS_WIN) || (defined(OS_POSIX) && !defined(OS_MAC))
+void CefBrowserPlatformDelegate::NotifyMoveOrResizeStarted() {}
+
 void CefBrowserPlatformDelegate::SizeTo(int width, int height) {}
 #endif
 
+gfx::Point CefBrowserPlatformDelegate::GetScreenPoint(
+    const gfx::Point& view) const {
+  NOTREACHED();
+  return gfx::Point();
+}
+
+void CefBrowserPlatformDelegate::ViewText(const std::string& text) {
+  NOTIMPLEMENTED();
+}
+
+bool CefBrowserPlatformDelegate::HandleKeyboardEvent(
+    const content::NativeWebKeyboardEvent& event) {
+  NOTREACHED();
+  return false;
+}
+
+bool CefBrowserPlatformDelegate::PreHandleGestureEvent(
+    content::WebContents* source,
+    const blink::WebGestureEvent& event) {
+  return false;
+}
+
+bool CefBrowserPlatformDelegate::IsNeverComposited(
+    content::WebContents* web_contents) {
+  return false;
+}
+
+CefEventHandle CefBrowserPlatformDelegate::GetEventHandle(
+    const content::NativeWebKeyboardEvent& event) const {
+  NOTREACHED();
+  return kNullEventHandle;
+}
+
 std::unique_ptr<CefFileDialogRunner>
 CefBrowserPlatformDelegate::CreateFileDialogRunner() {
+  NOTIMPLEMENTED();
   return nullptr;
 }
 
 std::unique_ptr<CefJavaScriptDialogRunner>
 CefBrowserPlatformDelegate::CreateJavaScriptDialogRunner() {
+  NOTIMPLEMENTED();
   return nullptr;
 }
 
+std::unique_ptr<CefMenuRunner> CefBrowserPlatformDelegate::CreateMenuRunner() {
+  NOTIMPLEMENTED();
+  return nullptr;
+}
+
+bool CefBrowserPlatformDelegate::IsWindowless() const {
+  return false;
+}
+
+bool CefBrowserPlatformDelegate::IsViewsHosted() const {
+  return false;
+}
+
 void CefBrowserPlatformDelegate::WasHidden(bool hidden) {
   NOTREACHED();
 }
@@ -183,16 +309,16 @@ void CefBrowserPlatformDelegate::DragTargetDrop(const CefMouseEvent& event) {
 
 void CefBrowserPlatformDelegate::StartDragging(
     const content::DropData& drop_data,
-    blink::WebDragOperationsMask allowed_ops,
+    blink::DragOperationsMask allowed_ops,
     const gfx::ImageSkia& image,
     const gfx::Vector2d& image_offset,
-    const content::DragEventSourceInfo& event_info,
+    const blink::mojom::DragEventSourceInfo& event_info,
     content::RenderWidgetHostImpl* source_rwh) {
   NOTREACHED();
 }
 
 void CefBrowserPlatformDelegate::UpdateDragCursor(
-    blink::WebDragOperation operation) {
+    blink::DragOperation operation) {
   NOTREACHED();
 }
 
@@ -228,12 +354,42 @@ gfx::Size CefBrowserPlatformDelegate::GetMaximumDialogSize() {
   return gfx::Size();
 }
 
-base::RepeatingClosure CefBrowserPlatformDelegate::GetBoundsChangedCallback() {
-  if (web_contents_dialog_helper_) {
-    return web_contents_dialog_helper_->GetBoundsChangedCallback();
-  }
+void CefBrowserPlatformDelegate::SetAutoResizeEnabled(bool enabled,
+                                                      const CefSize& min_size,
+                                                      const CefSize& max_size) {
+  NOTIMPLEMENTED();
+}
 
-  return base::RepeatingClosure();
+void CefBrowserPlatformDelegate::SetAccessibilityState(
+    cef_state_t accessibility_state) {
+  NOTIMPLEMENTED();
+}
+
+bool CefBrowserPlatformDelegate::IsPrintPreviewSupported() const {
+  return true;
+}
+
+void CefBrowserPlatformDelegate::Print() {
+  NOTIMPLEMENTED();
+}
+
+void CefBrowserPlatformDelegate::PrintToPDF(
+    const CefString& path,
+    const CefPdfPrintSettings& settings,
+    CefRefPtr<CefPdfPrintCallback> callback) {
+  NOTIMPLEMENTED();
+}
+
+void CefBrowserPlatformDelegate::Find(int identifier,
+                                      const CefString& searchText,
+                                      bool forward,
+                                      bool matchCase,
+                                      bool findNext) {
+  NOTIMPLEMENTED();
+}
+
+void CefBrowserPlatformDelegate::StopFinding(bool clearSelection) {
+  NOTIMPLEMENTED();
 }
 
 // static

libcef/browser/browser_platform_delegate.h

@@ -13,12 +13,18 @@
 #include "include/cef_drag_data.h"
 #include "include/internal/cef_types.h"
 #include "include/views/cef_browser_view.h"
-#include "libcef/browser/browser_host_impl.h"
 
 #include "base/callback_forward.h"
-#include "content/public/browser/web_contents.h"
+#include "extensions/common/view_type.h"
+#include "third_party/blink/public/common/page/drag_operation.h"
+#include "third_party/blink/public/mojom/page/drag.mojom-forward.h"
+#include "third_party/skia/include/core/SkColor.h"
+#include "ui/base/window_open_disposition.h"
+
+class GURL;
 
 namespace blink {
+class WebGestureEvent;
 class WebMouseEvent;
 class WebMouseWheelEvent;
 class WebInputEvent;
@@ -26,23 +32,41 @@ class WebTouchEvent;
 }  // namespace blink
 
 namespace content {
+struct AXEventNotificationDetails;
+struct AXLocationChangeNotificationDetails;
+struct DropData;
 struct NativeWebKeyboardEvent;
 class RenderViewHost;
 class RenderViewHostDelegateView;
+class RenderWidgetHostImpl;
+class WebContents;
 class WebContentsView;
 }  // namespace content
 
+namespace extensions {
+class Extension;
+class ExtensionHost;
+}  // namespace extensions
+
+namespace gfx {
+class ImageSkia;
+class Point;
+class Rect;
+class Size;
+class Vector2d;
+}  // namespace gfx
+
 #if defined(USE_AURA)
 namespace views {
 class Widget;
 }
 #endif
 
-class CefBrowserInfo;
+struct CefBrowserCreateParams;
+class CefBrowserHostBase;
 class CefFileDialogRunner;
 class CefJavaScriptDialogRunner;
 class CefMenuRunner;
-class CefWebContentsDialogHelper;
 
 // Provides platform-specific implementations of browser functionality. All
 // methods are called on the browser process UI thread unless otherwise
@@ -52,7 +76,14 @@ class CefBrowserPlatformDelegate {
   // Create a new CefBrowserPlatformDelegate instance. May be called on multiple
   // threads.
   static std::unique_ptr<CefBrowserPlatformDelegate> Create(
-      CefBrowserHostImpl::CreateParams& create_params);
+      const CefBrowserCreateParams& create_params);
+
+  // Called from AlloyBrowserHostImpl::Create.
+  // Wait for the call to WebContentsCreated(owned=true) before taking ownership
+  // of the resulting WebContents object.
+  virtual content::WebContents* CreateWebContents(
+      CefBrowserCreateParams& create_params,
+      bool& own_web_contents);
 
   // Called to create the view objects for a new WebContents. Will only be
   // called a single time per instance. May be called on multiple threads. Only
@@ -61,17 +92,51 @@ class CefBrowserPlatformDelegate {
       content::WebContentsView** view,
       content::RenderViewHostDelegateView** delegate_view);
 
-  // Called after the WebContents for the browser is created. Will only be
-  // called a single time per instance.
-  virtual void WebContentsCreated(content::WebContents* web_contents);
+  // Called after the WebContents for a browser has been created. |owned| will
+  // be true if |web_contents| was created via CreateWebContents() and we should
+  // take ownership. This will also be called for popup WebContents created
+  // indirectly by Chromium. Will only be called a single time per instance.
+  virtual void WebContentsCreated(content::WebContents* web_contents,
+                                  bool owned);
+
+  // Called when Chromium is ready to hand over ownership of a popup
+  // WebContents. WebContentsCreated(owned=false) will be called first for
+  // |new_contents|. Will only be called a single time per instance. See also
+  // the WebContentsDelegate documentation.
+  virtual void AddNewContents(
+      content::WebContents* source,
+      std::unique_ptr<content::WebContents> new_contents,
+      const GURL& target_url,
+      WindowOpenDisposition disposition,
+      const gfx::Rect& initial_rect,
+      bool user_gesture,
+      bool* was_blocked);
+
+  // Called when the WebContents is destroyed. This will be called before
+  // BrowserDestroyed(). Will only be called a single time per instance.
+  virtual void WebContentsDestroyed(content::WebContents* web_contents);
+
+  // See WebContentsDelegate documentation.
+  virtual bool ShouldTransferNavigation(bool is_main_frame_navigation);
 
   // Called after the RenderViewHost is created.
   virtual void RenderViewCreated(content::RenderViewHost* render_view_host);
 
-  // Called after the owning CefBrowserHostImpl is created. Will only be called
-  // a single time per instance. Do not send any client notifications from this
-  // method.
-  virtual void BrowserCreated(CefBrowserHostImpl* browser);
+  // See WebContentsObserver documentation.
+  virtual void RenderViewReady();
+
+  // Called after the owning AlloyBrowserHostImpl is created. Will only be
+  // called a single time per instance. Do not send any client notifications
+  // from this method.
+  virtual void BrowserCreated(CefBrowserHostBase* browser);
+
+  // Called from AlloyBrowserHostImpl::Create.
+  virtual void CreateExtensionHost(const extensions::Extension* extension,
+                                   const GURL& url,
+                                   extensions::ViewType host_type);
+
+  // Returns the current extension host.
+  virtual extensions::ExtensionHost* GetExtensionHost() const;
 
   // Send any notifications related to browser creation. Called after
   // BrowserCreated().
@@ -81,11 +146,11 @@ class CefBrowserPlatformDelegate {
   // BrowserDestroyed().
   virtual void NotifyBrowserDestroyed();
 
-  // Called before the owning CefBrowserHostImpl is destroyed. Will only be
-  // called a single time per instance. All references to the CefBrowserHostImpl
-  // and WebContents should be cleared when this method is called. Do not send
-  // any client notifications from this method.
-  virtual void BrowserDestroyed(CefBrowserHostImpl* browser);
+  // Called before the owning AlloyBrowserHostImpl is destroyed. Will only be
+  // called a single time per instance. All references to the
+  // AlloyBrowserHostImpl and WebContents should be cleared when this method is
+  // called. Do not send any client notifications from this method.
+  virtual void BrowserDestroyed(CefBrowserHostBase* browser);
 
   // Create the window that hosts the browser. Will only be called a single time
   // per instance. Only used with windowed rendering.
@@ -100,7 +165,7 @@ class CefBrowserPlatformDelegate {
   // rendering this will return the most immediate parent window handle. For
   // windowless rendering this will return the parent window handle specified by
   // the client, which may be NULL. May be called on multiple threads.
-  virtual CefWindowHandle GetHostWindowHandle() const = 0;
+  virtual CefWindowHandle GetHostWindowHandle() const;
 
 #if defined(USE_AURA)
   // Returns the Widget owner for the browser window. Only used with windowed
@@ -113,7 +178,7 @@ class CefBrowserPlatformDelegate {
 #endif
 
   // Called after the WebContents have been created for a new popup browser
-  // parented to this browser but before the CefBrowserHostImpl is created for
+  // parented to this browser but before the AlloyBrowserHostImpl is created for
   // the popup. |is_devtools| will be true if the popup will host DevTools. This
   // method will be called before WebContentsCreated() is called on
   // |new_platform_delegate|. Do not make the new browser visible in this
@@ -125,13 +190,13 @@ class CefBrowserPlatformDelegate {
       CefBrowserPlatformDelegate* new_platform_delegate,
       bool is_devtools);
 
-  // Called after the CefBrowserHostImpl is created for a new popup browser
+  // Called after the AlloyBrowserHostImpl is created for a new popup browser
   // parented to this browser. |is_devtools| will be true if the popup will host
   // DevTools. This method will be called immediately after
   // CefLifeSpanHandler::OnAfterCreated() for the popup browser. It is safe to
   // make the new browser visible in this callback (for example, add the browser
   // to a window and show it).
-  virtual void PopupBrowserCreated(CefBrowserHostImpl* new_browser,
+  virtual void PopupBrowserCreated(CefBrowserHostBase* new_browser,
                                    bool is_devtools);
 
   // Returns the background color for the browser. The alpha component will be
@@ -139,35 +204,31 @@ class CefBrowserPlatformDelegate {
   // fully opaque). SK_AlphaOPAQUE will always be returned for windowed
   // browsers. SK_ColorTRANSPARENT may be returned for windowless browsers to
   // enable transparency.
-  virtual SkColor GetBackgroundColor() const = 0;
-
-  virtual bool CanUseSharedTexture() const = 0;
-  virtual bool CanUseExternalBeginFrame() const = 0;
+  virtual SkColor GetBackgroundColor() const;
 
   // Notify the window that it was resized.
-  virtual void WasResized() = 0;
+  virtual void WasResized();
 
   // Send input events.
-  virtual void SendKeyEvent(const CefKeyEvent& event) = 0;
+  virtual void SendKeyEvent(const CefKeyEvent& event);
   virtual void SendMouseClickEvent(const CefMouseEvent& event,
                                    CefBrowserHost::MouseButtonType type,
                                    bool mouseUp,
-                                   int clickCount) = 0;
-  virtual void SendMouseMoveEvent(const CefMouseEvent& event,
-                                  bool mouseLeave) = 0;
+                                   int clickCount);
+  virtual void SendMouseMoveEvent(const CefMouseEvent& event, bool mouseLeave);
   virtual void SendMouseWheelEvent(const CefMouseEvent& event,
                                    int deltaX,
-                                   int deltaY) = 0;
-  virtual void SendTouchEvent(const CefTouchEvent& event) = 0;
+                                   int deltaY);
+  virtual void SendTouchEvent(const CefTouchEvent& event);
 
   // Send focus event. The browser's WebContents may be NULL when this method is
   // called.
-  virtual void SendFocusEvent(bool setFocus) = 0;
+  virtual void SendFocusEvent(bool setFocus);
 
   // Send capture lost event.
   virtual void SendCaptureLostEvent();
 
-#if defined(OS_WIN) || (defined(OS_POSIX) && !defined(OS_MACOSX))
+#if defined(OS_WIN) || (defined(OS_POSIX) && !defined(OS_MAC))
   // The window hosting the browser is about to be moved or resized. Only used
   // on Windows and Linux.
   virtual void NotifyMoveOrResizeStarted();
@@ -179,22 +240,29 @@ class CefBrowserPlatformDelegate {
 
   // Convert from view coordinates to screen coordinates. Potential display
   // scaling will be applied to the result.
-  virtual gfx::Point GetScreenPoint(const gfx::Point& view) const = 0;
+  virtual gfx::Point GetScreenPoint(const gfx::Point& view) const;
 
   // Open the specified text in the default text editor.
-  virtual void ViewText(const std::string& text) = 0;
+  virtual void ViewText(const std::string& text);
 
   // Forward the keyboard event to the application or frame window to allow
   // processing of shortcut keys.
   virtual bool HandleKeyboardEvent(
-      const content::NativeWebKeyboardEvent& event) = 0;
+      const content::NativeWebKeyboardEvent& event);
+
+  // See WebContentsDelegate documentation.
+  virtual bool PreHandleGestureEvent(content::WebContents* source,
+                                     const blink::WebGestureEvent& event);
+
+  // See WebContentsDelegate documentation.
+  virtual bool IsNeverComposited(content::WebContents* web_contents);
 
   // Invoke platform specific handling for the external protocol.
   static void HandleExternalProtocol(const GURL& url);
 
   // Returns the OS event handle, if any, associated with |event|.
   virtual CefEventHandle GetEventHandle(
-      const content::NativeWebKeyboardEvent& event) const = 0;
+      const content::NativeWebKeyboardEvent& event) const;
 
   // Create the platform-specific file dialog runner.
   virtual std::unique_ptr<CefFileDialogRunner> CreateFileDialogRunner();
@@ -204,15 +272,15 @@ class CefBrowserPlatformDelegate {
   CreateJavaScriptDialogRunner();
 
   // Create the platform-specific menu runner.
-  virtual std::unique_ptr<CefMenuRunner> CreateMenuRunner() = 0;
+  virtual std::unique_ptr<CefMenuRunner> CreateMenuRunner();
 
   // Returns true if this delegate implements windowless rendering. May be
   // called on multiple threads.
-  virtual bool IsWindowless() const = 0;
+  virtual bool IsWindowless() const;
 
   // Returns true if this delegate implements views-hosted browser handling. May
   // be called on multiple threads.
-  virtual bool IsViewsHosted() const = 0;
+  virtual bool IsViewsHosted() const;
 
   // Notify the browser that it was hidden. Only used with windowless rendering.
   virtual void WasHidden(bool hidden);
@@ -224,6 +292,7 @@ class CefBrowserPlatformDelegate {
   // Invalidate the view. Only used with windowless rendering.
   virtual void Invalidate(cef_paint_element_type_t type);
 
+  // Send the external begin frame message. Only used with windowless rendering.
   virtual void SendExternalBeginFrame();
 
   // Set the windowless frame rate. Only used with windowless rendering.
@@ -251,13 +320,14 @@ class CefBrowserPlatformDelegate {
                                   cef_drag_operations_mask_t allowed_ops);
   virtual void DragTargetDragLeave();
   virtual void DragTargetDrop(const CefMouseEvent& event);
-  virtual void StartDragging(const content::DropData& drop_data,
-                             blink::WebDragOperationsMask allowed_ops,
-                             const gfx::ImageSkia& image,
-                             const gfx::Vector2d& image_offset,
-                             const content::DragEventSourceInfo& event_info,
-                             content::RenderWidgetHostImpl* source_rwh);
-  virtual void UpdateDragCursor(blink::WebDragOperation operation);
+  virtual void StartDragging(
+      const content::DropData& drop_data,
+      blink::DragOperationsMask allowed_ops,
+      const gfx::ImageSkia& image,
+      const gfx::Vector2d& image_offset,
+      const blink::mojom::DragEventSourceInfo& event_info,
+      content::RenderWidgetHostImpl* source_rwh);
+  virtual void UpdateDragCursor(blink::DragOperation operation);
   virtual void DragSourceEndedAt(int x, int y, cef_drag_operations_mask_t op);
   virtual void DragSourceSystemDragEnded();
   virtual void AccessibilityEventReceived(
@@ -267,6 +337,23 @@ class CefBrowserPlatformDelegate {
   virtual gfx::Point GetDialogPosition(const gfx::Size& size);
   virtual gfx::Size GetMaximumDialogSize();
 
+  // See CefBrowserHost documentation.
+  virtual void SetAutoResizeEnabled(bool enabled,
+                                    const CefSize& min_size,
+                                    const CefSize& max_size);
+  virtual void SetAccessibilityState(cef_state_t accessibility_state);
+  virtual bool IsPrintPreviewSupported() const;
+  virtual void Print();
+  virtual void PrintToPDF(const CefString& path,
+                          const CefPdfPrintSettings& settings,
+                          CefRefPtr<CefPdfPrintCallback> callback);
+  virtual void Find(int identifier,
+                    const CefString& searchText,
+                    bool forward,
+                    bool matchCase,
+                    bool findNext);
+  virtual void StopFinding(bool clearSelection);
+
  protected:
   // Allow deletion via scoped_ptr only.
   friend std::default_delete<CefBrowserPlatformDelegate>;
@@ -274,15 +361,11 @@ class CefBrowserPlatformDelegate {
   CefBrowserPlatformDelegate();
   virtual ~CefBrowserPlatformDelegate();
 
-  base::RepeatingClosure GetBoundsChangedCallback();
-
   static int TranslateWebEventModifiers(uint32 cef_modifiers);
 
-  CefBrowserHostImpl* browser_ = nullptr;  // Not owned by this object.
-
- private:
-  // Used for the print preview dialog.
-  std::unique_ptr<CefWebContentsDialogHelper> web_contents_dialog_helper_;
+  // Not owned by this object.
+  content::WebContents* web_contents_ = nullptr;
+  CefBrowserHostBase* browser_ = nullptr;
 
   DISALLOW_COPY_AND_ASSIGN(CefBrowserPlatformDelegate);
 };

libcef/browser/browser_platform_delegate_create.cc

@@ -11,12 +11,15 @@
 #include "base/memory/ptr_util.h"
 #include "build/build_config.h"
 
+#include "libcef/browser/browser_host_base.h"
+#include "libcef/browser/chrome/browser_platform_delegate_chrome.h"
 #include "libcef/browser/extensions/browser_platform_delegate_background.h"
+#include "libcef/features/runtime_checks.h"
 
 #if defined(OS_WIN)
 #include "libcef/browser/native/browser_platform_delegate_native_win.h"
 #include "libcef/browser/osr/browser_platform_delegate_osr_win.h"
-#elif defined(OS_MACOSX)
+#elif defined(OS_MAC)
 #include "libcef/browser/native/browser_platform_delegate_native_mac.h"
 #include "libcef/browser/osr/browser_platform_delegate_osr_mac.h"
 #elif defined(OS_LINUX)
@@ -34,33 +37,32 @@ namespace {
 
 std::unique_ptr<CefBrowserPlatformDelegateNative> CreateNativeDelegate(
     const CefWindowInfo& window_info,
-    SkColor background_color,
-    bool use_shared_texture,
-    bool use_external_begin_frame) {
+    SkColor background_color) {
 #if defined(OS_WIN)
   return std::make_unique<CefBrowserPlatformDelegateNativeWin>(
-      window_info, background_color, use_shared_texture,
-      use_external_begin_frame);
-#elif defined(OS_MACOSX)
+      window_info, background_color);
+#elif defined(OS_MAC)
   return std::make_unique<CefBrowserPlatformDelegateNativeMac>(
       window_info, background_color);
 #elif defined(OS_LINUX)
   return std::make_unique<CefBrowserPlatformDelegateNativeLinux>(
-      window_info, background_color, use_external_begin_frame);
+      window_info, background_color);
 #endif
 }
 
 std::unique_ptr<CefBrowserPlatformDelegateOsr> CreateOSRDelegate(
-    std::unique_ptr<CefBrowserPlatformDelegateNative> native_delegate) {
+    std::unique_ptr<CefBrowserPlatformDelegateNative> native_delegate,
+    bool use_shared_texture,
+    bool use_external_begin_frame) {
 #if defined(OS_WIN)
   return std::make_unique<CefBrowserPlatformDelegateOsrWin>(
-      std::move(native_delegate));
-#elif defined(OS_MACOSX)
+      std::move(native_delegate), use_shared_texture, use_external_begin_frame);
+#elif defined(OS_MAC)
   return std::make_unique<CefBrowserPlatformDelegateOsrMac>(
       std::move(native_delegate));
 #elif defined(OS_LINUX)
   return std::make_unique<CefBrowserPlatformDelegateOsrLinux>(
-      std::move(native_delegate));
+      std::move(native_delegate), use_external_begin_frame);
 #endif
 }
 
@@ -68,7 +70,7 @@ std::unique_ptr<CefBrowserPlatformDelegateOsr> CreateOSRDelegate(
 
 // static
 std::unique_ptr<CefBrowserPlatformDelegate> CefBrowserPlatformDelegate::Create(
-    CefBrowserHostImpl::CreateParams& create_params) {
+    const CefBrowserCreateParams& create_params) {
   const bool is_windowless =
       create_params.window_info &&
       create_params.window_info->windowless_rendering_enabled &&
@@ -76,31 +78,38 @@ std::unique_ptr<CefBrowserPlatformDelegate> CefBrowserPlatformDelegate::Create(
   const SkColor background_color = CefContext::Get()->GetBackgroundColor(
       &create_params.settings, is_windowless ? STATE_ENABLED : STATE_DISABLED);
 
-  bool use_shared_texture = false;
-  bool use_external_begin_frame = false;
-
-  if (is_windowless) {
-    use_shared_texture = create_params.window_info &&
-                         create_params.window_info->shared_texture_enabled;
-
-    use_external_begin_frame =
-        create_params.window_info &&
-        create_params.window_info->external_begin_frame_enabled;
+  if (cef::IsChromeRuntimeEnabled()) {
+    // CefWindowInfo is not used in this case.
+    std::unique_ptr<CefBrowserPlatformDelegateNative> native_delegate =
+        CreateNativeDelegate(CefWindowInfo(), background_color);
+    return std::make_unique<CefBrowserPlatformDelegateChrome>(
+        std::move(native_delegate));
   }
 
   if (create_params.window_info) {
     std::unique_ptr<CefBrowserPlatformDelegateNative> native_delegate =
-        CreateNativeDelegate(*create_params.window_info.get(), background_color,
-                             use_shared_texture, use_external_begin_frame);
-    if (is_windowless)
-      return CreateOSRDelegate(std::move(native_delegate));
+        CreateNativeDelegate(*create_params.window_info.get(),
+                             background_color);
+    if (is_windowless) {
+      REQUIRE_ALLOY_RUNTIME();
+
+      const bool use_shared_texture =
+          create_params.window_info &&
+          create_params.window_info->shared_texture_enabled;
+
+      const bool use_external_begin_frame =
+          create_params.window_info &&
+          create_params.window_info->external_begin_frame_enabled;
+
+      return CreateOSRDelegate(std::move(native_delegate), use_shared_texture,
+                               use_external_begin_frame);
+    }
     return std::move(native_delegate);
   } else if (create_params.extension_host_type ==
              extensions::VIEW_TYPE_EXTENSION_BACKGROUND_PAGE) {
     // Creating a background extension host without a window.
     std::unique_ptr<CefBrowserPlatformDelegateNative> native_delegate =
-        CreateNativeDelegate(CefWindowInfo(), background_color,
-                             use_shared_texture, use_external_begin_frame);
+        CreateNativeDelegate(CefWindowInfo(), background_color);
     return std::make_unique<CefBrowserPlatformDelegateBackground>(
         std::move(native_delegate));
   }
@@ -108,8 +117,7 @@ std::unique_ptr<CefBrowserPlatformDelegate> CefBrowserPlatformDelegate::Create(
   else {
     // CefWindowInfo is not used in this case.
     std::unique_ptr<CefBrowserPlatformDelegateNative> native_delegate =
-        CreateNativeDelegate(CefWindowInfo(), background_color,
-                             use_shared_texture, use_external_begin_frame);
+        CreateNativeDelegate(CefWindowInfo(), background_color);
     return std::make_unique<CefBrowserPlatformDelegateViews>(
         std::move(native_delegate),
         static_cast<CefBrowserViewImpl*>(create_params.browser_view.get()));

libcef/browser/chrome/browser_delegate.h

@@ -0,0 +1,48 @@
+// Copyright 2020 The Chromium Embedded Framework Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef CEF_LIBCEF_BROWSER_CHROME_BROWSER_DELEGATE_H_
+#define CEF_LIBCEF_BROWSER_CHROME_BROWSER_DELEGATE_H_
+#pragma once
+
+#include <memory>
+
+#include "base/memory/scoped_refptr.h"
+#include "content/public/browser/web_contents_delegate.h"
+
+class Browser;
+
+namespace cef {
+
+// Delegate for the chrome Browser object. Lifespan is controlled by the Browser
+// object. See the ChromeBrowserDelegate documentation for additional details.
+// Only accessed on the UI thread.
+class BrowserDelegate : public content::WebContentsDelegate {
+ public:
+  // Opaque ref-counted base class for CEF-specific parameters passed via
+  // Browser::CreateParams::cef_params and possibly shared by multiple Browser
+  // instances.
+  class CreateParams : public base::RefCounted<CreateParams> {
+   public:
+    virtual ~CreateParams() {}
+  };
+
+  // Called from the Browser constructor to create a new delegate.
+  static std::unique_ptr<BrowserDelegate> Create(
+      Browser* browser,
+      scoped_refptr<CreateParams> cef_params);
+
+  ~BrowserDelegate() override {}
+
+  // Called immediately after |new_contents| is created.
+  virtual void OnWebContentsCreated(content::WebContents* new_contents) = 0;
+
+  // Add or remove ownership of the WebContents.
+  virtual void SetAsDelegate(content::WebContents* web_contents,
+                             bool set_delegate) = 0;
+};
+
+}  // namespace cef
+
+#endif  // CEF_LIBCEF_BROWSER_CHROME_BROWSER_DELEGATE_H_

libcef/browser/chrome/browser_platform_delegate_chrome.cc

@@ -0,0 +1,101 @@
+// Copyright 2020 The Chromium Embedded Framework Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "libcef/browser/chrome/browser_platform_delegate_chrome.h"
+
+#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_window.h"
+#include "ui/display/screen.h"
+#include "ui/gfx/geometry/point.h"
+
+CefBrowserPlatformDelegateChrome::CefBrowserPlatformDelegateChrome(
+    std::unique_ptr<CefBrowserPlatformDelegateNative> native_delegate)
+    : native_delegate_(std::move(native_delegate)) {
+  native_delegate_->set_windowless_handler(this);
+}
+
+void CefBrowserPlatformDelegateChrome::WebContentsCreated(
+    content::WebContents* web_contents,
+    bool owned) {
+  CefBrowserPlatformDelegate::WebContentsCreated(web_contents, owned);
+  native_delegate_->WebContentsCreated(web_contents, /*owned=*/false);
+}
+
+void CefBrowserPlatformDelegateChrome::WebContentsDestroyed(
+    content::WebContents* web_contents) {
+  CefBrowserPlatformDelegate::WebContentsDestroyed(web_contents);
+  native_delegate_->WebContentsDestroyed(web_contents);
+}
+
+void CefBrowserPlatformDelegateChrome::BrowserCreated(
+    CefBrowserHostBase* browser) {
+  CefBrowserPlatformDelegate::BrowserCreated(browser);
+  native_delegate_->BrowserCreated(browser);
+}
+
+void CefBrowserPlatformDelegateChrome::BrowserDestroyed(
+    CefBrowserHostBase* browser) {
+  CefBrowserPlatformDelegate::BrowserDestroyed(browser);
+  native_delegate_->BrowserDestroyed(browser);
+}
+
+SkColor CefBrowserPlatformDelegateChrome::GetBackgroundColor() const {
+  return native_delegate_->GetBackgroundColor();
+}
+
+void CefBrowserPlatformDelegateChrome::SendKeyEvent(const CefKeyEvent& event) {
+  native_delegate_->SendKeyEvent(event);
+}
+
+void CefBrowserPlatformDelegateChrome::SendMouseClickEvent(
+    const CefMouseEvent& event,
+    CefBrowserHost::MouseButtonType type,
+    bool mouseUp,
+    int clickCount) {
+  native_delegate_->SendMouseClickEvent(event, type, mouseUp, clickCount);
+}
+
+void CefBrowserPlatformDelegateChrome::SendMouseMoveEvent(
+    const CefMouseEvent& event,
+    bool mouseLeave) {
+  native_delegate_->SendMouseMoveEvent(event, mouseLeave);
+}
+
+void CefBrowserPlatformDelegateChrome::SendMouseWheelEvent(
+    const CefMouseEvent& event,
+    int deltaX,
+    int deltaY) {
+  native_delegate_->SendMouseWheelEvent(event, deltaX, deltaY);
+}
+
+gfx::Point CefBrowserPlatformDelegateChrome::GetScreenPoint(
+    const gfx::Point& view) const {
+  auto screen = display::Screen::GetScreen();
+
+  gfx::NativeWindow native_window =
+      chrome_browser_ ? chrome_browser_->window()->GetNativeWindow() : nullptr;
+
+  // Returns screen pixel coordinates.
+  auto screen_rect = screen->DIPToScreenRectInWindow(
+      native_window, gfx::Rect(view, gfx::Size(0, 0)));
+  return screen_rect.origin();
+}
+
+void CefBrowserPlatformDelegateChrome::ViewText(const std::string& text) {
+  native_delegate_->ViewText(text);
+}
+
+CefWindowHandle CefBrowserPlatformDelegateChrome::GetParentWindowHandle()
+    const {
+  return GetHostWindowHandle();
+}
+
+gfx::Point CefBrowserPlatformDelegateChrome::GetParentScreenPoint(
+    const gfx::Point& view) const {
+  return GetScreenPoint(view);
+}
+
+void CefBrowserPlatformDelegateChrome::set_chrome_browser(Browser* browser) {
+  chrome_browser_ = browser;
+}

libcef/browser/chrome/browser_platform_delegate_chrome.h

@@ -0,0 +1,52 @@
+// Copyright 2020 The Chromium Embedded Framework Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef CEF_LIBCEF_BROWSER_CHROME_BROWSER_PLATFORM_DELEGATE_CHROME_H_
+#define CEF_LIBCEF_BROWSER_CHROME_BROWSER_PLATFORM_DELEGATE_CHROME_H_
+
+#include "libcef/browser/browser_platform_delegate.h"
+#include "libcef/browser/native/browser_platform_delegate_native.h"
+
+class Browser;
+
+// Implementation of Chrome-based browser functionality.
+class CefBrowserPlatformDelegateChrome
+    : public CefBrowserPlatformDelegate,
+      public CefBrowserPlatformDelegateNative::WindowlessHandler {
+ public:
+  explicit CefBrowserPlatformDelegateChrome(
+      std::unique_ptr<CefBrowserPlatformDelegateNative> native_delegate);
+
+  // CefBrowserPlatformDelegate overrides.
+  void WebContentsCreated(content::WebContents* web_contents,
+                          bool owned) override;
+  void WebContentsDestroyed(content::WebContents* web_contents) override;
+  void BrowserCreated(CefBrowserHostBase* browser) override;
+  void BrowserDestroyed(CefBrowserHostBase* browser) override;
+  SkColor GetBackgroundColor() const override;
+  void SendKeyEvent(const CefKeyEvent& event) override;
+  void SendMouseClickEvent(const CefMouseEvent& event,
+                           CefBrowserHost::MouseButtonType type,
+                           bool mouseUp,
+                           int clickCount) override;
+  void SendMouseMoveEvent(const CefMouseEvent& event, bool mouseLeave) override;
+  void SendMouseWheelEvent(const CefMouseEvent& event,
+                           int deltaX,
+                           int deltaY) override;
+  gfx::Point GetScreenPoint(const gfx::Point& view) const override;
+  void ViewText(const std::string& text) override;
+
+  // CefBrowserPlatformDelegateNative::WindowlessHandler methods:
+  CefWindowHandle GetParentWindowHandle() const override;
+  gfx::Point GetParentScreenPoint(const gfx::Point& view) const override;
+
+  void set_chrome_browser(Browser* browser);
+
+ private:
+  std::unique_ptr<CefBrowserPlatformDelegateNative> native_delegate_;
+
+  Browser* chrome_browser_ = nullptr;
+};
+
+#endif  // CEF_LIBCEF_BROWSER_CHROME_BROWSER_PLATFORM_DELEGATE_CHROME_H_

libcef/browser/chrome/chrome_browser_context.cc

@@ -0,0 +1,40 @@
+// Copyright 2020 The Chromium Embedded Framework Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "libcef/browser/chrome/chrome_browser_context.h"
+
+#include "libcef/browser/prefs/browser_prefs.h"
+
+#include "chrome/browser/profiles/profile_manager.h"
+
+ChromeBrowserContext::ChromeBrowserContext(
+    const CefRequestContextSettings& settings)
+    : CefBrowserContext(settings) {}
+
+ChromeBrowserContext::~ChromeBrowserContext() = default;
+
+content::BrowserContext* ChromeBrowserContext::AsBrowserContext() {
+  return profile_;
+}
+
+Profile* ChromeBrowserContext::AsProfile() {
+  return profile_;
+}
+
+void ChromeBrowserContext::Initialize() {
+  CefBrowserContext::Initialize();
+
+  // TODO(chrome-runtime): ProfileManager can create new profiles relative to
+  // the user-data-dir, but it should be done asynchronously.
+  // The global ProfileManager instance can be retrieved via
+  // |g_browser_process->profile_manager()|.
+  profile_ = ProfileManager::GetLastUsedProfileAllowedByPolicy();
+
+  browser_prefs::SetLanguagePrefs(profile_);
+}
+
+void ChromeBrowserContext::Shutdown() {
+  CefBrowserContext::Shutdown();
+  profile_ = nullptr;
+}

libcef/browser/chrome/chrome_browser_context.h

@@ -0,0 +1,31 @@
+// Copyright 2020 The Chromium Embedded Framework Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef CEF_LIBCEF_BROWSER_CHROME_CHROME_BROWSER_CONTEXT_H_
+#define CEF_LIBCEF_BROWSER_CHROME_CHROME_BROWSER_CONTEXT_H_
+#pragma once
+
+#include "libcef/browser/browser_context.h"
+
+// See CefBrowserContext documentation for usage. Only accessed on the UI thread
+// unless otherwise indicated.
+class ChromeBrowserContext : public CefBrowserContext {
+ public:
+  explicit ChromeBrowserContext(const CefRequestContextSettings& settings);
+
+  // CefBrowserContext overrides.
+  content::BrowserContext* AsBrowserContext() override;
+  Profile* AsProfile() override;
+  void Initialize() override;
+  void Shutdown() override;
+
+ private:
+  ~ChromeBrowserContext() override;
+
+  Profile* profile_ = nullptr;
+
+  DISALLOW_COPY_AND_ASSIGN(ChromeBrowserContext);
+};
+
+#endif  // CEF_LIBCEF_BROWSER_CHROME_CHROME_BROWSER_CONTEXT_H_

libcef/browser/chrome/chrome_browser_delegate.cc

@@ -0,0 +1,260 @@
+// Copyright 2020 The Chromium Embedded Framework Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include <memory>
+
+#include "libcef/browser/chrome/chrome_browser_delegate.h"
+
+#include "libcef/browser/browser_contents_delegate.h"
+#include "libcef/browser/browser_host_base.h"
+#include "libcef/browser/browser_info_manager.h"
+#include "libcef/browser/browser_platform_delegate.h"
+#include "libcef/browser/chrome/chrome_browser_host_impl.h"
+#include "libcef/browser/request_context_impl.h"
+#include "libcef/common/app_manager.h"
+
+#include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/browser.h"
+#include "content/public/browser/keyboard_event_processing_result.h"
+#include "content/public/browser/native_web_keyboard_event.h"
+
+using content::KeyboardEventProcessingResult;
+
+ChromeBrowserDelegate::ChromeBrowserDelegate(
+    Browser* browser,
+    const CefBrowserCreateParams& create_params)
+    : browser_(browser), create_params_(create_params) {
+  DCHECK(browser_);
+}
+
+ChromeBrowserDelegate::~ChromeBrowserDelegate() = default;
+
+void ChromeBrowserDelegate::OnWebContentsCreated(
+    content::WebContents* new_contents) {
+  // Necessary to receive LoadingStateChanged calls during initial navigation.
+  // This will be called again in Browser::SetAsDelegate, which should be fine.
+  new_contents->SetDelegate(browser_);
+
+  SetAsDelegate(new_contents, /*set_delegate=*/true);
+}
+
+void ChromeBrowserDelegate::SetAsDelegate(content::WebContents* web_contents,
+                                          bool set_delegate) {
+  DCHECK(web_contents);
+  auto browser_host =
+      ChromeBrowserHostImpl::GetBrowserForContents(web_contents);
+
+  // |set_delegate=false| only makes sense if we already have a browser host.
+  DCHECK(browser_host || set_delegate);
+
+  if (browser_host) {
+    // We already have a browser host, so just change the associated Browser.
+    browser_host->SetBrowser(set_delegate ? browser_ : nullptr);
+    return;
+  }
+
+  auto platform_delegate = CefBrowserPlatformDelegate::Create(create_params_);
+  CHECK(platform_delegate);
+
+  auto browser_info = CefBrowserInfoManager::GetInstance()->CreateBrowserInfo(
+      /*is_popup=*/false, /*is_windowless=*/false, create_params_.extra_info);
+
+  auto request_context_impl =
+      CefRequestContextImpl::GetOrCreateForRequestContext(
+          create_params_.request_context);
+
+  CreateBrowser(web_contents, create_params_.settings, create_params_.client,
+                std::move(platform_delegate), browser_info,
+                request_context_impl);
+}
+
+void ChromeBrowserDelegate::WebContentsCreated(
+    content::WebContents* source_contents,
+    int opener_render_process_id,
+    int opener_render_frame_id,
+    const std::string& frame_name,
+    const GURL& target_url,
+    content::WebContents* new_contents) {
+  CefBrowserSettings settings;
+  CefRefPtr<CefClient> client;
+  std::unique_ptr<CefBrowserPlatformDelegate> platform_delegate;
+  CefRefPtr<CefDictionaryValue> extra_info;
+
+  CefBrowserInfoManager::GetInstance()->WebContentsCreated(
+      target_url, opener_render_process_id, opener_render_frame_id, settings,
+      client, platform_delegate, extra_info);
+
+  auto opener = ChromeBrowserHostImpl::GetBrowserForContents(source_contents);
+  if (!opener) {
+    LOG(ERROR) << "No opener found for chrome popup browser";
+    return;
+  }
+
+  auto browser_info =
+      CefBrowserInfoManager::GetInstance()->CreatePopupBrowserInfo(
+          new_contents, /*is_windowless=*/false, extra_info);
+  CHECK(browser_info->is_popup());
+
+  // Popups must share the same RequestContext as the parent.
+  auto request_context_impl = opener->request_context();
+  CHECK(request_context_impl);
+
+  // We don't officially own |new_contents| until AddNewContents() is called.
+  // However, we need to install observers/delegates here.
+  CreateBrowser(new_contents, settings, client, std::move(platform_delegate),
+                browser_info, request_context_impl);
+}
+
+content::WebContents* ChromeBrowserDelegate::OpenURLFromTab(
+    content::WebContents* source,
+    const content::OpenURLParams& params) {
+  // Return nullptr to cancel the navigation. Otherwise, proceed with default
+  // chrome handling.
+  if (auto delegate = GetDelegateForWebContents(source)) {
+    return delegate->OpenURLFromTab(source, params);
+  }
+  return nullptr;
+}
+
+void ChromeBrowserDelegate::LoadingStateChanged(content::WebContents* source,
+                                                bool to_different_document) {
+  if (auto delegate = GetDelegateForWebContents(source)) {
+    delegate->LoadingStateChanged(source, to_different_document);
+  }
+}
+
+void ChromeBrowserDelegate::UpdateTargetURL(content::WebContents* source,
+                                            const GURL& url) {
+  if (auto delegate = GetDelegateForWebContents(source)) {
+    delegate->UpdateTargetURL(source, url);
+  }
+}
+
+bool ChromeBrowserDelegate::DidAddMessageToConsole(
+    content::WebContents* source,
+    blink::mojom::ConsoleMessageLevel log_level,
+    const base::string16& message,
+    int32_t line_no,
+    const base::string16& source_id) {
+  if (auto delegate = GetDelegateForWebContents(source)) {
+    return delegate->DidAddMessageToConsole(source, log_level, message, line_no,
+                                            source_id);
+  }
+  return false;
+}
+
+void ChromeBrowserDelegate::DidNavigateMainFramePostCommit(
+    content::WebContents* web_contents) {
+  if (auto delegate = GetDelegateForWebContents(web_contents)) {
+    delegate->DidNavigateMainFramePostCommit(web_contents);
+  }
+}
+
+void ChromeBrowserDelegate::EnterFullscreenModeForTab(
+    content::RenderFrameHost* requesting_frame,
+    const blink::mojom::FullscreenOptions& options) {
+  auto web_contents =
+      content::WebContents::FromRenderFrameHost(requesting_frame);
+  if (!web_contents)
+    return;
+
+  if (auto delegate = GetDelegateForWebContents(web_contents)) {
+    delegate->EnterFullscreenModeForTab(requesting_frame, options);
+  }
+}
+
+void ChromeBrowserDelegate::ExitFullscreenModeForTab(
+    content::WebContents* web_contents) {
+  if (auto delegate = GetDelegateForWebContents(web_contents)) {
+    delegate->ExitFullscreenModeForTab(web_contents);
+  }
+}
+
+KeyboardEventProcessingResult ChromeBrowserDelegate::PreHandleKeyboardEvent(
+    content::WebContents* source,
+    const content::NativeWebKeyboardEvent& event) {
+  if (auto delegate = GetDelegateForWebContents(source)) {
+    return delegate->PreHandleKeyboardEvent(source, event);
+  }
+  return KeyboardEventProcessingResult::NOT_HANDLED;
+}
+
+bool ChromeBrowserDelegate::HandleKeyboardEvent(
+    content::WebContents* source,
+    const content::NativeWebKeyboardEvent& event) {
+  if (auto delegate = GetDelegateForWebContents(source)) {
+    return delegate->HandleKeyboardEvent(source, event);
+  }
+  return false;
+}
+
+void ChromeBrowserDelegate::CreateBrowser(
+    content::WebContents* web_contents,
+    CefBrowserSettings settings,
+    CefRefPtr<CefClient> client,
+    std::unique_ptr<CefBrowserPlatformDelegate> platform_delegate,
+    scoped_refptr<CefBrowserInfo> browser_info,
+    CefRefPtr<CefRequestContextImpl> request_context_impl) {
+  CEF_REQUIRE_UIT();
+  DCHECK(web_contents);
+  DCHECK(platform_delegate);
+  DCHECK(browser_info);
+  DCHECK(request_context_impl);
+
+  if (!client) {
+    if (auto app = CefAppManager::Get()->GetApplication()) {
+      if (auto bph = app->GetBrowserProcessHandler()) {
+        client = bph->GetDefaultClient();
+      }
+    }
+  }
+
+  if (!client) {
+    LOG(WARNING) << "Creating a chrome browser without a client";
+  }
+
+  // Check if chrome and CEF are using the same browser context.
+  // TODO(chrome-runtime): Verify if/when this might occur.
+  auto chrome_browser_context =
+      CefBrowserContext::FromBrowserContext(browser_->create_params().profile);
+  if (chrome_browser_context != request_context_impl->GetBrowserContext()) {
+    LOG(WARNING) << "Creating a chrome browser with mismatched context";
+  }
+
+  // Remains alive until the associated WebContents is destroyed.
+  CefRefPtr<ChromeBrowserHostImpl> browser_host =
+      new ChromeBrowserHostImpl(settings, client, std::move(platform_delegate),
+                                browser_info, request_context_impl);
+  browser_host->Attach(browser_, web_contents);
+}
+
+CefBrowserContentsDelegate* ChromeBrowserDelegate::GetDelegateForWebContents(
+    content::WebContents* web_contents) {
+  auto browser_host =
+      ChromeBrowserHostImpl::GetBrowserForContents(web_contents);
+  if (browser_host)
+    return browser_host->contents_delegate();
+  return nullptr;
+}
+
+namespace cef {
+
+// static
+std::unique_ptr<BrowserDelegate> BrowserDelegate::Create(
+    Browser* browser,
+    scoped_refptr<CreateParams> cef_params) {
+  CefBrowserCreateParams create_params;
+
+  // Parameters from ChromeBrowserHostImpl::Create, or nullptr if the Browser
+  // was created from somewhere else.
+  auto params = static_cast<ChromeBrowserHostImpl::DelegateCreateParams*>(
+      cef_params.get());
+  if (params) {
+    create_params = params->create_params_;
+  }
+
+  return std::make_unique<ChromeBrowserDelegate>(browser, create_params);
+}
+
+}  // namespace cef

libcef/browser/chrome/chrome_browser_delegate.h

@@ -0,0 +1,104 @@
+// Copyright 2020 The Chromium Embedded Framework Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef CEF_LIBCEF_BROWSER_CHROME_CHROME_BROWSER_DELEGATE_H_
+#define CEF_LIBCEF_BROWSER_CHROME_CHROME_BROWSER_DELEGATE_H_
+#pragma once
+
+#include <memory>
+
+#include "libcef/browser/browser_host_base.h"
+#include "libcef/browser/browser_info.h"
+#include "libcef/browser/chrome/browser_delegate.h"
+
+#include "base/optional.h"
+
+class CefBrowserContentsDelegate;
+class CefRequestContextImpl;
+class ChromeBrowserHostImpl;
+
+// Implementation of the cef::BrowserDelegate interface. Lifespan is controlled
+// by the Browser object. Only accessed on the UI thread.
+//
+// The Browser object represents the top-level Chrome browser window. One or
+// more tabs (WebContents) are then owned by the Browser object via
+// TabStripModel. A new Browser object can be created programmatically using
+// "new Browser" or Browser::Create, or as a result of user action such as
+// dragging a tab out of an existing window. New or existing tabs can also be
+// added to an already existing Browser object.
+//
+// The Browser object acts as the WebContentsDelegate for all attached tabs. CEF
+// integration requires WebContentsDelegate callbacks and notification of tab
+// attach/detach. To support this integration a cef::BrowserDelegate
+// (ChromeBrowserDelegate) member is created in the Browser constructor and
+// receives delegation for the Browser callbacks. ChromeBrowserDelegate creates
+// a new ChromeBrowserHostImpl when a tab is added to a Browser for the first
+// time, and that ChromeBrowserHostImpl continues to exist until the tab's
+// WebContents is destroyed. The associated WebContents object does not change,
+// but the Browser object will change when the tab is dragged between windows.
+class ChromeBrowserDelegate : public cef::BrowserDelegate {
+ public:
+  ChromeBrowserDelegate(Browser* browser,
+                        const CefBrowserCreateParams& create_params);
+  ~ChromeBrowserDelegate() override;
+
+  // cef::BrowserDelegate methods:
+  void OnWebContentsCreated(content::WebContents* new_contents) override;
+  void SetAsDelegate(content::WebContents* web_contents,
+                     bool set_delegate) override;
+
+  // WebContentsDelegate methods:
+  void WebContentsCreated(content::WebContents* source_contents,
+                          int opener_render_process_id,
+                          int opener_render_frame_id,
+                          const std::string& frame_name,
+                          const GURL& target_url,
+                          content::WebContents* new_contents) override;
+  content::WebContents* OpenURLFromTab(
+      content::WebContents* source,
+      const content::OpenURLParams& params) override;
+  void LoadingStateChanged(content::WebContents* source,
+                           bool to_different_document) override;
+  void UpdateTargetURL(content::WebContents* source, const GURL& url) override;
+  bool DidAddMessageToConsole(content::WebContents* source,
+                              blink::mojom::ConsoleMessageLevel log_level,
+                              const base::string16& message,
+                              int32_t line_no,
+                              const base::string16& source_id) override;
+  void DidNavigateMainFramePostCommit(
+      content::WebContents* web_contents) override;
+  void EnterFullscreenModeForTab(
+      content::RenderFrameHost* requesting_frame,
+      const blink::mojom::FullscreenOptions& options) override;
+  void ExitFullscreenModeForTab(content::WebContents* web_contents) override;
+  content::KeyboardEventProcessingResult PreHandleKeyboardEvent(
+      content::WebContents* source,
+      const content::NativeWebKeyboardEvent& event) override;
+  bool HandleKeyboardEvent(
+      content::WebContents* source,
+      const content::NativeWebKeyboardEvent& event) override;
+
+  Browser* browser() const { return browser_; }
+
+ private:
+  void CreateBrowser(
+      content::WebContents* web_contents,
+      CefBrowserSettings settings,
+      CefRefPtr<CefClient> client,
+      std::unique_ptr<CefBrowserPlatformDelegate> platform_delegate,
+      scoped_refptr<CefBrowserInfo> browser_info,
+      CefRefPtr<CefRequestContextImpl> request_context_impl);
+
+  CefBrowserContentsDelegate* GetDelegateForWebContents(
+      content::WebContents* web_contents);
+
+  Browser* const browser_;
+
+  // Used when creating a new browser host.
+  const CefBrowserCreateParams create_params_;
+
+  DISALLOW_COPY_AND_ASSIGN(ChromeBrowserDelegate);
+};
+
+#endif  // CEF_LIBCEF_BROWSER_CHROME_CHROME_BROWSER_DELEGATE_H_

libcef/browser/chrome/chrome_browser_host_impl.cc

@@ -0,0 +1,502 @@
+// Copyright 2020 The Chromium Embedded Framework Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "libcef/browser/chrome/chrome_browser_host_impl.h"
+
+#include "libcef/browser/browser_platform_delegate.h"
+#include "libcef/browser/chrome/browser_platform_delegate_chrome.h"
+#include "libcef/browser/thread_util.h"
+#include "libcef/features/runtime_checks.h"
+
+#include "base/logging.h"
+#include "base/notreached.h"
+#include "chrome/browser/printing/print_view_manager_common.h"
+#include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_commands.h"
+#include "chrome/browser/ui/browser_navigator.h"
+#include "chrome/browser/ui/browser_tabstrip.h"
+#include "chrome/browser/ui/browser_window.h"
+#include "chrome/browser/ui/tabs/tab_strip_model.h"
+#include "chrome/common/pref_names.h"
+#include "url/url_constants.h"
+
+// static
+CefRefPtr<ChromeBrowserHostImpl> ChromeBrowserHostImpl::Create(
+    const CefBrowserCreateParams& params) {
+  // Get or create the request context and profile.
+  CefRefPtr<CefRequestContextImpl> request_context_impl =
+      CefRequestContextImpl::GetOrCreateForRequestContext(
+          params.request_context);
+  CHECK(request_context_impl);
+  auto cef_browser_context = request_context_impl->GetBrowserContext();
+  CHECK(cef_browser_context);
+  auto profile = cef_browser_context->AsProfile();
+
+  Browser::CreateParams chrome_params =
+      Browser::CreateParams(profile, /*user_gesture=*/false);
+
+  // Pass |params| to cef::BrowserDelegate::Create from the Browser constructor.
+  chrome_params.cef_params = base::MakeRefCounted<DelegateCreateParams>(params);
+
+  // Create the Browser. This will indirectly create the ChomeBrowserDelegate.
+  // The same params will be used to create a new Browser if the tab is dragged
+  // out of the existing Browser.
+  auto browser = new Browser(chrome_params);
+
+  GURL url = params.url;
+  if (url.is_empty()) {
+    // Chrome will navigate to kChromeUINewTabURL by default. We want to keep
+    // the current CEF behavior of not navigating at all. Use a special URL that
+    // will be recognized in HandleNonNavigationAboutURL.
+    url = GURL("chrome://ignore/");
+  }
+
+  // Add a new tab. This will indirectly create a new tab WebContents and
+  // call ChromeBrowserDelegate::OnWebContentsCreated to create the associated
+  // ChromeBrowserHostImpl.
+  chrome::AddTabAt(browser, url, /*idx=*/-1, /*foreground=*/true);
+
+  // The new tab WebContents.
+  auto web_contents = browser->tab_strip_model()->GetActiveWebContents();
+  CHECK(web_contents);
+
+  // The associated ChromeBrowserHostImpl.
+  auto browser_host =
+      ChromeBrowserHostImpl::GetBrowserForContents(web_contents);
+  CHECK(browser_host);
+
+  browser->window()->Show();
+
+  return browser_host;
+}
+
+// static
+CefRefPtr<ChromeBrowserHostImpl> ChromeBrowserHostImpl::GetBrowserForHost(
+    const content::RenderViewHost* host) {
+  REQUIRE_CHROME_RUNTIME();
+  auto browser = CefBrowserHostBase::GetBrowserForHost(host);
+  return static_cast<ChromeBrowserHostImpl*>(browser.get());
+}
+
+// static
+CefRefPtr<ChromeBrowserHostImpl> ChromeBrowserHostImpl::GetBrowserForHost(
+    const content::RenderFrameHost* host) {
+  REQUIRE_CHROME_RUNTIME();
+  auto browser = CefBrowserHostBase::GetBrowserForHost(host);
+  return static_cast<ChromeBrowserHostImpl*>(browser.get());
+}
+
+// static
+CefRefPtr<ChromeBrowserHostImpl> ChromeBrowserHostImpl::GetBrowserForContents(
+    const content::WebContents* contents) {
+  REQUIRE_CHROME_RUNTIME();
+  auto browser = CefBrowserHostBase::GetBrowserForContents(contents);
+  return static_cast<ChromeBrowserHostImpl*>(browser.get());
+}
+
+// static
+CefRefPtr<ChromeBrowserHostImpl>
+ChromeBrowserHostImpl::GetBrowserForFrameTreeNode(int frame_tree_node_id) {
+  REQUIRE_CHROME_RUNTIME();
+  auto browser =
+      CefBrowserHostBase::GetBrowserForFrameTreeNode(frame_tree_node_id);
+  return static_cast<ChromeBrowserHostImpl*>(browser.get());
+}
+
+// static
+CefRefPtr<ChromeBrowserHostImpl> ChromeBrowserHostImpl::GetBrowserForFrameRoute(
+    int render_process_id,
+    int render_routing_id) {
+  REQUIRE_CHROME_RUNTIME();
+  auto browser = CefBrowserHostBase::GetBrowserForFrameRoute(render_process_id,
+                                                             render_routing_id);
+  return static_cast<ChromeBrowserHostImpl*>(browser.get());
+}
+
+ChromeBrowserHostImpl::~ChromeBrowserHostImpl() = default;
+
+void ChromeBrowserHostImpl::OnWebContentsDestroyed(
+    content::WebContents* web_contents) {
+  platform_delegate_->WebContentsDestroyed(web_contents);
+  DestroyBrowser();
+}
+
+void ChromeBrowserHostImpl::OnSetFocus(cef_focus_source_t source) {
+  if (!CEF_CURRENTLY_ON_UIT()) {
+    CEF_POST_TASK(CEF_UIT, base::BindOnce(&ChromeBrowserHostImpl::OnSetFocus,
+                                          this, source));
+    return;
+  }
+
+  if (contents_delegate_->OnSetFocus(source))
+    return;
+
+  if (browser_) {
+    const int tab_index = GetCurrentTabIndex();
+    if (tab_index != TabStripModel::kNoTab) {
+      chrome::SelectNumberedTab(browser_, tab_index);
+    }
+  }
+}
+
+void ChromeBrowserHostImpl::CloseBrowser(bool force_close) {
+  // Always do this asynchronously because TabStripModel is not re-entrant.
+  CEF_POST_TASK(CEF_UIT, base::BindOnce(&ChromeBrowserHostImpl::DoCloseBrowser,
+                                        this, force_close));
+}
+
+bool ChromeBrowserHostImpl::TryCloseBrowser() {
+  NOTIMPLEMENTED();
+  return false;
+}
+
+void ChromeBrowserHostImpl::SetFocus(bool focus) {
+  if (focus) {
+    OnSetFocus(FOCUS_SOURCE_SYSTEM);
+  }
+}
+
+CefWindowHandle ChromeBrowserHostImpl::GetWindowHandle() {
+  NOTIMPLEMENTED();
+  return kNullWindowHandle;
+}
+
+CefWindowHandle ChromeBrowserHostImpl::GetOpenerWindowHandle() {
+  NOTIMPLEMENTED();
+  return kNullWindowHandle;
+}
+
+bool ChromeBrowserHostImpl::HasView() {
+  // TODO(chrome-runtime): Support Views-hosted browsers.
+  return false;
+}
+
+double ChromeBrowserHostImpl::GetZoomLevel() {
+  NOTIMPLEMENTED();
+  return 0.0;
+}
+
+void ChromeBrowserHostImpl::SetZoomLevel(double zoomLevel) {
+  NOTIMPLEMENTED();
+}
+
+void ChromeBrowserHostImpl::RunFileDialog(
+    FileDialogMode mode,
+    const CefString& title,
+    const CefString& default_file_path,
+    const std::vector<CefString>& accept_filters,
+    int selected_accept_filter,
+    CefRefPtr<CefRunFileDialogCallback> callback) {
+  NOTIMPLEMENTED();
+  callback->OnFileDialogDismissed(0, {});
+}
+
+void ChromeBrowserHostImpl::Print() {
+  if (!CEF_CURRENTLY_ON_UIT()) {
+    CEF_POST_TASK(CEF_UIT, base::BindOnce(&ChromeBrowserHostImpl::Print, this));
+    return;
+  }
+
+  if (browser_) {
+    // Like chrome::Print() but specifying the WebContents.
+    printing::StartPrint(GetWebContents(),
+                         /*print_renderer=*/mojo::NullAssociatedRemote(),
+                         browser_->profile()->GetPrefs()->GetBoolean(
+                             prefs::kPrintPreviewDisabled),
+                         /*has_selection=*/false);
+  }
+}
+
+void ChromeBrowserHostImpl::PrintToPDF(
+    const CefString& path,
+    const CefPdfPrintSettings& settings,
+    CefRefPtr<CefPdfPrintCallback> callback) {
+  NOTIMPLEMENTED();
+  callback->OnPdfPrintFinished(CefString(), false);
+}
+
+void ChromeBrowserHostImpl::Find(int identifier,
+                                 const CefString& searchText,
+                                 bool forward,
+                                 bool matchCase,
+                                 bool findNext) {
+  NOTIMPLEMENTED();
+}
+
+void ChromeBrowserHostImpl::StopFinding(bool clearSelection) {
+  NOTIMPLEMENTED();
+}
+
+void ChromeBrowserHostImpl::ShowDevTools(const CefWindowInfo& windowInfo,
+                                         CefRefPtr<CefClient> client,
+                                         const CefBrowserSettings& settings,
+                                         const CefPoint& inspect_element_at) {
+  NOTIMPLEMENTED();
+}
+
+void ChromeBrowserHostImpl::CloseDevTools() {
+  NOTIMPLEMENTED();
+}
+
+bool ChromeBrowserHostImpl::HasDevTools() {
+  NOTIMPLEMENTED();
+  return false;
+}
+
+bool ChromeBrowserHostImpl::SendDevToolsMessage(const void* message,
+                                                size_t message_size) {
+  NOTIMPLEMENTED();
+  return false;
+}
+
+int ChromeBrowserHostImpl::ExecuteDevToolsMethod(
+    int message_id,
+    const CefString& method,
+    CefRefPtr<CefDictionaryValue> params) {
+  NOTIMPLEMENTED();
+  return 0;
+}
+
+CefRefPtr<CefRegistration> ChromeBrowserHostImpl::AddDevToolsMessageObserver(
+    CefRefPtr<CefDevToolsMessageObserver> observer) {
+  NOTIMPLEMENTED();
+  return nullptr;
+}
+
+bool ChromeBrowserHostImpl::IsWindowRenderingDisabled() {
+  return false;
+}
+
+void ChromeBrowserHostImpl::WasResized() {
+  NOTIMPLEMENTED();
+}
+
+void ChromeBrowserHostImpl::WasHidden(bool hidden) {
+  NOTIMPLEMENTED();
+}
+
+void ChromeBrowserHostImpl::NotifyScreenInfoChanged() {
+  NOTIMPLEMENTED();
+}
+
+void ChromeBrowserHostImpl::Invalidate(PaintElementType type) {
+  NOTIMPLEMENTED();
+}
+
+void ChromeBrowserHostImpl::SendExternalBeginFrame() {
+  NOTIMPLEMENTED();
+}
+
+void ChromeBrowserHostImpl::SendTouchEvent(const CefTouchEvent& event) {
+  NOTIMPLEMENTED();
+}
+
+void ChromeBrowserHostImpl::SendFocusEvent(bool setFocus) {
+  NOTIMPLEMENTED();
+}
+
+void ChromeBrowserHostImpl::SendCaptureLostEvent() {
+  NOTIMPLEMENTED();
+}
+
+void ChromeBrowserHostImpl::NotifyMoveOrResizeStarted() {
+  NOTIMPLEMENTED();
+}
+
+int ChromeBrowserHostImpl::GetWindowlessFrameRate() {
+  return 0;
+}
+
+void ChromeBrowserHostImpl::SetWindowlessFrameRate(int frame_rate) {}
+
+void ChromeBrowserHostImpl::ImeSetComposition(
+    const CefString& text,
+    const std::vector<CefCompositionUnderline>& underlines,
+    const CefRange& replacement_range,
+    const CefRange& selection_range) {
+  NOTIMPLEMENTED();
+}
+
+void ChromeBrowserHostImpl::ImeCommitText(const CefString& text,
+                                          const CefRange& replacement_range,
+                                          int relative_cursor_pos) {
+  NOTIMPLEMENTED();
+}
+void ChromeBrowserHostImpl::ImeFinishComposingText(bool keep_selection) {
+  NOTIMPLEMENTED();
+}
+
+void ChromeBrowserHostImpl::ImeCancelComposition() {
+  NOTIMPLEMENTED();
+}
+
+void ChromeBrowserHostImpl::DragTargetDragEnter(
+    CefRefPtr<CefDragData> drag_data,
+    const CefMouseEvent& event,
+    DragOperationsMask allowed_ops) {
+  NOTIMPLEMENTED();
+}
+
+void ChromeBrowserHostImpl::DragTargetDragOver(const CefMouseEvent& event,
+                                               DragOperationsMask allowed_ops) {
+  NOTIMPLEMENTED();
+}
+
+void ChromeBrowserHostImpl::DragTargetDragLeave() {
+  NOTIMPLEMENTED();
+}
+
+void ChromeBrowserHostImpl::DragTargetDrop(const CefMouseEvent& event) {
+  NOTIMPLEMENTED();
+}
+
+void ChromeBrowserHostImpl::DragSourceSystemDragEnded() {
+  NOTIMPLEMENTED();
+}
+
+void ChromeBrowserHostImpl::DragSourceEndedAt(int x,
+                                              int y,
+                                              DragOperationsMask op) {
+  NOTIMPLEMENTED();
+}
+
+void ChromeBrowserHostImpl::SetAudioMuted(bool mute) {
+  NOTIMPLEMENTED();
+}
+
+bool ChromeBrowserHostImpl::IsAudioMuted() {
+  NOTIMPLEMENTED();
+  return false;
+}
+
+void ChromeBrowserHostImpl::SetAccessibilityState(
+    cef_state_t accessibility_state) {
+  NOTIMPLEMENTED();
+}
+
+void ChromeBrowserHostImpl::SetAutoResizeEnabled(bool enabled,
+                                                 const CefSize& min_size,
+                                                 const CefSize& max_size) {
+  NOTIMPLEMENTED();
+}
+
+CefRefPtr<CefExtension> ChromeBrowserHostImpl::GetExtension() {
+  return nullptr;
+}
+
+bool ChromeBrowserHostImpl::IsBackgroundHost() {
+  return false;
+}
+
+bool ChromeBrowserHostImpl::Navigate(const content::OpenURLParams& params) {
+  CEF_REQUIRE_UIT();
+  if (GetCurrentTabIndex() == TabStripModel::kNoTab) {
+    // We can't navigate via the Browser because we don't have a current tab.
+    return CefBrowserHostBase::Navigate(params);
+  }
+
+  if (browser_) {
+    // This is generally equivalent to calling Browser::OpenURL, except:
+    // 1. It doesn't trigger a call to CefRequestHandler::OnOpenURLFromTab, and
+    // 2. It navigates in this CefBrowserHost's WebContents instead of
+    //    (a) creating a new WebContents, or (b) using the Browser's active
+    //    WebContents (which may not be the same), and
+    // 3. There is no risk of triggering chrome's popup blocker.
+    NavigateParams nav_params(browser_, params.url, params.transition);
+    nav_params.FillNavigateParamsFromOpenURLParams(params);
+
+    // Always navigate in the current tab.
+    nav_params.disposition = WindowOpenDisposition::CURRENT_TAB;
+    nav_params.source_contents = GetWebContents();
+
+    nav_params.tabstrip_add_types = TabStripModel::ADD_NONE;
+    if (params.user_gesture)
+      nav_params.window_action = NavigateParams::SHOW_WINDOW;
+    ::Navigate(&nav_params);
+    return true;
+  }
+  return false;
+}
+
+ChromeBrowserHostImpl::ChromeBrowserHostImpl(
+    const CefBrowserSettings& settings,
+    CefRefPtr<CefClient> client,
+    std::unique_ptr<CefBrowserPlatformDelegate> platform_delegate,
+    scoped_refptr<CefBrowserInfo> browser_info,
+    CefRefPtr<CefRequestContextImpl> request_context)
+    : CefBrowserHostBase(settings,
+                         client,
+                         std::move(platform_delegate),
+                         browser_info,
+                         request_context) {}
+
+void ChromeBrowserHostImpl::Attach(Browser* browser,
+                                   content::WebContents* web_contents) {
+  DCHECK(browser);
+  DCHECK(web_contents);
+
+  platform_delegate_->WebContentsCreated(web_contents,
+                                         /*own_web_contents=*/false);
+
+  SetBrowser(browser);
+  contents_delegate_->ObserveWebContents(web_contents);
+  InitializeBrowser();
+}
+
+void ChromeBrowserHostImpl::SetBrowser(Browser* browser) {
+  CEF_REQUIRE_UIT();
+  browser_ = browser;
+  static_cast<CefBrowserPlatformDelegateChrome*>(platform_delegate_.get())
+      ->set_chrome_browser(browser);
+}
+
+void ChromeBrowserHostImpl::InitializeBrowser() {
+  CEF_REQUIRE_UIT();
+  DCHECK(browser_);
+
+  // Associate the platform delegate with this browser.
+  platform_delegate_->BrowserCreated(this);
+
+  CefBrowserHostBase::InitializeBrowser();
+
+  // The WebContents won't be added to the Browser's TabStripModel until later
+  // in the current call stack. Block navigation until that time.
+  auto navigation_lock = browser_info_->CreateNavigationLock();
+  OnAfterCreated();
+}
+
+void ChromeBrowserHostImpl::DestroyBrowser() {
+  CEF_REQUIRE_UIT();
+  browser_ = nullptr;
+
+  OnBeforeClose();
+  OnBrowserDestroyed();
+
+  // Disassociate the platform delegate from this browser.
+  platform_delegate_->BrowserDestroyed(this);
+
+  CefBrowserHostBase::DestroyBrowser();
+}
+
+void ChromeBrowserHostImpl::DoCloseBrowser(bool force_close) {
+  CEF_REQUIRE_UIT();
+  if (browser_) {
+    // Like chrome::CloseTab() but specifying the WebContents.
+    const int tab_index = GetCurrentTabIndex();
+    if (tab_index != TabStripModel::kNoTab) {
+      browser_->tab_strip_model()->CloseWebContentsAt(
+          tab_index, TabStripModel::CLOSE_CREATE_HISTORICAL_TAB |
+                         TabStripModel::CLOSE_USER_GESTURE);
+    }
+  }
+}
+
+int ChromeBrowserHostImpl::GetCurrentTabIndex() const {
+  CEF_REQUIRE_UIT();
+  if (browser_) {
+    return browser_->tab_strip_model()->GetIndexOfWebContents(GetWebContents());
+  }
+  return TabStripModel::kNoTab;
+}

libcef/browser/chrome/chrome_browser_host_impl.h

@@ -0,0 +1,174 @@
+// Copyright 2020 The Chromium Embedded Framework Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef CEF_LIBCEF_BROWSER_CHROME_CHROME_BROWSER_HOST_IMPL_H_
+#define CEF_LIBCEF_BROWSER_CHROME_CHROME_BROWSER_HOST_IMPL_H_
+#pragma once
+
+#include <memory>
+
+#include "libcef/browser/browser_host_base.h"
+#include "libcef/browser/chrome/browser_delegate.h"
+
+class Browser;
+class ChromeBrowserDelegate;
+
+// CefBrowser implementation for the chrome runtime. Method calls are delegated
+// to the chrome Browser object or the WebContents as appropriate. See the
+// ChromeBrowserDelegate documentation for additional details. All methods are
+// thread-safe unless otherwise indicated.
+class ChromeBrowserHostImpl : public CefBrowserHostBase {
+ public:
+  // CEF-specific parameters passed via Browser::CreateParams::cef_params and
+  // possibly shared by multiple Browser instances.
+  class DelegateCreateParams : public cef::BrowserDelegate::CreateParams {
+   public:
+    DelegateCreateParams(const CefBrowserCreateParams& create_params)
+        : create_params_(create_params) {}
+
+    CefBrowserCreateParams create_params_;
+  };
+
+  // Create a new Browser with a single tab (WebContents) and associated
+  // ChromeBrowserHostImpl instance.
+  static CefRefPtr<ChromeBrowserHostImpl> Create(
+      const CefBrowserCreateParams& params);
+
+  // Returns the browser associated with the specified RenderViewHost.
+  static CefRefPtr<ChromeBrowserHostImpl> GetBrowserForHost(
+      const content::RenderViewHost* host);
+  // Returns the browser associated with the specified RenderFrameHost.
+  static CefRefPtr<ChromeBrowserHostImpl> GetBrowserForHost(
+      const content::RenderFrameHost* host);
+  // Returns the browser associated with the specified WebContents.
+  static CefRefPtr<ChromeBrowserHostImpl> GetBrowserForContents(
+      const content::WebContents* contents);
+  // Returns the browser associated with the specified FrameTreeNode ID.
+  static CefRefPtr<ChromeBrowserHostImpl> GetBrowserForFrameTreeNode(
+      int frame_tree_node_id);
+  // Returns the browser associated with the specified frame routing IDs.
+  static CefRefPtr<ChromeBrowserHostImpl> GetBrowserForFrameRoute(
+      int render_process_id,
+      int render_routing_id);
+
+  ~ChromeBrowserHostImpl() override;
+
+  // CefBrowserContentsDelegate::Observer methods:
+  void OnWebContentsDestroyed(content::WebContents* web_contents) override;
+
+  // CefBrowserHostBase methods called from CefFrameHostImpl:
+  void OnSetFocus(cef_focus_source_t source) override;
+
+  // CefBrowserHost methods:
+  void CloseBrowser(bool force_close) override;
+  bool TryCloseBrowser() override;
+  void SetFocus(bool focus) override;
+  CefWindowHandle GetWindowHandle() override;
+  CefWindowHandle GetOpenerWindowHandle() override;
+  bool HasView() override;
+  double GetZoomLevel() override;
+  void SetZoomLevel(double zoomLevel) override;
+  void RunFileDialog(FileDialogMode mode,
+                     const CefString& title,
+                     const CefString& default_file_path,
+                     const std::vector<CefString>& accept_filters,
+                     int selected_accept_filter,
+                     CefRefPtr<CefRunFileDialogCallback> callback) override;
+  void Print() override;
+  void PrintToPDF(const CefString& path,
+                  const CefPdfPrintSettings& settings,
+                  CefRefPtr<CefPdfPrintCallback> callback) override;
+  void Find(int identifier,
+            const CefString& searchText,
+            bool forward,
+            bool matchCase,
+            bool findNext) override;
+  void StopFinding(bool clearSelection) override;
+  void ShowDevTools(const CefWindowInfo& windowInfo,
+                    CefRefPtr<CefClient> client,
+                    const CefBrowserSettings& settings,
+                    const CefPoint& inspect_element_at) override;
+  void CloseDevTools() override;
+  bool HasDevTools() override;
+  bool SendDevToolsMessage(const void* message, size_t message_size) override;
+  int ExecuteDevToolsMethod(int message_id,
+                            const CefString& method,
+                            CefRefPtr<CefDictionaryValue> params) override;
+  CefRefPtr<CefRegistration> AddDevToolsMessageObserver(
+      CefRefPtr<CefDevToolsMessageObserver> observer) override;
+  bool IsWindowRenderingDisabled() override;
+  void WasResized() override;
+  void WasHidden(bool hidden) override;
+  void NotifyScreenInfoChanged() override;
+  void Invalidate(PaintElementType type) override;
+  void SendExternalBeginFrame() override;
+  void SendTouchEvent(const CefTouchEvent& event) override;
+  void SendFocusEvent(bool setFocus) override;
+  void SendCaptureLostEvent() override;
+  void NotifyMoveOrResizeStarted() override;
+  int GetWindowlessFrameRate() override;
+  void SetWindowlessFrameRate(int frame_rate) override;
+  void ImeSetComposition(const CefString& text,
+                         const std::vector<CefCompositionUnderline>& underlines,
+                         const CefRange& replacement_range,
+                         const CefRange& selection_range) override;
+  void ImeCommitText(const CefString& text,
+                     const CefRange& replacement_range,
+                     int relative_cursor_pos) override;
+  void ImeFinishComposingText(bool keep_selection) override;
+  void ImeCancelComposition() override;
+  void DragTargetDragEnter(CefRefPtr<CefDragData> drag_data,
+                           const CefMouseEvent& event,
+                           DragOperationsMask allowed_ops) override;
+  void DragTargetDragOver(const CefMouseEvent& event,
+                          DragOperationsMask allowed_ops) override;
+  void DragTargetDragLeave() override;
+  void DragTargetDrop(const CefMouseEvent& event) override;
+  void DragSourceSystemDragEnded() override;
+  void DragSourceEndedAt(int x, int y, DragOperationsMask op) override;
+  void SetAudioMuted(bool mute) override;
+  bool IsAudioMuted() override;
+  void SetAccessibilityState(cef_state_t accessibility_state) override;
+  void SetAutoResizeEnabled(bool enabled,
+                            const CefSize& min_size,
+                            const CefSize& max_size) override;
+  CefRefPtr<CefExtension> GetExtension() override;
+  bool IsBackgroundHost() override;
+
+ protected:
+  bool Navigate(const content::OpenURLParams& params) override;
+
+ private:
+  friend class ChromeBrowserDelegate;
+
+  ChromeBrowserHostImpl(
+      const CefBrowserSettings& settings,
+      CefRefPtr<CefClient> client,
+      std::unique_ptr<CefBrowserPlatformDelegate> platform_delegate,
+      scoped_refptr<CefBrowserInfo> browser_info,
+      CefRefPtr<CefRequestContextImpl> request_context);
+
+  // Called from ChromeBrowserDelegate::SetAsDelegate when this object is first
+  // created. Must be called on the UI thread.
+  void Attach(Browser* browser, content::WebContents* web_contents);
+
+  // Called from ChromeBrowserDelegate::SetAsDelegate when this object changes
+  // Browser ownership (e.g. dragging between windows). The old Browser will be
+  // cleared before the new Browser is added. Must be called on the UI thread.
+  void SetBrowser(Browser* browser);
+
+  // CefBrowserHostBase methods:
+  void InitializeBrowser() override;
+  void DestroyBrowser() override;
+
+  void DoCloseBrowser(bool force_close);
+
+  // Returns the current tab index for the associated WebContents, or
+  // TabStripModel::kNoTab if not found.
+  int GetCurrentTabIndex() const;
+
+  Browser* browser_ = nullptr;
+};
+
+#endif  // CEF_LIBCEF_BROWSER_CHROME_CHROME_BROWSER_HOST_IMPL_H_

libcef/browser/chrome/chrome_browser_main_extra_parts_cef.cc

@@ -0,0 +1,34 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "libcef/browser/chrome/chrome_browser_main_extra_parts_cef.h"
+
+#include "libcef/browser/context.h"
+
+#include "base/task/post_task.h"
+
+ChromeBrowserMainExtraPartsCef::ChromeBrowserMainExtraPartsCef() = default;
+
+ChromeBrowserMainExtraPartsCef::~ChromeBrowserMainExtraPartsCef() = default;
+
+void ChromeBrowserMainExtraPartsCef::PostProfileInit() {
+  CefRequestContextSettings settings;
+  CefContext::Get()->PopulateGlobalRequestContextSettings(&settings);
+
+  // Create the global RequestContext.
+  global_request_context_ =
+      CefRequestContextImpl::CreateGlobalRequestContext(settings);
+}
+
+void ChromeBrowserMainExtraPartsCef::PreMainMessageLoopRun() {
+  background_task_runner_ = base::CreateSingleThreadTaskRunner(
+      {base::ThreadPool(), base::TaskPriority::BEST_EFFORT,
+       base::TaskShutdownBehavior::BLOCK_SHUTDOWN, base::MayBlock()});
+  user_visible_task_runner_ = base::CreateSingleThreadTaskRunner(
+      {base::ThreadPool(), base::TaskPriority::USER_VISIBLE,
+       base::TaskShutdownBehavior::BLOCK_SHUTDOWN, base::MayBlock()});
+  user_blocking_task_runner_ = base::CreateSingleThreadTaskRunner(
+      {base::ThreadPool(), base::TaskPriority::USER_BLOCKING,
+       base::TaskShutdownBehavior::BLOCK_SHUTDOWN, base::MayBlock()});
+}

libcef/browser/chrome/chrome_browser_main_extra_parts_cef.h

@@ -0,0 +1,54 @@
+// Copyright 2019 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_CHROME_CHROME_BROWSER_MAIN_EXTRA_PARTS_CEF_H_
+#define CEF_LIBCEF_BROWSER_CHROME_CHROME_BROWSER_MAIN_EXTRA_PARTS_CEF_H_
+
+#include <memory>
+
+#include "libcef/browser/request_context_impl.h"
+
+#include "base/macros.h"
+#include "base/single_thread_task_runner.h"
+#include "chrome/browser/chrome_browser_main_extra_parts.h"
+
+// Wrapper that owns and initialize the browser memory-related extra parts.
+class ChromeBrowserMainExtraPartsCef : public ChromeBrowserMainExtraParts {
+ public:
+  ChromeBrowserMainExtraPartsCef();
+  ~ChromeBrowserMainExtraPartsCef() override;
+
+  CefRefPtr<CefRequestContextImpl> request_context() const {
+    return global_request_context_;
+  }
+
+  scoped_refptr<base::SingleThreadTaskRunner> background_task_runner() const {
+    return background_task_runner_;
+  }
+  scoped_refptr<base::SingleThreadTaskRunner> user_visible_task_runner() const {
+    return user_visible_task_runner_;
+  }
+  scoped_refptr<base::SingleThreadTaskRunner> user_blocking_task_runner()
+      const {
+    return user_blocking_task_runner_;
+  }
+
+ private:
+  // ChromeBrowserMainExtraParts overrides.
+  void PostProfileInit() override;
+  void PreMainMessageLoopRun() override;
+
+  CefRefPtr<CefRequestContextImpl> global_request_context_;
+
+  // Blocking task runners exposed via CefTaskRunner. For consistency with
+  // previous named thread behavior always execute all pending tasks before
+  // shutdown (e.g. to make sure critical data is saved to disk).
+  scoped_refptr<base::SingleThreadTaskRunner> background_task_runner_;
+  scoped_refptr<base::SingleThreadTaskRunner> user_visible_task_runner_;
+  scoped_refptr<base::SingleThreadTaskRunner> user_blocking_task_runner_;
+
+  DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsCef);
+};
+
+#endif  // CEF_LIBCEF_BROWSER_CHROME_CHROME_BROWSER_MAIN_EXTRA_PARTS_CEF_H_

libcef/browser/chrome/chrome_content_browser_client_cef.cc

@@ -0,0 +1,297 @@
+// Copyright 2020 The Chromium Embedded Framework Authors.
+// Portions copyright 2012 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "libcef/browser/chrome/chrome_content_browser_client_cef.h"
+
+#include "libcef/browser/browser_info_manager.h"
+#include "libcef/browser/browser_message_filter.h"
+#include "libcef/browser/chrome/chrome_browser_main_extra_parts_cef.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/common/app_manager.h"
+#include "libcef/common/cef_switches.h"
+#include "libcef/common/command_line_impl.h"
+
+#include "base/command_line.h"
+#include "base/path_service.h"
+#include "chrome/browser/chrome_browser_main.h"
+#include "chrome/common/chrome_paths.h"
+#include "chrome/common/chrome_switches.h"
+#include "content/public/browser/navigation_throttle.h"
+#include "content/public/browser/render_process_host.h"
+#include "content/public/common/content_switches.h"
+#include "third_party/blink/public/mojom/loader/resource_load_info.mojom-shared.h"
+
+namespace {
+
+void HandleExternalProtocolHelper(
+    ChromeContentBrowserClientCef* self,
+    content::WebContents::OnceGetter web_contents_getter,
+    content::NavigationUIData* navigation_data,
+    const network::ResourceRequest& resource_request) {
+  // Match the logic of the original call in
+  // NavigationURLLoaderImpl::PrepareForNonInterceptedRequest.
+  self->HandleExternalProtocol(
+      resource_request.url, std::move(web_contents_getter),
+      content::ChildProcessHost::kInvalidUniqueID, navigation_data,
+      resource_request.resource_type ==
+          static_cast<int>(blink::mojom::ResourceType::kMainFrame),
+      static_cast<ui::PageTransition>(resource_request.transition_type),
+      resource_request.has_user_gesture, resource_request.request_initiator,
+      nullptr);
+}
+
+}  // namespace
+
+ChromeContentBrowserClientCef::ChromeContentBrowserClientCef(
+    StartupData* startup_data)
+    : ChromeContentBrowserClient(startup_data) {}
+ChromeContentBrowserClientCef::~ChromeContentBrowserClientCef() = default;
+
+std::unique_ptr<content::BrowserMainParts>
+ChromeContentBrowserClientCef::CreateBrowserMainParts(
+    const content::MainFunctionParams& parameters) {
+  auto main_parts =
+      ChromeContentBrowserClient::CreateBrowserMainParts(parameters);
+  browser_main_parts_ = new ChromeBrowserMainExtraPartsCef;
+  static_cast<ChromeBrowserMainParts*>(main_parts.get())
+      ->AddParts(
+          base::WrapUnique<ChromeBrowserMainExtraParts>(browser_main_parts_));
+  return main_parts;
+}
+
+void ChromeContentBrowserClientCef::AppendExtraCommandLineSwitches(
+    base::CommandLine* command_line,
+    int child_process_id) {
+  ChromeContentBrowserClient::AppendExtraCommandLineSwitches(command_line,
+                                                             child_process_id);
+
+  // Necessary to launch sub-processes in the correct mode.
+  command_line->AppendSwitch(switches::kEnableChromeRuntime);
+
+  // Necessary to populate DIR_USER_DATA in sub-processes.
+  // See resource_util.cc GetUserDataPath.
+  base::FilePath user_data_dir;
+  if (base::PathService::Get(chrome::DIR_USER_DATA, &user_data_dir)) {
+    command_line->AppendSwitchPath(switches::kUserDataDir, user_data_dir);
+  }
+
+  const base::CommandLine* browser_cmd = base::CommandLine::ForCurrentProcess();
+
+  const std::string& process_type =
+      command_line->GetSwitchValueASCII(switches::kProcessType);
+  if (process_type == switches::kRendererProcess) {
+    // Propagate the following switches to the renderer command line (along with
+    // any associated values) if present in the browser command line.
+    static const char* const kSwitchNames[] = {
+        switches::kUncaughtExceptionStackSize,
+    };
+    command_line->CopySwitchesFrom(*browser_cmd, kSwitchNames,
+                                   base::size(kSwitchNames));
+  }
+
+  CefRefPtr<CefApp> app = CefAppManager::Get()->GetApplication();
+  if (app.get()) {
+    CefRefPtr<CefBrowserProcessHandler> handler =
+        app->GetBrowserProcessHandler();
+    if (handler.get()) {
+      CefRefPtr<CefCommandLineImpl> commandLinePtr(
+          new CefCommandLineImpl(command_line, false, false));
+      handler->OnBeforeChildProcessLaunch(commandLinePtr.get());
+      commandLinePtr->Detach(nullptr);
+    }
+  }
+}
+
+void ChromeContentBrowserClientCef::RenderProcessWillLaunch(
+    content::RenderProcessHost* host) {
+  const int id = host->GetID();
+  host->AddFilter(new CefBrowserMessageFilter(id));
+
+  // If the renderer process crashes then the host may already have
+  // CefBrowserInfoManager as an observer. Try to remove it first before adding
+  // to avoid DCHECKs.
+  host->RemoveObserver(CefBrowserInfoManager::GetInstance());
+  host->AddObserver(CefBrowserInfoManager::GetInstance());
+}
+
+bool ChromeContentBrowserClientCef::CanCreateWindow(
+    content::RenderFrameHost* opener,
+    const GURL& opener_url,
+    const GURL& opener_top_level_frame_url,
+    const url::Origin& source_origin,
+    content::mojom::WindowContainerType container_type,
+    const GURL& target_url,
+    const content::Referrer& referrer,
+    const std::string& frame_name,
+    WindowOpenDisposition disposition,
+    const blink::mojom::WindowFeatures& features,
+    bool user_gesture,
+    bool opener_suppressed,
+    bool* no_javascript_access) {
+  // The chrome layer has popup blocker, extensions, etc.
+  if (!ChromeContentBrowserClient::CanCreateWindow(
+          opener, opener_url, opener_top_level_frame_url, source_origin,
+          container_type, target_url, referrer, frame_name, disposition,
+          features, user_gesture, opener_suppressed, no_javascript_access)) {
+    return false;
+  }
+
+  return CefBrowserInfoManager::GetInstance()->CanCreateWindow(
+      opener, target_url, referrer, frame_name, disposition, features,
+      user_gesture, opener_suppressed, no_javascript_access);
+}
+
+bool ChromeContentBrowserClientCef::WillCreateURLLoaderFactory(
+    content::BrowserContext* browser_context,
+    content::RenderFrameHost* frame,
+    int render_process_id,
+    URLLoaderFactoryType type,
+    const url::Origin& request_initiator,
+    base::Optional<int64_t> navigation_id,
+    base::UkmSourceId ukm_source_id,
+    mojo::PendingReceiver<network::mojom::URLLoaderFactory>* factory_receiver,
+    mojo::PendingRemote<network::mojom::TrustedURLLoaderHeaderClient>*
+        header_client,
+    bool* bypass_redirect_checks,
+    bool* disable_secure_dns,
+    network::mojom::URLLoaderFactoryOverridePtr* factory_override) {
+  bool use_proxy = ChromeContentBrowserClient::WillCreateURLLoaderFactory(
+      browser_context, frame, render_process_id, type, request_initiator,
+      navigation_id, ukm_source_id, factory_receiver, header_client,
+      bypass_redirect_checks, disable_secure_dns, factory_override);
+  if (use_proxy) {
+    // The chrome layer will handle the request.
+    return use_proxy;
+  }
+
+  auto request_handler = net_service::CreateInterceptedRequestHandler(
+      browser_context, frame, render_process_id,
+      type == URLLoaderFactoryType::kNavigation,
+      type == URLLoaderFactoryType::kDownload, request_initiator);
+
+  net_service::ProxyURLLoaderFactory::CreateProxy(
+      browser_context, factory_receiver, header_client,
+      std::move(request_handler));
+  return true;
+}
+
+bool ChromeContentBrowserClientCef::HandleExternalProtocol(
+    const GURL& url,
+    content::WebContents::OnceGetter web_contents_getter,
+    int child_id,
+    content::NavigationUIData* navigation_data,
+    bool is_main_frame,
+    ui::PageTransition page_transition,
+    bool has_user_gesture,
+    const base::Optional<url::Origin>& initiating_origin,
+    mojo::PendingRemote<network::mojom::URLLoaderFactory>* out_factory) {
+  // |out_factory| will be non-nullptr when this method is initially called
+  // from NavigationURLLoaderImpl::PrepareForNonInterceptedRequest.
+  if (out_factory) {
+    // Let the other HandleExternalProtocol variant handle the request.
+    return false;
+  }
+
+  // The request was unhandled and we've recieved a callback from
+  // HandleExternalProtocolHelper. Forward to the chrome layer for default
+  // handling.
+  return ChromeContentBrowserClient::HandleExternalProtocol(
+      url, std::move(web_contents_getter), child_id, navigation_data,
+      is_main_frame, page_transition, has_user_gesture, initiating_origin,
+      nullptr);
+}
+
+bool ChromeContentBrowserClientCef::HandleExternalProtocol(
+    content::WebContents::Getter web_contents_getter,
+    int frame_tree_node_id,
+    content::NavigationUIData* navigation_data,
+    const network::ResourceRequest& resource_request,
+    mojo::PendingRemote<network::mojom::URLLoaderFactory>* out_factory) {
+  mojo::PendingReceiver<network::mojom::URLLoaderFactory> receiver =
+      out_factory->InitWithNewPipeAndPassReceiver();
+
+  // HandleExternalProtocolHelper may be called if nothing handles the request.
+  auto request_handler = net_service::CreateInterceptedRequestHandler(
+      web_contents_getter, frame_tree_node_id, resource_request,
+      base::Bind(HandleExternalProtocolHelper, base::Unretained(this),
+                 web_contents_getter, navigation_data, resource_request));
+
+  net_service::ProxyURLLoaderFactory::CreateProxy(
+      web_contents_getter, std::move(receiver), std::move(request_handler));
+  return true;
+}
+
+std::vector<std::unique_ptr<content::NavigationThrottle>>
+ChromeContentBrowserClientCef::CreateThrottlesForNavigation(
+    content::NavigationHandle* navigation_handle) {
+  auto throttles = ChromeContentBrowserClient::CreateThrottlesForNavigation(
+      navigation_handle);
+  throttle::CreateThrottlesForNavigation(navigation_handle, throttles);
+  return throttles;
+}
+
+void ChromeContentBrowserClientCef::ConfigureNetworkContextParams(
+    content::BrowserContext* context,
+    bool in_memory,
+    const base::FilePath& relative_partition_path,
+    network::mojom::NetworkContextParams* network_context_params,
+    network::mojom::CertVerifierCreationParams* cert_verifier_creation_params) {
+  ChromeContentBrowserClient::ConfigureNetworkContextParams(
+      context, in_memory, relative_partition_path, network_context_params,
+      cert_verifier_creation_params);
+
+  auto cef_context = CefBrowserContext::FromBrowserContext(context);
+  network_context_params->cookieable_schemes =
+      cef_context ? cef_context->GetCookieableSchemes()
+                  : CefCookieManagerImpl::GetGlobalCookieableSchemes();
+}
+
+std::unique_ptr<content::LoginDelegate>
+ChromeContentBrowserClientCef::CreateLoginDelegate(
+    const net::AuthChallengeInfo& auth_info,
+    content::WebContents* web_contents,
+    const content::GlobalRequestID& request_id,
+    bool is_request_for_main_frame,
+    const GURL& url,
+    scoped_refptr<net::HttpResponseHeaders> response_headers,
+    bool first_auth_attempt,
+    LoginAuthRequiredCallback auth_required_callback) {
+  // |web_contents| is nullptr for CefURLRequests without an associated frame.
+  if (!web_contents || base::CommandLine::ForCurrentProcess()->HasSwitch(
+                           switches::kDisableChromeLoginPrompt)) {
+    // Delegate auth callbacks to GetAuthCredentials.
+    return std::make_unique<net_service::LoginDelegate>(
+        auth_info, web_contents, request_id, url,
+        std::move(auth_required_callback));
+  }
+
+  return ChromeContentBrowserClient::CreateLoginDelegate(
+      auth_info, web_contents, request_id, is_request_for_main_frame, url,
+      response_headers, first_auth_attempt, std::move(auth_required_callback));
+}
+
+CefRefPtr<CefRequestContextImpl>
+ChromeContentBrowserClientCef::request_context() const {
+  return browser_main_parts_->request_context();
+}
+
+scoped_refptr<base::SingleThreadTaskRunner>
+ChromeContentBrowserClientCef::background_task_runner() const {
+  return browser_main_parts_->background_task_runner();
+}
+
+scoped_refptr<base::SingleThreadTaskRunner>
+ChromeContentBrowserClientCef::user_visible_task_runner() const {
+  return browser_main_parts_->user_visible_task_runner();
+}
+
+scoped_refptr<base::SingleThreadTaskRunner>
+ChromeContentBrowserClientCef::user_blocking_task_runner() const {
+  return browser_main_parts_->user_blocking_task_runner();
+}

libcef/browser/chrome/chrome_content_browser_client_cef.h

@@ -0,0 +1,107 @@
+// Copyright 2020 The Chromium Embedded Framework Authors.
+// Portions copyright 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_CHROME_CHROME_CONTENT_BROWSER_CLIENT_CEF_
+#define CEF_LIBCEF_BROWSER_CHROME_CHROME_CONTENT_BROWSER_CLIENT_CEF_
+
+#include <memory>
+
+#include "libcef/browser/request_context_impl.h"
+
+#include "base/macros.h"
+#include "chrome/browser/chrome_content_browser_client.h"
+
+class ChromeBrowserMainExtraPartsCef;
+
+// CEF override of ChromeContentBrowserClient.
+class ChromeContentBrowserClientCef : public ChromeContentBrowserClient {
+ public:
+  explicit ChromeContentBrowserClientCef(StartupData* startup_data = nullptr);
+  ~ChromeContentBrowserClientCef() override;
+
+  // ChromeContentBrowserClient overrides.
+  std::unique_ptr<content::BrowserMainParts> CreateBrowserMainParts(
+      const content::MainFunctionParams& parameters) override;
+  void AppendExtraCommandLineSwitches(base::CommandLine* command_line,
+                                      int child_process_id) override;
+  void RenderProcessWillLaunch(content::RenderProcessHost* host) override;
+  bool CanCreateWindow(content::RenderFrameHost* opener,
+                       const GURL& opener_url,
+                       const GURL& opener_top_level_frame_url,
+                       const url::Origin& source_origin,
+                       content::mojom::WindowContainerType container_type,
+                       const GURL& target_url,
+                       const content::Referrer& referrer,
+                       const std::string& frame_name,
+                       WindowOpenDisposition disposition,
+                       const blink::mojom::WindowFeatures& features,
+                       bool user_gesture,
+                       bool opener_suppressed,
+                       bool* no_javascript_access) override;
+  bool WillCreateURLLoaderFactory(
+      content::BrowserContext* browser_context,
+      content::RenderFrameHost* frame,
+      int render_process_id,
+      URLLoaderFactoryType type,
+      const url::Origin& request_initiator,
+      base::Optional<int64_t> navigation_id,
+      base::UkmSourceId ukm_source_id,
+      mojo::PendingReceiver<network::mojom::URLLoaderFactory>* factory_receiver,
+      mojo::PendingRemote<network::mojom::TrustedURLLoaderHeaderClient>*
+          header_client,
+      bool* bypass_redirect_checks,
+      bool* disable_secure_dns,
+      network::mojom::URLLoaderFactoryOverridePtr* factory_override) override;
+  bool HandleExternalProtocol(
+      const GURL& url,
+      content::WebContents::OnceGetter web_contents_getter,
+      int child_id,
+      content::NavigationUIData* navigation_data,
+      bool is_main_frame,
+      ui::PageTransition page_transition,
+      bool has_user_gesture,
+      const base::Optional<url::Origin>& initiating_origin,
+      mojo::PendingRemote<network::mojom::URLLoaderFactory>* out_factory)
+      override;
+  bool HandleExternalProtocol(
+      content::WebContents::Getter web_contents_getter,
+      int frame_tree_node_id,
+      content::NavigationUIData* navigation_data,
+      const network::ResourceRequest& request,
+      mojo::PendingRemote<network::mojom::URLLoaderFactory>* out_factory)
+      override;
+  std::vector<std::unique_ptr<content::NavigationThrottle>>
+  CreateThrottlesForNavigation(
+      content::NavigationHandle* navigation_handle) override;
+  void ConfigureNetworkContextParams(
+      content::BrowserContext* context,
+      bool in_memory,
+      const base::FilePath& relative_partition_path,
+      network::mojom::NetworkContextParams* network_context_params,
+      network::mojom::CertVerifierCreationParams* cert_verifier_creation_params)
+      override;
+  std::unique_ptr<content::LoginDelegate> CreateLoginDelegate(
+      const net::AuthChallengeInfo& auth_info,
+      content::WebContents* web_contents,
+      const content::GlobalRequestID& request_id,
+      bool is_request_for_main_frame,
+      const GURL& url,
+      scoped_refptr<net::HttpResponseHeaders> response_headers,
+      bool first_auth_attempt,
+      LoginAuthRequiredCallback auth_required_callback) override;
+
+  CefRefPtr<CefRequestContextImpl> request_context() const;
+
+  scoped_refptr<base::SingleThreadTaskRunner> background_task_runner() const;
+  scoped_refptr<base::SingleThreadTaskRunner> user_visible_task_runner() const;
+  scoped_refptr<base::SingleThreadTaskRunner> user_blocking_task_runner() const;
+
+ private:
+  ChromeBrowserMainExtraPartsCef* browser_main_parts_ = nullptr;
+
+  DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClientCef);
+};
+
+#endif  // CEF_LIBCEF_BROWSER_CHROME_CHROME_CONTENT_BROWSER_CLIENT_CEF_

libcef/browser/chrome_crash_reporter_client_stub.cc

@@ -5,11 +5,11 @@
 
 #include "build/build_config.h"
 
-#if defined(OS_MACOSX)
+#if defined(OS_MAC)
 
 #include "chrome/app/chrome_crash_reporter_client.h"
 
 // Required due to https://crrev.com/1c9f89a06f
 void ChromeCrashReporterClient::Create() {}
 
-#endif  // defined(OS_MACOSX)
+#endif  // defined(OS_MAC)

libcef/browser/chrome_profile_stub.cc

@@ -1,177 +0,0 @@
-// Copyright (c) 2015 The Chromium Embedded Framework Authors.
-// Portions copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "libcef/browser/chrome_profile_stub.h"
-
-#include "components/variations/variations_client.h"
-#include "components/variations/variations_http_header_provider.h"
-#include "content/public/browser/resource_context.h"
-#include "net/url_request/url_request_context.h"
-
-namespace {
-
-class CefVariationsClient : public variations::VariationsClient {
- public:
-  explicit CefVariationsClient(content::BrowserContext* browser_context)
-      : browser_context_(browser_context) {}
-
-  ~CefVariationsClient() override = default;
-
-  bool IsIncognito() const override {
-    return browser_context_->IsOffTheRecord();
-  }
-
-  std::string GetVariationsHeader() const override {
-    return variations::VariationsHttpHeaderProvider::GetInstance()
-        ->GetClientDataHeader(false /* is_signed_in */);
-  }
-
- private:
-  content::BrowserContext* browser_context_;
-};
-
-}  // namespace
-
-ChromeProfileStub::ChromeProfileStub() {}
-
-ChromeProfileStub::~ChromeProfileStub() {}
-
-bool ChromeProfileStub::IsOffTheRecord() {
-  return false;
-}
-
-bool ChromeProfileStub::IsOffTheRecord() const {
-  return false;
-}
-
-const Profile::OTRProfileID& ChromeProfileStub::GetOTRProfileID() const {
-  NOTREACHED();
-  static base::NoDestructor<Profile::OTRProfileID> otr_profile_id(
-      "ProfileImp::NoOTRProfileID");
-  return *otr_profile_id;
-}
-
-variations::VariationsClient* ChromeProfileStub::GetVariationsClient() {
-  if (!variations_client_)
-    variations_client_ = std::make_unique<CefVariationsClient>(this);
-  return variations_client_.get();
-}
-
-scoped_refptr<base::SequencedTaskRunner> ChromeProfileStub::GetIOTaskRunner() {
-  NOTREACHED();
-  return scoped_refptr<base::SequencedTaskRunner>();
-}
-
-std::string ChromeProfileStub::GetProfileUserName() const {
-  NOTREACHED();
-  return std::string();
-}
-
-Profile::ProfileType ChromeProfileStub::GetProfileType() const {
-  return REGULAR_PROFILE;
-}
-
-Profile* ChromeProfileStub::GetOffTheRecordProfile(
-    const Profile::OTRProfileID& otr_profile_id) {
-  NOTREACHED();
-  return nullptr;
-}
-
-std::vector<Profile*> ChromeProfileStub::GetAllOffTheRecordProfiles() {
-  NOTREACHED();
-  return {};
-}
-
-void ChromeProfileStub::DestroyOffTheRecordProfile(Profile* otr_profile) {
-  NOTREACHED();
-}
-
-bool ChromeProfileStub::HasOffTheRecordProfile(
-    const Profile::OTRProfileID& otr_profile_id) {
-  return false;
-}
-
-bool ChromeProfileStub::HasAnyOffTheRecordProfile() {
-  return false;
-}
-
-Profile* ChromeProfileStub::GetOriginalProfile() {
-  return this;
-}
-
-const Profile* ChromeProfileStub::GetOriginalProfile() const {
-  return this;
-}
-
-bool ChromeProfileStub::IsSupervised() const {
-  return false;
-}
-
-bool ChromeProfileStub::IsChild() const {
-  return false;
-}
-
-bool ChromeProfileStub::IsLegacySupervised() const {
-  return false;
-}
-
-ExtensionSpecialStoragePolicy*
-ChromeProfileStub::GetExtensionSpecialStoragePolicy() {
-  NOTREACHED();
-  return nullptr;
-}
-
-PrefService* ChromeProfileStub::GetOffTheRecordPrefs() {
-  NOTREACHED();
-  return nullptr;
-}
-
-bool ChromeProfileStub::IsSameProfile(Profile* profile) {
-  NOTREACHED();
-  return false;
-}
-
-base::Time ChromeProfileStub::GetStartTime() const {
-  NOTREACHED();
-  return base::Time();
-}
-
-base::FilePath ChromeProfileStub::last_selected_directory() {
-  NOTREACHED();
-  return base::FilePath();
-}
-
-void ChromeProfileStub::set_last_selected_directory(
-    const base::FilePath& path) {
-  NOTREACHED();
-}
-
-GURL ChromeProfileStub::GetHomePage() {
-  NOTREACHED();
-  return GURL();
-}
-
-bool ChromeProfileStub::WasCreatedByVersionOrLater(const std::string& version) {
-  NOTREACHED();
-  return false;
-}
-
-void ChromeProfileStub::SetExitType(ExitType exit_type) {
-  NOTREACHED();
-}
-
-Profile::ExitType ChromeProfileStub::GetLastSessionExitType() {
-  NOTREACHED();
-  return EXIT_NORMAL;
-}
-
-base::Time ChromeProfileStub::GetCreationTime() const {
-  NOTREACHED();
-  return base::Time();
-}
-
-void ChromeProfileStub::SetCreationTimeForTesting(base::Time creation_time) {
-  NOTREACHED();
-}

libcef/browser/context.cc

@@ -3,48 +3,26 @@
 // be found in the LICENSE file.
 
 #include "libcef/browser/context.h"
-#include "libcef/browser/browser_host_impl.h"
-#include "libcef/browser/browser_info.h"
+
 #include "libcef/browser/browser_info_manager.h"
-#include "libcef/browser/browser_main.h"
-#include "libcef/browser/chrome_browser_process_stub.h"
 #include "libcef/browser/thread_util.h"
 #include "libcef/browser/trace_subscriber.h"
 #include "libcef/common/cef_switches.h"
-#include "libcef/common/main_delegate.h"
-#include "libcef/common/widevine_loader.h"
-#include "libcef/renderer/content_renderer_client.h"
 
-#include "base/base_switches.h"
 #include "base/bind.h"
-#include "base/command_line.h"
-#include "base/debug/debugger.h"
 #include "base/files/file_util.h"
 #include "base/run_loop.h"
-#include "base/synchronization/waitable_event.h"
+#include "base/task/current_thread.h"
 #include "base/threading/thread_restrictions.h"
 #include "components/network_session_configurator/common/network_switches.h"
-#include "content/app/content_service_manager_main_delegate.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
-#include "content/public/browser/render_process_host.h"
-#include "content/public/common/content_switches.h"
-#include "services/service_manager/embedder/main.h"
-#include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_switches.h"
 
 #if defined(OS_WIN)
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/chrome_elf/chrome_elf_main.h"
 #include "chrome/install_static/initialize_from_primary_module.h"
-#include "components/crash/core/app/crashpad.h"
-#include "content/public/app/sandbox_helper_win.h"
-#include "sandbox/win/src/sandbox_types.h"
-#endif
-
-#if defined(OS_MACOSX) || defined(OS_WIN)
-#include "components/crash/core/app/crash_switches.h"
-#include "third_party/crashpad/crashpad/handler/handler_main.h"
 #endif
 
 namespace {
@@ -95,54 +73,6 @@ void InitCrashReporter() {
 }
 #endif  // defined(OS_WIN)
 
-#if defined(OS_MACOSX) || defined(OS_WIN)
-
-// Based on components/crash/core/app/run_as_crashpad_handler_win.cc
-// Remove the "--type=crashpad-handler" command-line flag that will otherwise
-// confuse the crashpad handler.
-// Chrome uses an embedded crashpad handler on Windows only and imports this
-// function via the existing "run_as_crashpad_handler" target defined in
-// components/crash/core/app/BUILD.gn. CEF uses an embedded handler on both
-// Windows and macOS so we define the function here instead of using the
-// existing target (because we can't use that target on macOS).
-int RunAsCrashpadHandler(const base::CommandLine& command_line) {
-  base::CommandLine::StringVector argv = command_line.argv();
-  const base::CommandLine::StringType process_type =
-      FILE_PATH_LITERAL("--type=");
-  argv.erase(
-      std::remove_if(argv.begin(), argv.end(),
-                     [&process_type](const base::CommandLine::StringType& str) {
-                       return base::StartsWith(str, process_type,
-                                               base::CompareCase::SENSITIVE) ||
-                              (!str.empty() && str[0] == L'/');
-                     }),
-      argv.end());
-
-#if defined(OS_MACOSX)
-  // HandlerMain on macOS uses the system version of getopt_long which expects
-  // the first argument to be the program name.
-  argv.insert(argv.begin(), command_line.GetProgram().value());
-#endif
-
-  std::unique_ptr<char*[]> argv_as_utf8(new char*[argv.size() + 1]);
-  std::vector<std::string> storage;
-  storage.reserve(argv.size());
-  for (size_t i = 0; i < argv.size(); ++i) {
-#if defined(OS_WIN)
-    storage.push_back(base::UTF16ToUTF8(argv[i]));
-#else
-    storage.push_back(argv[i]);
-#endif
-    argv_as_utf8[i] = &storage[i][0];
-  }
-  argv_as_utf8[argv.size()] = nullptr;
-  argv.clear();
-  return crashpad::HandlerMain(static_cast<int>(storage.size()),
-                               argv_as_utf8.get(), nullptr);
-}
-
-#endif  // defined(OS_MACOSX) || defined(OS_WIN)
-
 bool GetColor(const cef_color_t cef_in, bool is_windowless, SkColor* sk_out) {
   // Windowed browser colors must be fully opaque.
   if (!is_windowless && CefColorGetA(cef_in) != SK_AlphaOPAQUE)
@@ -252,52 +182,8 @@ int CefExecuteProcess(const CefMainArgs& args,
   InitCrashReporter();
 #endif
 
-  base::CommandLine command_line(base::CommandLine::NO_PROGRAM);
-#if defined(OS_WIN)
-  command_line.ParseFromString(::GetCommandLineW());
-#else
-  command_line.InitFromArgv(args.argc, args.argv);
-#endif
-
-  // Wait for the debugger as early in process initialization as possible.
-  if (command_line.HasSwitch(switches::kWaitForDebugger))
-    base::debug::WaitForDebugger(60, true);
-
-  // If no process type is specified then it represents the browser process and
-  // we do nothing.
-  std::string process_type =
-      command_line.GetSwitchValueASCII(switches::kProcessType);
-  if (process_type.empty())
-    return -1;
-
-#if defined(OS_MACOSX) || defined(OS_WIN)
-  if (process_type == crash_reporter::switches::kCrashpadHandler)
-    return RunAsCrashpadHandler(command_line);
-#endif
-
-  CefMainDelegate main_delegate(application);
-
-// Execute the secondary process.
-#if defined(OS_WIN)
-  sandbox::SandboxInterfaceInfo sandbox_info = {0};
-  if (windows_sandbox_info == nullptr) {
-    content::InitializeSandboxInfo(&sandbox_info);
-    windows_sandbox_info = &sandbox_info;
-  }
-
-  content::ContentMainParams params(&main_delegate);
-  params.instance = args.instance;
-  params.sandbox_info =
-      static_cast<sandbox::SandboxInterfaceInfo*>(windows_sandbox_info);
-
-  return content::ContentMain(params);
-#else
-  content::ContentMainParams params(&main_delegate);
-  params.argc = args.argc;
-  params.argv = const_cast<const char**>(args.argv);
-
-  return content::ContentMain(params);
-#endif
+  return CefMainRunner::RunAsHelperProcess(args, application,
+                                           windows_sandbox_info);
 }
 
 bool CefInitialize(const CefMainArgs& args,
@@ -321,8 +207,6 @@ bool CefInitialize(const CefMainArgs& args,
     return false;
   }
 
-  g_browser_process = new ChromeBrowserProcessStub();
-
   // Create the new global context object.
   g_context = new CefContext();
 
@@ -382,8 +266,7 @@ void CefRunMessageLoop() {
     return;
   }
 
-  base::RunLoop run_loop;
-  run_loop.Run();
+  g_context->RunMessageLoop();
 }
 
 void CefQuitMessageLoop() {
@@ -399,8 +282,7 @@ void CefQuitMessageLoop() {
     return;
   }
 
-  // Quit the CefBrowserMessageLoop.
-  base::RunLoop::QuitCurrentWhenIdleDeprecated();
+  g_context->QuitMessageLoop();
 }
 
 void CefSetOSModalLoop(bool osModalLoop) {
@@ -412,7 +294,7 @@ void CefSetOSModalLoop(bool osModalLoop) {
   }
 
   if (CEF_CURRENTLY_ON_UIT())
-    base::MessageLoopCurrent::Get()->set_os_modal_loop(osModalLoop);
+    base::CurrentThread::Get()->set_os_modal_loop(osModalLoop);
   else
     CEF_POST_TASK(CEF_UIT, base::Bind(CefSetOSModalLoop, osModalLoop));
 #endif  // defined(OS_WIN)
@@ -436,6 +318,7 @@ bool CefContext::Initialize(const CefMainArgs& args,
                             void* windows_sandbox_info) {
   init_thread_id_ = base::PlatformThread::CurrentId();
   settings_ = settings;
+  application_ = application;
 
 #if !(defined(OS_WIN) || defined(OS_LINUX))
   if (settings.multi_threaded_message_loop) {
@@ -466,78 +349,29 @@ bool CefContext::Initialize(const CefMainArgs& args,
   NormalizePathAndSet(settings_.resources_dir_path, "resources_dir_path");
   NormalizePathAndSet(settings_.locales_dir_path, "locales_dir_path");
 
-  main_delegate_.reset(new CefMainDelegate(application));
   browser_info_manager_.reset(new CefBrowserInfoManager);
 
-  int exit_code;
+  main_runner_.reset(new CefMainRunner(settings_.multi_threaded_message_loop,
+                                       settings_.external_message_pump));
+  return main_runner_->Initialize(
+      &settings_, application, args, windows_sandbox_info, &initialized_,
+      base::BindOnce(&CefContext::OnContextInitialized,
+                     base::Unretained(this)));
+}
 
-  // Initialize the content runner.
-  content::ContentMainParams params(main_delegate_.get());
-#if defined(OS_WIN)
-  sandbox::SandboxInterfaceInfo sandbox_info = {0};
-  if (windows_sandbox_info == nullptr) {
-    windows_sandbox_info = &sandbox_info;
-    settings_.no_sandbox = true;
-  }
+void CefContext::RunMessageLoop() {
+  // Must always be called on the same thread as Initialize.
+  DCHECK(OnInitThread());
 
-  params.instance = args.instance;
-  params.sandbox_info =
-      static_cast<sandbox::SandboxInterfaceInfo*>(windows_sandbox_info);
-#else
-  params.argc = args.argc;
-  params.argv = const_cast<const char**>(args.argv);
-#endif
+  // Blocks until QuitMessageLoop() is called.
+  main_runner_->RunMessageLoop();
+}
 
-  sm_main_delegate_.reset(
-      new content::ContentServiceManagerMainDelegate(params));
-  sm_main_params_.reset(
-      new service_manager::MainParams(sm_main_delegate_.get()));
+void CefContext::QuitMessageLoop() {
+  // Must always be called on the same thread as Initialize.
+  DCHECK(OnInitThread());
 
-#if defined(OS_POSIX) && !defined(OS_ANDROID)
-  sm_main_params_->argc = params.argc;
-  sm_main_params_->argv = params.argv;
-#endif
-
-  exit_code = service_manager::MainInitialize(*sm_main_params_);
-  DCHECK_LT(exit_code, 0);
-  if (exit_code >= 0)
-    return false;
-
-  static_cast<ChromeBrowserProcessStub*>(g_browser_process)->Initialize();
-
-  if (settings.multi_threaded_message_loop) {
-    base::WaitableEvent uithread_startup_event(
-        base::WaitableEvent::ResetPolicy::AUTOMATIC,
-        base::WaitableEvent::InitialState::NOT_SIGNALED);
-
-    if (!main_delegate_->CreateUIThread(base::BindOnce(
-            [](CefContext* context, base::WaitableEvent* event) {
-              service_manager::MainRun(*context->sm_main_params_);
-              event->Signal();
-            },
-            base::Unretained(this),
-            base::Unretained(&uithread_startup_event)))) {
-      return false;
-    }
-
-    initialized_ = true;
-
-    // We need to wait until service_manager::MainRun has finished.
-    uithread_startup_event.Wait();
-  } else {
-    initialized_ = true;
-    service_manager::MainRun(*sm_main_params_);
-  }
-
-  if (CEF_CURRENTLY_ON_UIT()) {
-    OnContextInitialized();
-  } else {
-    // Continue initialization on the UI thread.
-    CEF_POST_TASK(CEF_UIT, base::Bind(&CefContext::OnContextInitialized,
-                                      base::Unretained(this)));
-  }
-
-  return true;
+  main_runner_->QuitMessageLoop();
 }
 
 void CefContext::Shutdown() {
@@ -546,28 +380,9 @@ void CefContext::Shutdown() {
 
   shutting_down_ = true;
 
-  if (settings_.multi_threaded_message_loop) {
-    // Events that will be used to signal when shutdown is complete. Start in
-    // non-signaled mode so that the event will block.
-    base::WaitableEvent uithread_shutdown_event(
-        base::WaitableEvent::ResetPolicy::AUTOMATIC,
-        base::WaitableEvent::InitialState::NOT_SIGNALED);
-
-    // Finish shutdown on the UI thread.
-    CEF_POST_TASK(CEF_UIT,
-                  base::Bind(&CefContext::FinishShutdownOnUIThread,
-                             base::Unretained(this), &uithread_shutdown_event));
-
-    /// Block until UI thread shutdown is complete.
-    uithread_shutdown_event.Wait();
-
-    FinalizeShutdown();
-  } else {
-    // Finish shutdown on the current thread, which should be the UI thread.
-    FinishShutdownOnUIThread(nullptr);
-
-    FinalizeShutdown();
-  }
+  main_runner_->Shutdown(
+      base::BindOnce(&CefContext::ShutdownOnUIThread, base::Unretained(this)),
+      base::BindOnce(&CefContext::FinalizeShutdown, base::Unretained(this)));
 }
 
 bool CefContext::OnInitThread() {
@@ -654,25 +469,16 @@ bool CefContext::HasObserver(Observer* observer) const {
 void CefContext::OnContextInitialized() {
   CEF_REQUIRE_UIT();
 
-  static_cast<ChromeBrowserProcessStub*>(g_browser_process)
-      ->OnContextInitialized();
-
-#if BUILDFLAG(ENABLE_WIDEVINE) && BUILDFLAG(ENABLE_LIBRARY_CDMS)
-  CefWidevineLoader::GetInstance()->OnContextInitialized();
-#endif
-
   // Notify the handler.
-  CefRefPtr<CefApp> app = CefContentClient::Get()->application();
-  if (app.get()) {
+  if (application_) {
     CefRefPtr<CefBrowserProcessHandler> handler =
-        app->GetBrowserProcessHandler();
-    if (handler.get())
+        application_->GetBrowserProcessHandler();
+    if (handler)
       handler->OnContextInitialized();
   }
 }
 
-void CefContext::FinishShutdownOnUIThread(
-    base::WaitableEvent* uithread_shutdown_event) {
+void CefContext::ShutdownOnUIThread() {
   CEF_REQUIRE_UIT();
 
   browser_info_manager_->DestroyAllBrowsers();
@@ -682,34 +488,9 @@ void CefContext::FinishShutdownOnUIThread(
 
   if (trace_subscriber_.get())
     trace_subscriber_.reset(nullptr);
-
-  static_cast<ChromeBrowserProcessStub*>(g_browser_process)->Shutdown();
-
-  ui::ResourceBundle::GetSharedInstance().CleanupOnUIThread();
-
-  sm_main_delegate_->ShutdownOnUIThread();
-
-  if (uithread_shutdown_event)
-    uithread_shutdown_event->Signal();
 }
 
 void CefContext::FinalizeShutdown() {
-  if (content::RenderProcessHost::run_renderer_in_process()) {
-    // Blocks until RenderProcess cleanup is complete.
-    CefContentRendererClient::Get()->RunSingleProcessCleanup();
-  }
-
-  // Shut down the browser runner or UI thread.
-  main_delegate_->ShutdownBrowser();
-
-  // Shut down the content runner.
-  service_manager::MainShutdown(*sm_main_params_);
-
   browser_info_manager_.reset(nullptr);
-  sm_main_params_.reset(nullptr);
-  sm_main_delegate_.reset(nullptr);
-  main_delegate_.reset(nullptr);
-
-  delete g_browser_process;
-  g_browser_process = nullptr;
+  application_ = nullptr;
 }