Fix substitution of localized strings for directory listings (issue #2412)

This reverts commit 66b5dc3d55.

BUILD.gn

@@ -100,11 +100,11 @@ import("//build/config/sanitizers/sanitizers.gni")
 import("//build/config/ui.gni")
 import("//cef/cef_repack_locales.gni")
 import("//chrome/common/features.gni")
-import("//extensions/features/features.gni")
+import("//extensions/buildflags/buildflags.gni")
 import("//media/media_options.gni")
 import("//mojo/public/tools/bindings/mojom.gni")
-import("//ppapi/features/features.gni")
-import("//printing/features/features.gni")
+import("//ppapi/buildflags/buildflags.gni")
+import("//printing/buildflags/buildflags.gni")
 import("//services/catalog/public/tools/catalog.gni")
 import("//services/service_manager/public/service_manifest.gni")
 import("//third_party/icu/config.gni")
@@ -112,18 +112,20 @@ import("//third_party/widevine/cdm/widevine.gni")
 import("//tools/grit/repack.gni")
 import("//tools/grit/grit_rule.gni")
 import("//tools/v8_context_snapshot/v8_context_snapshot.gni")
+import("//ui/gl/features.gni")
 import("//v8/gni/v8.gni")
 if (is_clang) {
   import("//build/config/clang/clang.gni")
 }
 if (is_linux) {
   import("//build/config/linux/pkg_config.gni")
+  import("//third_party/fontconfig/fontconfig.gni")
 }
 if (is_mac) {
   import("//build/config/mac/rules.gni")
   import("//build/mac/tweak_info_plist.gni")
   import("//build/util/version.gni")
-  import("//media/cdm/ppapi/cdm_paths.gni")
+  import("//media/cdm/library_cdm/cdm_paths.gni")
 }
 if (is_win) {
   import("//build/config/win/console_app.gni")
@@ -148,6 +150,12 @@ if (is_clang) {
   assert(!clang_use_chrome_plugins)
 }
 
+if (is_linux) {
+  # Use system fontconfig. This avoids a startup hang on Ubuntu 16.04.4 (see
+  # issue #2424).
+  assert(!use_bundled_fontconfig)
+}
+
 if (is_mac) {
   # Always generate dSYM files. The make_distrib script will fail if
   # enable_dsyms=true is not explicitly set when is_official_build=false.
@@ -266,9 +274,9 @@ if (is_win) {
       "//components/crash/core/common",  # crash_keys
 
       # Required by chrome_switches.cc
-      "//chrome/common:features",
-      "//ppapi/features:features",
-      "//printing/features:features",
+      "//chrome/common:buildflags",
+      "//ppapi/buildflags:buildflags",
+      "//printing/buildflags:buildflags",
       "//ui/base:ui_features",
     ]
   }
@@ -395,6 +403,8 @@ static_library("libcef_static") {
     "libcef/browser/net/chrome_scheme_handler.h",
     "libcef/browser/net/cookie_store_proxy.cc",
     "libcef/browser/net/cookie_store_proxy.h",
+    "libcef/browser/net/cookie_store_source.cc",
+    "libcef/browser/net/cookie_store_source.h",
     "libcef/browser/net/crlset_file_util_impl.cc",
     "libcef/browser/net/devtools_scheme_handler.cc",
     "libcef/browser/net/devtools_scheme_handler.h",
@@ -650,6 +660,7 @@ static_library("libcef_static") {
     "//chrome/services/printing:lib",
     "//chrome/utility",
     "//components/cdm/renderer",
+    "//components/certificate_transparency",
     "//components/content_settings/core/browser",
     "//components/content_settings/core/common",
     "//components/crx_file",
@@ -666,11 +677,10 @@ static_library("libcef_static") {
     "//components/printing/browser",
     "//components/printing/common",
     "//components/printing/renderer",
-    "//components/printing/service:pdf_compositor_manifest",
-    "//components/printing/service/public/cpp:factory",
-    "//components/printing/service/public/interfaces",
+    "//components/services/pdf_compositor:pdf_compositor_manifest",
+    "//components/services/pdf_compositor/public/cpp:utils",
+    "//components/services/pdf_compositor/public/interfaces",
     "//components/proxy_config",
-    "//components/ssl_config",
     "//components/update_client",
     "//components/url_formatter",
     "//components/user_prefs",
@@ -691,36 +701,34 @@ static_library("libcef_static") {
     "//device/base",
     "//extensions/browser",
     "//extensions/browser/api:api_registration",
+    "//extensions/buildflags",
     "//extensions/common/api",
-    "//extensions/features",
     "//extensions/renderer",
-    "//extensions/utility",
     "//gpu",
     "//ipc",
     "//media",
     "//media/blink",
     "//net",
-    "//net:net_browser_services",
-    "//net:net_utility_services",
+    "//net/dns:mojo_client",
     "//net:net_with_v8",
     "//pdf",
-    "//ppapi/features",
-    "//printing/features",
+    "//ppapi/buildflags",
+    "//printing/buildflags",
     "//services/network:network_service",
     "//services/network/public/cpp",
     "//services/service_manager/embedder",
-    "//services/service_manager/public/interfaces",
+    "//services/service_manager/public/cpp",
     "//services/service_manager/runner/common",
     "//skia",
     "//storage/browser",
+    "//third_party/blink/public:blink",
     "//third_party/brotli:dec",
     "//third_party/cld_3/src/src:cld_3",
     "//third_party/hunspell",
     "//third_party/leveldatabase",
     "//third_party/libxml",
-    "//third_party/WebKit/public:blink",
     "//third_party/widevine/cdm:headers",
-    "//third_party/widevine/cdm:widevinecdmadapter",
+    "//third_party/widevine/cdm",
     "//third_party/icu",
     "//third_party/zlib:minizip",
     "//ui/base",
@@ -771,6 +779,8 @@ static_library("libcef_static") {
 
     libs = [
       "comctl32.lib",
+      # For D3D11_DECODER_PROFILE_H264_VLD_NOFGT.
+      "dxguid.lib",
     ]
   }
 
@@ -1023,6 +1033,7 @@ if (is_win) {
 
 cef_packaged_services = [
   "//chrome/app:chrome_manifest",  # For spell checking.
+  "//chrome/app:chrome_renderer_manifest",  # For spell checking.
   "//chrome/services/printing:manifest",
   "//services/metrics:manifest",
   "//services/proxy_resolver:proxy_resolver_manifest",
@@ -1067,11 +1078,11 @@ template("cef_pak_scaled") {
     # Each input pak file should also have a deps line for completeness.
     # Add associated .h files in the make_pack_header("resources") target.
     sources = [
-      "$root_gen_dir/blink/public/resources/blink_scaled_resources_${percent}_percent.pak",
       "$root_gen_dir/chrome/renderer_resources_${percent}_percent.pak",
       "$root_gen_dir/components/components_resources_${percent}_percent.pak",
       "$root_gen_dir/content/app/resources/content_resources_${percent}_percent.pak",
       "$root_gen_dir/extensions/extensions_browser_resources_${percent}_percent.pak",
+      "$root_gen_dir/third_party/blink/public/resources/blink_scaled_resources_${percent}_percent.pak",
       "$root_gen_dir/ui/resources/ui_resources_${percent}_percent.pak",
     ]
 
@@ -1079,18 +1090,18 @@ template("cef_pak_scaled") {
     # the libcef_static target. Grit deps that generate .cc files must be
     # listed both here and in the libcef_static target.
     public_deps = [
-      "//third_party/WebKit/public:scaled_resources",
       "//chrome/renderer:resources",
       "//components/resources:components_scaled_resources",
       "//content/app/resources",
       "//extensions:extensions_browser_resources",
+      "//third_party/blink/public:scaled_resources",
       "//ui/resources:ui_resources_grd",
     ]
 
     deps = [
       # This repack target generates the blink_scaled_resources_*_percent.pak
       # file but doesn't expose the public_deps required by make_pack_header.
-      "//third_party/WebKit/public:scaled_resources_${percent}_percent",
+      "//third_party/blink/public:scaled_resources_${percent}_percent",
     ]
 
     if (toolkit_views) {
@@ -1207,7 +1218,6 @@ repack("pak") {
   # Each input pak file should also have a deps line for completeness.
   # Add associated .h files in the make_pack_header("resources") target.
   sources = [
-    "$root_gen_dir/blink/public/resources/blink_resources.pak",
     "$root_gen_dir/chrome/browser_resources.pak",
     "$root_gen_dir/chrome/net_internals_resources.pak",
     "$root_gen_dir/chrome/common_resources.pak",
@@ -1216,13 +1226,13 @@ repack("pak") {
     "$root_gen_dir/content/browser/tracing/tracing_resources.pak",
     "$root_gen_dir/content/content_resources.pak",
     "$root_gen_dir/net/net_resources.pak",
+    "$root_gen_dir/third_party/blink/public/resources/blink_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 = [
-    "//third_party/WebKit/public:resources_grit",
     "//chrome/browser:resources",
     "//chrome/browser/resources:net_internals_resources",
     "//chrome/common:resources",
@@ -1231,6 +1241,7 @@ repack("pak") {
     "//content/browser/tracing:resources",
     "//content:resources",
     "//net:net_resources",
+    "//third_party/blink/public:resources",
   ]
 
   output = "$root_out_dir/cef.pak"
@@ -1267,9 +1278,6 @@ template("make_pack_header") {
 make_pack_header("resources") {
   header = "$root_out_dir/includes/include/cef_pack_resources.h"
   inputs = [
-    "$root_gen_dir/blink/public/resources/grit/media_controls_resources.h",
-    "$root_gen_dir/blink/public/resources/grit/blink_image_resources.h",
-    "$root_gen_dir/blink/public/resources/grit/blink_resources.h",
     "$root_gen_dir/cef/grit/cef_resources.h",
     "$root_gen_dir/chrome/grit/browser_resources.h",
     "$root_gen_dir/chrome/grit/common_resources.h",
@@ -1284,6 +1292,7 @@ make_pack_header("resources") {
     "$root_gen_dir/extensions/grit/extensions_renderer_resources.h",
     "$root_gen_dir/extensions/grit/extensions_resources.h",
     "$root_gen_dir/net/grit/net_resources.h",
+    "$root_gen_dir/third_party/blink/public/resources/grit/blink_resources.h",
     "$root_gen_dir/ui/resources/grit/ui_resources.h",
     "$root_gen_dir/ui/resources/grit/webui_resources.h",
     "$root_gen_dir/ui/views/resources/grit/views_resources.h",
@@ -1349,7 +1358,6 @@ if (is_mac) {
       "$root_out_dir/cef_200_percent.pak",
       "$root_out_dir/cef_extensions.pak",
       "$root_out_dir/devtools_resources.pak",
-      "$root_out_dir/$widevine_cdm_path/widevinecdmadapter.plugin",
     ]
 
     public_deps = [
@@ -1358,7 +1366,6 @@ if (is_mac) {
       ":pak_200_percent",
       ":pak_devtools",
       ":pak_extensions",
-      "//third_party/widevine/cdm:widevinecdmadapter",
     ]
 
     if (icu_use_data_file) {
@@ -1383,9 +1390,61 @@ if (is_mac) {
     ]
   }
 
+  if (use_egl) {
+    # Add the ANGLE .dylibs in the MODULE_DIR of the Framework app bundle.
+    bundle_data("cef_framework_angle_binaries") {
+      sources = [
+        "$root_out_dir/egl_intermediates/libEGL.dylib",
+        "$root_out_dir/egl_intermediates/libGLESv2.dylib",
+      ]
+      outputs = [
+        "{{bundle_contents_dir}}/Libraries/{{source_file_part}}",
+      ]
+      public_deps = [
+        "//ui/gl:angle_library_copy",
+      ]
+    }
+
+    # Add the SwiftShader .dylibs in the MODULE_DIR of the Framework app bundle.
+    bundle_data("cef_framework_swiftshader_binaries") {
+      sources = [
+        "$root_out_dir/egl_intermediates/libswiftshader_libEGL.dylib",
+        "$root_out_dir/egl_intermediates/libswiftshader_libGLESv2.dylib",
+      ]
+      outputs = [
+        "{{bundle_contents_dir}}/Libraries/{{source_file_part}}",
+      ]
+      public_deps = [
+        "//ui/gl:swiftshader_library_copy",
+      ]
+    }
+  }
+
+  group("cef_framework_angle_library") {
+    if (use_egl) {
+      deps = [
+        ":cef_framework_angle_binaries",
+      ]
+    }
+  }
+
+  group("cef_framework_swiftshader_library") {
+    if (use_egl) {
+      deps = [
+        ":cef_framework_swiftshader_binaries",
+      ]
+    }
+  }
+
   mac_framework_bundle("cef_framework") {
     output_name = cef_framework_name
 
+    framework_version = "A"
+    framework_contents = [
+      "Libraries",
+      "Resources",
+    ]
+
     sources = gypi_paths2.includes_common +
               gypi_paths2.includes_mac +
               gypi_paths.autogen_cpp_includes +
@@ -1399,8 +1458,10 @@ if (is_mac) {
     #   - crash_report_sender.app
 
     deps = [
+      ":cef_framework_angle_library",
       ":cef_framework_locales",
       ":cef_framework_resources",
+      ":cef_framework_swiftshader_library",
       ":libcef_static",
     ]
 
@@ -1421,11 +1482,11 @@ if (is_mac) {
     if (is_component_build) {
       # Set up the rpath for the framework so that it can find dylibs in the
       # root output directory. The framework is at
-      # $app_name.app/Contents/Frameworks/$output_name.framework/$output_name
+      # $app_name.app/Contents/Frameworks/$output_name.framework/Versions/A/$output_name
       # so use loader_path to go back to the root output directory.
       ldflags += [
         "-rpath",
-        "@loader_path/../../../..",
+        "@loader_path/../../../../../..",
       ]
     }
 
@@ -1462,9 +1523,12 @@ if (is_mac) {
       ]
     }
 
-    if (is_linux && !is_debug && !using_sanitizer && use_allocator=="none") {
+    if (is_linux && !is_debug && use_allocator=="none") {
       # Only export necessary symbols from libcef.so.
-      # Don't do this in Debug builds because it causes the resulting application to crash.
+      # Don't do this in Debug builds because it causes the resulting
+      # application to crash.
+      # Also need to do this for ASAN builds to work around
+      # https://crbug.com/832808.
       ldflags = [ "-Wl,--version-script=" +
                   rebase_path("//cef/libcef_dll/libcef.lst") ]
     }
@@ -1833,7 +1897,6 @@ if (is_mac) {
     deps = [
       ":libcef",
       ":libcef_dll_wrapper",
-      "//build/config:exe_and_shlib_deps",
     ]
 
     if (is_win) {
@@ -1907,7 +1970,6 @@ if (is_mac) {
     deps = [
       ":libcef",
       ":libcef_dll_wrapper",
-      "//build/config:exe_and_shlib_deps",
     ]
 
     if (is_win) {
@@ -1976,7 +2038,6 @@ if (is_mac) {
     deps = [
       ":libcef",
       ":libcef_dll_wrapper",
-      "//build/config:exe_and_shlib_deps",
       "//testing/gtest",
     ]
 

CHROMIUM_BUILD_COMPATIBILITY.txt

@@ -7,5 +7,5 @@
 # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
 
 {
-  'chromium_checkout': 'bc084a8b5afa3744a74927344e304c02ae54189f',
+  'chromium_checkout': 'refs/tags/69.0.3497.100',
 }

CHROMIUM_UPDATE.txt

@@ -0,0 +1,73 @@
+# The Chromium Embedded Framework (CEF) project is built on top of the Chromium
+# project source tree. When updating Chromium to a new version certain files and
+# patterns should be observed for changes. If changes are detected then the CEF
+# source code or patch files will likely need to be updated.
+#
+# Add `--log-chromium-changes` to the automate-git.py command-line to output
+# the following files in the <download-dir>:
+#
+# * chromium_update_changes.diff
+#   Files in the chromium/src directory that have changed. See the 'files'
+#   section below.
+#
+# * chromium_update_patterns.txt
+#   Files in the chromium/src directory that contain invalid/unexpected
+#   patterns. See the 'patterns' section below. Failure of this step is
+#   considered a fatal error during update.
+#
+# * chromium_update_patches.txt
+#   Output from attempting to update existing Chromium patch files using the
+#   patch_updater.py tool. Failure of this step is considered a fatal error
+#   during update.
+#
+# For complete update instructions see:
+# https://bitbucket.org/chromiumembedded/cef/wiki/ChromiumUpdate.md
+
+{
+  # 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/browser/browser_process.h',
+    'chrome/browser/extensions/api/tabs/tabs_api.*',
+    'chrome/browser/extensions/chrome_component_extension_resource_manager.*',
+    'chrome/browser/extensions/chrome_extension_web_contents_observer.*',
+    'chrome/browser/extensions/component_loader.*',
+    'chrome/browser/extensions/extension_service.*',
+    'chrome/browser/printing/print_view_manager*',
+    'chrome/browser/printing/printing_message_filter*',
+    'chrome/browser/profiles/profile.h',
+    'chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.*',
+    'chrome/common/extensions/api/*_features.json',
+    'chrome/renderer/chrome_content_renderer_client.*',
+    'chrome/renderer/extensions/chrome_extensions_renderer_client.*',
+    'content/browser/renderer_host/render_widget_host_view_base.*',
+    'content/public/browser/content_browser_client.*',
+    'content/public/browser/render_widget_host_view.h',
+    'content/public/browser/storage_partition.h',
+    'content/public/browser/web_contents_delegate.h',
+    'content/public/common/content_features.cc',
+    'content/shell/BUILD.gn',
+    'content/shell/app/*',
+    'content/shell/browser/shell_*',
+    'content/shell/browser/renderer_host/shell_*',
+    'content/shell/common/shell_*',
+    'content/shell/gpu/shell_*',
+    'content/shell/renderer/shell_*',
+    'content/shell/utility/shell_*',
+    'extensions/shell/*',
+    'net/cookies/cookie_store.h',
+  ],
+  # Patterns that should not be found in the chromium/src directory after
+  # applying patch files.
+  'patterns': [
+    {
+      # New instances of this static_cast are added to the Chromium sources with
+      # some regularity. If unfixed they will result in runtime crashes.
+      'pattern': 'static_cast<StoragePartitionImpl\*>(',
+      'exclude_matches': '^(.+?)test(.+?):',
+      'message': 'New instances in non-test files should be converted to ' +\
+                 'call StoragePartition methods.' +\
+                 '\nSee storage_partition_1973.patch.',
+    },
+  ],
+}

cef_paths.gypi

@@ -8,7 +8,7 @@
 # by hand. See the translator.README.txt file in the tools directory for
 # more information.
 #
-# $hash=bede6f61d0f5b45669b8e924144e4200c41f869b$
+# $hash=67bc21133e37f5361a39f25dcfe004616d467dbc$
 #
 
 {
@@ -432,6 +432,8 @@
       'libcef_dll/ctocpp/urlrequest_client_ctocpp.h',
       'libcef_dll/ctocpp/v8accessor_ctocpp.cc',
       'libcef_dll/ctocpp/v8accessor_ctocpp.h',
+      'libcef_dll/ctocpp/v8array_buffer_release_callback_ctocpp.cc',
+      'libcef_dll/ctocpp/v8array_buffer_release_callback_ctocpp.h',
       'libcef_dll/cpptoc/v8context_cpptoc.cc',
       'libcef_dll/cpptoc/v8context_cpptoc.h',
       'libcef_dll/cpptoc/v8exception_cpptoc.cc',
@@ -712,6 +714,8 @@
       'libcef_dll/cpptoc/urlrequest_client_cpptoc.h',
       'libcef_dll/cpptoc/v8accessor_cpptoc.cc',
       'libcef_dll/cpptoc/v8accessor_cpptoc.h',
+      'libcef_dll/cpptoc/v8array_buffer_release_callback_cpptoc.cc',
+      'libcef_dll/cpptoc/v8array_buffer_release_callback_cpptoc.h',
       'libcef_dll/ctocpp/v8context_ctocpp.cc',
       'libcef_dll/ctocpp/v8context_ctocpp.h',
       'libcef_dll/ctocpp/v8exception_ctocpp.cc',

cef_paths2.gypi

@@ -26,7 +26,6 @@
       'include/base/cef_string16.h',
       'include/base/cef_template_util.h',
       'include/base/cef_thread_checker.h',
-      'include/base/cef_thread_collision_warner.h',
       'include/base/cef_trace_event.h',
       'include/base/cef_tuple.h',
       'include/base/cef_weak_ptr.h',
@@ -115,7 +114,6 @@
       'libcef_dll/base/cef_ref_counted.cc',
       'libcef_dll/base/cef_string16.cc',
       'libcef_dll/base/cef_thread_checker_impl.cc',
-      'libcef_dll/base/cef_thread_collision_warner.cc',
       'libcef_dll/base/cef_weak_ptr.cc',
     ],
     'libcef_dll_wrapper_sources_common': [
@@ -159,7 +157,6 @@
       'tests/shared/browser/main_message_loop_std.cc',
       'tests/shared/browser/main_message_loop_std.h',
       'tests/shared/browser/resource_util.h',
-      'tests/shared/browser/resource_util.h',
     ],
     'shared_sources_common': [
       'tests/shared/common/client_app.cc',
@@ -371,6 +368,8 @@
       'tests/cefclient/browser/dialog_handler_gtk.cc',
       'tests/cefclient/browser/dialog_handler_gtk.h',
       'tests/cefclient/browser/main_context_impl_posix.cc',
+      'tests/cefclient/browser/main_message_loop_multithreaded_gtk.cc',
+      'tests/cefclient/browser/main_message_loop_multithreaded_gtk.h',
       'tests/cefclient/browser/print_handler_gtk.cc',
       'tests/cefclient/browser/print_handler_gtk.h',
       'tests/cefclient/browser/resource_util_linux.cc',
@@ -380,6 +379,8 @@
       'tests/cefclient/browser/root_window_views.h',
       'tests/cefclient/browser/temp_window_x11.cc',
       'tests/cefclient/browser/temp_window_x11.h',
+      'tests/cefclient/browser/util_gtk.cc',
+      'tests/cefclient/browser/util_gtk.h',
       'tests/cefclient/browser/views_menu_bar.cc',
       'tests/cefclient/browser/views_menu_bar.h',
       'tests/cefclient/browser/views_style.cc',

cmake/cef_variables.cmake.in

@@ -86,7 +86,8 @@ if(OS_LINUX)
     -Werror                         # Treat warnings as errors
     -Wno-missing-field-initializers # Don't warn about missing field initializers
     -Wno-unused-parameter           # Don't warn about unused parameters
-    -Wno-error=comment              # Don't complain about code in ascii art
+    -Wno-error=comment              # Don't warn about code in comments
+    -Wno-comment                    # Don't warn about code in comments
     )
   list(APPEND CEF_C_COMPILER_FLAGS
     -std=c99                        # Use the C99 language standard
@@ -198,9 +199,12 @@ if(OS_LINUX)
   set(CEF_BINARY_FILES
     chrome-sandbox
     libcef.so
+    libEGL.so
+    libGLESv2.so
     natives_blob.bin
     snapshot_blob.bin
     v8_context_snapshot.bin
+    swiftshader
     )
 
   # List of CEF resource files.
@@ -333,12 +337,16 @@ if(OS_WINDOWS)
   option(USE_SANDBOX "Enable or disable use of the sandbox." ON)
   if(USE_SANDBOX)
     # Check if the current MSVC version is compatible with the cef_sandbox.lib
-    # static library.
+    # static library. For a list of all version numbers see
+    # https://en.wikipedia.org/wiki/Microsoft_Visual_C%2B%2B#Internal_version_numbering
     list(APPEND supported_msvc_versions
       1900  # VS2015 and updates 1, 2, & 3
       1910  # VS2017 version 15.1 & 15.2
       1911  # VS2017 version 15.3 & 15.4
       1912  # VS2017 version 15.5
+      1913  # VS2017 version 15.6
+      1914  # VS2017 version 15.7
+      1915  # VS2017 version 15.8
       )
     list(FIND supported_msvc_versions ${MSVC_VERSION} _index)
     if (${_index} EQUAL -1)
@@ -350,6 +358,13 @@ if(OS_WINDOWS)
   # Consumers who run into LNK4099 warnings can pass /Z7 instead (see issue #385).
   set(CEF_DEBUG_INFO_FLAG "/Zi" CACHE STRING "Optional flag specifying specific /Z flag to use")
 
+  # Consumers using different runtime types may want to pass different flags
+  set(CEF_RUNTIME_LIBRARY_FLAG "/MT" CACHE STRING "Optional flag specifying which runtime to use")
+  if (CEF_RUNTIME_LIBRARY_FLAG)
+    list(APPEND CEF_COMPILER_FLAGS_DEBUG ${CEF_RUNTIME_LIBRARY_FLAG}d)
+    list(APPEND CEF_COMPILER_FLAGS_RELEASE ${CEF_RUNTIME_LIBRARY_FLAG})
+  endif()
+
   # Platform-specific compiler/linker flags.
   set(CEF_LIBTYPE STATIC)
   list(APPEND CEF_COMPILER_FLAGS
@@ -369,12 +384,10 @@ if(OS_WINDOWS)
     ${CEF_DEBUG_INFO_FLAG}
     )
   list(APPEND CEF_COMPILER_FLAGS_DEBUG
-    /MTd          # Multithreaded debug runtime
     /RTC1         # Disable optimizations
     /Od           # Enable basic run-time checks
     )
   list(APPEND CEF_COMPILER_FLAGS_RELEASE
-    /MT           # Multithreaded release runtime
     /O2           # Optimize for maximum speed
     /Ob2          # Inline any suitable function
     /GF           # Enable string pooling

include/base/cef_build.h

@@ -162,6 +162,16 @@
 #define ALLOW_UNUSED_LOCAL(x) false ? (void)x : (void)0
 #endif
 
+// Sanitizers annotations.
+#if defined(__has_attribute)
+#if __has_attribute(no_sanitize)
+#define NO_SANITIZE(what) __attribute__((no_sanitize(what)))
+#endif
+#endif
+#if !defined(NO_SANITIZE)
+#define NO_SANITIZE(what)
+#endif
+
 #endif  // !USING_CHROMIUM_INCLUDES
 
 // Annotate a virtual method indicating it must be overriding a virtual method

include/base/cef_ref_counted.h

@@ -51,7 +51,7 @@
 #include "include/base/cef_atomic_ref_count.h"
 #include "include/base/cef_build.h"
 #include "include/base/cef_logging.h"
-#include "include/base/cef_thread_collision_warner.h"
+#include "include/base/cef_macros.h"
 
 namespace base {
 
@@ -78,10 +78,6 @@ class RefCountedBase {
   }
 
   void AddRef() const {
-// TODO(maruel): Add back once it doesn't assert 500 times/sec.
-// Current thread books the critical section "AddRelease"
-// without release it.
-// DFAKE_SCOPED_LOCK_THREAD_LOCKED(add_release_);
 #if DCHECK_IS_ON()
     DCHECK(!in_dtor_);
 #endif
@@ -90,10 +86,6 @@ class RefCountedBase {
 
   // Returns true if the object should self-delete.
   bool Release() const {
-// TODO(maruel): Add back once it doesn't assert 500 times/sec.
-// Current thread books the critical section "AddRelease"
-// without release it.
-// DFAKE_SCOPED_LOCK_THREAD_LOCKED(add_release_);
 #if DCHECK_IS_ON()
     DCHECK(!in_dtor_);
 #endif
@@ -112,8 +104,6 @@ class RefCountedBase {
   mutable bool in_dtor_;
 #endif
 
-  DFAKE_MUTEX(add_release_);
-
   DISALLOW_COPY_AND_ASSIGN(RefCountedBase);
 };
 

include/base/cef_string16.h

@@ -86,6 +86,7 @@ typedef std::char_traits<wchar_t> string16_char_traits;
 
 #include "include/base/cef_macros.h"
 
+namespace cef {
 namespace base {
 
 typedef uint16_t char16;
@@ -156,7 +157,15 @@ struct string16_char_traits {
   static int_type eof() { return static_cast<int_type>(EOF); }
 };
 
-typedef std::basic_string<char16, base::string16_char_traits> string16;
+typedef std::basic_string<char16, string16_char_traits> string16;
+
+}  // namespace base
+}  // namespace cef
+
+namespace base {
+
+typedef cef::base::char16 char16;
+typedef cef::base::string16 string16;
 
 extern std::ostream& operator<<(std::ostream& out, const string16& str);
 
@@ -204,8 +213,8 @@ extern void PrintTo(const string16& str, std::ostream* out);
 //
 // TODO(mark): File this bug with Apple and update this note with a bug number.
 
-extern template class std::basic_string<base::char16,
-                                        base::string16_char_traits>;
+extern template class std::basic_string<cef::base::char16,
+                                        cef::base::string16_char_traits>;
 
 #endif  // WCHAR_T_IS_UTF32
 

include/base/cef_thread_collision_warner.h

@@ -1,276 +0,0 @@
-// Copyright (c) 2014 Marshall A. Greenblatt. Portions copyright (c) 2012
-// Google Inc. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//    * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//    * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//    * Neither the name of Google Inc. nor the name Chromium Embedded
-// Framework nor the names of its contributors may be used to endorse
-// or promote products derived from this software without specific prior
-// written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef CEF_INCLUDE_BASE_CEF_THREAD_COLLISION_WARNER_H_
-#define CEF_INCLUDE_BASE_CEF_THREAD_COLLISION_WARNER_H_
-#pragma once
-
-#if defined(BASE_THREADING_THREAD_COLLISION_WARNER_H_)
-// Do nothing if the Chromium header has already been included.
-// This can happen in cases where Chromium code is used directly by the
-// client application. When using Chromium code directly always include
-// the Chromium header first to avoid type conflicts.
-#elif defined(USING_CHROMIUM_INCLUDES)
-// When building CEF include the Chromium header directly.
-#include "base/threading/thread_collision_warner.h"
-#else  // !USING_CHROMIUM_INCLUDES
-// The following is substantially similar to the Chromium implementation.
-// If the Chromium implementation diverges the below implementation should be
-// updated to match.
-
-#include <memory>
-
-#include "include/base/cef_atomicops.h"
-#include "include/base/cef_basictypes.h"
-#include "include/base/cef_build.h"
-#include "include/base/cef_logging.h"
-#include "include/base/cef_macros.h"
-
-// A helper class alongside macros to be used to verify assumptions about thread
-// safety of a class.
-//
-// Example: Queue implementation non thread-safe but still usable if clients
-//          are synchronized somehow.
-//
-//          In this case the macro DFAKE_SCOPED_LOCK has to be
-//          used, it checks that if a thread is inside the push/pop then
-//          noone else is still inside the pop/push
-//
-// class NonThreadSafeQueue {
-//  public:
-//   ...
-//   void push(int) { DFAKE_SCOPED_LOCK(push_pop_); ... }
-//   int pop() { DFAKE_SCOPED_LOCK(push_pop_); ... }
-//   ...
-//  private:
-//   DFAKE_MUTEX(push_pop_);
-// };
-//
-//
-// Example: Queue implementation non thread-safe but still usable if clients
-//          are synchronized somehow, it calls a method to "protect" from
-//          a "protected" method
-//
-//          In this case the macro DFAKE_SCOPED_RECURSIVE_LOCK
-//          has to be used, it checks that if a thread is inside the push/pop
-//          then noone else is still inside the pop/push
-//
-// class NonThreadSafeQueue {
-//  public:
-//   void push(int) {
-//     DFAKE_SCOPED_LOCK(push_pop_);
-//     ...
-//   }
-//   int pop() {
-//     DFAKE_SCOPED_RECURSIVE_LOCK(push_pop_);
-//     bar();
-//     ...
-//   }
-//   void bar() { DFAKE_SCOPED_RECURSIVE_LOCK(push_pop_); ... }
-//   ...
-//  private:
-//   DFAKE_MUTEX(push_pop_);
-// };
-//
-//
-// Example: Queue implementation not usable even if clients are synchronized,
-//          so only one thread in the class life cycle can use the two members
-//          push/pop.
-//
-//          In this case the macro DFAKE_SCOPED_LOCK_THREAD_LOCKED pins the
-//          specified
-//          critical section the first time a thread enters push or pop, from
-//          that time on only that thread is allowed to execute push or pop.
-//
-// class NonThreadSafeQueue {
-//  public:
-//   ...
-//   void push(int) { DFAKE_SCOPED_LOCK_THREAD_LOCKED(push_pop_); ... }
-//   int pop() { DFAKE_SCOPED_LOCK_THREAD_LOCKED(push_pop_); ... }
-//   ...
-//  private:
-//   DFAKE_MUTEX(push_pop_);
-// };
-//
-//
-// Example: Class that has to be contructed/destroyed on same thread, it has
-//          a "shareable" method (with external synchronization) and a not
-//          shareable method (even with external synchronization).
-//
-//          In this case 3 Critical sections have to be defined
-//
-// class ExoticClass {
-//  public:
-//   ExoticClass() { DFAKE_SCOPED_LOCK_THREAD_LOCKED(ctor_dtor_); ... }
-//   ~ExoticClass() { DFAKE_SCOPED_LOCK_THREAD_LOCKED(ctor_dtor_); ... }
-//
-//   void Shareable() { DFAKE_SCOPED_LOCK(shareable_section_); ... }
-//   void NotShareable() { DFAKE_SCOPED_LOCK_THREAD_LOCKED(ctor_dtor_); ... }
-//   ...
-//  private:
-//   DFAKE_MUTEX(ctor_dtor_);
-//   DFAKE_MUTEX(shareable_section_);
-// };
-
-#if DCHECK_IS_ON()
-
-// Defines a class member that acts like a mutex. It is used only as a
-// verification tool.
-#define DFAKE_MUTEX(obj) mutable base::ThreadCollisionWarner obj
-// Asserts the call is never called simultaneously in two threads. Used at
-// member function scope.
-#define DFAKE_SCOPED_LOCK(obj) \
-  base::ThreadCollisionWarner::ScopedCheck s_check_##obj(&obj)
-// Asserts the call is never called simultaneously in two threads. Used at
-// member function scope. Same as DFAKE_SCOPED_LOCK but allows recursive locks.
-#define DFAKE_SCOPED_RECURSIVE_LOCK(obj) \
-  base::ThreadCollisionWarner::ScopedRecursiveCheck sr_check_##obj(&obj)
-// Asserts the code is always executed in the same thread.
-#define DFAKE_SCOPED_LOCK_THREAD_LOCKED(obj) \
-  base::ThreadCollisionWarner::Check check_##obj(&obj)
-
-#else
-
-#define DFAKE_MUTEX(obj) typedef void InternalFakeMutexType##obj
-#define DFAKE_SCOPED_LOCK(obj) ((void)0)
-#define DFAKE_SCOPED_RECURSIVE_LOCK(obj) ((void)0)
-#define DFAKE_SCOPED_LOCK_THREAD_LOCKED(obj) ((void)0)
-
-#endif
-
-namespace base {
-
-// The class ThreadCollisionWarner uses an Asserter to notify the collision
-// AsserterBase is the interfaces and DCheckAsserter is the default asserter
-// used. During the unit tests is used another class that doesn't "DCHECK"
-// in case of collision (check thread_collision_warner_unittests.cc)
-struct AsserterBase {
-  virtual ~AsserterBase() {}
-  virtual void warn() = 0;
-};
-
-struct DCheckAsserter : public AsserterBase {
-  virtual ~DCheckAsserter() {}
-  virtual void warn() OVERRIDE;
-};
-
-class ThreadCollisionWarner {
- public:
-  // The parameter asserter is there only for test purpose
-  explicit ThreadCollisionWarner(AsserterBase* asserter = new DCheckAsserter())
-      : valid_thread_id_(0), counter_(0), asserter_(asserter) {}
-
-  ~ThreadCollisionWarner() { delete asserter_; }
-
-  // This class is meant to be used through the macro
-  // DFAKE_SCOPED_LOCK_THREAD_LOCKED
-  // it doesn't leave the critical section, as opposed to ScopedCheck,
-  // because the critical section being pinned is allowed to be used only
-  // from one thread
-  class Check {
-   public:
-    explicit Check(ThreadCollisionWarner* warner) : warner_(warner) {
-      warner_->EnterSelf();
-    }
-
-    ~Check() {}
-
-   private:
-    ThreadCollisionWarner* warner_;
-
-    DISALLOW_COPY_AND_ASSIGN(Check);
-  };
-
-  // This class is meant to be used through the macro
-  // DFAKE_SCOPED_LOCK
-  class ScopedCheck {
-   public:
-    explicit ScopedCheck(ThreadCollisionWarner* warner) : warner_(warner) {
-      warner_->Enter();
-    }
-
-    ~ScopedCheck() { warner_->Leave(); }
-
-   private:
-    ThreadCollisionWarner* warner_;
-
-    DISALLOW_COPY_AND_ASSIGN(ScopedCheck);
-  };
-
-  // This class is meant to be used through the macro
-  // DFAKE_SCOPED_RECURSIVE_LOCK
-  class ScopedRecursiveCheck {
-   public:
-    explicit ScopedRecursiveCheck(ThreadCollisionWarner* warner)
-        : warner_(warner) {
-      warner_->EnterSelf();
-    }
-
-    ~ScopedRecursiveCheck() { warner_->Leave(); }
-
-   private:
-    ThreadCollisionWarner* warner_;
-
-    DISALLOW_COPY_AND_ASSIGN(ScopedRecursiveCheck);
-  };
-
- private:
-  // This method stores the current thread identifier and does a DCHECK
-  // if a another thread has already done it, it is safe if same thread
-  // calls this multiple time (recursion allowed).
-  void EnterSelf();
-
-  // Same as EnterSelf but recursion is not allowed.
-  void Enter();
-
-  // Removes the thread_id stored in order to allow other threads to
-  // call EnterSelf or Enter.
-  void Leave();
-
-  // This stores the thread id that is inside the critical section, if the
-  // value is 0 then no thread is inside.
-  volatile subtle::Atomic32 valid_thread_id_;
-
-  // Counter to trace how many time a critical section was "pinned"
-  // (when allowed) in order to unpin it when counter_ reaches 0.
-  volatile subtle::Atomic32 counter_;
-
-  // Here only for class unit tests purpose, during the test I need to not
-  // DCHECK but notify the collision with something else.
-  AsserterBase* asserter_;
-
-  DISALLOW_COPY_AND_ASSIGN(ThreadCollisionWarner);
-};
-
-}  // namespace base
-
-#endif  // !USING_CHROMIUM_INCLUDES
-
-#endif  // CEF_INCLUDE_BASE_CEF_THREAD_COLLISION_WARNER_H_

include/capi/cef_cookie_capi.h

@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=e0605a0c9918e225b9282b6d5e6138a7d697945b$
+// $hash=00e6d1aa80d5998d89cc272dcb199cde0add12fa$
 //
 
 #ifndef CEF_INCLUDE_CAPI_CEF_COOKIE_CAPI_H_
@@ -159,6 +159,16 @@ typedef struct _cef_cookie_manager_t {
 CEF_EXPORT cef_cookie_manager_t* cef_cookie_manager_get_global_manager(
     struct _cef_completion_callback_t* callback);
 
+///
+// Returns a cookie manager that neither stores nor retrieves cookies. All usage
+// of cookies will be blocked including cookies accessed via the network
+// (request/response headers), via JavaScript (document.cookie), and via
+// cef_cookie_manager_t functions. No cookies will be displayed in DevTools. If
+// you wish to only block cookies sent via the network use the
+// cef_request_tHandler CanGetCookies and CanSetCookie functions instead.
+///
+CEF_EXPORT cef_cookie_manager_t* cef_cookie_manager_get_blocking_manager();
+
 ///
 // Creates a new cookie manager. If |path| is NULL data will be stored in memory
 // only. Otherwise, data will be stored at the specified |path|. To persist

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=ab31ef5d72b4b1c9809698e5fbbdae21918af713$
+// $hash=c7641e41aca6bf30b9c36092861f061d2b16ff82$
 //
 
 #ifndef CEF_INCLUDE_CAPI_CEF_DISPLAY_HANDLER_CAPI_H_
@@ -132,6 +132,15 @@ typedef struct _cef_display_handler_t {
   int(CEF_CALLBACK* on_auto_resize)(struct _cef_display_handler_t* self,
                                     struct _cef_browser_t* browser,
                                     const cef_size_t* new_size);
+
+  ///
+  // Called when the overall page loading progress has changed. |progress|
+  // ranges from 0.0 to 1.0.
+  ///
+  void(CEF_CALLBACK* on_loading_progress_change)(
+      struct _cef_display_handler_t* self,
+      struct _cef_browser_t* browser,
+      double progress);
 } cef_display_handler_t;
 
 #ifdef __cplusplus

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=3fb1034cb02cfeddcaf02d8fde0dec5b8a18f416$
+// $hash=f2f3acb1df9815e4ac9bf34010ce260a2496ae5a$
 //
 
 #ifndef CEF_INCLUDE_CAPI_CEF_RENDER_HANDLER_CAPI_H_
@@ -202,6 +202,17 @@ typedef struct _cef_render_handler_t {
       const cef_range_t* selected_range,
       size_t character_boundsCount,
       cef_rect_t const* character_bounds);
+
+  ///
+  // Called when text selection has changed for the specified |browser|.
+  // |selected_text| is the currently selected text and |selected_range| is the
+  // character range.
+  ///
+  void(CEF_CALLBACK* on_text_selection_changed)(
+      struct _cef_render_handler_t* self,
+      struct _cef_browser_t* browser,
+      const cef_string_t* selected_text,
+      const cef_range_t* selected_range);
 } cef_render_handler_t;
 
 #ifdef __cplusplus

include/capi/cef_request_handler_capi.h

@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=b8b5a62b11dbc48f0733c0522864e4dbda8b4f59$
+// $hash=95e44047a75693dbae0ab6b07b415d188252bfdf$
 //
 
 #ifndef CEF_INCLUDE_CAPI_CEF_REQUEST_HANDLER_CAPI_H_
@@ -112,12 +112,15 @@ typedef struct _cef_request_handler_t {
   // If the navigation is allowed cef_load_handler_t::OnLoadStart and
   // cef_load_handler_t::OnLoadEnd will be called. If the navigation is canceled
   // cef_load_handler_t::OnLoadError will be called with an |errorCode| value of
-  // ERR_ABORTED.
+  // ERR_ABORTED. The |user_gesture| value will be true (1) if the browser
+  // navigated via explicit user gesture (e.g. clicking a link) or false (0) if
+  // it navigated automatically (e.g. via the DomContentLoaded event).
   ///
   int(CEF_CALLBACK* on_before_browse)(struct _cef_request_handler_t* self,
                                       struct _cef_browser_t* browser,
                                       struct _cef_frame_t* frame,
                                       struct _cef_request_t* request,
+                                      int user_gesture,
                                       int is_redirect);
 
   ///

include/capi/cef_response_capi.h

@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=561e4711432158fd3da971f3c0240dcf5e8e782a$
+// $hash=fd2cbc427bccf30298e26dd6c3bcef9551433f8b$
 //
 
 #ifndef CEF_INCLUDE_CAPI_CEF_RESPONSE_CAPI_H_
@@ -127,6 +127,18 @@ typedef struct _cef_response_t {
   ///
   void(CEF_CALLBACK* set_header_map)(struct _cef_response_t* self,
                                      cef_string_multimap_t headerMap);
+
+  ///
+  // Get the resolved URL after redirects or changed as a result of HSTS.
+  ///
+  // The resulting string must be freed by calling cef_string_userfree_free().
+  cef_string_userfree_t(CEF_CALLBACK* get_url)(struct _cef_response_t* self);
+
+  ///
+  // Set the resolved URL after redirects or changed as a result of HSTS.
+  ///
+  void(CEF_CALLBACK* set_url)(struct _cef_response_t* self,
+                              const cef_string_t* url);
 } cef_response_t;
 
 ///

include/capi/cef_v8_capi.h

@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=e9e43167b1cf8033bd7e6ba6931213d7cf4b69b5$
+// $hash=2303574e76708e5311aede8e66eb7f1f679e0d1f$
 //
 
 #ifndef CEF_INCLUDE_CAPI_CEF_V8_CAPI_H_
@@ -355,6 +355,25 @@ typedef struct _cef_v8exception_t {
   int(CEF_CALLBACK* get_end_column)(struct _cef_v8exception_t* self);
 } cef_v8exception_t;
 
+///
+// Callback structure that is passed to cef_v8value_t::CreateArrayBuffer.
+///
+typedef struct _cef_v8array_buffer_release_callback_t {
+  ///
+  // Base structure.
+  ///
+  cef_base_ref_counted_t base;
+
+  ///
+  // Called to release |buffer| when the ArrayBuffer JS object is garbage
+  // collected. |buffer| is the value that was passed to CreateArrayBuffer along
+  // with this object.
+  ///
+  void(CEF_CALLBACK* release_buffer)(
+      struct _cef_v8array_buffer_release_callback_t* self,
+      void* buffer);
+} cef_v8array_buffer_release_callback_t;
+
 ///
 // Structure representing a V8 value handle. V8 handles can only be accessed
 // from the thread on which they are created. Valid threads for creating a V8
@@ -425,6 +444,11 @@ typedef struct _cef_v8value_t {
   ///
   int(CEF_CALLBACK* is_array)(struct _cef_v8value_t* self);
 
+  ///
+  // True if the value type is an ArrayBuffer.
+  ///
+  int(CEF_CALLBACK* is_array_buffer)(struct _cef_v8value_t* self);
+
   ///
   // True if the value type is function.
   ///
@@ -639,6 +663,25 @@ typedef struct _cef_v8value_t {
   ///
   int(CEF_CALLBACK* get_array_length)(struct _cef_v8value_t* self);
 
+  // ARRAY BUFFER METHODS - These functions are only available on ArrayBuffers.
+
+  ///
+  // Returns the ReleaseCallback object associated with the ArrayBuffer or NULL
+  // if the ArrayBuffer was not created with CreateArrayBuffer.
+  ///
+  struct _cef_v8array_buffer_release_callback_t*(
+      CEF_CALLBACK* get_array_buffer_release_callback)(
+      struct _cef_v8value_t* self);
+
+  ///
+  // Prevent the ArrayBuffer from using it's memory block by setting the length
+  // to zero. This operation cannot be undone. If the ArrayBuffer was created
+  // with CreateArrayBuffer then
+  // cef_v8array_buffer_release_callback_t::ReleaseBuffer will be called to
+  // release the underlying buffer.
+  ///
+  int(CEF_CALLBACK* neuter_array_buffer)(struct _cef_v8value_t* self);
+
   // FUNCTION METHODS - These functions are only available on functions.
 
   ///
@@ -751,6 +794,21 @@ CEF_EXPORT cef_v8value_t* cef_v8value_create_object(
 ///
 CEF_EXPORT cef_v8value_t* cef_v8value_create_array(int length);
 
+///
+// Create a new cef_v8value_t object of type ArrayBuffer which wraps the
+// provided |buffer| of size |length| bytes. The ArrayBuffer is externalized,
+// meaning that it does not own |buffer|. The caller is responsible for freeing
+// |buffer| when requested via a call to cef_v8array_buffer_release_callback_t::
+// ReleaseBuffer. This function should only be called from within the scope of a
+// cef_render_process_handler_t, cef_v8handler_t or cef_v8accessor_t callback,
+// or in combination with calling enter() and exit() on a stored cef_v8context_t
+// reference.
+///
+CEF_EXPORT cef_v8value_t* cef_v8value_create_array_buffer(
+    void* buffer,
+    size_t length,
+    cef_v8array_buffer_release_callback_t* release_callback);
+
 ///
 // Create a new cef_v8value_t object of type function. This function should only
 // be called from within the scope of a cef_render_process_handler_t,

include/capi/cef_web_plugin_capi.h

@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=ec4f722423ff89dd2ff61fd3336bda1776081023$
+// $hash=8815d0d0778cc210fb6f9ede9dafc5ca51124169$
 //
 
 #ifndef CEF_INCLUDE_CAPI_CEF_WEB_PLUGIN_CAPI_H_
@@ -202,9 +202,6 @@ CEF_EXPORT void cef_is_web_plugin_unstable(
 //   2. widevinecdm file from the CDM binary distribution (e.g.
 //      widevinecdm.dll on on Windows, libwidevinecdm.dylib on OS X,
 //      libwidevinecdm.so on Linux).
-//   3. widevidecdmadapter file from the CEF binary distribution (e.g.
-//      widevinecdmadapter.dll on Windows, widevinecdmadapter.plugin on OS X,
-//      libwidevinecdmadapter.so on Linux).
 //
 // If any of these files are missing or if the manifest file has incorrect
 // contents the registration will fail and |callback| will receive a |result|

include/cef_auth_callback.h

@@ -50,7 +50,7 @@ class CefAuthCallback : public virtual CefBaseRefCounted {
   ///
   // Continue the authentication request.
   ///
-  /*--cef(capi_name=cont,optional_param=password)--*/
+  /*--cef(capi_name=cont,optional_param=username,optional_param=password)--*/
   virtual void Continue(const CefString& username,
                         const CefString& password) = 0;
 

include/cef_cookie.h

@@ -64,6 +64,17 @@ class CefCookieManager : public virtual CefBaseRefCounted {
   static CefRefPtr<CefCookieManager> GetGlobalManager(
       CefRefPtr<CefCompletionCallback> callback);
 
+  ///
+  // Returns a cookie manager that neither stores nor retrieves cookies. All
+  // usage of cookies will be blocked including cookies accessed via the network
+  // (request/response headers), via JavaScript (document.cookie), and via
+  // CefCookieManager methods. No cookies will be displayed in DevTools. If you
+  // wish to only block cookies sent via the network use the CefRequestHandler
+  // CanGetCookies and CanSetCookie methods instead.
+  ///
+  /*--cef()--*/
+  static CefRefPtr<CefCookieManager> GetBlockingManager();
+
   ///
   // Creates a new cookie manager. If |path| is empty data will be stored in
   // memory only. Otherwise, data will be stored at the specified |path|. To

include/cef_display_handler.h

@@ -127,6 +127,14 @@ class CefDisplayHandler : public virtual CefBaseRefCounted {
                             const CefSize& new_size) {
     return false;
   }
+
+  ///
+  // Called when the overall page loading progress has changed. |progress|
+  // ranges from 0.0 to 1.0.
+  ///
+  /*--cef()--*/
+  virtual void OnLoadingProgressChange(CefRefPtr<CefBrowser> browser,
+                                       double progress) {}
 };
 
 #endif  // CEF_INCLUDE_CEF_DISPLAY_HANDLER_H_

include/cef_render_handler.h

@@ -204,6 +204,16 @@ class CefRenderHandler : public virtual CefBaseRefCounted {
   virtual void OnImeCompositionRangeChanged(CefRefPtr<CefBrowser> browser,
                                             const CefRange& selected_range,
                                             const RectList& character_bounds) {}
+
+  ///
+  // Called when text selection has changed for the specified |browser|.
+  // |selected_text| is the currently selected text and |selected_range| is
+  // the character range.
+  ///
+  /*--cef(optional_param=selected_text,optional_param=selected_range)--*/
+  virtual void OnTextSelectionChanged(CefRefPtr<CefBrowser> browser,
+                                      const CefString& selected_text,
+                                      const CefRange& selected_range) {}
 };
 
 #endif  // CEF_INCLUDE_CEF_RENDER_HANDLER_H_

include/cef_request_handler.h

@@ -106,12 +106,15 @@ class CefRequestHandler : public virtual CefBaseRefCounted {
   // If the navigation is allowed CefLoadHandler::OnLoadStart and
   // CefLoadHandler::OnLoadEnd will be called. If the navigation is canceled
   // CefLoadHandler::OnLoadError will be called with an |errorCode| value of
-  // ERR_ABORTED.
+  // ERR_ABORTED. The |user_gesture| value will be true if the browser
+  // navigated via explicit user gesture (e.g. clicking a link) or false if it
+  // navigated automatically (e.g. via the DomContentLoaded event).
   ///
   /*--cef()--*/
   virtual bool OnBeforeBrowse(CefRefPtr<CefBrowser> browser,
                               CefRefPtr<CefFrame> frame,
                               CefRefPtr<CefRequest> request,
+                              bool user_gesture,
                               bool is_redirect) {
     return false;
   }

include/cef_response.h

@@ -128,6 +128,18 @@ class CefResponse : public virtual CefBaseRefCounted {
   ///
   /*--cef()--*/
   virtual void SetHeaderMap(const HeaderMap& headerMap) = 0;
+
+  ///
+  // Get the resolved URL after redirects or changed as a result of HSTS.
+  ///
+  /*--cef()--*/
+  virtual CefString GetURL() = 0;
+
+  ///
+  // Set the resolved URL after redirects or changed as a result of HSTS.
+  ///
+  /*--cef()--*/
+  virtual void SetURL(const CefString& url) = 0;
 };
 
 #endif  // CEF_INCLUDE_CEF_RESPONSE_H_

include/cef_v8.h

@@ -407,6 +407,21 @@ class CefV8Exception : public virtual CefBaseRefCounted {
   virtual int GetEndColumn() = 0;
 };
 
+///
+// Callback interface that is passed to CefV8Value::CreateArrayBuffer.
+///
+/*--cef(source=client)--*/
+class CefV8ArrayBufferReleaseCallback : public virtual CefBaseRefCounted {
+ public:
+  ///
+  // Called to release |buffer| when the ArrayBuffer JS object is garbage
+  // collected. |buffer| is the value that was passed to CreateArrayBuffer along
+  // with this object.
+  ///
+  /*--cef()--*/
+  virtual void ReleaseBuffer(void* buffer) = 0;
+};
+
 ///
 // Class representing a V8 value handle. V8 handles can only be accessed from
 // the thread on which they are created. Valid threads for creating a V8 handle
@@ -493,6 +508,22 @@ class CefV8Value : public virtual CefBaseRefCounted {
   /*--cef()--*/
   static CefRefPtr<CefV8Value> CreateArray(int length);
 
+  ///
+  // Create a new CefV8Value object of type ArrayBuffer which wraps the provided
+  // |buffer| of size |length| bytes. The ArrayBuffer is externalized, meaning
+  // that it does not own |buffer|. The caller is responsible for freeing
+  // |buffer| when requested via a call to CefV8ArrayBufferReleaseCallback::
+  // ReleaseBuffer. This method should only be called from within the scope of a
+  // CefRenderProcessHandler, CefV8Handler or CefV8Accessor callback, or in
+  // combination with calling Enter() and Exit() on a stored CefV8Context
+  // reference.
+  ///
+  /*--cef()--*/
+  static CefRefPtr<CefV8Value> CreateArrayBuffer(
+      void* buffer,
+      size_t length,
+      CefRefPtr<CefV8ArrayBufferReleaseCallback> release_callback);
+
   ///
   // Create a new CefV8Value object of type function. This method should only be
   // called from within the scope of a CefRenderProcessHandler, CefV8Handler or
@@ -571,6 +602,12 @@ class CefV8Value : public virtual CefBaseRefCounted {
   /*--cef()--*/
   virtual bool IsArray() = 0;
 
+  ///
+  // True if the value type is an ArrayBuffer.
+  ///
+  /*--cef()--*/
+  virtual bool IsArrayBuffer() = 0;
+
   ///
   // True if the value type is function.
   ///
@@ -793,6 +830,25 @@ class CefV8Value : public virtual CefBaseRefCounted {
   /*--cef()--*/
   virtual int GetArrayLength() = 0;
 
+  // ARRAY BUFFER METHODS - These methods are only available on ArrayBuffers.
+
+  ///
+  // Returns the ReleaseCallback object associated with the ArrayBuffer or NULL
+  // if the ArrayBuffer was not created with CreateArrayBuffer.
+  ///
+  /*--cef()--*/
+  virtual CefRefPtr<CefV8ArrayBufferReleaseCallback>
+  GetArrayBufferReleaseCallback() = 0;
+
+  ///
+  // Prevent the ArrayBuffer from using it's memory block by setting the length
+  // to zero. This operation cannot be undone. If the ArrayBuffer was created
+  // with CreateArrayBuffer then CefV8ArrayBufferReleaseCallback::ReleaseBuffer
+  // will be called to release the underlying buffer.
+  ///
+  /*--cef()--*/
+  virtual bool NeuterArrayBuffer() = 0;
+
   // FUNCTION METHODS - These methods are only available on functions.
 
   ///

include/cef_web_plugin.h

@@ -179,9 +179,6 @@ class CefRegisterCdmCallback : public virtual CefBaseRefCounted {
 //   2. widevinecdm file from the CDM binary distribution (e.g.
 //      widevinecdm.dll on on Windows, libwidevinecdm.dylib on OS X,
 //      libwidevinecdm.so on Linux).
-//   3. widevidecdmadapter file from the CEF binary distribution (e.g.
-//      widevinecdmadapter.dll on Windows, widevinecdmadapter.plugin on OS X,
-//      libwidevinecdmadapter.so on Linux).
 //
 // If any of these files are missing or if the manifest file has incorrect
 // contents the registration will fail and |callback| will receive a |result|

include/internal/cef_types.h

@@ -151,14 +151,6 @@ typedef struct _cef_settings_t {
   ///
   size_t size;
 
-  ///
-  // Set to true (1) to use a single process for the browser and renderer. This
-  // run mode is not officially supported by Chromium and is less stable than
-  // the multi-process default. Also configurable using the "single-process"
-  // command-line switch.
-  ///
-  int single_process;
-
   ///
   // Set to true (1) to disable the sandbox for sub-processes. See
   // cef_sandbox_win.h for requirements to enable the sandbox on Windows. Also
@@ -189,7 +181,7 @@ typedef struct _cef_settings_t {
   // 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
   // called from your application message loop. This option is only supported on
-  // Windows.
+  // Windows and Linux.
   ///
   int multi_threaded_message_loop;
 
@@ -1264,6 +1256,12 @@ typedef enum {
   // originated in the browser process.
   ///
   UR_FLAG_NO_RETRY_ON_5XX = 1 << 5,
+
+  ///
+  // If set 3XX responses will cause the fetch to halt immediately rather than
+  // continue through the redirect.
+  ///
+  UR_FLAG_STOP_ON_REDIRECT = 1 << 6,
 } cef_urlrequest_flags_t;
 
 ///
@@ -1379,23 +1377,41 @@ typedef enum {
   ///
   // The main thread in the browser. This will be the same as the main
   // application thread if CefInitialize() is called with a
-  // CefSettings.multi_threaded_message_loop value of false.
+  // CefSettings.multi_threaded_message_loop value of false. Do not perform
+  // blocking tasks on this thread. All tasks posted after
+  // CefBrowserProcessHandler::OnContextInitialized() and before CefShutdown()
+  // are guaranteed to run. This thread will outlive all other CEF threads.
   ///
   TID_UI,
 
   ///
-  // Used to interact with the database.
+  // Used for blocking tasks (e.g. file system access) where the user won't
+  // notice if the task takes an arbitrarily long time to complete. All tasks
+  // posted after CefBrowserProcessHandler::OnContextInitialized() and before
+  // CefShutdown() are guaranteed to run.
   ///
-  TID_DB,
+  TID_FILE_BACKGROUND,
+  TID_FILE = TID_FILE_BACKGROUND,
 
   ///
-  // Used to interact with the file system.
+  // Used for blocking tasks (e.g. file system access) that affect UI or
+  // responsiveness of future user interactions. Do not use if an immediate
+  // response to a user interaction is expected. All tasks posted after
+  // CefBrowserProcessHandler::OnContextInitialized() and before CefShutdown()
+  // are guaranteed to run.
+  // Examples:
+  // - Updating the UI to reflect progress on a long task.
+  // - Loading data that might be shown in the UI after a future user
+  //   interaction.
   ///
-  TID_FILE,
+  TID_FILE_USER_VISIBLE,
 
   ///
-  // Used for file system operations that block user interactions.
-  // Responsiveness of this thread affects users.
+  // Used for blocking tasks (e.g. file system access) that affect UI
+  // immediately after a user interaction. All tasks posted after
+  // CefBrowserProcessHandler::OnContextInitialized() and before CefShutdown()
+  // are guaranteed to run.
+  // Example: Generating data shown in the UI immediately after a click.
   ///
   TID_FILE_USER_BLOCKING,
 
@@ -1405,12 +1421,10 @@ typedef enum {
   TID_PROCESS_LAUNCHER,
 
   ///
-  // Used to handle slow HTTP cache operations.
-  ///
-  TID_CACHE,
-
-  ///
-  // Used to process IPC and network messages.
+  // Used to process IPC and network messages. Do not perform blocking tasks on
+  // this thread. All tasks posted after
+  // CefBrowserProcessHandler::OnContextInitialized() and before CefShutdown()
+  // are guaranteed to run.
   ///
   TID_IO,
 
@@ -1418,6 +1432,10 @@ 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
+  // run before sub-process termination (sub-processes may be killed at any time
+  // without warning).
   ///
   TID_RENDERER,
 } cef_thread_id_t;

include/internal/cef_types_wrappers.h

@@ -539,7 +539,6 @@ struct CefSettingsTraits {
   static inline void set(const struct_type* src,
                          struct_type* target,
                          bool copy) {
-    target->single_process = src->single_process;
     target->no_sandbox = src->no_sandbox;
     cef_string_set(src->browser_subprocess_path.str,
                    src->browser_subprocess_path.length,

libcef/browser/browser_context.cc

@@ -130,6 +130,12 @@ ChromeZoomLevelPrefs* CefBrowserContext::GetZoomLevelPrefs() {
       GetStoragePartition(this, NULL)->GetZoomLevelDelegate());
 }
 
+scoped_refptr<network::SharedURLLoaderFactory>
+CefBrowserContext::GetURLLoaderFactory() {
+  return GetDefaultStoragePartition(this)
+      ->GetURLLoaderFactoryForBrowserProcess();
+}
+
 void CefBrowserContext::OnRenderFrameDeleted(int render_process_id,
                                              int render_frame_id,
                                              bool is_main_frame,

libcef/browser/browser_context.h

@@ -146,6 +146,7 @@ class CefBrowserContext : public ChromeProfileStub {
 
   // Profile methods.
   ChromeZoomLevelPrefs* GetZoomLevelPrefs() override;
+  scoped_refptr<network::SharedURLLoaderFactory> GetURLLoaderFactory() override;
 
   // Returns a RequestContext associated with this object. If this object is a
   // *Proxy then it will return the single associated proxy RequestContext. If

libcef/browser/browser_context_impl.cc

@@ -39,8 +39,8 @@
 #include "content/public/browser/storage_partition.h"
 #include "extensions/browser/extension_protocols.h"
 #include "extensions/common/constants.h"
-#include "net/proxy/proxy_config_service.h"
-#include "net/proxy/proxy_service.h"
+#include "net/proxy_resolution/proxy_config_service.h"
+#include "net/proxy_resolution/proxy_resolution_service.h"
 
 using content::BrowserThread;
 
@@ -162,7 +162,7 @@ class CefVisitedLinkListener : public visitedlink::VisitedLinkMaster::Listener {
 
   void CreateListenerForContext(const CefBrowserContext* context) {
     CEF_REQUIRE_UIT();
-    auto listener = base::MakeUnique<visitedlink::VisitedLinkEventListener>(
+    auto listener = std::make_unique<visitedlink::VisitedLinkEventListener>(
         const_cast<CefBrowserContext*>(context));
     listener_map_.insert(std::make_pair(context, std::move(listener)));
   }
@@ -176,11 +176,11 @@ class CefVisitedLinkListener : public visitedlink::VisitedLinkMaster::Listener {
 
   // visitedlink::VisitedLinkMaster::Listener methods.
 
-  void NewTable(mojo::SharedBufferHandle table) override {
+  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);
+      it->second->NewTable(table_region);
   }
 
   void Add(visitedlink::VisitedLinkCommon::Fingerprint fingerprint) override {
@@ -418,7 +418,8 @@ CefBrowserContextImpl::GetSSLHostStateDelegate() {
   return ssl_host_state_delegate_.get();
 }
 
-content::PermissionManager* CefBrowserContextImpl::GetPermissionManager() {
+content::PermissionControllerDelegate*
+CefBrowserContextImpl::GetPermissionControllerDelegate() {
   return nullptr;
 }
 
@@ -450,7 +451,8 @@ net::URLRequestContextGetter* CefBrowserContextImpl::CreateRequestContext(
   // TODO(cef): Determine if we can use the Chrome/Mojo implementation from
   // https://crrev.com/d0d0d050
   std::unique_ptr<net::ProxyConfigService> base_service(
-      net::ProxyService::CreateSystemProxyConfigService(io_thread_runner));
+      net::ProxyResolutionService::CreateSystemProxyConfigService(
+          io_thread_runner));
   std::unique_ptr<net::ProxyConfigService> proxy_config_service(
       pref_proxy_config_tracker_->CreateTrackingProxyConfigService(
           std::move(base_service)));
@@ -461,10 +463,8 @@ net::URLRequestContextGetter* CefBrowserContextImpl::CreateRequestContext(
     // data in its installation directory).
     extensions::InfoMap* extension_info_map = extension_system()->info_map();
     (*protocol_handlers)[extensions::kExtensionScheme] =
-        linked_ptr<net::URLRequestJobFactory::ProtocolHandler>(
         extensions::CreateExtensionProtocolHandler(IsOffTheRecord(),
-                                                       extension_info_map)
-                .release());
+                                                   extension_info_map);
   }
 
   url_request_getter_ = new CefURLRequestContextGetterImpl(

libcef/browser/browser_context_impl.h

@@ -67,7 +67,8 @@ class CefBrowserContextImpl : public CefBrowserContext,
   storage::SpecialStoragePolicy* GetSpecialStoragePolicy() override;
   content::PushMessagingService* GetPushMessagingService() override;
   content::SSLHostStateDelegate* GetSSLHostStateDelegate() override;
-  content::PermissionManager* GetPermissionManager() override;
+  content::PermissionControllerDelegate* GetPermissionControllerDelegate()
+      override;
   content::BackgroundFetchDelegate* GetBackgroundFetchDelegate() override;
   content::BackgroundSyncController* GetBackgroundSyncController() override;
   content::BrowsingDataRemoverDelegate* GetBrowsingDataRemoverDelegate()

libcef/browser/browser_context_proxy.cc

@@ -153,8 +153,9 @@ CefBrowserContextProxy::GetSSLHostStateDelegate() {
   return parent_->GetSSLHostStateDelegate();
 }
 
-content::PermissionManager* CefBrowserContextProxy::GetPermissionManager() {
-  return parent_->GetPermissionManager();
+content::PermissionControllerDelegate*
+CefBrowserContextProxy::GetPermissionControllerDelegate() {
+  return parent_->GetPermissionControllerDelegate();
 }
 
 content::BackgroundFetchDelegate*

libcef/browser/browser_context_proxy.h

@@ -42,7 +42,8 @@ class CefBrowserContextProxy : public CefBrowserContext {
   storage::SpecialStoragePolicy* GetSpecialStoragePolicy() override;
   content::PushMessagingService* GetPushMessagingService() override;
   content::SSLHostStateDelegate* GetSSLHostStateDelegate() override;
-  content::PermissionManager* GetPermissionManager() override;
+  content::PermissionControllerDelegate* GetPermissionControllerDelegate()
+      override;
   content::BackgroundFetchDelegate* GetBackgroundFetchDelegate() override;
   content::BackgroundSyncController* GetBackgroundSyncController() override;
   content::BrowsingDataRemoverDelegate* GetBrowsingDataRemoverDelegate()

libcef/browser/browser_host_impl.h

@@ -400,13 +400,15 @@ class CefBrowserHostImpl : public CefBrowserHost,
       const content::OpenURLParams& params) override;
   bool ShouldTransferNavigation(bool is_main_frame_navigation) override;
   void AddNewContents(content::WebContents* source,
-                      content::WebContents* new_contents,
+                      std::unique_ptr<content::WebContents> new_contents,
                       WindowOpenDisposition disposition,
                       const gfx::Rect& initial_rect,
                       bool user_gesture,
                       bool* was_blocked) override;
   void LoadingStateChanged(content::WebContents* source,
                            bool to_different_document) override;
+  void LoadProgressChanged(content::WebContents* source,
+                           double progress) override;
   void CloseContents(content::WebContents* source) override;
   void UpdateTargetURL(content::WebContents* source, const GURL& url) override;
   bool DidAddMessageToConsole(content::WebContents* source,
@@ -450,8 +452,10 @@ class CefBrowserHostImpl : public CefBrowserHost,
   void RunFileChooser(content::RenderFrameHost* render_frame_host,
                       const content::FileChooserParams& params) override;
   bool EmbedsFullscreenWidget() const override;
-  void EnterFullscreenModeForTab(content::WebContents* web_contents,
-                                 const GURL& origin) override;
+  void EnterFullscreenModeForTab(
+      content::WebContents* web_contents,
+      const GURL& origin,
+      const blink::WebFullscreenOptions& options) override;
   void ExitFullscreenModeForTab(content::WebContents* web_contents) override;
   bool IsFullscreenForTabOrPending(
       const content::WebContents* web_contents) const override;
@@ -470,15 +474,14 @@ class CefBrowserHostImpl : public CefBrowserHost,
   void RequestMediaAccessPermission(
       content::WebContents* web_contents,
       const content::MediaStreamRequest& request,
-      const content::MediaResponseCallback& callback) override;
-  bool CheckMediaAccessPermission(content::WebContents* web_contents,
+      content::MediaResponseCallback callback) override;
+  bool CheckMediaAccessPermission(content::RenderFrameHost* render_frame_host,
                                   const GURL& security_origin,
                                   content::MediaStreamType type) override;
   bool IsNeverVisible(content::WebContents* web_contents) override;
 
   // content::WebContentsObserver methods.
   using content::WebContentsObserver::BeforeUnloadFired;
-  using content::WebContentsObserver::WasHidden;
   void RenderFrameCreated(content::RenderFrameHost* render_frame_host) override;
   void RenderFrameHostChanged(content::RenderFrameHost* old_host,
                               content::RenderFrameHost* new_host) override;
@@ -503,8 +506,7 @@ class CefBrowserHostImpl : public CefBrowserHost,
   bool OnMessageReceived(const IPC::Message& message,
                          content::RenderFrameHost* render_frame_host) override;
   void AccessibilityEventReceived(
-      const std::vector<content::AXEventNotificationDetails>& eventData)
-      override;
+      const content::AXEventNotificationDetails& content_event_bundle) override;
   void AccessibilityLocationChangesReceived(
       const std::vector<content::AXLocationChangeNotificationDetails>& locData)
       override;
@@ -519,6 +521,20 @@ class CefBrowserHostImpl : public CefBrowserHost,
   void RemoveObserver(Observer* observer);
   bool HasObserver(Observer* observer) const;
 
+  class NavigationLock final {
+   private:
+    friend class CefBrowserHostImpl;
+    friend std::unique_ptr<NavigationLock>::deleter_type;
+
+    explicit NavigationLock(CefRefPtr<CefBrowserHostImpl> browser);
+    ~NavigationLock();
+
+    CefRefPtr<CefBrowserHostImpl> browser_;
+  };
+
+  // Block navigation-related events on NavigationLock life span.
+  std::unique_ptr<NavigationLock> CreateNavigationLock();
+
  private:
   class DevToolsWebContentsObserver;
 
@@ -526,6 +542,7 @@ class CefBrowserHostImpl : public CefBrowserHost,
       const CefBrowserSettings& settings,
       CefRefPtr<CefClient> client,
       content::WebContents* web_contents,
+      bool own_web_contents,
       scoped_refptr<CefBrowserInfo> browser_info,
       CefRefPtr<CefBrowserHostImpl> opener,
       bool is_devtools_popup,
@@ -563,6 +580,8 @@ class CefBrowserHostImpl : public CefBrowserHost,
       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();
 
@@ -575,6 +594,11 @@ class CefBrowserHostImpl : public CefBrowserHost,
   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);
+
   // Update or create a frame object. |frame_id| (renderer routing id) will be
   // >= 0 if the frame currently exists in the renderer process. |frame_id| will
   // be < 0 for the main frame if it has not yet navigated for the first time,
@@ -585,13 +609,13 @@ class CefBrowserHostImpl : public CefBrowserHost,
   // if PlzNavigate is disabled; or >= 0 otherwise. |parent_frame_id| will be
   // CefFrameHostImpl::kUnspecifiedFrameId if unknown. In cases where |frame_id|
   // is < 0 either the existing main frame object or a pending object will be
-  // returned depending on current state. If |is_download| is true then the
-  // value of |is_main_frame| cannot be relied on.
+  // returned depending on current state. If |is_main_frame_state_flaky| is true
+  // then the value of |is_main_frame| cannot be relied on.
   CefRefPtr<CefFrame> GetOrCreateFrame(int64 frame_id,
                                        int frame_tree_node_id,
                                        int64 parent_frame_id,
                                        bool is_main_frame,
-                                       bool is_download,
+                                       bool is_main_frame_state_flaky,
                                        base::string16 frame_name,
                                        const GURL& frame_url);
 
@@ -625,6 +649,8 @@ class CefBrowserHostImpl : public CefBrowserHost,
   // Create the CefFileDialogManager if it doesn't already exist.
   void EnsureFileDialogManager();
 
+  void ConfigureAutoResize();
+
   // Send a message to the RenderViewHost associated with this browser.
   // TODO(cef): With the introduction of OOPIFs, WebContents can span multiple
   // processes. Messages should be sent to specific RenderFrameHosts instead.
@@ -632,7 +658,6 @@ class CefBrowserHostImpl : public CefBrowserHost,
 
   CefBrowserSettings settings_;
   CefRefPtr<CefClient> client_;
-  std::unique_ptr<content::WebContents> web_contents_;
   scoped_refptr<CefBrowserInfo> browser_info_;
   CefWindowHandle opener_;
   CefRefPtr<CefRequestContext> request_context_;
@@ -641,6 +666,12 @@ class CefBrowserHostImpl : public CefBrowserHost,
   const bool is_views_hosted_;
   CefWindowHandle host_window_handle_;
 
+  // Non-nullptr if this object owns the WebContents. Will be nullptr for popup
+  // browsers between the calls to WebContentsCreated() and AddNewContents(),
+  // and may never be set if the parent browser is destroyed during popup
+  // creation.
+  std::unique_ptr<content::WebContents> owned_web_contents_;
+
   // Volatile state information. All access must be protected by the state lock.
   base::Lock state_lock_;
   bool is_loading_;
@@ -674,9 +705,11 @@ class CefBrowserHostImpl : public CefBrowserHost,
   // thread.
   DestructionState destruction_state_;
 
-  // True if frame destruction is currently pending. Navigation should not occur
-  // while this flag is true.
-  bool frame_destruction_pending_;
+  // 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.
@@ -726,6 +759,11 @@ class CefBrowserHostImpl : public CefBrowserHost,
   CefRefPtr<CefExtension> extension_;
   bool is_background_host_ = false;
 
+  // Used with auto-resize.
+  bool auto_resize_enabled_ = false;
+  gfx::Size auto_resize_min_;
+  gfx::Size auto_resize_max_;
+
   IMPLEMENT_REFCOUNTING(CefBrowserHostImpl);
   DISALLOW_COPY_AND_ASSIGN(CefBrowserHostImpl);
 };

libcef/browser/browser_info_manager.cc

@@ -154,7 +154,7 @@ bool CefBrowserInfoManager::CanCreateWindow(
   window_info->SetAsPopup(NULL, CefString());
 #endif
 
-  auto pending_popup = base::MakeUnique<CefBrowserInfoManager::PendingPopup>();
+  auto pending_popup = std::make_unique<CefBrowserInfoManager::PendingPopup>();
   pending_popup->step = CefBrowserInfoManager::PendingPopup::CAN_CREATE_WINDOW;
   pending_popup->opener_process_id = opener->GetProcess()->GetID();
   pending_popup->opener_frame_id = opener->GetRoutingID();

libcef/browser/browser_info_manager.h

@@ -16,7 +16,7 @@
 
 #include "base/synchronization/lock.h"
 #include "content/public/browser/render_process_host_observer.h"
-#include "third_party/WebKit/public/web/window_features.mojom.h"
+#include "third_party/blink/public/web/window_features.mojom.h"
 #include "ui/base/window_open_disposition.h"
 #include "url/gurl.h"
 

libcef/browser/browser_main.cc

@@ -10,7 +10,6 @@
 
 #include "libcef/browser/browser_context_impl.h"
 #include "libcef/browser/browser_context_keyed_service_factories.h"
-#include "libcef/browser/browser_message_loop.h"
 #include "libcef/browser/content_browser_client.h"
 #include "libcef/browser/context.h"
 #include "libcef/browser/devtools_manager_delegate.h"
@@ -26,12 +25,15 @@
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_number_conversions.h"
+#include "base/task_scheduler/post_task.h"
+#include "chrome/browser/chrome_browser_main_extra_parts.h"
 #include "chrome/browser/plugins/plugin_finder.h"
 #include "content/public/browser/gpu_data_manager.h"
-#include "content/public/common/result_codes.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/constants.h"
 #include "net/base/net_module.h"
+#include "services/service_manager/embedder/result_codes.h"
+#include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/resource/resource_bundle.h"
 
 #if defined(USE_AURA)
@@ -58,13 +60,14 @@ CefBrowserMainParts::CefBrowserMainParts(
     const content::MainFunctionParams& parameters)
     : BrowserMainParts(), devtools_delegate_(NULL) {}
 
-CefBrowserMainParts::~CefBrowserMainParts() {}
+CefBrowserMainParts::~CefBrowserMainParts() {
+  for (int i = static_cast<int>(chrome_extra_parts_.size()) - 1; i >= 0; --i)
+    delete chrome_extra_parts_[i];
+  chrome_extra_parts_.clear();
+}
 
-void CefBrowserMainParts::PreMainMessageLoopStart() {
-  if (!base::MessageLoop::current()) {
-    // Create the browser message loop.
-    message_loop_.reset(new CefBrowserMessageLoop());
-  }
+void CefBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) {
+  chrome_extra_parts_.push_back(parts);
 }
 
 int CefBrowserMainParts::PreEarlyInitialization() {
@@ -73,7 +76,16 @@ int CefBrowserMainParts::PreEarlyInitialization() {
   // views::LinuxUI::SetInstance.
   ui::InitializeInputMethodForTesting();
 #endif
-  return content::RESULT_CODE_NORMAL_EXIT;
+
+  for (size_t i = 0; i < chrome_extra_parts_.size(); ++i)
+    chrome_extra_parts_[i]->PreEarlyInitialization();
+
+  return service_manager::RESULT_CODE_NORMAL_EXIT;
+}
+
+void CefBrowserMainParts::PostEarlyInitialization() {
+  for (size_t i = 0; i < chrome_extra_parts_.size(); ++i)
+    chrome_extra_parts_[i]->PostEarlyInitialization();
 }
 
 void CefBrowserMainParts::ToolkitInitialized() {
@@ -89,6 +101,14 @@ void CefBrowserMainParts::ToolkitInitialized() {
       CefContentBrowserClient::Get()->GetResourceDllName());
 #endif
 #endif  // defined(USE_AURA)
+
+  for (size_t i = 0; i < chrome_extra_parts_.size(); ++i)
+    chrome_extra_parts_[i]->ToolkitInitialized();
+}
+
+void CefBrowserMainParts::PreMainMessageLoopStart() {
+  for (size_t i = 0; i < chrome_extra_parts_.size(); ++i)
+    chrome_extra_parts_[i]->PreMainMessageLoopStart();
 }
 
 void CefBrowserMainParts::PostMainMessageLoopStart() {
@@ -98,6 +118,9 @@ void CefBrowserMainParts::PostMainMessageLoopStart() {
   printing::PrintingContextLinux::SetPdfPaperSizeFunction(
       &CefPrintDialogLinux::GetPdfPaperSize);
 #endif
+
+  for (size_t i = 0; i < chrome_extra_parts_.size(); ++i)
+    chrome_extra_parts_[i]->PostMainMessageLoopStart();
 }
 
 int CefBrowserMainParts::PreCreateThreads() {
@@ -111,14 +134,28 @@ int CefBrowserMainParts::PreCreateThreads() {
   // before the IO thread is started.
   content::GpuDataManager::GetInstance();
 
+  for (size_t i = 0; i < chrome_extra_parts_.size(); ++i)
+    chrome_extra_parts_[i]->PreCreateThreads();
+
   return 0;
 }
 
+void CefBrowserMainParts::ServiceManagerConnectionStarted(
+    content::ServiceManagerConnection* connection) {
+  for (size_t i = 0; i < chrome_extra_parts_.size(); ++i)
+    chrome_extra_parts_[i]->ServiceManagerConnectionStarted(connection);
+}
+
 void CefBrowserMainParts::PreMainMessageLoopRun() {
 #if defined(USE_AURA)
   display::Screen::SetScreenInstance(views::CreateDesktopScreen());
 #endif
 
+  ui::MaterialDesignController::Initialize();
+
+  // CEF's profile is a BrowserContext.
+  PreProfileInit();
+
   if (extensions::ExtensionsEnabled()) {
     // Initialize extension global objects before creating the global
     // BrowserContext.
@@ -137,6 +174,16 @@ void CefBrowserMainParts::PreMainMessageLoopRun() {
 
   printing::CefPrintingMessageFilter::EnsureShutdownNotifierFactoryBuilt();
 
+  background_task_runner_ = base::CreateSingleThreadTaskRunnerWithTraits(
+      {base::TaskPriority::BACKGROUND,
+       base::TaskShutdownBehavior::BLOCK_SHUTDOWN, base::MayBlock()});
+  user_visible_task_runner_ = base::CreateSingleThreadTaskRunnerWithTraits(
+      {base::TaskPriority::USER_VISIBLE,
+       base::TaskShutdownBehavior::BLOCK_SHUTDOWN, base::MayBlock()});
+  user_blocking_task_runner_ = base::CreateSingleThreadTaskRunnerWithTraits(
+      {base::TaskPriority::USER_BLOCKING,
+       base::TaskShutdownBehavior::BLOCK_SHUTDOWN, base::MayBlock()});
+
   CefRequestContextSettings settings;
   CefContext::Get()->PopulateRequestContextSettings(&settings);
 
@@ -146,12 +193,21 @@ void CefBrowserMainParts::PreMainMessageLoopRun() {
   CefBrowserContextImpl* browser_context = static_cast<CefBrowserContextImpl*>(
       global_request_context_->GetBrowserContext());
 
+  PostProfileInit();
+
   CefDevToolsManagerDelegate::StartHttpHandler(browser_context);
 
   // Triggers initialization of the singleton instance on UI thread.
   PluginFinder::GetInstance()->Init();
 
   scheme::RegisterWebUIControllerFactory();
+
+  // These have no equivalent in CEF.
+  PreBrowserStart();
+  PostBrowserStart();
+
+  for (size_t i = 0; i < chrome_extra_parts_.size(); ++i)
+    chrome_extra_parts_[i]->PreMainMessageLoopRun();
 }
 
 void CefBrowserMainParts::PostMainMessageLoopRun() {
@@ -167,6 +223,9 @@ void CefBrowserMainParts::PostMainMessageLoopRun() {
     extensions::ExtensionsBrowserClient::Set(NULL);
     extensions_browser_client_.reset();
   }
+
+  for (size_t i = 0; i < chrome_extra_parts_.size(); ++i)
+    chrome_extra_parts_[i]->PostMainMessageLoopRun();
 }
 
 void CefBrowserMainParts::PostDestroyThreads() {
@@ -175,3 +234,23 @@ void CefBrowserMainParts::PostDestroyThreads() {
   delete views::ViewsDelegate::GetInstance();
 #endif
 }
+
+void CefBrowserMainParts::PreProfileInit() {
+  for (size_t i = 0; i < chrome_extra_parts_.size(); ++i)
+    chrome_extra_parts_[i]->PreProfileInit();
+}
+
+void CefBrowserMainParts::PostProfileInit() {
+  for (size_t i = 0; i < chrome_extra_parts_.size(); ++i)
+    chrome_extra_parts_[i]->PostProfileInit();
+}
+
+void CefBrowserMainParts::PreBrowserStart() {
+  for (size_t i = 0; i < chrome_extra_parts_.size(); ++i)
+    chrome_extra_parts_[i]->PreBrowserStart();
+}
+
+void CefBrowserMainParts::PostBrowserStart() {
+  for (size_t i = 0; i < chrome_extra_parts_.size(); ++i)
+    chrome_extra_parts_[i]->PostBrowserStart();
+}

libcef/browser/browser_main.h

@@ -16,11 +16,6 @@
 #include "content/public/browser/browser_main_parts.h"
 #include "net/url_request/url_request_context_getter.h"
 
-namespace base {
-class MessageLoop;
-class Thread;
-}  // namespace base
-
 namespace content {
 struct MainFunctionParams;
 }
@@ -37,26 +32,51 @@ class WMState;
 #endif
 
 class CefDevToolsDelegate;
+class ChromeBrowserMainExtraParts;
 
 class CefBrowserMainParts : public content::BrowserMainParts {
  public:
   explicit CefBrowserMainParts(const content::MainFunctionParams& parameters);
   ~CefBrowserMainParts() override;
 
+  // Add additional ChromeBrowserMainExtraParts.
+  void AddParts(ChromeBrowserMainExtraParts* parts);
+
+  int PreEarlyInitialization() override;
+  void PostEarlyInitialization() override;
+  void ToolkitInitialized() override;
   void PreMainMessageLoopStart() override;
   void PostMainMessageLoopStart() override;
-  int PreEarlyInitialization() override;
-  void ToolkitInitialized() override;
   int PreCreateThreads() override;
+  void ServiceManagerConnectionStarted(
+      content::ServiceManagerConnection* connection) override;
   void PreMainMessageLoopRun() override;
   void PostMainMessageLoopRun() override;
   void PostDestroyThreads() override;
 
+  // Additional stages for ChromeBrowserMainExtraParts. These stages are called
+  // in order from PreMainMessageLoopRun(). See implementation for details.
+  void PreProfileInit();
+  void PostProfileInit();
+  void PreBrowserStart();
+  void PostBrowserStart();
+
   CefRefPtr<CefRequestContextImpl> request_context() const {
     return global_request_context_;
   }
   CefDevToolsDelegate* devtools_delegate() const { return devtools_delegate_; }
 
+  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:
 #if defined(OS_WIN)
   void PlatformInitialize();
@@ -64,16 +84,27 @@ class CefBrowserMainParts : public content::BrowserMainParts {
 
   CefRefPtr<CefRequestContextImpl> global_request_context_;
   CefDevToolsDelegate* devtools_delegate_;  // Deletes itself.
-  std::unique_ptr<base::MessageLoop> message_loop_;
 
   std::unique_ptr<extensions::ExtensionsClient> extensions_client_;
   std::unique_ptr<extensions::ExtensionsBrowserClient>
       extensions_browser_client_;
 
+  // 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).
+  // |background_task_runner_| is also passed to SQLitePersistentCookieStore.
+  scoped_refptr<base::SingleThreadTaskRunner> background_task_runner_;
+  scoped_refptr<base::SingleThreadTaskRunner> user_visible_task_runner_;
+  scoped_refptr<base::SingleThreadTaskRunner> user_blocking_task_runner_;
+
 #if defined(USE_AURA)
   std::unique_ptr<wm::WMState> wm_state_;
 #endif
 
+  // Vector of additional ChromeBrowserMainExtraParts.
+  // Parts are deleted in the inverse order they are added.
+  std::vector<ChromeBrowserMainExtraParts*> chrome_extra_parts_;
+
   DISALLOW_COPY_AND_ASSIGN(CefBrowserMainParts);
 };
 

libcef/browser/browser_main_win.cc

@@ -8,11 +8,7 @@
 
 #include "libcef/browser/browser_main.h"
 
-#include "cef/grit/cef_strings.h"
-#include "content/public/browser/utility_process_host.h"
-#include "content/public/browser/utility_process_host_client.h"
-#include "ui/base/l10n/l10n_util.h"
-#include "ui/gfx/win/direct_write.h"
+#include "base/logging.h"
 
 void CefBrowserMainParts::PlatformInitialize() {
   HRESULT res;

libcef/browser/browser_message_loop.cc

@@ -7,7 +7,6 @@
 #include "libcef/common/content_client.h"
 
 #include "base/memory/ptr_util.h"
-#include "base/run_loop.h"
 
 #if defined(OS_MACOSX)
 #include "base/mac/scoped_nsautorelease_pool.h"
@@ -103,20 +102,3 @@ CefBrowserMessageLoop::CefBrowserMessageLoop()
 }
 
 CefBrowserMessageLoop::~CefBrowserMessageLoop() {}
-
-// static
-CefBrowserMessageLoop* CefBrowserMessageLoop::current() {
-  base::MessageLoop* loop = base::MessageLoop::current();
-  DCHECK(loop->IsType(base::MessageLoop::TYPE_UI));
-  return static_cast<CefBrowserMessageLoop*>(loop);
-}
-
-void CefBrowserMessageLoop::DoMessageLoopIteration() {
-  base::RunLoop run_loop;
-  run_loop.RunUntilIdle();
-}
-
-void CefBrowserMessageLoop::RunMessageLoop() {
-  base::RunLoop run_loop;
-  run_loop.Run();
-}

libcef/browser/browser_message_loop.h

@@ -17,15 +17,6 @@ class CefBrowserMessageLoop : public base::MessageLoopForUI {
   CefBrowserMessageLoop();
   ~CefBrowserMessageLoop() override;
 
-  // Returns the CefBrowserMessageLoop of the current thread.
-  static CefBrowserMessageLoop* current();
-
-  // Do a single interation of the UI message loop.
-  void DoMessageLoopIteration();
-
-  // Run the UI message loop.
-  void RunMessageLoop();
-
  private:
   DISALLOW_COPY_AND_ASSIGN(CefBrowserMessageLoop);
 };

libcef/browser/browser_platform_delegate.cc

@@ -196,7 +196,7 @@ void CefBrowserPlatformDelegate::DragSourceSystemDragEnded() {
 }
 
 void CefBrowserPlatformDelegate::AccessibilityEventReceived(
-    const std::vector<content::AXEventNotificationDetails>& eventData) {
+    const content::AXEventNotificationDetails& eventData) {
   NOTREACHED();
 }
 

libcef/browser/browser_platform_delegate.h

@@ -22,14 +22,14 @@ namespace blink {
 class WebMouseEvent;
 class WebMouseWheelEvent;
 class WebInputEvent;
-}
+}  // namespace blink
 
 namespace content {
 struct NativeWebKeyboardEvent;
 class RenderViewHost;
 class RenderViewHostDelegateView;
 class WebContentsView;
-}
+}  // namespace content
 
 #if defined(USE_AURA)
 namespace views {
@@ -140,7 +140,7 @@ class CefBrowserPlatformDelegate {
   virtual SkColor GetBackgroundColor() const = 0;
 
   // Notify the window that it was resized.
-  virtual void WasResized() = 0;
+  virtual void SynchronizeVisualProperties() = 0;
 
   // Send input events.
   virtual void SendKeyEvent(const content::NativeWebKeyboardEvent& event) = 0;
@@ -262,7 +262,7 @@ class CefBrowserPlatformDelegate {
   virtual void DragSourceEndedAt(int x, int y, cef_drag_operations_mask_t op);
   virtual void DragSourceSystemDragEnded();
   virtual void AccessibilityEventReceived(
-      const std::vector<content::AXEventNotificationDetails>& eventData);
+      const content::AXEventNotificationDetails& eventData);
   virtual void AccessibilityLocationChangesReceived(
       const std::vector<content::AXLocationChangeNotificationDetails>& locData);
 

libcef/browser/browser_platform_delegate_create.cc

@@ -36,13 +36,13 @@ std::unique_ptr<CefBrowserPlatformDelegateNative> CreateNativeDelegate(
     const CefWindowInfo& window_info,
     SkColor background_color) {
 #if defined(OS_WIN)
-  return base::MakeUnique<CefBrowserPlatformDelegateNativeWin>(
+  return std::make_unique<CefBrowserPlatformDelegateNativeWin>(
       window_info, background_color);
 #elif defined(OS_MACOSX)
-  return base::MakeUnique<CefBrowserPlatformDelegateNativeMac>(
+  return std::make_unique<CefBrowserPlatformDelegateNativeMac>(
       window_info, background_color);
 #elif defined(OS_LINUX)
-  return base::MakeUnique<CefBrowserPlatformDelegateNativeLinux>(
+  return std::make_unique<CefBrowserPlatformDelegateNativeLinux>(
       window_info, background_color);
 #endif
 }
@@ -50,13 +50,13 @@ std::unique_ptr<CefBrowserPlatformDelegateNative> CreateNativeDelegate(
 std::unique_ptr<CefBrowserPlatformDelegateOsr> CreateOSRDelegate(
     std::unique_ptr<CefBrowserPlatformDelegateNative> native_delegate) {
 #if defined(OS_WIN)
-  return base::MakeUnique<CefBrowserPlatformDelegateOsrWin>(
+  return std::make_unique<CefBrowserPlatformDelegateOsrWin>(
       std::move(native_delegate));
 #elif defined(OS_MACOSX)
-  return base::MakeUnique<CefBrowserPlatformDelegateOsrMac>(
+  return std::make_unique<CefBrowserPlatformDelegateOsrMac>(
       std::move(native_delegate));
 #elif defined(OS_LINUX)
-  return base::MakeUnique<CefBrowserPlatformDelegateOsrLinux>(
+  return std::make_unique<CefBrowserPlatformDelegateOsrLinux>(
       std::move(native_delegate));
 #endif
 }
@@ -85,7 +85,7 @@ std::unique_ptr<CefBrowserPlatformDelegate> CefBrowserPlatformDelegate::Create(
     // Creating a background extension host without a window.
     std::unique_ptr<CefBrowserPlatformDelegateNative> native_delegate =
         CreateNativeDelegate(CefWindowInfo(), background_color);
-    return base::MakeUnique<CefBrowserPlatformDelegateBackground>(
+    return std::make_unique<CefBrowserPlatformDelegateBackground>(
         std::move(native_delegate));
   }
 #if defined(USE_AURA)
@@ -93,7 +93,7 @@ std::unique_ptr<CefBrowserPlatformDelegate> CefBrowserPlatformDelegate::Create(
     // CefWindowInfo is not used in this case.
     std::unique_ptr<CefBrowserPlatformDelegateNative> native_delegate =
         CreateNativeDelegate(CefWindowInfo(), background_color);
-    return base::MakeUnique<CefBrowserPlatformDelegateViews>(
+    return std::make_unique<CefBrowserPlatformDelegateViews>(
         std::move(native_delegate),
         static_cast<CefBrowserViewImpl*>(create_params.browser_view.get()));
   }

libcef/browser/browser_urlrequest_impl.cc

@@ -20,7 +20,6 @@
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_util.h"
 #include "content/public/browser/browser_thread.h"
-#include "content/public/common/url_fetcher.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_response_headers.h"
@@ -356,6 +355,9 @@ class CefBrowserURLRequest::Context
       CefResponseImpl* responseImpl =
           static_cast<CefResponseImpl*>(response_.get());
 
+      responseImpl->SetURL(fetcher_->GetURL().spec());
+      responseImpl->SetStatus(fetcher_->GetResponseCode());
+
       net::HttpResponseHeaders* headers = fetcher_->GetResponseHeaders();
       if (headers)
         responseImpl->SetResponseHeaders(*headers);

libcef/browser/chrome_browser_process_stub.cc

@@ -15,7 +15,8 @@
 #include "chrome/browser/printing/print_job_manager.h"
 #include "components/net_log/chrome_net_log.h"
 #include "content/public/common/content_switches.h"
-#include "ui/message_center/message_center.h"
+#include "services/network/public/cpp/network_switches.h"
+#include "services/network/public/cpp/shared_url_loader_factory.h"
 
 ChromeBrowserProcessStub::ChromeBrowserProcessStub()
     : initialized_(false),
@@ -116,6 +117,12 @@ ChromeBrowserProcessStub::network_connection_tracker() {
   return NULL;
 }
 
+network::NetworkQualityTracker*
+ChromeBrowserProcessStub::network_quality_tracker() {
+  NOTREACHED();
+  return NULL;
+}
+
 WatchDogThread* ChromeBrowserProcessStub::watchdog_thread() {
   NOTREACHED();
   return NULL;
@@ -138,6 +145,12 @@ ChromeBrowserProcessStub::system_request_context() {
   return NULL;
 }
 
+scoped_refptr<network::SharedURLLoaderFactory>
+ChromeBrowserProcessStub::shared_url_loader_factory() {
+  NOTREACHED();
+  return NULL;
+}
+
 variations::VariationsService* ChromeBrowserProcessStub::variations_service() {
   NOTREACHED();
   return NULL;
@@ -165,11 +178,6 @@ ChromeBrowserProcessStub::notification_platform_bridge() {
   return NULL;
 }
 
-message_center::MessageCenter* ChromeBrowserProcessStub::message_center() {
-  NOTREACHED();
-  return NULL;
-}
-
 policy::ChromeBrowserPolicyConnector*
 ChromeBrowserProcessStub::browser_policy_connector() {
   NOTREACHED();
@@ -191,9 +199,7 @@ GpuModeManager* ChromeBrowserProcessStub::gpu_mode_manager() {
   return NULL;
 }
 
-void ChromeBrowserProcessStub::CreateDevToolsHttpProtocolHandler(
-    const std::string& ip,
-    uint16_t port) {
+void ChromeBrowserProcessStub::CreateDevToolsProtocolHandler() {
   NOTREACHED();
 }
 
@@ -265,7 +271,6 @@ StatusTray* ChromeBrowserProcessStub::status_tray() {
 
 safe_browsing::SafeBrowsingService*
 ChromeBrowserProcessStub::safe_browsing_service() {
-  NOTREACHED();
   return NULL;
 }
 
@@ -296,10 +301,10 @@ net_log::ChromeNetLog* ChromeBrowserProcessStub::net_log() {
   if (!net_log_) {
     const base::CommandLine& command_line =
         *base::CommandLine::ForCurrentProcess();
-    net_log_ = base::MakeUnique<net_log::ChromeNetLog>();
-    if (command_line.HasSwitch(switches::kLogNetLog)) {
+    net_log_ = std::make_unique<net_log::ChromeNetLog>();
+    if (command_line.HasSwitch(network::switches::kLogNetLog)) {
       net_log_->StartWritingToFile(
-          command_line.GetSwitchValuePath(switches::kLogNetLog),
+          command_line.GetSwitchValuePath(network::switches::kLogNetLog),
           GetNetCaptureModeFromCommandLine(command_line),
           command_line.GetCommandLineString(), std::string());
     }
@@ -325,12 +330,10 @@ ChromeBrowserProcessStub::media_file_system_registry() {
   return NULL;
 }
 
-#if BUILDFLAG(ENABLE_WEBRTC)
 WebRtcLogUploader* ChromeBrowserProcessStub::webrtc_log_uploader() {
   NOTREACHED();
   return NULL;
 }
-#endif
 
 network_time::NetworkTimeTracker*
 ChromeBrowserProcessStub::network_time_tracker() {
@@ -354,12 +357,6 @@ resource_coordinator::TabManager* ChromeBrowserProcessStub::GetTabManager() {
   return NULL;
 }
 
-physical_web::PhysicalWebDataSource*
-ChromeBrowserProcessStub::GetPhysicalWebDataSource() {
-  NOTREACHED();
-  return NULL;
-}
-
 prefs::InProcessPrefServiceFactory*
 ChromeBrowserProcessStub::pref_service_factory() const {
   NOTREACHED();

libcef/browser/chrome_browser_process_stub.h

@@ -16,7 +16,7 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/event_router_forwarder.h"
 #include "chrome/browser/profiles/incognito_helpers.h"
-#include "media/media_features.h"
+#include "media/media_buildflags.h"
 
 class ChromeProfileManagerStub;
 
@@ -50,22 +50,23 @@ class ChromeBrowserProcessStub : public BrowserProcess,
   IOThread* io_thread() override;
   SystemNetworkContextManager* system_network_context_manager() override;
   content::NetworkConnectionTracker* network_connection_tracker() override;
+  network::NetworkQualityTracker* network_quality_tracker() override;
   WatchDogThread* watchdog_thread() override;
   ProfileManager* profile_manager() override;
   PrefService* local_state() override;
   net::URLRequestContextGetter* system_request_context() override;
+  scoped_refptr<network::SharedURLLoaderFactory> shared_url_loader_factory()
+      override;
   variations::VariationsService* variations_service() override;
   BrowserProcessPlatformPart* platform_part() override;
   extensions::EventRouterForwarder* extension_event_router_forwarder() override;
   NotificationUIManager* notification_ui_manager() override;
   NotificationPlatformBridge* notification_platform_bridge() override;
-  message_center::MessageCenter* message_center() override;
   policy::ChromeBrowserPolicyConnector* browser_policy_connector() override;
   policy::PolicyService* policy_service() override;
   IconManager* icon_manager() override;
   GpuModeManager* gpu_mode_manager() override;
-  void CreateDevToolsHttpProtocolHandler(const std::string& ip,
-                                         uint16_t port) override;
+  void CreateDevToolsProtocolHandler() override;
   void CreateDevToolsAutoOpener() override;
   bool IsShuttingDown() override;
   printing::PrintJobManager* print_job_manager() override;
@@ -98,15 +99,12 @@ class ChromeBrowserProcessStub : public BrowserProcess,
   component_updater::SupervisedUserWhitelistInstaller*
   supervised_user_whitelist_installer() override;
   MediaFileSystemRegistry* media_file_system_registry() override;
-#if BUILDFLAG(ENABLE_WEBRTC)
   WebRtcLogUploader* webrtc_log_uploader() override;
-#endif
   network_time::NetworkTimeTracker* network_time_tracker() override;
   gcm::GCMDriver* gcm_driver() override;
   shell_integration::DefaultWebClientState CachedDefaultWebClientState()
       override;
   resource_coordinator::TabManager* GetTabManager() override;
-  physical_web::PhysicalWebDataSource* GetPhysicalWebDataSource() override;
   prefs::InProcessPrefServiceFactory* pref_service_factory() const override;
 
   // BrowserContextIncognitoHelper implementation.

libcef/browser/chrome_profile_stub.cc

@@ -75,11 +75,6 @@ ChromeProfileStub::GetRequestContextForExtensions() {
   return GetRequestContext();
 }
 
-net::SSLConfigService* ChromeProfileStub::GetSSLConfigService() {
-  NOTREACHED();
-  return NULL;
-}
-
 bool ChromeProfileStub::IsSameProfile(Profile* profile) {
   NOTREACHED();
   return false;

libcef/browser/chrome_profile_stub.h

@@ -34,7 +34,6 @@ class ChromeProfileStub : public Profile {
   ExtensionSpecialStoragePolicy* GetExtensionSpecialStoragePolicy() override;
   PrefService* GetOffTheRecordPrefs() override;
   net::URLRequestContextGetter* GetRequestContextForExtensions() override;
-  net::SSLConfigService* GetSSLConfigService() override;
   bool IsSameProfile(Profile* profile) override;
   base::Time GetStartTime() const override;
   base::FilePath last_selected_directory() override;

libcef/browser/content_browser_client.cc

@@ -41,6 +41,7 @@
 #include "base/json/json_reader.h"
 #include "base/path_service.h"
 #include "cef/grit/cef_resources.h"
+#include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_service.h"
 #include "chrome/browser/plugins/plugin_info_host_impl.h"
 #include "chrome/browser/profiles/profile.h"
@@ -49,10 +50,10 @@
 #include "chrome/common/constants.mojom.h"
 #include "chrome/grit/browser_resources.h"
 #include "chrome/grit/generated_resources.h"
-#include "chrome/services/printing/public/interfaces/constants.mojom.h"
+#include "chrome/services/printing/public/mojom/constants.mojom.h"
 #include "components/navigation_interception/intercept_navigation_throttle.h"
 #include "components/navigation_interception/navigation_params.h"
-#include "components/printing/service/public/interfaces/pdf_compositor.mojom.h"
+#include "components/services/pdf_compositor/public/interfaces/pdf_compositor.mojom.h"
 #include "content/browser/frame_host/navigation_handle_impl.h"
 #include "content/browser/frame_host/render_frame_host_impl.h"
 #include "content/browser/plugin_service_impl.h"
@@ -75,18 +76,23 @@
 #include "content/public/common/service_names.mojom.h"
 #include "content/public/common/storage_quota_params.h"
 #include "content/public/common/web_preferences.h"
+#include "extensions/browser/api/web_request/web_request_api.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/io_thread_extension_message_filter.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/switches.h"
 #include "net/ssl/ssl_cert_request_info.h"
 #include "ppapi/host/ppapi_host.h"
-#include "services/proxy_resolver/public/interfaces/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/WebKit/public/web/WebWindowFeatures.h"
+#include "third_party/blink/public/web/web_window_features.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_switches.h"
@@ -96,10 +102,6 @@
 #include "libcef/common/widevine_loader.h"
 #endif
 
-#if defined(OS_MACOSX)
-#include "components/spellcheck/browser/spellcheck_message_filter_platform.h"
-#endif
-
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
 #include "base/debug/leak_annotations.h"
 #include "chrome/common/chrome_paths.h"
@@ -337,7 +339,7 @@ class CefQuotaPermissionContext : public content::QuotaPermissionContext {
 breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost(
     const std::string& process_type) {
   base::FilePath dumps_path;
-  PathService::Get(chrome::DIR_CRASH_DUMPS, &dumps_path);
+  base::PathService::Get(chrome::DIR_CRASH_DUMPS, &dumps_path);
   {
     ANNOTATE_SCOPED_MEMORY_LEAK;
     // Uploads will only occur if a non-empty crash URL is specified in
@@ -429,8 +431,14 @@ bool NavigationOnUIThread(
         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.is_redirect());
+            browser.get(), frame, request.get(), params.has_user_gesture(),
+            params.is_redirect());
       }
     }
   }
@@ -450,6 +458,8 @@ CefContentBrowserClient::~CefContentBrowserClient() {}
 
 // static
 CefContentBrowserClient* CefContentBrowserClient::Get() {
+  if (!CefContentClient::Get())
+    return nullptr;
   return static_cast<CefContentBrowserClient*>(
       CefContentClient::Get()->browser());
 }
@@ -457,25 +467,20 @@ CefContentBrowserClient* CefContentBrowserClient::Get() {
 content::BrowserMainParts* CefContentBrowserClient::CreateBrowserMainParts(
     const content::MainFunctionParams& parameters) {
   browser_main_parts_ = new CefBrowserMainParts(parameters);
+  browser_main_parts_->AddParts(
+      ChromeService::GetInstance()->CreateExtraParts());
   return browser_main_parts_;
 }
 
 void CefContentBrowserClient::RenderProcessWillLaunch(
-    content::RenderProcessHost* host) {
+    content::RenderProcessHost* host,
+    service_manager::mojom::ServiceRequest* service_request) {
   const int id = host->GetID();
   Profile* profile = Profile::FromBrowserContext(host->GetBrowserContext());
 
   host->AddFilter(new CefBrowserMessageFilter(id));
   host->AddFilter(new printing::CefPrintingMessageFilter(id, profile));
 
-#if defined(OS_MACOSX)
-  const base::CommandLine* command_line =
-      base::CommandLine::ForCurrentProcess();
-  if (!command_line->HasSwitch(switches::kDisableSpellChecking)) {
-    host->AddFilter(new SpellCheckMessageFilterPlatform(id));
-  }
-#endif
-
   if (extensions::ExtensionsEnabled()) {
     host->AddFilter(new extensions::ExtensionMessageFilter(id, profile));
     host->AddFilter(
@@ -492,6 +497,16 @@ void CefContentBrowserClient::RenderProcessWillLaunch(
 
   host->Send(
       new CefProcessMsg_SetIsIncognitoProcess(profile->IsOffTheRecord()));
+
+  service_manager::mojom::ServicePtr service;
+  *service_request = mojo::MakeRequest(&service);
+  service_manager::mojom::PIDReceiverPtr pid_receiver;
+  service_manager::Identity renderer_identity = host->GetChildIdentity();
+  ChromeService::GetInstance()->connector()->StartService(
+      service_manager::Identity(chrome::mojom::kRendererServiceName,
+                                renderer_identity.user_id(),
+                                renderer_identity.instance()),
+      std::move(service), mojo::MakeRequest(&pid_receiver));
 }
 
 bool CefContentBrowserClient::ShouldUseProcessPerSite(
@@ -590,11 +605,12 @@ void CefContentBrowserClient::SiteInstanceDeleting(
 }
 
 void CefContentBrowserClient::RegisterInProcessServices(
-    StaticServiceMap* services) {
+    StaticServiceMap* services,
+    content::ServiceManagerConnection* connection) {
   {
     // For spell checking.
     service_manager::EmbeddedServiceInfo info;
-    info.factory = base::Bind(&ChromeService::Create);
+    info.factory = ChromeService::GetInstance()->CreateChromeServiceFactory();
     services->insert(std::make_pair(chrome::mojom::kServiceName, info));
   }
 }
@@ -602,11 +618,12 @@ void CefContentBrowserClient::RegisterInProcessServices(
 void CefContentBrowserClient::RegisterOutOfProcessServices(
     OutOfProcessServiceMap* services) {
   (*services)[printing::mojom::kServiceName] =
-      base::ASCIIToUTF16("PDF Compositor Service");
+      base::BindRepeating(&base::ASCIIToUTF16, "PDF Compositor Service");
   (*services)[printing::mojom::kChromePrintingServiceName] =
-      base::ASCIIToUTF16("Printing Service");
+      base::BindRepeating(&base::ASCIIToUTF16, "Printing Service");
   (*services)[proxy_resolver::mojom::kProxyResolverServiceName] =
-      l10n_util::GetStringUTF16(IDS_UTILITY_PROCESS_PROXY_RESOLVER_NAME);
+      base::BindRepeating(&l10n_util::GetStringUTF16,
+                          IDS_UTILITY_PROCESS_PROXY_RESOLVER_NAME);
 }
 
 std::unique_ptr<base::Value> CefContentBrowserClient::GetServiceManifestOverlay(
@@ -633,6 +650,8 @@ std::vector<content::ContentBrowserClient::ServiceManifestInfo>
 CefContentBrowserClient::GetExtraServiceManifests() {
   return std::vector<ServiceManifestInfo>({
       {printing::mojom::kServiceName, IDR_PDF_COMPOSITOR_MANIFEST},
+      {chrome::mojom::kRendererServiceName,
+       IDR_CHROME_RENDERER_SERVICE_MANIFEST},
   });
 }
 
@@ -711,7 +730,7 @@ void CefContentBrowserClient::AppendExtraCommandLineSwitches(
   }
 
 #if defined(OS_LINUX)
-  if (process_type == switches::kZygoteProcess) {
+  if (process_type == service_manager::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[] = {
@@ -721,9 +740,9 @@ void CefContentBrowserClient::AppendExtraCommandLineSwitches(
                                    arraysize(kSwitchNames));
 
 #if defined(WIDEVINE_CDM_AVAILABLE) && BUILDFLAG(ENABLE_LIBRARY_CDMS)
-    if (!browser_cmd->HasSwitch(switches::kNoSandbox)) {
+    if (!browser_cmd->HasSwitch(service_manager::switches::kNoSandbox)) {
       // Pass the Widevine CDM path to the Zygote process. See comments in
-      // CefWidevineLoader::AddPepperPlugins.
+      // CefWidevineLoader::AddContentDecryptionModules.
       const base::FilePath& cdm_path = CefWidevineLoader::GetInstance()->path();
       if (!cdm_path.empty())
         command_line->AppendSwitchPath(switches::kWidevineCdmPath, cdm_path);
@@ -753,6 +772,10 @@ void CefContentBrowserClient::AppendExtraCommandLineSwitches(
   }
 }
 
+std::string CefContentBrowserClient::GetApplicationLocale() {
+  return g_browser_process->GetApplicationLocale();
+}
+
 content::QuotaPermissionContext*
 CefContentBrowserClient::CreateQuotaPermissionContext() {
   return new CefQuotaPermissionContext();
@@ -958,7 +981,7 @@ CefContentBrowserClient::CreateThrottlesForNavigation(
   }
 
   std::unique_ptr<content::NavigationThrottle> throttle =
-      base::MakeUnique<navigation_interception::InterceptNavigationThrottle>(
+      std::make_unique<navigation_interception::InterceptNavigationThrottle>(
           navigation_handle, base::Bind(&NavigationOnUIThread, is_main_frame,
                                         frame_id, parent_frame_id));
   throttles.push_back(std::move(throttle));
@@ -973,7 +996,7 @@ void CefContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
     content::PosixFileDescriptorInfo* mappings) {
   int crash_signal_fd = GetCrashSignalFD(command_line);
   if (crash_signal_fd >= 0) {
-    mappings->Share(kCrashDumpSignal, crash_signal_fd);
+    mappings->Share(service_manager::kCrashDumpSignal, crash_signal_fd);
   }
 }
 #endif  // defined(OS_LINUX)
@@ -985,7 +1008,7 @@ const wchar_t* CefContentBrowserClient::GetResourceDllName() {
   if (file_path[0] == 0) {
     // Retrieve the module path (usually libcef.dll).
     base::FilePath module;
-    PathService::Get(base::FILE_MODULE, &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);
@@ -1010,6 +1033,75 @@ void CefContentBrowserClient::ExposeInterfacesToRenderer(
       base::MakeRefCounted<PluginInfoHostImpl>(host->GetID(), profile)));
 }
 
+std::unique_ptr<net::ClientCertStore>
+CefContentBrowserClient::CreateClientCertStore(
+    content::ResourceContext* resource_context) {
+  if (!resource_context)
+    return nullptr;
+  return static_cast<CefResourceContext*>(resource_context)
+      ->CreateClientCertStore();
+}
+
+void CefContentBrowserClient::RegisterNonNetworkNavigationURLLoaderFactories(
+    int frame_tree_node_id,
+    NonNetworkURLLoaderFactoryMap* factories) {
+  if (!extensions::ExtensionsEnabled())
+    return;
+
+  content::WebContents* web_contents =
+      content::WebContents::FromFrameTreeNodeId(frame_tree_node_id);
+  factories->emplace(
+      extensions::kExtensionScheme,
+      extensions::CreateExtensionNavigationURLLoaderFactory(
+          web_contents->GetBrowserContext(),
+          !!extensions::WebViewGuest::FromWebContents(web_contents)));
+}
+
+void CefContentBrowserClient::RegisterNonNetworkSubresourceURLLoaderFactories(
+    int render_process_id,
+    int render_frame_id,
+    NonNetworkURLLoaderFactoryMap* factories) {
+  if (!extensions::ExtensionsEnabled())
+    return;
+
+  auto factory = extensions::CreateExtensionURLLoaderFactory(render_process_id,
+                                                             render_frame_id);
+  if (factory)
+    factories->emplace(extensions::kExtensionScheme, std::move(factory));
+}
+
+bool CefContentBrowserClient::WillCreateURLLoaderFactory(
+    content::BrowserContext* browser_context,
+    content::RenderFrameHost* frame,
+    bool is_navigation,
+    network::mojom::URLLoaderFactoryRequest* factory_request) {
+  if (!extensions::ExtensionsEnabled())
+    return false;
+
+  auto* web_request_api =
+      extensions::BrowserContextKeyedAPIFactory<extensions::WebRequestAPI>::Get(
+          browser_context);
+  return web_request_api->MaybeProxyURLLoaderFactory(frame, is_navigation,
+                                                     factory_request);
+}
+
+bool CefContentBrowserClient::HandleExternalProtocol(
+    const GURL& url,
+    content::ResourceRequestInfo::WebContentsGetter web_contents_getter,
+    int child_id,
+    content::NavigationUIData* navigation_data,
+    bool is_main_frame,
+    ui::PageTransition page_transition,
+    bool has_user_gesture) {
+  CEF_POST_TASK(
+      CEF_UIT,
+      base::Bind(
+          base::IgnoreResult(
+              &CefContentBrowserClient::HandleExternalProtocolOnUIThread),
+          url, web_contents_getter));
+  return false;
+}
+
 void CefContentBrowserClient::RegisterCustomScheme(const std::string& scheme) {
   // Register as a Web-safe scheme so that requests for the scheme from a
   // render process will be allowed in resource_dispatcher_host_impl.cc
@@ -1029,6 +1121,21 @@ CefDevToolsDelegate* CefContentBrowserClient::devtools_delegate() const {
   return browser_main_parts_->devtools_delegate();
 }
 
+scoped_refptr<base::SingleThreadTaskRunner>
+CefContentBrowserClient::background_task_runner() const {
+  return browser_main_parts_->background_task_runner();
+}
+
+scoped_refptr<base::SingleThreadTaskRunner>
+CefContentBrowserClient::user_visible_task_runner() const {
+  return browser_main_parts_->user_visible_task_runner();
+}
+
+scoped_refptr<base::SingleThreadTaskRunner>
+CefContentBrowserClient::user_blocking_task_runner() const {
+  return browser_main_parts_->user_blocking_task_runner();
+}
+
 const extensions::Extension* CefContentBrowserClient::GetExtension(
     content::SiteInstance* site_instance) {
   extensions::ExtensionRegistry* registry =
@@ -1038,3 +1145,18 @@ const extensions::Extension* CefContentBrowserClient::GetExtension(
   return registry->enabled_extensions().GetExtensionOrAppByURL(
       site_instance->GetSiteURL());
 }
+
+// static
+void CefContentBrowserClient::HandleExternalProtocolOnUIThread(
+    const GURL& url,
+    const content::ResourceRequestInfo::WebContentsGetter&
+        web_contents_getter) {
+  CEF_REQUIRE_UIT();
+  content::WebContents* web_contents = web_contents_getter.Run();
+  if (web_contents) {
+    CefRefPtr<CefBrowserHostImpl> browser =
+        CefBrowserHostImpl::GetBrowserForContents(web_contents);
+    if (browser.get())
+      browser->HandleExternalProtocol(url);
+  }
+}

libcef/browser/content_browser_client.h

@@ -43,13 +43,17 @@ class CefContentBrowserClient : public content::ContentBrowserClient {
   // ContentBrowserClient implementation.
   content::BrowserMainParts* CreateBrowserMainParts(
       const content::MainFunctionParams& parameters) override;
-  void RenderProcessWillLaunch(content::RenderProcessHost* host) override;
+  void RenderProcessWillLaunch(
+      content::RenderProcessHost* host,
+      service_manager::mojom::ServiceRequest* service_request) override;
   bool ShouldUseProcessPerSite(content::BrowserContext* browser_context,
                                const GURL& effective_url) override;
   bool IsHandledURL(const GURL& url) override;
   void SiteInstanceGotProcess(content::SiteInstance* site_instance) override;
   void SiteInstanceDeleting(content::SiteInstance* site_instance) override;
-  void RegisterInProcessServices(StaticServiceMap* services) override;
+  void RegisterInProcessServices(
+      StaticServiceMap* services,
+      content::ServiceManagerConnection* connection) override;
   void RegisterOutOfProcessServices(OutOfProcessServiceMap* services) override;
   std::unique_ptr<base::Value> GetServiceManifestOverlay(
       base::StringPiece name) override;
@@ -58,6 +62,7 @@ class CefContentBrowserClient : public content::ContentBrowserClient {
                             content::BrowserContext* context2) override;
   void AppendExtraCommandLineSwitches(base::CommandLine* command_line,
                                       int child_process_id) override;
+  std::string GetApplicationLocale() override;
   content::QuotaPermissionContext* CreateQuotaPermissionContext() override;
   void GetQuotaSettings(
       content::BrowserContext* context,
@@ -122,17 +127,51 @@ class CefContentBrowserClient : public content::ContentBrowserClient {
       blink::AssociatedInterfaceRegistry* associated_registry,
       content::RenderProcessHost* render_process_host) override;
 
+  std::unique_ptr<net::ClientCertStore> CreateClientCertStore(
+      content::ResourceContext* resource_context) override;
+
+  void RegisterNonNetworkNavigationURLLoaderFactories(
+      int frame_tree_node_id,
+      NonNetworkURLLoaderFactoryMap* factories) override;
+  void RegisterNonNetworkSubresourceURLLoaderFactories(
+      int render_process_id,
+      int render_frame_id,
+      NonNetworkURLLoaderFactoryMap* factories) override;
+  bool WillCreateURLLoaderFactory(
+      content::BrowserContext* browser_context,
+      content::RenderFrameHost* frame,
+      bool is_navigation,
+      network::mojom::URLLoaderFactoryRequest* factory_request) override;
+
+  bool HandleExternalProtocol(
+      const GURL& url,
+      content::ResourceRequestInfo::WebContentsGetter web_contents_getter,
+      int child_id,
+      content::NavigationUIData* navigation_data,
+      bool is_main_frame,
+      ui::PageTransition page_transition,
+      bool has_user_gesture) override;
+
   // Perform browser process registration for the custom scheme.
   void RegisterCustomScheme(const std::string& scheme);
 
   CefRefPtr<CefRequestContextImpl> request_context() const;
   CefDevToolsDelegate* devtools_delegate() 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:
   // Returns the extension or app associated with |site_instance| or NULL.
   const extensions::Extension* GetExtension(
       content::SiteInstance* site_instance);
 
+  static void HandleExternalProtocolOnUIThread(
+      const GURL& url,
+      const content::ResourceRequestInfo::WebContentsGetter&
+          web_contents_getter);
+
   CefBrowserMainParts* browser_main_parts_;
 
   std::unique_ptr<content::PluginServiceFilter> plugin_service_filter_;

libcef/browser/context.cc

@@ -7,7 +7,6 @@
 #include "libcef/browser/browser_info.h"
 #include "libcef/browser/browser_info_manager.h"
 #include "libcef/browser/browser_main.h"
-#include "libcef/browser/browser_message_loop.h"
 #include "libcef/browser/chrome_browser_process_stub.h"
 #include "libcef/browser/thread_util.h"
 #include "libcef/browser/trace_subscriber.h"
@@ -21,6 +20,7 @@
 #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 "components/network_session_configurator/common/network_switches.h"
 #include "content/app/content_service_manager_main_delegate.h"
@@ -29,6 +29,7 @@
 #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)
@@ -271,7 +272,8 @@ void CefDoMessageLoopWork() {
     return;
   }
 
-  CefBrowserMessageLoop::current()->DoMessageLoopIteration();
+  base::RunLoop run_loop;
+  run_loop.RunUntilIdle();
 }
 
 void CefRunMessageLoop() {
@@ -287,7 +289,8 @@ void CefRunMessageLoop() {
     return;
   }
 
-  CefBrowserMessageLoop::current()->RunMessageLoop();
+  base::RunLoop run_loop;
+  run_loop.Run();
 }
 
 void CefQuitMessageLoop() {
@@ -341,7 +344,7 @@ bool CefContext::Initialize(const CefMainArgs& args,
   init_thread_id_ = base::PlatformThread::CurrentId();
   settings_ = settings;
 
-#if !defined(OS_WIN)
+#if !(defined(OS_WIN) || defined(OS_LINUX))
   if (settings.multi_threaded_message_loop) {
     NOTIMPLEMENTED() << "multi_threaded_message_loop is not supported.";
     return false;
@@ -524,6 +527,8 @@ void CefContext::FinishShutdownOnUIThread(
 
   static_cast<ChromeBrowserProcessStub*>(g_browser_process)->Shutdown();
 
+  ui::ResourceBundle::GetSharedInstance().CleanupOnUIThread();
+
   if (uithread_shutdown_event)
     uithread_shutdown_event->Signal();
 }

libcef/browser/cookie_manager_impl.cc

@@ -10,19 +10,18 @@
 
 #include "libcef/browser/content_browser_client.h"
 #include "libcef/browser/context.h"
+#include "libcef/browser/net/cookie_store_source.h"
 #include "libcef/browser/net/network_delegate.h"
 #include "libcef/common/task_runner_impl.h"
 #include "libcef/common/time_util.h"
 
 #include "base/bind.h"
-#include "base/files/file_util.h"
 #include "base/format_macros.h"
 #include "base/logging.h"
 #include "base/threading/thread_restrictions.h"
 #include "content/browser/storage_partition_impl.h"
 #include "net/cookies/cookie_util.h"
 #include "net/cookies/parsed_cookie.h"
-#include "net/extras/sqlite/sqlite_persistent_cookie_store.h"
 #include "net/url_request/url_request_context.h"
 #include "url/gurl.h"
 
@@ -120,7 +119,8 @@ net::CookieStore* GetExistingCookieStoreHelper(
 
 }  // namespace
 
-CefCookieManagerImpl::CefCookieManagerImpl() : weak_ptr_factory_(this) {}
+CefCookieManagerImpl::CefCookieManagerImpl(bool is_blocking)
+    : is_blocking_(is_blocking), weak_ptr_factory_(this) {}
 
 CefCookieManagerImpl::~CefCookieManagerImpl() {
   CEF_REQUIRE_IOT();
@@ -131,6 +131,7 @@ void CefCookieManagerImpl::Initialize(
     const CefString& path,
     bool persist_session_cookies,
     CefRefPtr<CefCompletionCallback> callback) {
+  CHECK(!is_blocking_);
   if (request_context.get()) {
     request_context_ = request_context;
     request_context_->GetRequestContextImpl(
@@ -160,7 +161,7 @@ void CefCookieManagerImpl::GetCookieStore(
     return;
   }
 
-  DCHECK(cookie_store_.get());
+  DCHECK(is_blocking_ || cookie_source_);
 
   // Binding ref-counted |this| to CookieStoreGetter may result in
   // heap-use-after-free if (a) the CookieStoreGetter contains the last
@@ -183,8 +184,8 @@ void CefCookieManagerImpl::GetCookieStore(
 
 net::CookieStore* CefCookieManagerImpl::GetExistingCookieStore() {
   CEF_REQUIRE_IOT();
-  if (cookie_store_.get()) {
-    return cookie_store_.get();
+  if (cookie_source_) {
+    return cookie_source_->GetCookieStore();
   } else if (request_context_impl_.get()) {
     net::CookieStore* cookie_store =
         request_context_impl_->GetExistingCookieStore();
@@ -192,6 +193,8 @@ net::CookieStore* CefCookieManagerImpl::GetExistingCookieStore() {
     return cookie_store;
   }
 
+  DCHECK(is_blocking_);
+  if (!is_blocking_)
     LOG(ERROR) << "Cookie store does not exist";
   return nullptr;
 }
@@ -283,41 +286,13 @@ bool CefCookieManagerImpl::SetStoragePath(
   if (!path.empty())
     new_path = base::FilePath(path);
 
-  if (cookie_store_.get() &&
-      ((storage_path_.empty() && path.empty()) || storage_path_ == new_path)) {
-    // The path has not changed so don't do anything.
+  if (!cookie_source_) {
+    cookie_source_.reset(new CefCookieStoreOwnerSource());
+  }
+
+  cookie_source_->SetCookieStoragePath(new_path, persist_session_cookies);
+
   RunAsyncCompletionOnIOThread(callback);
-    return true;
-  }
-
-  scoped_refptr<net::SQLitePersistentCookieStore> persistent_store;
-  if (!new_path.empty()) {
-    // TODO(cef): Move directory creation to the blocking pool instead of
-    // allowing file IO on this thread.
-    base::ThreadRestrictions::ScopedAllowIO allow_io;
-    if (base::DirectoryExists(new_path) || base::CreateDirectory(new_path)) {
-      const base::FilePath& cookie_path = new_path.AppendASCII("Cookies");
-      persistent_store = new net::SQLitePersistentCookieStore(
-          cookie_path, BrowserThread::GetTaskRunnerForThread(BrowserThread::IO),
-          BrowserThread::GetTaskRunnerForThread(BrowserThread::DB),
-          persist_session_cookies, NULL);
-    } else {
-      NOTREACHED() << "The cookie storage directory could not be created";
-      storage_path_.clear();
-    }
-  }
-
-  // Set the new cookie store that will be used for all new requests. The old
-  // cookie store, if any, will be automatically flushed and closed when no
-  // longer referenced.
-  cookie_store_.reset(new net::CookieMonster(persistent_store.get(), NULL));
-  if (persistent_store.get() && persist_session_cookies)
-    cookie_store_->SetPersistSessionCookies(true);
-  storage_path_ = new_path;
-
-  // Restore the previously supported schemes.
-  SetSupportedSchemesInternal(supported_schemes_, callback);
-
   return true;
 }
 
@@ -495,12 +470,10 @@ void CefCookieManagerImpl::SetSupportedSchemesInternal(
     return;
   }
 
-  DCHECK(cookie_store_.get());
-  if (!cookie_store_.get())
-    return;
-
-  supported_schemes_ = schemes;
-  SetCookieMonsterSchemes(cookie_store_.get(), supported_schemes_);
+  DCHECK(is_blocking_ || cookie_source_);
+  if (cookie_source_) {
+    cookie_source_->SetCookieSupportedSchemes(schemes);
+  }
 
   RunAsyncCompletionOnIOThread(callback);
 }
@@ -552,8 +525,13 @@ void CefCookieManagerImpl::SetCookieInternal(
   CEF_REQUIRE_IOT();
 
   net::CookieStore* cookie_store = cookie_store_getter.Run();
-  if (!cookie_store)
+  if (!cookie_store) {
+    if (callback.get()) {
+      CEF_POST_TASK(CEF_IOT, base::Bind(&CefSetCookieCallback::OnComplete,
+                                        callback.get(), false));
+    }
     return;
+  }
 
   std::string name = CefString(&cookie.name).ToString();
   std::string value = CefString(&cookie.value).ToString();
@@ -584,8 +562,13 @@ void CefCookieManagerImpl::DeleteCookiesInternal(
   CEF_REQUIRE_IOT();
 
   net::CookieStore* cookie_store = cookie_store_getter.Run();
-  if (!cookie_store)
+  if (!cookie_store) {
+    if (callback.get()) {
+      CEF_POST_TASK(CEF_IOT, base::Bind(&CefDeleteCookiesCallback::OnComplete,
+                                        callback.get(), 0));
+    }
     return;
+  }
 
   if (url.is_empty()) {
     // Delete all cookies.
@@ -593,10 +576,10 @@ void CefCookieManagerImpl::DeleteCookiesInternal(
         base::Bind(DeleteCookiesCallbackImpl, callback));
   } else if (cookie_name.empty()) {
     // Delete all matching host cookies.
-    cookie_store->DeleteAllCreatedBetweenWithPredicateAsync(
-        base::Time(), base::Time::Max(),
-        content::StoragePartitionImpl::CreatePredicateForHostCookies(url),
-        base::Bind(DeleteCookiesCallbackImpl, callback));
+    net::CookieDeletionInfo delete_info;
+    delete_info.host = url.host();
+    cookie_store->DeleteAllMatchingInfoAsync(
+        delete_info, base::Bind(DeleteCookiesCallbackImpl, callback));
   } else {
     // Delete all matching host and domain cookies.
     cookie_store->DeleteCookieAsync(
@@ -610,8 +593,10 @@ void CefCookieManagerImpl::FlushStoreInternal(
   CEF_REQUIRE_IOT();
 
   net::CookieStore* cookie_store = cookie_store_getter.Run();
-  if (!cookie_store)
+  if (!cookie_store) {
+    RunAsyncCompletionOnIOThread(callback);
     return;
+  }
 
   cookie_store->FlushStore(base::Bind(RunAsyncCompletionOnIOThread, callback));
 }
@@ -631,6 +616,11 @@ CefRefPtr<CefCookieManager> CefCookieManager::GetGlobalManager(
       callback);
 }
 
+// static
+CefRefPtr<CefCookieManager> CefCookieManager::GetBlockingManager() {
+  return new CefCookieManagerImpl(true);
+}
+
 // static
 CefRefPtr<CefCookieManager> CefCookieManager::CreateManager(
     const CefString& path,
@@ -642,7 +632,8 @@ CefRefPtr<CefCookieManager> CefCookieManager::CreateManager(
     return NULL;
   }
 
-  CefRefPtr<CefCookieManagerImpl> cookie_manager = new CefCookieManagerImpl();
+  CefRefPtr<CefCookieManagerImpl> cookie_manager =
+      new CefCookieManagerImpl(false);
   cookie_manager->Initialize(NULL, path, persist_session_cookies, callback);
   return cookie_manager.get();
 }

libcef/browser/cookie_manager_impl.h

@@ -15,13 +15,16 @@
 #include "base/memory/weak_ptr.h"
 #include "net/cookies/cookie_monster.h"
 
+class CefCookieStoreOwnerSource;
+
 // Implementation of the CefCookieManager interface.
 class CefCookieManagerImpl : public CefCookieManager {
  public:
-  CefCookieManagerImpl();
+  explicit CefCookieManagerImpl(bool is_blocking);
   ~CefCookieManagerImpl() override;
 
-  // Must be called immediately after this object is created.
+  // Must be called immediately after this object is created when |is_blocking|
+  // is false.
   void Initialize(CefRefPtr<CefRequestContextImpl> request_context,
                   const CefString& path,
                   bool persist_session_cookies,
@@ -113,14 +116,15 @@ class CefCookieManagerImpl : public CefCookieManager {
   void FlushStoreInternal(CefRefPtr<CefCompletionCallback> callback,
                           const CookieStoreGetter& cookie_store_getter);
 
+  // If true all cookies will be blocked.
+  const bool is_blocking_;
+
   // Used for cookie monsters owned by the context.
   CefRefPtr<CefRequestContextImpl> request_context_;
   scoped_refptr<CefURLRequestContextGetterImpl> request_context_impl_;
 
   // Used for cookie monsters owned by this object.
-  base::FilePath storage_path_;
-  std::vector<std::string> supported_schemes_;
-  std::unique_ptr<net::CookieMonster> cookie_store_;
+  std::unique_ptr<CefCookieStoreOwnerSource> cookie_source_;
 
   // Must be the last member.
   base::WeakPtrFactory<CefCookieManagerImpl> weak_ptr_factory_;

libcef/browser/devtools_frontend.cc

@@ -100,7 +100,7 @@ int ResponseWriter::Finish(int net_error,
 }
 
 static std::string GetFrontendURL() {
-  return base::StringPrintf("%s://%s/inspector.html",
+  return base::StringPrintf("%s://%s/devtools_app.html",
                             content::kChromeDevToolsScheme,
                             scheme::kChromeDevToolsHost);
 }
@@ -163,7 +163,7 @@ void CefDevToolsFrontend::InspectElementAt(int x, int y) {
   if (inspect_element_at_.x != x || inspect_element_at_.y != y)
     inspect_element_at_.Set(x, y);
   if (agent_host_)
-    agent_host_->InspectElement(this, x, y);
+    agent_host_->InspectElement(inspected_contents_->GetFocusedFrame(), x, y);
 }
 
 void CefDevToolsFrontend::Close() {
@@ -226,8 +226,8 @@ void CefDevToolsFrontend::DocumentAvailableInMainFrame() {
     agent_host_ = agent_host;
     agent_host_->AttachClient(this);
     if (!inspect_element_at_.IsEmpty()) {
-      agent_host_->InspectElement(this, inspect_element_at_.x,
-                                  inspect_element_at_.y);
+      agent_host_->InspectElement(inspected_contents_->GetFocusedFrame(),
+                                  inspect_element_at_.x, inspect_element_at_.y);
     }
   }
 }
@@ -299,9 +299,9 @@ void CefDevToolsFrontend::HandleMessageFromDevToolsFrontend(
               setting:
                 "It's not possible to disable this feature from settings."
               chrome_policy {
-                DeveloperToolsDisabled {
+                DeveloperToolsAvailability {
                   policy_options {mode: MANDATORY}
-                  DeveloperToolsDisabled: true
+                  DeveloperToolsAvailability: 2
                 }
               }
             })");
@@ -392,7 +392,7 @@ void CefDevToolsFrontend::OnURLFetchComplete(const net::URLFetcher* source) {
   DCHECK(it != pending_requests_.end());
 
   base::DictionaryValue response;
-  auto headers = base::MakeUnique<base::DictionaryValue>();
+  auto headers = std::make_unique<base::DictionaryValue>();
   net::HttpResponseHeaders* rh = source->GetResponseHeaders();
   response.SetInteger("statusCode", rh ? rh->response_code() : 200);
 

libcef/browser/devtools_manager_delegate.cc

@@ -105,8 +105,7 @@ void CefDevToolsManagerDelegate::StartHttpHandler(
   if (!socket_factory)
     return;
   content::DevToolsAgentHost::StartRemoteDebuggingServer(
-      std::move(socket_factory), std::string(), browser_context->GetPath(),
-      base::FilePath());
+      std::move(socket_factory), browser_context->GetPath(), base::FilePath());
 
   const base::CommandLine& command_line =
       *base::CommandLine::ForCurrentProcess();
@@ -138,7 +137,6 @@ std::string CefDevToolsManagerDelegate::GetDiscoveryPageHTML() {
       .as_string();
 }
 
-std::string CefDevToolsManagerDelegate::GetFrontendResource(
-    const std::string& path) {
-  return content::DevToolsFrontendHost::GetFrontendResource(path).as_string();
+bool CefDevToolsManagerDelegate::HasBundledFrontendResources() {
+  return true;
 }

libcef/browser/devtools_manager_delegate.h

@@ -25,7 +25,7 @@ class CefDevToolsManagerDelegate : public content::DevToolsManagerDelegate {
   scoped_refptr<content::DevToolsAgentHost> CreateNewTarget(
       const GURL& url) override;
   std::string GetDiscoveryPageHTML() override;
-  std::string GetFrontendResource(const std::string& path) override;
+  bool HasBundledFrontendResources() override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CefDevToolsManagerDelegate);

libcef/browser/download_item_impl.cc

@@ -6,11 +6,11 @@
 
 #include "libcef/common/time_util.h"
 
-#include "content/public/browser/download_item.h"
+#include "components/download/public/common/download_item.h"
 #include "url/gurl.h"
 
-CefDownloadItemImpl::CefDownloadItemImpl(content::DownloadItem* value)
-    : CefValueBase<CefDownloadItem, content::DownloadItem>(
+CefDownloadItemImpl::CefDownloadItemImpl(download::DownloadItem* value)
+    : CefValueBase<CefDownloadItem, download::DownloadItem>(
           value,
           NULL,
           kOwnerNoDelete,
@@ -26,17 +26,17 @@ bool CefDownloadItemImpl::IsValid() {
 
 bool CefDownloadItemImpl::IsInProgress() {
   CEF_VALUE_VERIFY_RETURN(false, false);
-  return const_value().GetState() == content::DownloadItem::IN_PROGRESS;
+  return const_value().GetState() == download::DownloadItem::IN_PROGRESS;
 }
 
 bool CefDownloadItemImpl::IsComplete() {
   CEF_VALUE_VERIFY_RETURN(false, false);
-  return const_value().GetState() == content::DownloadItem::COMPLETE;
+  return const_value().GetState() == download::DownloadItem::COMPLETE;
 }
 
 bool CefDownloadItemImpl::IsCanceled() {
   CEF_VALUE_VERIFY_RETURN(false, false);
-  return const_value().GetState() == content::DownloadItem::CANCELLED;
+  return const_value().GetState() == download::DownloadItem::CANCELLED;
 }
 
 int64 CefDownloadItemImpl::GetCurrentSpeed() {

libcef/browser/download_item_impl.h

@@ -9,15 +9,15 @@
 #include "include/cef_download_item.h"
 #include "libcef/common/value_base.h"
 
-namespace content {
+namespace download {
 class DownloadItem;
 }
 
 // CefDownloadItem implementation
 class CefDownloadItemImpl
-    : public CefValueBase<CefDownloadItem, content::DownloadItem> {
+    : public CefValueBase<CefDownloadItem, download::DownloadItem> {
  public:
-  explicit CefDownloadItemImpl(content::DownloadItem* value);
+  explicit CefDownloadItemImpl(download::DownloadItem* value);
 
   // CefDownloadItem methods.
   bool IsValid() override;

libcef/browser/download_manager_delegate.cc

@@ -15,11 +15,12 @@
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/public/browser/browser_context.h"
+#include "content/public/browser/download_item_utils.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/file_chooser_params.h"
 #include "net/base/filename_util.h"
 
-using content::DownloadItem;
+using download::DownloadItem;
 using content::DownloadManager;
 using content::WebContents;
 
@@ -53,11 +54,9 @@ class CefBeforeDownloadCallbackImpl : public CefBeforeDownloadCallback {
 
       if (manager_) {
         base::FilePath path = base::FilePath(download_path);
-        CEF_POST_TASK(
-            CEF_FILET,
-            base::Bind(&CefBeforeDownloadCallbackImpl::GenerateFilename,
-                       manager_, download_id_, suggested_name_, path,
-                       show_dialog, callback_));
+        CEF_POST_USER_VISIBLE_TASK(base::Bind(
+            &CefBeforeDownloadCallbackImpl::GenerateFilename, manager_,
+            download_id_, suggested_name_, path, show_dialog, callback_));
       }
 
       download_id_ = 0;
@@ -77,6 +76,8 @@ class CefBeforeDownloadCallbackImpl : public CefBeforeDownloadCallback {
       const base::FilePath& download_path,
       bool show_dialog,
       const content::DownloadTargetCallback& callback) {
+    CEF_REQUIRE_BLOCKING();
+
     base::FilePath suggested_path = download_path;
     if (!suggested_path.empty()) {
       // Create the directory if necessary.
@@ -89,7 +90,7 @@ class CefBeforeDownloadCallbackImpl : public CefBeforeDownloadCallback {
     }
 
     if (suggested_path.empty()) {
-      if (PathService::Get(base::DIR_TEMP, &suggested_path)) {
+      if (base::PathService::Get(base::DIR_TEMP, &suggested_path)) {
         // Use the temp directory.
         suggested_path = suggested_path.Append(suggested_name);
       } else {
@@ -114,13 +115,14 @@ class CefBeforeDownloadCallbackImpl : public CefBeforeDownloadCallback {
       return;
 
     DownloadItem* item = manager->GetDownload(download_id);
-    if (!item || item->GetState() != content::DownloadItem::IN_PROGRESS)
+    if (!item || item->GetState() != DownloadItem::IN_PROGRESS)
       return;
 
     bool handled = false;
 
     if (show_dialog) {
-      WebContents* web_contents = item->GetWebContents();
+      WebContents* web_contents =
+          content::DownloadItemUtils::GetWebContents(item);
       CefRefPtr<CefBrowserHostImpl> browser =
           CefBrowserHostImpl::GetBrowserForContents(web_contents);
       if (browser.get()) {
@@ -146,8 +148,8 @@ class CefBeforeDownloadCallbackImpl : public CefBeforeDownloadCallback {
 
     if (!handled) {
       callback.Run(suggested_path, DownloadItem::TARGET_DISPOSITION_OVERWRITE,
-                   content::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS, suggested_path,
-                   content::DOWNLOAD_INTERRUPT_REASON_NONE);
+                   download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS, suggested_path,
+                   download::DOWNLOAD_INTERRUPT_REASON_NONE);
     }
   }
 
@@ -163,8 +165,8 @@ class CefBeforeDownloadCallbackImpl : public CefBeforeDownloadCallback {
 
     // The download will be cancelled if |path| is empty.
     callback.Run(path, DownloadItem::TARGET_DISPOSITION_OVERWRITE,
-                 content::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS, path,
-                 content::DOWNLOAD_INTERRUPT_REASON_NONE);
+                 download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS, path,
+                 download::DOWNLOAD_INTERRUPT_REASON_NONE);
   }
 
   base::WeakPtr<DownloadManager> manager_;
@@ -206,7 +208,7 @@ class CefDownloadItemCallbackImpl : public CefDownloadItemCallback {
 
     if (manager_) {
       DownloadItem* item = manager_->GetDownload(download_id_);
-      if (item && item->GetState() == content::DownloadItem::IN_PROGRESS)
+      if (item && item->GetState() == DownloadItem::IN_PROGRESS)
         item->Cancel(true);
     }
 
@@ -219,7 +221,7 @@ class CefDownloadItemCallbackImpl : public CefDownloadItemCallback {
 
     if (manager_) {
       DownloadItem* item = manager_->GetDownload(download_id_);
-      if (item && item->GetState() == content::DownloadItem::IN_PROGRESS)
+      if (item && item->GetState() == DownloadItem::IN_PROGRESS)
         item->Pause();
     }
   }
@@ -316,7 +318,8 @@ void CefDownloadManagerDelegate::OnDownloadDestroyed(DownloadItem* item) {
 void CefDownloadManagerDelegate::OnDownloadCreated(DownloadManager* manager,
                                                    DownloadItem* item) {
   CefBrowserHostImpl* browser = nullptr;
-  content::WebContents* contents = item->GetWebContents();
+  content::WebContents* contents =
+      content::DownloadItemUtils::GetWebContents(item);
   if (contents) {
     browser = CefBrowserHostImpl::GetBrowserForContents(contents).get();
     DCHECK(browser);
@@ -360,8 +363,8 @@ bool CefDownloadManagerDelegate::DetermineDownloadTarget(
   if (!item->GetForcedFilePath().empty()) {
     callback.Run(
         item->GetForcedFilePath(), DownloadItem::TARGET_DISPOSITION_OVERWRITE,
-        content::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS, item->GetForcedFilePath(),
-        content::DOWNLOAD_INTERRUPT_REASON_NONE);
+        download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS, item->GetForcedFilePath(),
+        download::DOWNLOAD_INTERRUPT_REASON_NONE);
     return true;
   }
 
@@ -419,6 +422,6 @@ CefBrowserHostImpl* CefDownloadManagerDelegate::GetBrowser(DownloadItem* item) {
   // StartDownloadWithId (originating from CreateInterruptedDownload) with no
   // associated WebContents and consequently no associated CEF browser. In that
   // case DetermineDownloadTarget will be called before OnDownloadCreated.
-  DCHECK(!item->GetWebContents());
+  DCHECK(!content::DownloadItemUtils::GetWebContents(item));
   return nullptr;
 }

libcef/browser/download_manager_delegate.h

@@ -12,11 +12,11 @@
 
 #include "base/compiler_specific.h"
 #include "base/memory/weak_ptr.h"
-#include "content/public/browser/download_item.h"
+#include "components/download/public/common/download_item.h"
 #include "content/public/browser/download_manager.h"
 #include "content/public/browser/download_manager_delegate.h"
 
-class CefDownloadManagerDelegate : public content::DownloadItem::Observer,
+class CefDownloadManagerDelegate : public download::DownloadItem::Observer,
                                    public content::DownloadManager::Observer,
                                    public content::DownloadManagerDelegate,
                                    public CefBrowserHostImpl::Observer {
@@ -26,24 +26,24 @@ class CefDownloadManagerDelegate : public content::DownloadItem::Observer,
 
  private:
   // DownloadItem::Observer methods.
-  void OnDownloadUpdated(content::DownloadItem* item) override;
-  void OnDownloadDestroyed(content::DownloadItem* item) override;
+  void OnDownloadUpdated(download::DownloadItem* item) override;
+  void OnDownloadDestroyed(download::DownloadItem* item) override;
 
   // DownloadManager::Observer methods.
   void OnDownloadCreated(content::DownloadManager* manager,
-                         content::DownloadItem* item) override;
+                         download::DownloadItem* item) override;
   void ManagerGoingDown(content::DownloadManager* manager) override;
 
   // DownloadManagerDelegate methods.
   bool DetermineDownloadTarget(
-      content::DownloadItem* item,
+      download::DownloadItem* item,
       const content::DownloadTargetCallback& callback) override;
   void GetNextId(const content::DownloadIdCallback& callback) override;
 
   // CefBrowserHostImpl::Observer methods.
   void OnBrowserDestroyed(CefBrowserHostImpl* browser) override;
 
-  CefBrowserHostImpl* GetBrowser(content::DownloadItem* item);
+  CefBrowserHostImpl* GetBrowser(download::DownloadItem* item);
 
   content::DownloadManager* manager_;
   base::WeakPtrFactory<content::DownloadManager> manager_ptr_factory_;
@@ -51,7 +51,7 @@ class CefDownloadManagerDelegate : public content::DownloadItem::Observer,
   // Map of DownloadItem to originating CefBrowserHostImpl. Maintaining this
   // map is necessary because DownloadItem::GetWebContents() may return NULL if
   // the browser navigates while the download is in progress.
-  typedef std::map<content::DownloadItem*, CefBrowserHostImpl*> ItemBrowserMap;
+  typedef std::map<download::DownloadItem*, CefBrowserHostImpl*> ItemBrowserMap;
   ItemBrowserMap item_browser_map_;
 
   DISALLOW_COPY_AND_ASSIGN(CefDownloadManagerDelegate);

libcef/browser/extensions/api/tabs/tabs_api.cc

@@ -142,11 +142,11 @@ ExecuteCodeFunction::InitResult ExecuteCodeInTabFunction::Init() {
   return set_init_result(SUCCESS);
 }
 
-bool ExecuteCodeInTabFunction::CanExecuteScriptOnPage() {
+bool ExecuteCodeInTabFunction::CanExecuteScriptOnPage(std::string* error) {
   CHECK_GE(execute_tab_id_, 0);
 
   CefRefPtr<CefBrowserHostImpl> browser =
-      cef_details_.GetBrowserForTabIdAgain(execute_tab_id_, &error_);
+      cef_details_.GetBrowserForTabIdAgain(execute_tab_id_, error);
   if (!browser)
     return false;
 
@@ -156,7 +156,7 @@ bool ExecuteCodeInTabFunction::CanExecuteScriptOnPage() {
       ExtensionApiFrameIdMap::GetRenderFrameHostById(browser->web_contents(),
                                                      frame_id);
   if (!rfh) {
-    error_ = ErrorUtils::FormatErrorMessage(keys::kFrameNotFoundError,
+    *error = ErrorUtils::FormatErrorMessage(keys::kFrameNotFoundError,
                                             base::IntToString(frame_id),
                                             base::IntToString(execute_tab_id_));
     return false;
@@ -180,12 +180,12 @@ bool ExecuteCodeInTabFunction::CanExecuteScriptOnPage() {
 
   // NOTE: This can give the wrong answer due to race conditions, but it is OK,
   // we check again in the renderer.
-  if (!extension()->permissions_data()->CanAccessPage(
-          extension(), effective_document_url, execute_tab_id_, &error_)) {
+  if (!extension()->permissions_data()->CanAccessPage(effective_document_url,
+                                                      execute_tab_id_, error)) {
     if (is_about_url &&
         extension()->permissions_data()->active_permissions().HasAPIPermission(
             APIPermission::kTab)) {
-      error_ = ErrorUtils::FormatErrorMessage(
+      *error = ErrorUtils::FormatErrorMessage(
           manifest_errors::kCannotAccessAboutUrl,
           rfh->GetLastCommittedURL().spec(),
           rfh->GetLastCommittedOrigin().Serialize());
@@ -196,11 +196,12 @@ bool ExecuteCodeInTabFunction::CanExecuteScriptOnPage() {
   return true;
 }
 
-ScriptExecutor* ExecuteCodeInTabFunction::GetScriptExecutor() {
+ScriptExecutor* ExecuteCodeInTabFunction::GetScriptExecutor(
+    std::string* error) {
   CHECK_GE(execute_tab_id_, 0);
 
   CefRefPtr<CefBrowserHostImpl> browser =
-      cef_details_.GetBrowserForTabIdAgain(execute_tab_id_, &error_);
+      cef_details_.GetBrowserForTabIdAgain(execute_tab_id_, error);
   if (!browser)
     return nullptr;
 
@@ -217,7 +218,8 @@ const GURL& ExecuteCodeInTabFunction::GetWebViewSrc() const {
   return GURL::EmptyGURL();
 }
 
-bool ExecuteCodeInTabFunction::LoadFile(const std::string& file) {
+bool ExecuteCodeInTabFunction::LoadFile(const std::string& file,
+                                        std::string* error) {
   if (cef_details_.LoadFile(
           file, base::BindOnce(&ExecuteCodeInTabFunction::LoadFileComplete,
                                this, file))) {
@@ -225,7 +227,7 @@ bool ExecuteCodeInTabFunction::LoadFile(const std::string& file) {
   }
 
   // Default handling.
-  return ExecuteCodeFunction::LoadFile(file);
+  return ExecuteCodeFunction::LoadFile(file, error);
 }
 
 void ExecuteCodeInTabFunction::LoadFileComplete(
@@ -239,15 +241,6 @@ bool TabsExecuteScriptFunction::ShouldInsertCSS() const {
   return false;
 }
 
-void TabsExecuteScriptFunction::OnExecuteCodeFinished(
-    const std::string& error,
-    const GURL& on_url,
-    const base::ListValue& result) {
-  if (error.empty())
-    SetResult(result.CreateDeepCopy());
-  ExecuteCodeInTabFunction::OnExecuteCodeFinished(error, on_url, result);
-}
-
 bool TabsInsertCSSFunction::ShouldInsertCSS() const {
   return true;
 }
@@ -264,10 +257,31 @@ content::WebContents* ZoomAPIFunction::GetWebContents(int tab_id) {
   return browser->web_contents();
 }
 
+void ZoomAPIFunction::SendResponse(bool success) {
+  ResponseValue response;
+  if (success) {
+    response = ArgumentList(std::move(results_));
+  } else {
+    response = results_ ? ErrorWithArguments(std::move(results_), error_)
+                        : Error(error_);
+  }
+  Respond(std::move(response));
+}
+
+ExtensionFunction::ResponseAction ZoomAPIFunction::Run() {
+  if (RunAsync())
+    return RespondLater();
+  // TODO(devlin): Track these down and eliminate them if possible. We
+  // shouldn't return results and an error.
+  if (results_)
+    return RespondNow(ErrorWithArguments(std::move(results_), error_));
+  return RespondNow(Error(error_));
+}
+
 bool TabsSetZoomFunction::RunAsync() {
   std::unique_ptr<tabs::SetZoom::Params> params(
       tabs::SetZoom::Params::Create(*args_));
-  EXTENSION_FUNCTION_VALIDATE(params);
+  EXTENSION_FUNCTION_PRERUN_VALIDATE(params);
 
   int tab_id = params->tab_id ? *params->tab_id : -1;
   content::WebContents* web_contents = GetWebContents(tab_id);
@@ -275,7 +289,7 @@ bool TabsSetZoomFunction::RunAsync() {
     return false;
 
   GURL url(web_contents->GetVisibleURL());
-  if (extensions::PermissionsData::IsRestrictedUrl(url, extension(), &error_))
+  if (extension()->permissions_data()->IsRestrictedUrl(url, &error_))
     return false;
 
   zoom::ZoomController* zoom_controller =
@@ -299,7 +313,7 @@ bool TabsSetZoomFunction::RunAsync() {
 bool TabsGetZoomFunction::RunAsync() {
   std::unique_ptr<tabs::GetZoom::Params> params(
       tabs::GetZoom::Params::Create(*args_));
-  EXTENSION_FUNCTION_VALIDATE(params);
+  EXTENSION_FUNCTION_PRERUN_VALIDATE(params);
 
   int tab_id = params->tab_id ? *params->tab_id : -1;
   content::WebContents* web_contents = GetWebContents(tab_id);
@@ -319,7 +333,7 @@ bool TabsSetZoomSettingsFunction::RunAsync() {
 
   std::unique_ptr<tabs::SetZoomSettings::Params> params(
       tabs::SetZoomSettings::Params::Create(*args_));
-  EXTENSION_FUNCTION_VALIDATE(params);
+  EXTENSION_FUNCTION_PRERUN_VALIDATE(params);
 
   int tab_id = params->tab_id ? *params->tab_id : -1;
   content::WebContents* web_contents = GetWebContents(tab_id);
@@ -327,7 +341,7 @@ bool TabsSetZoomSettingsFunction::RunAsync() {
     return false;
 
   GURL url(web_contents->GetVisibleURL());
-  if (PermissionsData::IsRestrictedUrl(url, extension(), &error_))
+  if (extension()->permissions_data()->IsRestrictedUrl(url, &error_))
     return false;
 
   // "per-origin" scope is only available in "automatic" mode.
@@ -370,7 +384,7 @@ bool TabsSetZoomSettingsFunction::RunAsync() {
 bool TabsGetZoomSettingsFunction::RunAsync() {
   std::unique_ptr<tabs::GetZoomSettings::Params> params(
       tabs::GetZoomSettings::Params::Create(*args_));
-  EXTENSION_FUNCTION_VALIDATE(params);
+  EXTENSION_FUNCTION_PRERUN_VALIDATE(params);
 
   int tab_id = params->tab_id ? *params->tab_id : -1;
   content::WebContents* web_contents = GetWebContents(tab_id);

libcef/browser/extensions/api/tabs/tabs_api.h

@@ -55,11 +55,11 @@ class ExecuteCodeInTabFunction : public ExecuteCodeFunction {
 
   // Initializes |execute_tab_id_| and |details_|.
   InitResult Init() override;
-  bool CanExecuteScriptOnPage() override;
-  ScriptExecutor* GetScriptExecutor() override;
+  bool CanExecuteScriptOnPage(std::string* error) override;
+  ScriptExecutor* GetScriptExecutor(std::string* error) override;
   bool IsWebView() const override;
   const GURL& GetWebViewSrc() const override;
-  bool LoadFile(const std::string& file) override;
+  bool LoadFile(const std::string& file, std::string* error) override;
 
  private:
   const CefExtensionFunctionDetails cef_details_;
@@ -78,10 +78,6 @@ class TabsExecuteScriptFunction : public ExecuteCodeInTabFunction {
  private:
   ~TabsExecuteScriptFunction() override {}
 
-  void OnExecuteCodeFinished(const std::string& error,
-                             const GURL& on_url,
-                             const base::ListValue& script_result) override;
-
   DECLARE_EXTENSION_FUNCTION("tabs.executeScript", TABS_EXECUTESCRIPT)
 };
 
@@ -94,7 +90,8 @@ class TabsInsertCSSFunction : public ExecuteCodeInTabFunction {
   DECLARE_EXTENSION_FUNCTION("tabs.insertCSS", TABS_INSERTCSS)
 };
 
-class ZoomAPIFunction : public AsyncExtensionFunction {
+// Based on ChromeAsyncExtensionFunction.
+class ZoomAPIFunction : public UIThreadExtensionFunction {
  public:
   ZoomAPIFunction();
 
@@ -103,10 +100,26 @@ class ZoomAPIFunction : public AsyncExtensionFunction {
 
   // Gets the WebContents for |tab_id| if it is specified. Otherwise get the
   // WebContents for the active tab in the current window. Calling this function
-  // may set error_.
+  // may set |error_|.
   content::WebContents* GetWebContents(int tab_id);
 
+  virtual bool RunAsync() = 0;
+
+  // Responds with success/failure. |results_| or |error_| should be set
+  // accordingly.
+  void SendResponse(bool success);
+
+  // Exposed versions of ExtensionFunction::results_ and
+  // ExtensionFunction::error_ that are curried into the response.
+  // These need to keep the same name to avoid breaking existing
+  // implementations, but this should be temporary with crbug.com/648275
+  // and crbug.com/634140.
+  std::unique_ptr<base::ListValue> results_;
+  std::string error_;
+
  private:
+  ResponseAction Run() final;
+
   const CefExtensionFunctionDetails cef_details_;
 };
 

libcef/browser/extensions/browser_platform_delegate_background.cc

@@ -39,7 +39,7 @@ SkColor CefBrowserPlatformDelegateBackground::GetBackgroundColor() const {
   return native_delegate_->GetBackgroundColor();
 }
 
-void CefBrowserPlatformDelegateBackground::WasResized() {
+void CefBrowserPlatformDelegateBackground::SynchronizeVisualProperties() {
   // Nothing to do here.
 }
 

libcef/browser/extensions/browser_platform_delegate_background.h

@@ -22,7 +22,7 @@ class CefBrowserPlatformDelegateBackground
   void CloseHostWindow() override;
   CefWindowHandle GetHostWindowHandle() const override;
   SkColor GetBackgroundColor() const override;
-  void WasResized() override;
+  void SynchronizeVisualProperties() override;
   void SendKeyEvent(const content::NativeWebKeyboardEvent& event) override;
   void SendMouseEvent(const blink::WebMouseEvent& event) override;
   void SendMouseWheelEvent(const blink::WebMouseWheelEvent& event) override;

libcef/browser/extensions/chrome_api_registration.cc

@@ -3,13 +3,15 @@
 // found in the LICENSE file.
 
 // APIs must also be registered in
-// libcef/common/extensions/api/_*_features.json files. See
+// libcef/common/extensions/api/_*_features.json files and possibly
+// CefExtensionsDispatcherDelegate::PopulateSourceMap. See
 // libcef/common/extensions/api/README.txt for additional details.
 
 #include "libcef/browser/extensions/chrome_api_registration.h"
 
 #include "libcef/browser/extensions/api/tabs/tabs_api.h"
 
+#include "chrome/browser/extensions/api/content_settings/content_settings_api.h"
 #include "chrome/browser/extensions/api/resources_private/resources_private_api.h"
 #include "chrome/browser/extensions/api/streams_private/streams_private_api.h"
 #include "extensions/browser/api/alarms/alarms_api.h"
@@ -37,6 +39,12 @@ const char* const kSupportedAPIs[] = {
     EXTENSION_FUNCTION_NAME(AlarmsGetAllFunction),
     EXTENSION_FUNCTION_NAME(AlarmsClearFunction),
     EXTENSION_FUNCTION_NAME(AlarmsClearAllFunction),
+    "contentSettings",
+    EXTENSION_FUNCTION_NAME(ContentSettingsContentSettingClearFunction),
+    EXTENSION_FUNCTION_NAME(ContentSettingsContentSettingGetFunction),
+    EXTENSION_FUNCTION_NAME(ContentSettingsContentSettingSetFunction),
+    EXTENSION_FUNCTION_NAME(
+        ContentSettingsContentSettingGetResourceIdentifiersFunction),
     "storage",
     EXTENSION_FUNCTION_NAME(StorageStorageAreaGetFunction),
     EXTENSION_FUNCTION_NAME(StorageStorageAreaSetFunction),
@@ -75,6 +83,11 @@ void ChromeFunctionRegistry::RegisterAll(ExtensionFunctionRegistry* registry) {
   registry->RegisterFunction<AlarmsGetAllFunction>();
   registry->RegisterFunction<AlarmsClearFunction>();
   registry->RegisterFunction<AlarmsClearAllFunction>();
+  registry->RegisterFunction<ContentSettingsContentSettingClearFunction>();
+  registry->RegisterFunction<ContentSettingsContentSettingGetFunction>();
+  registry->RegisterFunction<ContentSettingsContentSettingSetFunction>();
+  registry->RegisterFunction<
+      ContentSettingsContentSettingGetResourceIdentifiersFunction>();
   registry->RegisterFunction<StorageStorageAreaGetFunction>();
   registry->RegisterFunction<StorageStorageAreaSetFunction>();
   registry->RegisterFunction<StorageStorageAreaRemoveFunction>();

libcef/browser/extensions/component_extension_resource_manager.cc

@@ -25,7 +25,7 @@ bool CefComponentExtensionResourceManager::IsComponentExtensionResource(
   base::FilePath directory_path = extension_path;
   base::FilePath resources_dir;
   base::FilePath relative_path;
-  if (!PathService::Get(chrome::DIR_RESOURCES, &resources_dir) ||
+  if (!base::PathService::Get(chrome::DIR_RESOURCES, &resources_dir) ||
       !resources_dir.AppendRelativePath(directory_path, &relative_path)) {
     return false;
   }

libcef/browser/extensions/extension_function_details.cc

@@ -160,8 +160,9 @@ CefRefPtr<CefBrowserHostImpl> CefExtensionFunctionDetails::GetCurrentBrowser()
     CefRefPtr<CefExtensionHandler> handler = GetCefExtension()->GetHandler();
     if (handler) {
       // Give the handler an opportunity to specify a different browser.
-      CefRefPtr<CefBrowser> active_browser = handler->GetActiveBrowser(
-          GetCefExtension(), browser.get(), function_->include_incognito());
+      CefRefPtr<CefBrowser> active_browser =
+          handler->GetActiveBrowser(GetCefExtension(), browser.get(),
+                                    function_->include_incognito_information());
       if (active_browser && active_browser != browser) {
         CefRefPtr<CefBrowserHostImpl> active_browser_impl =
             static_cast<CefBrowserHostImpl*>(active_browser.get());
@@ -200,8 +201,9 @@ bool CefExtensionFunctionDetails::CanAccessBrowser(
   if (browser && browser->client()) {
     CefRefPtr<CefExtensionHandler> handler = GetCefExtension()->GetHandler();
     if (handler) {
-      return handler->CanAccessBrowser(GetCefExtension(), browser.get(),
-                                       function_->include_incognito(), target);
+      return handler->CanAccessBrowser(
+          GetCefExtension(), browser.get(),
+          function_->include_incognito_information(), target);
     }
   }
 
@@ -415,36 +417,36 @@ std::unique_ptr<api::tabs::Tab> CefExtensionFunctionDetails::CreateTabObject(
   content::WebContents* contents = new_browser->web_contents();
 
   bool is_loading = contents->IsLoading();
-  auto tab_object = base::MakeUnique<api::tabs::Tab>();
-  tab_object->id = base::MakeUnique<int>(new_browser->GetIdentifier());
+  auto tab_object = std::make_unique<api::tabs::Tab>();
+  tab_object->id = std::make_unique<int>(new_browser->GetIdentifier());
   tab_object->index = index;
   tab_object->window_id = *tab_object->id;
-  tab_object->status = base::MakeUnique<std::string>(
+  tab_object->status = std::make_unique<std::string>(
       is_loading ? keys::kStatusValueLoading : keys::kStatusValueComplete);
   tab_object->active = active;
   tab_object->selected = true;
   tab_object->highlighted = true;
   tab_object->pinned = false;
-  tab_object->audible = base::MakeUnique<bool>(contents->WasRecentlyAudible());
+  // TODO(extensions): Use RecentlyAudibleHelper to populate |audible|.
   tab_object->discarded = false;
   tab_object->auto_discardable = false;
   tab_object->muted_info = CreateMutedInfo(contents);
   tab_object->incognito = false;
   gfx::Size contents_size = contents->GetContainerBounds().size();
-  tab_object->width = base::MakeUnique<int>(contents_size.width());
-  tab_object->height = base::MakeUnique<int>(contents_size.height());
-  tab_object->url = base::MakeUnique<std::string>(contents->GetURL().spec());
+  tab_object->width = std::make_unique<int>(contents_size.width());
+  tab_object->height = std::make_unique<int>(contents_size.height());
+  tab_object->url = std::make_unique<std::string>(contents->GetURL().spec());
   tab_object->title =
-      base::MakeUnique<std::string>(base::UTF16ToUTF8(contents->GetTitle()));
+      std::make_unique<std::string>(base::UTF16ToUTF8(contents->GetTitle()));
 
   content::NavigationEntry* entry = contents->GetController().GetVisibleEntry();
   if (entry && entry->GetFavicon().valid) {
     tab_object->fav_icon_url =
-        base::MakeUnique<std::string>(entry->GetFavicon().url.spec());
+        std::make_unique<std::string>(entry->GetFavicon().url.spec());
   }
 
   if (opener_browser_id >= 0)
-    tab_object->opener_tab_id = base::MakeUnique<int>(opener_browser_id);
+    tab_object->opener_tab_id = std::make_unique<int>(opener_browser_id);
 
   return tab_object;
 }

libcef/browser/extensions/extension_host_delegate.cc

@@ -7,6 +7,7 @@
 #include "libcef/browser/extensions/extensions_browser_client.h"
 
 #include "base/logging.h"
+#include "content/public/browser/web_contents.h"
 
 namespace extensions {
 
@@ -28,7 +29,8 @@ CefExtensionHostDelegate::GetJavaScriptDialogManager() {
   return NULL;
 }
 
-void CefExtensionHostDelegate::CreateTab(content::WebContents* web_contents,
+void CefExtensionHostDelegate::CreateTab(
+    std::unique_ptr<content::WebContents> web_contents,
     const std::string& extension_id,
     WindowOpenDisposition disposition,
     const gfx::Rect& initial_rect,
@@ -40,14 +42,14 @@ void CefExtensionHostDelegate::CreateTab(content::WebContents* web_contents,
 void CefExtensionHostDelegate::ProcessMediaAccessRequest(
     content::WebContents* web_contents,
     const content::MediaStreamRequest& request,
-    const content::MediaResponseCallback& callback,
+    content::MediaResponseCallback callback,
     const Extension* extension) {
   // Never routed here from CefBrowserHostImpl.
   NOTREACHED();
 }
 
 bool CefExtensionHostDelegate::CheckMediaAccessPermission(
-    content::WebContents* web_contents,
+    content::RenderFrameHost* render_frame_host,
     const GURL& security_origin,
     content::MediaStreamType type,
     const Extension* extension) {

libcef/browser/extensions/extension_host_delegate.h

@@ -21,16 +21,16 @@ class CefExtensionHostDelegate : public ExtensionHostDelegate {
   void OnExtensionHostCreated(content::WebContents* web_contents) override;
   void OnRenderViewCreatedForBackgroundPage(ExtensionHost* host) override;
   content::JavaScriptDialogManager* GetJavaScriptDialogManager() override;
-  void CreateTab(content::WebContents* web_contents,
+  void CreateTab(std::unique_ptr<content::WebContents> web_contents,
                  const std::string& extension_id,
                  WindowOpenDisposition disposition,
                  const gfx::Rect& initial_rect,
                  bool user_gesture) override;
   void ProcessMediaAccessRequest(content::WebContents* web_contents,
                                  const content::MediaStreamRequest& request,
-                                 const content::MediaResponseCallback& callback,
+                                 content::MediaResponseCallback callback,
                                  const Extension* extension) override;
-  bool CheckMediaAccessPermission(content::WebContents* web_contents,
+  bool CheckMediaAccessPermission(content::RenderFrameHost* render_frame_host,
                                   const GURL& security_origin,
                                   content::MediaStreamType type,
                                   const Extension* extension) override;

libcef/browser/extensions/extension_system.cc

@@ -20,7 +20,6 @@
 #include "base/path_service.h"
 #include "base/strings/string_tokenizer.h"
 #include "base/strings/utf_string_conversions.h"
-#include "base/task_scheduler/post_task.h"
 #include "base/threading/thread_restrictions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_paths.h"
@@ -112,7 +111,7 @@ void LoadExtensionWithManifest(base::WeakPtr<CefExtensionSystem> context,
                                bool internal,
                                CefRefPtr<CefRequestContext> loader_context,
                                CefRefPtr<CefExtensionHandler> handler) {
-  base::AssertBlockingAllowed();
+  CEF_REQUIRE_BLOCKING();
 
   std::unique_ptr<base::DictionaryValue> manifest =
       ParseManifest(manifest_contents);
@@ -131,7 +130,7 @@ void LoadExtensionFromDisk(base::WeakPtr<CefExtensionSystem> context,
                            bool internal,
                            CefRefPtr<CefRequestContext> loader_context,
                            CefRefPtr<CefExtensionHandler> handler) {
-  base::AssertBlockingAllowed();
+  CEF_REQUIRE_BLOCKING();
 
   base::FilePath manifest_path = root_directory.AppendASCII("manifest.json");
   std::string manifest_contents;
@@ -239,8 +238,7 @@ void CefExtensionSystem::LoadExtension(
     CefRefPtr<CefRequestContext> loader_context,
     CefRefPtr<CefExtensionHandler> handler) {
   CEF_REQUIRE_UIT();
-  base::PostTaskWithTraits(
-      FROM_HERE, {base::TaskPriority::USER_VISIBLE, base::MayBlock()},
+  CEF_POST_USER_VISIBLE_TASK(
       base::BindOnce(LoadExtensionFromDisk, weak_ptr_factory_.GetWeakPtr(),
                      root_directory, internal, loader_context, handler));
 }
@@ -252,11 +250,9 @@ void CefExtensionSystem::LoadExtension(
     CefRefPtr<CefRequestContext> loader_context,
     CefRefPtr<CefExtensionHandler> handler) {
   CEF_REQUIRE_UIT();
-  base::PostTaskWithTraits(
-      FROM_HERE, {base::TaskPriority::USER_VISIBLE, base::MayBlock()},
-      base::BindOnce(LoadExtensionWithManifest, weak_ptr_factory_.GetWeakPtr(),
-                     manifest_contents, root_directory, internal,
-                     loader_context, handler));
+  CEF_POST_USER_VISIBLE_TASK(base::BindOnce(
+      LoadExtensionWithManifest, weak_ptr_factory_.GetWeakPtr(),
+      manifest_contents, root_directory, internal, loader_context, handler));
 }
 
 // Implementation based on ComponentLoader::Add.
@@ -453,18 +449,26 @@ ContentVerifier* CefExtensionSystem::content_verifier() {
 
 std::unique_ptr<ExtensionSet> CefExtensionSystem::GetDependentExtensions(
     const Extension* extension) {
-  return base::MakeUnique<ExtensionSet>();
+  return std::make_unique<ExtensionSet>();
 }
 
 void CefExtensionSystem::InstallUpdate(
     const std::string& extension_id,
     const std::string& public_key,
     const base::FilePath& temp_dir,
+    bool install_immediately,
     InstallUpdateCallback install_update_callback) {
   NOTREACHED();
   base::DeleteFile(temp_dir, true /* recursive */);
 }
 
+bool CefExtensionSystem::FinishDelayedInstallationIfReady(
+    const std::string& extension_id,
+    bool install_immediately) {
+  NOTREACHED();
+  return false;
+}
+
 CefExtensionSystem::ComponentExtensionInfo::ComponentExtensionInfo(
     const base::DictionaryValue* manifest,
     const base::FilePath& directory,
@@ -473,7 +477,7 @@ CefExtensionSystem::ComponentExtensionInfo::ComponentExtensionInfo(
   if (!root_directory.IsAbsolute()) {
     // This path structure is required by
     // url_request_util::MaybeCreateURLRequestResourceBundleJob.
-    CHECK(PathService::Get(chrome::DIR_RESOURCES, &root_directory));
+    CHECK(base::PathService::Get(chrome::DIR_RESOURCES, &root_directory));
     root_directory = root_directory.Append(directory);
   }
 }

libcef/browser/extensions/extension_system.h

@@ -114,7 +114,10 @@ class CefExtensionSystem : public ExtensionSystem {
   void InstallUpdate(const std::string& extension_id,
                      const std::string& public_key,
                      const base::FilePath& temp_dir,
+                     bool install_immediately,
                      InstallUpdateCallback install_update_callback) override;
+  bool FinishDelayedInstallationIfReady(const std::string& extension_id,
+                                        bool install_immediately) override;
 
   bool initialized() const { return initialized_; }
 

libcef/browser/extensions/extension_view_host.cc

@@ -12,7 +12,7 @@
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/notification_types.h"
 #include "extensions/browser/runtime_data.h"
-#include "third_party/WebKit/public/platform/WebGestureEvent.h"
+#include "third_party/blink/public/platform/web_gesture_event.h"
 
 using content::NativeWebKeyboardEvent;
 using content::OpenURLParams;

libcef/browser/extensions/extension_web_contents_observer.cc

@@ -21,6 +21,16 @@ CefExtensionWebContentsObserver::CefExtensionWebContentsObserver(
 
 CefExtensionWebContentsObserver::~CefExtensionWebContentsObserver() {}
 
+// static
+void CefExtensionWebContentsObserver::CreateForWebContents(
+    content::WebContents* web_contents) {
+  content::WebContentsUserData<
+      CefExtensionWebContentsObserver>::CreateForWebContents(web_contents);
+
+  // Initialize this instance if necessary.
+  FromWebContents(web_contents)->Initialize();
+}
+
 void CefExtensionWebContentsObserver::RenderFrameCreated(
     content::RenderFrameHost* render_frame_host) {
   ExtensionWebContentsObserver::RenderFrameCreated(render_frame_host);
@@ -36,7 +46,7 @@ void CefExtensionWebContentsObserver::RenderFrameCreated(
   // are allowed to use chrome://resources/ URLs.
   if ((extension->is_extension() || extension->is_platform_app()) &&
       Manifest::IsComponentLocation(extension->location())) {
-    policy->GrantOrigin(
+    policy->GrantRequestOrigin(
         process_id, url::Origin::Create(GURL(content::kChromeUIResourcesURL)));
   }
 }

libcef/browser/extensions/extension_web_contents_observer.h

@@ -22,6 +22,10 @@ class CefExtensionWebContentsObserver
  public:
   ~CefExtensionWebContentsObserver() override;
 
+  // Creates and initializes an instance of this class for the given
+  // |web_contents|, if it doesn't already exist.
+  static void CreateForWebContents(content::WebContents* web_contents);
+
   ScriptExecutor* script_executor() { return script_executor_.get(); }
 
  private:

libcef/browser/extensions/extensions_browser_client.cc

@@ -123,6 +123,25 @@ CefExtensionsBrowserClient::MaybeCreateResourceBundleRequestJob(
       send_cors_header);
 }
 
+base::FilePath CefExtensionsBrowserClient::GetBundleResourcePath(
+    const network::ResourceRequest& request,
+    const base::FilePath& extension_resources_path,
+    int* resource_id) const {
+  *resource_id = 0;
+  return base::FilePath();
+}
+
+void CefExtensionsBrowserClient::LoadResourceFromResourceBundle(
+    const network::ResourceRequest& request,
+    network::mojom::URLLoaderRequest loader,
+    const base::FilePath& resource_relative_path,
+    int resource_id,
+    const std::string& content_security_policy,
+    network::mojom::URLLoaderClientPtr client,
+    bool send_cors_header) {
+  NOTREACHED() << "Load resources from bundles not supported.";
+}
+
 bool CefExtensionsBrowserClient::AllowCrossRendererResourceLoad(
     const GURL& url,
     content::ResourceType resource_type,
@@ -235,10 +254,19 @@ bool CefExtensionsBrowserClient::DidVersionUpdate(BrowserContext* context) {
 
 void CefExtensionsBrowserClient::PermitExternalProtocolHandler() {}
 
+bool CefExtensionsBrowserClient::IsInDemoMode() {
+  return false;
+}
+
 bool CefExtensionsBrowserClient::IsRunningInForcedAppMode() {
   return false;
 }
 
+bool CefExtensionsBrowserClient::IsAppModeForcedForApp(
+    const ExtensionId& extension_id) {
+  return false;
+}
+
 bool CefExtensionsBrowserClient::IsLoggedInAsPublicAccount() {
   return false;
 }

libcef/browser/extensions/extensions_browser_client.h

@@ -51,6 +51,18 @@ class CefExtensionsBrowserClient : public ExtensionsBrowserClient {
       const base::FilePath& directory_path,
       const std::string& content_security_policy,
       bool send_cors_header) override;
+  base::FilePath GetBundleResourcePath(
+      const network::ResourceRequest& request,
+      const base::FilePath& extension_resources_path,
+      int* resource_id) const override;
+  void LoadResourceFromResourceBundle(
+      const network::ResourceRequest& request,
+      network::mojom::URLLoaderRequest loader,
+      const base::FilePath& resource_relative_path,
+      int resource_id,
+      const std::string& content_security_policy,
+      network::mojom::URLLoaderClientPtr client,
+      bool send_cors_header) override;
   bool AllowCrossRendererResourceLoad(const GURL& url,
                                       content::ResourceType resource_type,
                                       ui::PageTransition page_transition,
@@ -72,7 +84,9 @@ class CefExtensionsBrowserClient : public ExtensionsBrowserClient {
                                      ExtensionHost** host) override;
   bool DidVersionUpdate(content::BrowserContext* context) override;
   void PermitExternalProtocolHandler() override;
+  bool IsInDemoMode() override;
   bool IsRunningInForcedAppMode() override;
+  bool IsAppModeForcedForApp(const ExtensionId& extension_id) override;
   bool IsLoggedInAsPublicAccount() override;
   ExtensionSystemProvider* GetExtensionSystemFactory() override;
   void RegisterExtensionFunctions(

libcef/browser/javascript_dialog_manager.cc

@@ -79,12 +79,14 @@ void CefJavaScriptDialogManager::Destroy() {
 
 void CefJavaScriptDialogManager::RunJavaScriptDialog(
     content::WebContents* web_contents,
-    const GURL& origin_url,
+    content::RenderFrameHost* render_frame_host,
     content::JavaScriptDialogType message_type,
     const base::string16& message_text,
     const base::string16& default_prompt_text,
     DialogClosedCallback callback,
     bool* did_suppress_message) {
+  const GURL& origin_url = render_frame_host->GetLastCommittedURL();
+
   CefRefPtr<CefClient> client = browser_->GetClient();
   if (client.get()) {
     CefRefPtr<CefJSDialogHandler> handler = client->GetJSDialogHandler();

libcef/browser/javascript_dialog_manager.h

@@ -29,7 +29,7 @@ class CefJavaScriptDialogManager : public content::JavaScriptDialogManager {
 
   // JavaScriptDialogManager methods.
   void RunJavaScriptDialog(content::WebContents* web_contents,
-                           const GURL& origin_url,
+                           content::RenderFrameHost* render_frame_host,
                            content::JavaScriptDialogType message_type,
                            const base::string16& message_text,
                            const base::string16& default_prompt_text,

libcef/browser/native/browser_platform_delegate_native.cc

@@ -20,10 +20,10 @@ SkColor CefBrowserPlatformDelegateNative::GetBackgroundColor() const {
   return background_color_;
 }
 
-void CefBrowserPlatformDelegateNative::WasResized() {
+void CefBrowserPlatformDelegateNative::SynchronizeVisualProperties() {
   content::RenderViewHost* host = browser_->web_contents()->GetRenderViewHost();
   if (host)
-    host->GetWidget()->WasResized();
+    host->GetWidget()->SynchronizeVisualProperties();
 }
 
 void CefBrowserPlatformDelegateNative::SendKeyEvent(

libcef/browser/native/browser_platform_delegate_native.h

@@ -26,7 +26,7 @@ class CefBrowserPlatformDelegateNative : public CefBrowserPlatformDelegate {
 
   // CefBrowserPlatformDelegate methods:
   SkColor GetBackgroundColor() const override;
-  void WasResized() override;
+  void SynchronizeVisualProperties() override;
   void SendKeyEvent(const content::NativeWebKeyboardEvent& event) override;
   void SendMouseEvent(const blink::WebMouseEvent& event) override;
   void SendMouseWheelEvent(const blink::WebMouseWheelEvent& event) override;

libcef/browser/native/browser_platform_delegate_native_linux.cc

@@ -383,5 +383,8 @@ void CefBrowserPlatformDelegateNativeLinux::TranslateMouseEvent(
                       TranslateModifiers(mouse_event.modifiers));
 
   // timestamp
-  result.SetTimeStampSeconds(GetSystemUptime());
+  result.SetTimeStamp(base::TimeTicks() +
+                      base::TimeDelta::FromSeconds(GetSystemUptime()));
+
+  result.pointer_type = blink::WebPointerProperties::PointerType::kMouse;
 }

libcef/browser/native/browser_platform_delegate_native_mac.mm

@@ -20,9 +20,9 @@
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
-#include "third_party/WebKit/public/platform/WebInputEvent.h"
-#include "third_party/WebKit/public/platform/WebMouseEvent.h"
-#include "third_party/WebKit/public/platform/WebMouseWheelEvent.h"
+#include "third_party/blink/public/platform/web_input_event.h"
+#include "third_party/blink/public/platform/web_mouse_event.h"
+#include "third_party/blink/public/platform/web_mouse_wheel_event.h"
 #import "ui/base/cocoa/cocoa_base_utils.h"
 #import "ui/base/cocoa/underlay_opengl_hosting_window.h"
 #include "ui/events/keycodes/keyboard_codes_posix.h"
@@ -99,6 +99,7 @@
 }
 
 - (void)cleanup:(id)window {
+  [window_ setDelegate:nil];
   [self release];
 }
 
@@ -468,5 +469,8 @@ void CefBrowserPlatformDelegateNativeMac::TranslateMouseEvent(
                       TranslateModifiers(mouse_event.modifiers));
 
   // timestamp - Mac OSX specific
-  result.SetTimeStampSeconds(currentEventTimestamp());
+  result.SetTimeStamp(base::TimeTicks() +
+                      base::TimeDelta::FromSeconds(currentEventTimestamp()));
+
+  result.pointer_type = blink::WebPointerProperties::PointerType::kMouse;
 }

libcef/browser/native/browser_platform_delegate_native_win.cc

@@ -20,9 +20,10 @@
 #include "base/memory/ref_counted_memory.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/registry.h"
+#include "base/win/win_util.h"
 #include "content/public/browser/native_web_keyboard_event.h"
-#include "third_party/WebKit/public/platform/WebMouseEvent.h"
-#include "third_party/WebKit/public/platform/WebMouseWheelEvent.h"
+#include "third_party/blink/public/platform/web_mouse_event.h"
+#include "third_party/blink/public/platform/web_mouse_wheel_event.h"
 #include "ui/aura/window.h"
 #include "ui/base/win/shell.h"
 #include "ui/display/display.h"
@@ -41,7 +42,7 @@
 namespace {
 
 void WriteTempFileAndView(scoped_refptr<base::RefCountedString> str) {
-  CEF_REQUIRE_FILET();
+  CEF_REQUIRE_BLOCKING();
 
   base::FilePath tmp_file;
   if (!base::CreateTemporaryFile(&tmp_file))
@@ -83,7 +84,7 @@ bool HasExternalHandler(const std::string& scheme) {
 }
 
 void ExecuteExternalProtocol(const GURL& url) {
-  CEF_REQUIRE_FILET();
+  CEF_REQUIRE_BLOCKING();
 
   if (!HasExternalHandler(url.scheme()))
     return;
@@ -95,6 +96,31 @@ void ExecuteExternalProtocol(const GURL& url) {
   ShellExecuteA(NULL, "open", address.c_str(), NULL, NULL, SW_SHOWNORMAL);
 }
 
+// DPI value for 1x scale factor.
+#define DPI_1X 96.0f
+
+float GetWindowScaleFactor(HWND hwnd) {
+  DCHECK(hwnd);
+
+  if (base::win::IsProcessPerMonitorDpiAware()) {
+    // Let Windows tell us the correct DPI.
+    static auto get_dpi_for_window_func = []() {
+      return reinterpret_cast<decltype(::GetDpiForWindow)*>(
+          GetProcAddress(GetModuleHandle(L"user32.dll"), "GetDpiForWindow"));
+    }();
+    if (get_dpi_for_window_func)
+      return static_cast<float>(get_dpi_for_window_func(hwnd)) / DPI_1X;
+  }
+
+  // Fallback to the monitor that contains the window center point.
+  RECT cr;
+  GetWindowRect(hwnd, &cr);
+  return display::Screen::GetScreen()
+      ->GetDisplayNearestPoint(
+          gfx::Point((cr.right - cr.left) / 2, (cr.bottom - cr.top) / 2))
+      .device_scale_factor();
+}
+
 }  // namespace
 
 CefBrowserPlatformDelegateNativeWin::CefBrowserPlatformDelegateNativeWin(
@@ -117,40 +143,49 @@ void CefBrowserPlatformDelegateNativeWin::BrowserDestroyed(
 bool CefBrowserPlatformDelegateNativeWin::CreateHostWindow() {
   RegisterWindowClass();
 
+  has_frame_ = !(window_info_.style & WS_CHILD);
+
   std::wstring windowName(CefString(&window_info_.window_name));
 
   // Create the new browser window.
-  window_info_.window = CreateWindowEx(
-      window_info_.ex_style, GetWndClass(), windowName.c_str(),
-      window_info_.style, window_info_.x, window_info_.y, window_info_.width,
-      window_info_.height, window_info_.parent_window, window_info_.menu,
-      ::GetModuleHandle(NULL), NULL);
+  CreateWindowEx(window_info_.ex_style, GetWndClass(), windowName.c_str(),
+                 window_info_.style, window_info_.x, window_info_.y,
+                 window_info_.width, window_info_.height,
+                 window_info_.parent_window, window_info_.menu,
+                 ::GetModuleHandle(NULL), this);
 
   // It's possible for CreateWindowEx to fail if the parent window was
   // destroyed between the call to CreateBrowser and the above one.
-  DCHECK(window_info_.window != NULL);
+  DCHECK(window_info_.window);
   if (!window_info_.window)
     return false;
 
   host_window_created_ = true;
 
-  // Set window user data to this object for future reference from the window
-  // procedure.
-  gfx::SetWindowUserData(window_info_.window, this);
-
   // Add a reference that will later be released in DestroyBrowser().
   browser_->AddRef();
 
-  RECT cr;
-  GetClientRect(window_info_.window, &cr);
+  if (!called_enable_non_client_dpi_scaling_ && has_frame_ &&
+      base::win::IsProcessPerMonitorDpiAware()) {
+    // This call gets Windows to scale the non-client area when WM_DPICHANGED
+    // is fired on Windows versions < 10.0.14393.0.
+    // Derived signature; not available in headers.
+    static auto enable_child_window_dpi_message_func = []() {
+      using EnableChildWindowDpiMessagePtr = LRESULT(WINAPI*)(HWND, BOOL);
+      return reinterpret_cast<EnableChildWindowDpiMessagePtr>(GetProcAddress(
+          GetModuleHandle(L"user32.dll"), "EnableChildWindowDpiMessage"));
+    }();
+    if (enable_child_window_dpi_message_func)
+      enable_child_window_dpi_message_func(window_info_.window, TRUE);
+  }
 
   DCHECK(!window_widget_);
 
-  // Adjust for potential display scaling.
+  // Convert from device coordinates to logical coordinates.
+  RECT cr;
+  GetClientRect(window_info_.window, &cr);
   gfx::Point point = gfx::Point(cr.right, cr.bottom);
-  float scale = display::Screen::GetScreen()
-                    ->GetDisplayNearestPoint(point)
-                    .device_scale_factor();
+  const float scale = GetWindowScaleFactor(window_info_.window);
   point =
       gfx::ToFlooredPoint(gfx::ScalePoint(gfx::PointF(point), 1.0f / scale));
 
@@ -270,26 +305,26 @@ gfx::Point CefBrowserPlatformDelegateNativeWin::GetScreenPoint(
   if (windowless_handler_)
     return windowless_handler_->GetParentScreenPoint(view);
 
-  if (!window_widget_)
+  if (!window_info_.window)
     return view;
 
-  aura::Window* window = window_widget_->GetNativeView();
-  const gfx::Rect& bounds_in_screen = window->GetBoundsInScreen();
-  const gfx::Point& screen_point = gfx::Point(bounds_in_screen.x() + view.x(),
-                                              bounds_in_screen.y() + view.y());
+  // Convert from logical coordinates to device coordinates.
+  const float scale = GetWindowScaleFactor(window_info_.window);
+  const gfx::Point& device_pt =
+      gfx::ToFlooredPoint(gfx::ScalePoint(gfx::PointF(view), scale));
 
-  // Adjust for potential display scaling.
-  float scale = display::Screen::GetScreen()
-                    ->GetDisplayNearestPoint(screen_point)
-                    .device_scale_factor();
-  return gfx::ToFlooredPoint(gfx::ScalePoint(gfx::PointF(screen_point), scale));
+  // Convert from client coordinates to screen coordinates.
+  POINT screen_pt = {device_pt.x(), device_pt.y()};
+  ClientToScreen(window_info_.window, &screen_pt);
+
+  return gfx::Point(screen_pt.x, screen_pt.y);
 }
 
 void CefBrowserPlatformDelegateNativeWin::ViewText(const std::string& text) {
   std::string str = text;
   scoped_refptr<base::RefCountedString> str_ref =
       base::RefCountedString::TakeString(&str);
-  CEF_POST_TASK(CEF_FILET, base::Bind(WriteTempFileAndView, str_ref));
+  CEF_POST_USER_VISIBLE_TASK(base::Bind(WriteTempFileAndView, str_ref));
 }
 
 void CefBrowserPlatformDelegateNativeWin::HandleKeyboardEvent(
@@ -335,8 +370,7 @@ void CefBrowserPlatformDelegateNativeWin::HandleKeyboardEvent(
 
 void CefBrowserPlatformDelegateNativeWin::HandleExternalProtocol(
     const GURL& url) {
-  // Execute on the FILE thread.
-  CEF_POST_TASK(CEF_FILET, base::Bind(ExecuteExternalProtocol, url));
+  CEF_POST_USER_VISIBLE_TASK(base::Bind(ExecuteExternalProtocol, url));
 }
 
 void CefBrowserPlatformDelegateNativeWin::TranslateKeyEvent(
@@ -523,7 +557,10 @@ void CefBrowserPlatformDelegateNativeWin::TranslateMouseEvent(
                       TranslateModifiers(mouse_event.modifiers));
 
   // timestamp
-  result.SetTimeStampSeconds(GetMessageTime() / 1000.0);
+  result.SetTimeStamp(base::TimeTicks() +
+                      base::TimeDelta::FromMilliseconds(GetMessageTime()));
+
+  result.pointer_type = blink::WebPointerProperties::PointerType::kMouse;
 }
 
 // static
@@ -562,12 +599,15 @@ LRESULT CALLBACK CefBrowserPlatformDelegateNativeWin::WndProc(HWND hwnd,
                                                               UINT message,
                                                               WPARAM wParam,
                                                               LPARAM lParam) {
-  CefBrowserPlatformDelegateNativeWin* platform_delegate =
-      static_cast<CefBrowserPlatformDelegateNativeWin*>(
-          gfx::GetWindowUserData(hwnd));
+  CefBrowserPlatformDelegateNativeWin* platform_delegate = nullptr;
   CefBrowserHostImpl* browser = nullptr;
+
+  if (message != WM_NCCREATE) {
+    platform_delegate = static_cast<CefBrowserPlatformDelegateNativeWin*>(
+        gfx::GetWindowUserData(hwnd));
     if (platform_delegate)
       browser = platform_delegate->browser_;
+  }
 
   switch (message) {
     case WM_CLOSE:
@@ -579,6 +619,31 @@ LRESULT CALLBACK CefBrowserPlatformDelegateNativeWin::WndProc(HWND hwnd,
       // Allow the close.
       break;
 
+    case WM_NCCREATE: {
+      CREATESTRUCT* cs = reinterpret_cast<CREATESTRUCT*>(lParam);
+      platform_delegate =
+          reinterpret_cast<CefBrowserPlatformDelegateNativeWin*>(
+              cs->lpCreateParams);
+      DCHECK(platform_delegate);
+      // Associate |platform_delegate| with the window handle.
+      gfx::SetWindowUserData(hwnd, platform_delegate);
+      platform_delegate->window_info_.window = hwnd;
+
+      if (platform_delegate->has_frame_ &&
+          base::win::IsProcessPerMonitorDpiAware()) {
+        // This call gets Windows to scale the non-client area when
+        // WM_DPICHANGED is fired on Windows versions >= 10.0.14393.0.
+        static auto enable_non_client_dpi_scaling_func = []() {
+          return reinterpret_cast<decltype(::EnableNonClientDpiScaling)*>(
+              GetProcAddress(GetModuleHandle(L"user32.dll"),
+                             "EnableNonClientDpiScaling"));
+        }();
+        platform_delegate->called_enable_non_client_dpi_scaling_ =
+            !!(enable_non_client_dpi_scaling_func &&
+               enable_non_client_dpi_scaling_func(hwnd));
+      }
+    } break;
+
     case WM_NCDESTROY:
       if (platform_delegate) {
         // Clear the user data pointer.
@@ -617,6 +682,17 @@ LRESULT CALLBACK CefBrowserPlatformDelegateNativeWin::WndProc(HWND hwnd,
 
     case WM_ERASEBKGND:
       return 0;
+
+    case WM_DPICHANGED:
+      if (platform_delegate && platform_delegate->has_frame_) {
+        // Suggested size and position of the current window scaled for the
+        // new DPI.
+        const RECT* rect = reinterpret_cast<RECT*>(lParam);
+        SetWindowPos(platform_delegate->GetHostWindowHandle(), NULL, rect->left,
+                     rect->top, rect->right - rect->left,
+                     rect->bottom - rect->top, SWP_NOZORDER | SWP_NOACTIVATE);
+      }
+      break;
   }
 
   return DefWindowProc(hwnd, message, wParam, lParam);

libcef/browser/native/browser_platform_delegate_native_win.h

@@ -68,6 +68,9 @@ class CefBrowserPlatformDelegateNativeWin
   // Widget hosting the web contents. It will be deleted automatically when the
   // associated root window is destroyed.
   views::Widget* window_widget_;
+
+  bool has_frame_ = false;
+  bool called_enable_non_client_dpi_scaling_ = false;
 };
 
 #endif  // CEF_LIBCEF_BROWSER_NATIVE_BROWSER_PLATFORM_DELEGATE_NATIVE_WIN_H_

libcef/browser/native/javascript_dialog_runner_win.cc

@@ -121,7 +121,7 @@ void CefJavaScriptDialogRunnerWin::Run(
   HMODULE hModule = NULL;
 
   // Try to load the dialog from the DLL.
-  if (PathService::Get(base::DIR_MODULE, &file_path)) {
+  if (base::PathService::Get(base::DIR_MODULE, &file_path)) {
     file_path = file_path.Append(L"libcef.dll");
     hModule = ::GetModuleHandle(file_path.value().c_str());
   }

libcef/browser/native/menu_runner_mac.mm

@@ -9,6 +9,7 @@
 #include "base/compiler_specific.h"
 #import "base/mac/scoped_sending_event.h"
 #include "base/message_loop/message_loop.h"
+#include "base/message_loop/message_loop_current.h"
 #import "ui/base/cocoa/menu_controller.h"
 #include "ui/gfx/geometry/point.h"
 
@@ -33,8 +34,7 @@ bool CefMenuRunnerMac::RunContextMenu(
       menu_controller_);
 
   // Make sure events can be pumped while the menu is up.
-  base::MessageLoop::ScopedNestableTaskAllower allow(
-      base::MessageLoop::current());
+  base::MessageLoopCurrent::ScopedNestableTaskAllower allow;
 
   // One of the events that could be pumped is |window.close()|.
   // User-initiated event-tracking loops protect against this by

libcef/browser/native/menu_runner_win.cc

@@ -8,6 +8,7 @@
 #include "libcef/browser/native/menu_2.h"
 
 #include "base/message_loop/message_loop.h"
+#include "base/message_loop/message_loop_current.h"
 #include "ui/gfx/geometry/point.h"
 
 CefMenuRunnerWin::CefMenuRunnerWin() {}
@@ -21,8 +22,7 @@ bool CefMenuRunnerWin::RunContextMenu(
   menu_->Rebuild(NULL);
 
   // Make sure events can be pumped while the menu is up.
-  base::MessageLoop::ScopedNestableTaskAllower allow(
-      base::MessageLoop::current());
+  base::MessageLoopCurrent::ScopedNestableTaskAllower allow;
 
   const gfx::Point& screen_point =
       browser->GetScreenPoint(gfx::Point(params.x, params.y));

libcef/browser/native/native_menu_win.cc

@@ -647,7 +647,7 @@ void CefNativeMenuWin::AddMenuItemAt(int menu_index, int model_index) {
   else
     mii.fType = MFT_OWNERDRAW;
 
-  std::unique_ptr<ItemData> item_data = base::MakeUnique<ItemData>();
+  std::unique_ptr<ItemData> item_data = std::make_unique<ItemData>();
   item_data->label = base::string16();
   ui::MenuModel::ItemType type = model_->GetTypeAt(model_index);
   if (type == ui::MenuModel::TYPE_SUBMENU) {
@@ -676,7 +676,7 @@ void CefNativeMenuWin::AddSeparatorItemAt(int menu_index, int model_index) {
   mii.fType = MFT_SEPARATOR;
   // Insert a dummy entry into our label list so we can index directly into it
   // using item indices if need be.
-  items_.insert(items_.begin() + model_index, base::MakeUnique<ItemData>());
+  items_.insert(items_.begin() + model_index, std::make_unique<ItemData>());
   InsertMenuItem(menu_, menu_index, TRUE, &mii);
 }
 

libcef/browser/native/window_x11.cc

@@ -26,7 +26,7 @@ const char kNetWMPing[] = "_NET_WM_PING";
 const char kNetWMState[] = "_NET_WM_STATE";
 const char kXdndProxy[] = "XdndProxy";
 
-::Window FindEventTarget(const base::NativeEvent& xev) {
+::Window FindEventTarget(const ui::PlatformEvent& xev) {
   ::Window target = xev->xany.window;
   if (xev->type == GenericEvent)
     target = static_cast<XIDeviceEvent*>(xev->xcookie.data)->event;
@@ -104,6 +104,7 @@ CefWindowX11::CefWindowX11(CefRefPtr<CefBrowserHostImpl> browser,
                            InputOutput,
                            CopyFromParent,  // visual
                            CWBackPixmap | CWOverrideRedirect, &swa);
+  CHECK(xwindow_);
 
   if (ui::PlatformEventSource::GetInstance())
     ui::PlatformEventSource::GetInstance()->AddPlatformEventDispatcher(this);
@@ -333,7 +334,7 @@ uint32_t CefWindowX11::DispatchEvent(const ui::PlatformEvent& event) {
       }
       break;
     }
-    case FocusIn:
+    case x11::FocusIn:
       // This message is received first followed by a "_NET_ACTIVE_WINDOW"
       // message sent to the root window. When X11DesktopHandler handles the
       // "_NET_ACTIVE_WINDOW" message it will erroneously mark the WebView
@@ -347,7 +348,7 @@ uint32_t CefWindowX11::DispatchEvent(const ui::PlatformEvent& event) {
                               100);
       }
       break;
-    case FocusOut:
+    case x11::FocusOut:
       // Cancel the pending focus change if some other window has gained focus
       // while waiting for the async task to run. Otherwise we can get stuck in
       // a focus change loop.

libcef/browser/net/chrome_scheme_handler.cc

@@ -36,6 +36,7 @@
 #include "content/browser/frame_host/debug_urls.h"
 #include "content/browser/webui/content_web_ui_controller_factory.h"
 #include "content/public/browser/browser_url_handler.h"
+#include "content/public/browser/web_ui_controller.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/common/url_utils.h"
 #include "content/public/common/user_agent.h"
@@ -72,7 +73,6 @@ const char* kAllowedWebUIHosts[] = {
     chrome::kChromeUINetInternalsHost,
     content::kChromeUINetworkErrorHost,
     content::kChromeUINetworkErrorsListingHost,
-    content::kChromeUINetworkViewCacheHost,
     content::kChromeUIResourcesHost,
     content::kChromeUIServiceWorkerInternalsHost,
     chrome::kChromeUISystemInfoHost,
@@ -212,24 +212,20 @@ class CefWebUIControllerFactory : public content::WebUIControllerFactory {
     return false;
   }
 
-  content::WebUIController* CreateWebUIControllerForURL(
+  std::unique_ptr<content::WebUIController> CreateWebUIControllerForURL(
       content::WebUI* web_ui,
       const GURL& url) const override {
-    content::WebUIController* controller = nullptr;
+    std::unique_ptr<content::WebUIController> controller;
     if (!AllowWebUIForURL(url))
       return controller;
 
     controller = content::ContentWebUIControllerFactory::GetInstance()
                      ->CreateWebUIControllerForURL(web_ui, url);
-    if (controller != nullptr)
+    if (controller.get())
       return controller;
 
-    controller = ChromeWebUIControllerFactory::GetInstance()
+    return ChromeWebUIControllerFactory::GetInstance()
         ->CreateWebUIControllerForURL(web_ui, url);
-    if (controller != nullptr)
-      return controller;
-
-    return nullptr;
   }
 
   content::WebUI::TypeID GetWebUIType(content::BrowserContext* browser_context,
@@ -438,7 +434,7 @@ std::string GetCommandLine() {
 
 std::string GetModulePath() {
   base::FilePath path;
-  if (PathService::Get(base::FILE_MODULE, &path))
+  if (base::PathService::Get(base::FILE_MODULE, &path))
     return CefString(path.value());
   return std::string();
 }
@@ -794,6 +790,7 @@ void DidFinishChromeLoad(CefRefPtr<CefFrame> frame, const GURL& validated_url) {
   switch (host_id) {
     case CHROME_VERSION:
       DidFinishChromeVersionLoad(frame);
+      break;
     default:
       break;
   }

libcef/browser/net/cookie_store_proxy.cc

@@ -4,20 +4,50 @@
 
 #include "libcef/browser/net/cookie_store_proxy.h"
 
-#include "libcef/browser/cookie_manager_impl.h"
-#include "libcef/browser/net/url_request_context_impl.h"
+#include "include/cef_request_context.h"
+#include "libcef/browser/net/cookie_store_source.h"
 #include "libcef/browser/thread_util.h"
 
 #include "base/logging.h"
-#include "net/url_request/url_request_context.h"
+#include "net/cookies/cookie_change_dispatcher.h"
+
+namespace {
+
+class NullCookieChangeDispatcher : public net::CookieChangeDispatcher {
+ public:
+  NullCookieChangeDispatcher() {}
+  ~NullCookieChangeDispatcher() override {}
+
+  // net::CookieChangeDispatcher
+  std::unique_ptr<net::CookieChangeSubscription> AddCallbackForCookie(
+      const GURL& url,
+      const std::string& name,
+      net::CookieChangeCallback callback) override {
+    return nullptr;
+  }
+
+  std::unique_ptr<net::CookieChangeSubscription> AddCallbackForUrl(
+      const GURL& url,
+      net::CookieChangeCallback callback) override {
+    return nullptr;
+  }
+
+  std::unique_ptr<net::CookieChangeSubscription> AddCallbackForAllChanges(
+      net::CookieChangeCallback callback) override {
+    return nullptr;
+  }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(NullCookieChangeDispatcher);
+};
+
+}  // namespace
 
 CefCookieStoreProxy::CefCookieStoreProxy(
-    CefURLRequestContextImpl* parent,
-    CefRefPtr<CefRequestContextHandler> handler)
-    : parent_(parent), handler_(handler) {
+    std::unique_ptr<CefCookieStoreSource> source)
+    : source_(std::move(source)) {
   CEF_REQUIRE_IOT();
-  DCHECK(parent_);
-  DCHECK(handler_.get());
+  DCHECK(source_);
 }
 
 CefCookieStoreProxy::~CefCookieStoreProxy() {
@@ -33,6 +63,8 @@ void CefCookieStoreProxy::SetCookieWithOptionsAsync(
   if (cookie_store) {
     cookie_store->SetCookieWithOptionsAsync(url, cookie_line, options,
                                             std::move(callback));
+  } else if (!callback.is_null()) {
+    std::move(callback).Run(false);
   }
 }
 
@@ -46,103 +78,104 @@ void CefCookieStoreProxy::SetCanonicalCookieAsync(
     cookie_store->SetCanonicalCookieAsync(std::move(cookie), secure_source,
                                           modify_http_only,
                                           std::move(callback));
+  } else if (!callback.is_null()) {
+    std::move(callback).Run(false);
   }
 }
 
-void CefCookieStoreProxy::GetCookiesWithOptionsAsync(
-    const GURL& url,
-    const net::CookieOptions& options,
-    GetCookiesCallback callback) {
-  net::CookieStore* cookie_store = GetCookieStore();
-  if (cookie_store)
-    cookie_store->GetCookiesWithOptionsAsync(url, options, std::move(callback));
-}
-
 void CefCookieStoreProxy::GetCookieListWithOptionsAsync(
     const GURL& url,
     const net::CookieOptions& options,
     GetCookieListCallback callback) {
   net::CookieStore* cookie_store = GetCookieStore();
-  if (cookie_store)
+  if (cookie_store) {
     cookie_store->GetCookieListWithOptionsAsync(url, options,
                                                 std::move(callback));
+  } else if (!callback.is_null()) {
+    std::move(callback).Run(net::CookieList());
+  }
 }
 
 void CefCookieStoreProxy::GetAllCookiesAsync(GetCookieListCallback callback) {
   net::CookieStore* cookie_store = GetCookieStore();
-  if (cookie_store)
+  if (cookie_store) {
     cookie_store->GetAllCookiesAsync(std::move(callback));
+  } else if (!callback.is_null()) {
+    std::move(callback).Run(net::CookieList());
+  }
 }
 
 void CefCookieStoreProxy::DeleteCookieAsync(const GURL& url,
                                             const std::string& cookie_name,
                                             base::OnceClosure callback) {
   net::CookieStore* cookie_store = GetCookieStore();
-  if (cookie_store)
+  if (cookie_store) {
     cookie_store->DeleteCookieAsync(url, cookie_name, std::move(callback));
+  } else if (!callback.is_null()) {
+    std::move(callback).Run();
+  }
 }
 
 void CefCookieStoreProxy::DeleteCanonicalCookieAsync(
     const net::CanonicalCookie& cookie,
     DeleteCallback callback) {
   net::CookieStore* cookie_store = GetCookieStore();
-  if (cookie_store)
-    cookie_store->DeleteCanonicalCookieAsync(cookie, std::move(callback));
-}
-
-void CefCookieStoreProxy::DeleteAllCreatedBetweenAsync(
-    const base::Time& delete_begin,
-    const base::Time& delete_end,
-    DeleteCallback callback) {
-  net::CookieStore* cookie_store = GetCookieStore();
   if (cookie_store) {
-    cookie_store->DeleteAllCreatedBetweenAsync(delete_begin, delete_end,
-                                               std::move(callback));
+    cookie_store->DeleteCanonicalCookieAsync(cookie, std::move(callback));
+  } else if (!callback.is_null()) {
+    std::move(callback).Run(0);
   }
 }
 
-void CefCookieStoreProxy::DeleteAllCreatedBetweenWithPredicateAsync(
-    const base::Time& delete_begin,
-    const base::Time& delete_end,
-    const CookiePredicate& predicate,
+void CefCookieStoreProxy::DeleteAllCreatedInTimeRangeAsync(
+    const net::CookieDeletionInfo::TimeRange& creation_range,
     DeleteCallback callback) {
   net::CookieStore* cookie_store = GetCookieStore();
   if (cookie_store) {
-    cookie_store->DeleteAllCreatedBetweenWithPredicateAsync(
-        delete_begin, delete_end, predicate, std::move(callback));
+    cookie_store->DeleteAllCreatedInTimeRangeAsync(creation_range,
+                                                   std::move(callback));
+  } else if (!callback.is_null()) {
+    std::move(callback).Run(0);
+  }
+}
+
+void CefCookieStoreProxy::DeleteAllMatchingInfoAsync(
+    net::CookieDeletionInfo delete_info,
+    DeleteCallback callback) {
+  net::CookieStore* cookie_store = GetCookieStore();
+  if (cookie_store) {
+    cookie_store->DeleteAllMatchingInfoAsync(delete_info, std::move(callback));
+  } else if (!callback.is_null()) {
+    std::move(callback).Run(0);
   }
 }
 
 void CefCookieStoreProxy::DeleteSessionCookiesAsync(DeleteCallback callback) {
   net::CookieStore* cookie_store = GetCookieStore();
-  if (cookie_store)
+  if (cookie_store) {
     cookie_store->DeleteSessionCookiesAsync(std::move(callback));
+  } else if (!callback.is_null()) {
+    std::move(callback).Run(0);
+  }
 }
 
 void CefCookieStoreProxy::FlushStore(base::OnceClosure callback) {
   net::CookieStore* cookie_store = GetCookieStore();
-  if (cookie_store)
+  if (cookie_store) {
     cookie_store->FlushStore(std::move(callback));
+  } else if (!callback.is_null()) {
+    std::move(callback).Run();
+  }
 }
 
-std::unique_ptr<net::CookieStore::CookieChangedSubscription>
-CefCookieStoreProxy::AddCallbackForCookie(
-    const GURL& url,
-    const std::string& name,
-    const CookieChangedCallback& callback) {
+net::CookieChangeDispatcher& CefCookieStoreProxy::GetChangeDispatcher() {
   net::CookieStore* cookie_store = GetCookieStore();
   if (cookie_store)
-    return cookie_store->AddCallbackForCookie(url, name, callback);
-  return nullptr;
-}
+    return cookie_store->GetChangeDispatcher();
 
-std::unique_ptr<net::CookieStore::CookieChangedSubscription>
-CefCookieStoreProxy::AddCallbackForAllChanges(
-    const CookieChangedCallback& callback) {
-  net::CookieStore* cookie_store = GetCookieStore();
-  if (cookie_store)
-    return cookie_store->AddCallbackForAllChanges(callback);
-  return nullptr;
+  if (!null_dispatcher_)
+    null_dispatcher_.reset(new NullCookieChangeDispatcher());
+  return *null_dispatcher_;
 }
 
 bool CefCookieStoreProxy::IsEphemeral() {
@@ -154,26 +187,5 @@ bool CefCookieStoreProxy::IsEphemeral() {
 
 net::CookieStore* CefCookieStoreProxy::GetCookieStore() {
   CEF_REQUIRE_IOT();
-
-  net::CookieStore* cookie_store = nullptr;
-
-  CefRefPtr<CefCookieManager> manager = handler_->GetCookieManager();
-  if (manager.get()) {
-    // Use the cookie store provided by the manager.
-    cookie_store = reinterpret_cast<CefCookieManagerImpl*>(manager.get())
-                       ->GetExistingCookieStore();
-    DCHECK(cookie_store);
-    return cookie_store;
-  }
-
-  DCHECK(parent_);
-  if (parent_) {
-    // Use the cookie store from the parent.
-    cookie_store = parent_->cookie_store();
-    DCHECK(cookie_store);
-    if (!cookie_store)
-      LOG(ERROR) << "Cookie store does not exist";
-  }
-
-  return cookie_store;
+  return source_->GetCookieStore();
 }

libcef/browser/net/cookie_store_proxy.h

@@ -6,19 +6,15 @@
 #define CEF_LIBCEF_BROWSER_COOKIE_STORE_PROXY_H_
 #pragma once
 
-#include "include/cef_request_context_handler.h"
-
 #include "net/cookies/cookie_store.h"
 
-class CefURLRequestContextImpl;
+class CefCookieStoreSource;
 
-// Proxies cookie requests to the CefRequestContextHandler or global cookie
-// store. Life span is controlled by CefURLRequestContextProxy. Only accessed on
-// the IO thread. See browser_context.h for an object relationship diagram.
+// Proxies cookie requests to a CefCookieStoreSource (see comments on the
+// implementation classes for details). Only accessed on the IO thread.
 class CefCookieStoreProxy : public net::CookieStore {
  public:
-  CefCookieStoreProxy(CefURLRequestContextImpl* parent,
-                      CefRefPtr<CefRequestContextHandler> handler);
+  explicit CefCookieStoreProxy(std::unique_ptr<CefCookieStoreSource> source);
   ~CefCookieStoreProxy() override;
 
   // net::CookieStore methods.
@@ -30,9 +26,6 @@ class CefCookieStoreProxy : public net::CookieStore {
                                bool secure_source,
                                bool modify_http_only,
                                SetCookiesCallback callback) override;
-  void GetCookiesWithOptionsAsync(const GURL& url,
-                                  const net::CookieOptions& options,
-                                  GetCookiesCallback callback) override;
   void GetCookieListWithOptionsAsync(const GURL& url,
                                      const net::CookieOptions& options,
                                      GetCookieListCallback callback) override;
@@ -42,31 +35,21 @@ class CefCookieStoreProxy : public net::CookieStore {
                          base::OnceClosure callback) override;
   void DeleteCanonicalCookieAsync(const net::CanonicalCookie& cookie,
                                   DeleteCallback callback) override;
-  void DeleteAllCreatedBetweenAsync(const base::Time& delete_begin,
-                                    const base::Time& delete_end,
+  void DeleteAllCreatedInTimeRangeAsync(
+      const net::CookieDeletionInfo::TimeRange& creation_range,
       DeleteCallback callback) override;
-  void DeleteAllCreatedBetweenWithPredicateAsync(
-      const base::Time& delete_begin,
-      const base::Time& delete_end,
-      const CookiePredicate& predicate,
+  void DeleteAllMatchingInfoAsync(net::CookieDeletionInfo delete_info,
                                   DeleteCallback callback) override;
   void DeleteSessionCookiesAsync(DeleteCallback callback) override;
   void FlushStore(base::OnceClosure callback) override;
-  std::unique_ptr<CookieChangedSubscription> AddCallbackForCookie(
-      const GURL& url,
-      const std::string& name,
-      const CookieChangedCallback& callback) override;
-  std::unique_ptr<CookieChangedSubscription> AddCallbackForAllChanges(
-      const CookieChangedCallback& callback) override;
+  net::CookieChangeDispatcher& GetChangeDispatcher() override;
   bool IsEphemeral() override;
 
  private:
   net::CookieStore* GetCookieStore();
 
-  // The |parent_| pointer is kept alive by CefURLRequestContextGetterProxy
-  // which has a ref to the owning CefURLRequestContextGetterImpl.
-  CefURLRequestContextImpl* parent_;
-  CefRefPtr<CefRequestContextHandler> handler_;
+  std::unique_ptr<CefCookieStoreSource> const source_;
+  std::unique_ptr<net::CookieChangeDispatcher> null_dispatcher_;
 
   DISALLOW_COPY_AND_ASSIGN(CefCookieStoreProxy);
 };

libcef/browser/net/cookie_store_source.cc

@@ -0,0 +1,110 @@
+// Copyright (c) 2018 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/net/cookie_store_source.h"
+
+#include "libcef/browser/content_browser_client.h"
+#include "libcef/browser/cookie_manager_impl.h"
+#include "libcef/browser/net/url_request_context_impl.h"
+#include "libcef/browser/thread_util.h"
+
+#include "base/files/file_util.h"
+#include "base/logging.h"
+#include "net/extras/sqlite/sqlite_persistent_cookie_store.h"
+
+CefCookieStoreHandlerSource::CefCookieStoreHandlerSource(
+    CefURLRequestContextImpl* parent,
+    CefRefPtr<CefRequestContextHandler> handler)
+    : parent_(parent), handler_(handler) {
+  DCHECK(parent_);
+  DCHECK(handler_);
+}
+
+net::CookieStore* CefCookieStoreHandlerSource::GetCookieStore() {
+  CEF_REQUIRE_IOT();
+
+  CefRefPtr<CefCookieManager> manager = handler_->GetCookieManager();
+  if (manager) {
+    // Use the cookie store provided by the manager. May be nullptr if the
+    // cookie manager is blocking.
+    return reinterpret_cast<CefCookieManagerImpl*>(manager.get())
+        ->GetExistingCookieStore();
+  }
+
+  DCHECK(parent_);
+  if (parent_) {
+    // Use the cookie store from the parent.
+    net::CookieStore* cookie_store = parent_->cookie_store();
+    DCHECK(cookie_store);
+    if (!cookie_store)
+      LOG(ERROR) << "Cookie store does not exist";
+    return cookie_store;
+  }
+
+  return nullptr;
+}
+
+CefCookieStoreOwnerSource::CefCookieStoreOwnerSource() {}
+
+void CefCookieStoreOwnerSource::SetCookieStoragePath(
+    const base::FilePath& path,
+    bool persist_session_cookies) {
+  CEF_REQUIRE_IOT();
+
+  if (cookie_store_ && ((path_.empty() && path.empty()) || path_ == path)) {
+    // The path has not changed so don't do anything.
+    return;
+  }
+
+  scoped_refptr<net::SQLitePersistentCookieStore> persistent_store;
+  if (!path.empty()) {
+    // TODO(cef): Move directory creation to the blocking pool instead of
+    // allowing file IO on this thread.
+    base::ThreadRestrictions::ScopedAllowIO allow_io;
+    if (base::DirectoryExists(path) || base::CreateDirectory(path)) {
+      const base::FilePath& cookie_path = path.AppendASCII("Cookies");
+      persistent_store = new net::SQLitePersistentCookieStore(
+          cookie_path,
+          content::BrowserThread::GetTaskRunnerForThread(
+              content::BrowserThread::IO),
+          // Intentionally using the background task runner exposed by CEF to
+          // facilitate unit test expectations. This task runner MUST be
+          // configured with BLOCK_SHUTDOWN.
+          CefContentBrowserClient::Get()->background_task_runner(),
+          persist_session_cookies, NULL);
+    } else {
+      NOTREACHED() << "The cookie storage directory could not be created";
+    }
+  }
+
+  // Set the new cookie store that will be used for all new requests. The old
+  // cookie store, if any, will be automatically flushed and closed when no
+  // longer referenced.
+  std::unique_ptr<net::CookieMonster> cookie_monster(
+      new net::CookieMonster(persistent_store.get(), nullptr));
+  if (persistent_store.get() && persist_session_cookies)
+    cookie_monster->SetPersistSessionCookies(true);
+  path_ = path;
+
+  // Restore the previously supported schemes.
+  CefCookieManagerImpl::SetCookieMonsterSchemes(cookie_monster.get(),
+                                                supported_schemes_);
+
+  cookie_store_ = std::move(cookie_monster);
+}
+
+void CefCookieStoreOwnerSource::SetCookieSupportedSchemes(
+    const std::vector<std::string>& schemes) {
+  CEF_REQUIRE_IOT();
+
+  supported_schemes_ = schemes;
+  CefCookieManagerImpl::SetCookieMonsterSchemes(
+      static_cast<net::CookieMonster*>(cookie_store_.get()),
+      supported_schemes_);
+}
+
+net::CookieStore* CefCookieStoreOwnerSource::GetCookieStore() {
+  CEF_REQUIRE_IOT();
+  return cookie_store_.get();
+}

libcef/browser/net/cookie_store_source.h

@@ -0,0 +1,73 @@
+// Copyright (c) 2018 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_COOKIE_STORE_SOURCE_H_
+#define CEF_LIBCEF_BROWSER_COOKIE_STORE_SOURCE_H_
+#pragma once
+
+#include <memory>
+#include <string>
+#include <vector>
+
+#include "include/cef_request_context_handler.h"
+
+#include "base/macros.h"
+
+namespace base {
+class FilePath;
+}
+
+namespace net {
+class CookieStore;
+}
+
+class CefURLRequestContextImpl;
+
+// Abstract base class for CookieStore sources. Only accessed on the IO thread.
+class CefCookieStoreSource {
+ public:
+  virtual net::CookieStore* GetCookieStore() = 0;
+  virtual ~CefCookieStoreSource() {}
+};
+
+// Sources a cookie store that is created/owned by a CefCookieManager or the
+// parent context. Life span is controlled by CefURLRequestContextProxy. See
+// browser_context.h for an object relationship diagram.
+class CefCookieStoreHandlerSource : public CefCookieStoreSource {
+ public:
+  CefCookieStoreHandlerSource(CefURLRequestContextImpl* parent,
+                              CefRefPtr<CefRequestContextHandler> handler);
+
+  net::CookieStore* GetCookieStore() override;
+
+ private:
+  // The |parent_| pointer is kept alive by CefURLRequestContextGetterProxy
+  // which has a ref to the owning CefURLRequestContextGetterImpl.
+  CefURLRequestContextImpl* parent_;
+  CefRefPtr<CefRequestContextHandler> handler_;
+
+  DISALLOW_COPY_AND_ASSIGN(CefCookieStoreHandlerSource);
+};
+
+// Sources a cookie store that is created/owned by this object. Life span is
+// controlled by the owning URLRequestContext.
+class CefCookieStoreOwnerSource : public CefCookieStoreSource {
+ public:
+  CefCookieStoreOwnerSource();
+
+  void SetCookieStoragePath(const base::FilePath& path,
+                            bool persist_session_cookies);
+  void SetCookieSupportedSchemes(const std::vector<std::string>& schemes);
+
+  net::CookieStore* GetCookieStore() override;
+
+ private:
+  std::unique_ptr<net::CookieStore> cookie_store_;
+  base::FilePath path_;
+  std::vector<std::string> supported_schemes_;
+
+  DISALLOW_COPY_AND_ASSIGN(CefCookieStoreOwnerSource);
+};
+
+#endif  // CEF_LIBCEF_BROWSER_COOKIE_STORE_SOURCE_H_

libcef/browser/net/crlset_file_util_impl.cc

@@ -9,10 +9,8 @@
 
 #include "base/files/file_util.h"
 #include "base/logging.h"
-#include "base/task_scheduler/post_task.h"
 #include "base/threading/thread_restrictions.h"
 #include "net/cert/crl_set.h"
-#include "net/cert/crl_set_storage.h"
 #include "net/ssl/ssl_config_service.h"
 
 namespace {
@@ -25,7 +23,7 @@ void SetCRLSetIfNewer(scoped_refptr<net::CRLSet> crl_set) {
 }
 
 void LoadFromDisk(const base::FilePath& path) {
-  base::AssertBlockingAllowed();
+  CEF_REQUIRE_BLOCKING();
 
   std::string crl_set_bytes;
   if (!base::ReadFileToString(path, &crl_set_bytes)) {
@@ -34,7 +32,7 @@ void LoadFromDisk(const base::FilePath& path) {
   }
 
   scoped_refptr<net::CRLSet> crl_set;
-  if (!net::CRLSetStorage::Parse(crl_set_bytes, &crl_set)) {
+  if (!net::CRLSet::Parse(crl_set_bytes, &crl_set)) {
     LOG(WARNING) << "Failed to parse CRL set from " << path.MaybeAsASCII();
     return;
   }
@@ -51,7 +49,5 @@ void CefLoadCRLSetsFile(const CefString& path) {
     return;
   }
 
-  base::PostTaskWithTraits(FROM_HERE,
-                           {base::TaskPriority::BACKGROUND, base::MayBlock()},
-                           base::BindOnce(&LoadFromDisk, path));
+  CEF_POST_USER_VISIBLE_TASK(base::BindOnce(&LoadFromDisk, path));
 }

libcef/browser/net/network_delegate.cc

@@ -32,18 +32,18 @@ namespace {
 
 class CefBeforeResourceLoadCallbackImpl : public CefRequestCallback {
  public:
-  typedef net::CompletionCallback CallbackType;
+  typedef net::CompletionOnceCallback CallbackType;
 
   CefBeforeResourceLoadCallbackImpl(CefRefPtr<CefRequestImpl> cef_request,
                                     GURL* new_url,
                                     net::URLRequest* url_request,
                                     bool force_google_safesearch,
-                                    const CallbackType& callback)
+                                    CallbackType callback)
       : cef_request_(cef_request),
         new_url_(new_url),
         url_request_(url_request),
         force_google_safesearch_(force_google_safesearch),
-        callback_(callback) {
+        callback_(std::move(callback)) {
     DCHECK(new_url);
     DCHECK(url_request_);
 
@@ -56,12 +56,13 @@ class CefBeforeResourceLoadCallbackImpl : public CefRequestCallback {
     if (!callback_.is_null()) {
       // The callback is still pending. Cancel it now.
       if (CEF_CURRENTLY_ON_IOT()) {
-        RunNow(cef_request_, new_url_, url_request_, callback_,
+        RunNow(cef_request_, new_url_, url_request_, std::move(callback_),
                force_google_safesearch_, false);
       } else {
-        CEF_POST_TASK(
-            CEF_IOT, base::Bind(&CefBeforeResourceLoadCallbackImpl::RunNow,
-                                cef_request_, new_url_, url_request_, callback_,
+        CEF_POST_TASK(CEF_IOT,
+                      base::Bind(&CefBeforeResourceLoadCallbackImpl::RunNow,
+                                 cef_request_, new_url_, url_request_,
+                                 base::Passed(std::move(callback_)),
                                  force_google_safesearch_, false));
       }
     }
@@ -79,12 +80,13 @@ class CefBeforeResourceLoadCallbackImpl : public CefRequestCallback {
   void ContinueNow(bool allow) {
     CEF_REQUIRE_IOT();
     if (!callback_.is_null()) {
-      RunNow(cef_request_, new_url_, url_request_, callback_,
+      RunNow(cef_request_, new_url_, url_request_, std::move(callback_),
              force_google_safesearch_, allow);
       Disconnect();
     }
   }
 
+ private:
   void Disconnect() {
     CEF_REQUIRE_IOT();
     cef_request_ = nullptr;
@@ -93,7 +95,6 @@ class CefBeforeResourceLoadCallbackImpl : public CefRequestCallback {
     callback_.Reset();
   }
 
- private:
   // Used to disconnect the callback when the associated URLRequest is
   // destroyed.
   class Disconnector : public base::SupportsUserData::Data {
@@ -114,7 +115,7 @@ class CefBeforeResourceLoadCallbackImpl : public CefRequestCallback {
   static void RunNow(CefRefPtr<CefRequestImpl> cef_request,
                      GURL* new_url,
                      net::URLRequest* request,
-                     const CallbackType& callback,
+                     CallbackType callback,
                      bool force_google_safesearch,
                      bool allow) {
     CEF_REQUIRE_IOT();
@@ -144,7 +145,7 @@ class CefBeforeResourceLoadCallbackImpl : public CefRequestCallback {
       if (force_google_safesearch && allow && new_url->is_empty())
         safe_search_util::ForceGoogleSafeSearch(request, new_url);
 
-      callback.Run(allow ? net::OK : net::ERR_ABORTED);
+      std::move(callback).Run(allow ? net::OK : net::ERR_ABORTED);
     }
   }
 
@@ -168,17 +169,18 @@ int CefBeforeResourceLoadCallbackImpl::kLocatorKey = 0;
 
 class CefAuthCallbackImpl : public CefAuthCallback {
  public:
-  CefAuthCallbackImpl(const net::NetworkDelegate::AuthCallback& callback,
-                      net::AuthCredentials* credentials)
-      : callback_(callback), credentials_(credentials) {}
+  typedef net::NetworkDelegate::AuthCallback CallbackType;
+
+  CefAuthCallbackImpl(CallbackType callback, net::AuthCredentials* credentials)
+      : callback_(std::move(callback)), credentials_(credentials) {}
   ~CefAuthCallbackImpl() override {
     if (!callback_.is_null()) {
       // The auth callback is still pending. Cancel it now.
       if (CEF_CURRENTLY_ON_IOT()) {
-        CancelNow(callback_);
+        CancelNow(std::move(callback_));
       } else {
-        CEF_POST_TASK(CEF_IOT,
-                      base::Bind(&CefAuthCallbackImpl::CancelNow, callback_));
+        CEF_POST_TASK(CEF_IOT, base::Bind(&CefAuthCallbackImpl::CancelNow,
+                                          base::Passed(std::move(callback_))));
       }
     }
   }
@@ -187,8 +189,8 @@ class CefAuthCallbackImpl : public CefAuthCallback {
     if (CEF_CURRENTLY_ON_IOT()) {
       if (!callback_.is_null()) {
         credentials_->Set(username, password);
-        callback_.Run(net::NetworkDelegate::AUTH_REQUIRED_RESPONSE_SET_AUTH);
-        callback_.Reset();
+        std::move(callback_).Run(
+            net::NetworkDelegate::AUTH_REQUIRED_RESPONSE_SET_AUTH);
       }
     } else {
       CEF_POST_TASK(CEF_IOT, base::Bind(&CefAuthCallbackImpl::Continue, this,
@@ -199,23 +201,23 @@ class CefAuthCallbackImpl : public CefAuthCallback {
   void Cancel() override {
     if (CEF_CURRENTLY_ON_IOT()) {
       if (!callback_.is_null()) {
-        CancelNow(callback_);
-        callback_.Reset();
+        CancelNow(std::move(callback_));
       }
     } else {
       CEF_POST_TASK(CEF_IOT, base::Bind(&CefAuthCallbackImpl::Cancel, this));
     }
   }
 
-  void Disconnect() { callback_.Reset(); }
+  CallbackType Disconnect() WARN_UNUSED_RESULT { return std::move(callback_); }
 
  private:
-  static void CancelNow(const net::NetworkDelegate::AuthCallback& callback) {
+  static void CancelNow(CallbackType callback) {
     CEF_REQUIRE_IOT();
-    callback.Run(net::NetworkDelegate::AUTH_REQUIRED_RESPONSE_NO_ACTION);
+    std::move(callback).Run(
+        net::NetworkDelegate::AUTH_REQUIRED_RESPONSE_NO_ACTION);
   }
 
-  net::NetworkDelegate::AuthCallback callback_;
+  CallbackType callback_;
   net::AuthCredentials* credentials_;
 
   IMPLEMENT_REFCOUNTING(CefAuthCallbackImpl);
@@ -272,14 +274,13 @@ std::unique_ptr<net::SourceStream> CefNetworkDelegate::CreateSourceStream(
   }
 
   if (cef_filter && cef_filter->InitFilter())
-    return base::MakeUnique<CefSourceStream>(cef_filter, std::move(upstream));
+    return std::make_unique<CefSourceStream>(cef_filter, std::move(upstream));
 
   return upstream;
 }
 
-int CefNetworkDelegate::OnBeforeURLRequest(
-    net::URLRequest* request,
-    const net::CompletionCallback& callback,
+int CefNetworkDelegate::OnBeforeURLRequest(net::URLRequest* request,
+                                           net::CompletionOnceCallback callback,
                                            GURL* new_url) {
   if (net_util::IsInternalRequest(request))
     return net::OK;
@@ -312,7 +313,7 @@ int CefNetworkDelegate::OnBeforeURLRequest(
         CefRefPtr<CefBeforeResourceLoadCallbackImpl> callbackImpl(
             new CefBeforeResourceLoadCallbackImpl(requestPtr, new_url, request,
                                                   force_google_safesearch,
-                                                  callback));
+                                                  std::move(callback)));
 
         // Give the client an opportunity to evaluate the request.
         cef_return_value_t retval = handler->OnBeforeResourceLoad(
@@ -338,7 +339,9 @@ int CefNetworkDelegate::OnBeforeURLRequest(
   return net::OK;
 }
 
-void CefNetworkDelegate::OnCompleted(net::URLRequest* request, bool started) {
+void CefNetworkDelegate::OnCompleted(net::URLRequest* request,
+                                     bool started,
+                                     int net_error) {
   if (net_util::IsInternalRequest(request))
     return;
 
@@ -391,7 +394,7 @@ void CefNetworkDelegate::OnCompleted(net::URLRequest* request, bool started) {
 net::NetworkDelegate::AuthRequiredResponse CefNetworkDelegate::OnAuthRequired(
     net::URLRequest* request,
     const net::AuthChallengeInfo& auth_info,
-    const AuthCallback& callback,
+    AuthCallback callback,
     net::AuthCredentials* credentials) {
   if (net_util::IsInternalRequest(request))
     return AUTH_REQUIRED_RESPONSE_NO_ACTION;
@@ -406,14 +409,14 @@ net::NetworkDelegate::AuthRequiredResponse CefNetworkDelegate::OnAuthRequired(
         CefRefPtr<CefFrame> frame = browser->GetFrameForRequest(request);
 
         CefRefPtr<CefAuthCallbackImpl> callbackPtr(
-            new CefAuthCallbackImpl(callback, credentials));
+            new CefAuthCallbackImpl(std::move(callback), credentials));
         if (handler->GetAuthCredentials(
                 browser.get(), frame, auth_info.is_proxy,
                 auth_info.challenger.host(), auth_info.challenger.port(),
                 auth_info.realm, auth_info.scheme, callbackPtr.get())) {
           return AUTH_REQUIRED_RESPONSE_IO_PENDING;
         } else {
-          callbackPtr->Disconnect();
+          callback = callbackPtr->Disconnect();
         }
       }
     }
@@ -426,14 +429,14 @@ net::NetworkDelegate::AuthRequiredResponse CefNetworkDelegate::OnAuthRequired(
     CefRefPtr<CefURLRequestClient> client = user_data->GetClient();
     if (client.get()) {
       CefRefPtr<CefAuthCallbackImpl> callbackPtr(
-          new CefAuthCallbackImpl(callback, credentials));
+          new CefAuthCallbackImpl(std::move(callback), credentials));
       if (client->GetAuthCredentials(
               auth_info.is_proxy, auth_info.challenger.host(),
               auth_info.challenger.port(), auth_info.realm, auth_info.scheme,
               callbackPtr.get())) {
         return AUTH_REQUIRED_RESPONSE_IO_PENDING;
       } else {
-        callbackPtr->Disconnect();
+        callback = callbackPtr->Disconnect();
       }
     }
   }

libcef/browser/net/network_delegate.h

@@ -30,14 +30,16 @@ class CefNetworkDelegate : public net::NetworkDelegateImpl {
       net::URLRequest* request,
       std::unique_ptr<net::SourceStream> upstream) override;
   int OnBeforeURLRequest(net::URLRequest* request,
-                         const net::CompletionCallback& callback,
+                         net::CompletionOnceCallback callback,
                          GURL* new_url) override;
   AuthRequiredResponse OnAuthRequired(
       net::URLRequest* request,
       const net::AuthChallengeInfo& auth_info,
-      const AuthCallback& callback,
+      AuthCallback callback,
       net::AuthCredentials* credentials) override;
-  void OnCompleted(net::URLRequest* request, bool started) override;
+  void OnCompleted(net::URLRequest* request,
+                   bool started,
+                   int net_error) override;
   bool OnCanGetCookies(const net::URLRequest& request,
                        const net::CookieList& cookie_list) override;
   bool OnCanSetCookie(const net::URLRequest& request,

libcef/browser/net/resource_request_job.cc

@@ -282,11 +282,14 @@ void CefResourceRequestJob::GetLoadTimingInfo(
   load_timing_info->receive_headers_end = receive_headers_end_;
 }
 
-bool CefResourceRequestJob::IsRedirectResponse(GURL* location,
-                                               int* http_status_code) {
+bool CefResourceRequestJob::IsRedirectResponse(
+    GURL* location,
+    int* http_status_code,
+    bool* insecure_scheme_was_upgraded) {
   CEF_REQUIRE_IOT();
 
   bool redirect = false;
+  *insecure_scheme_was_upgraded = false;
 
   if (redirect_url_.is_valid()) {
     // Redirect to the new URL.
@@ -328,6 +331,22 @@ bool CefResourceRequestJob::GetMimeType(std::string* mime_type) const {
   return true;
 }
 
+bool CefResourceRequestJob::GetCharset(std::string* charset) {
+  CEF_REQUIRE_IOT();
+
+  if (net::HttpResponseHeaders* headers = GetResponseHeaders())
+    return headers->GetCharset(charset);
+  return false;
+}
+
+int CefResourceRequestJob::GetResponseCode() const {
+  CEF_REQUIRE_IOT();
+
+  if (response_.get())
+    return response_->GetStatus();
+  return -1;
+}
+
 void CefResourceRequestJob::SendHeaders() {
   CEF_REQUIRE_IOT();
 
@@ -403,7 +422,7 @@ void CefResourceRequestJob::AddCookieHeaderAndStart() {
 void CefResourceRequestJob::DoLoadCookies() {
   net::CookieOptions options;
   options.set_include_httponly();
-  request_->context()->cookie_store()->GetCookiesWithOptionsAsync(
+  request_->context()->cookie_store()->GetCookieListWithOptionsAsync(
       request_->url(), options,
       base::Bind(&CefResourceRequestJob::OnCookiesLoaded,
                  weak_factory_.GetWeakPtr()));
@@ -430,8 +449,11 @@ void CefResourceRequestJob::CheckCookiePolicyAndLoad(
     DoStartTransaction();
 }
 
-void CefResourceRequestJob::OnCookiesLoaded(const std::string& cookie_line) {
-  if (!cookie_line.empty()) {
+void CefResourceRequestJob::OnCookiesLoaded(
+    const net::CookieList& cookie_list) {
+  if (!cookie_list.empty()) {
+    const std::string& cookie_line =
+        net::CanonicalCookie::BuildCookieLine(cookie_list);
     CefRequest::HeaderMap headerMap;
     cef_request_->GetHeaderMap(headerMap);
     headerMap.insert(