Bump v4.2.1

* fix: default enable_negotiate_port to false (#18251)

* chore: command_line is not a pointer

.circleci/config.yml

@@ -48,13 +48,13 @@ env-stack-dumping: &env-stack-dumping
   ELECTRON_ENABLE_STACK_DUMPING: '1'
 
 env-browsertests: &env-browsertests
-  GN_CONFIG: //electron/build/args/native_tests.gn
-  BUILD_TARGET: electron/spec:chromium_browsertests
+  GN_EXTRA_ARGS: 'is_component_ffmpeg = false'
+  BUILD_TARGET: electron:chromium_browsertests
   TESTS_CONFIG: src/electron/spec/configs/browsertests.yml
 
 env-unittests: &env-unittests
-  GN_CONFIG: //electron/build/args/native_tests.gn
-  BUILD_TARGET: electron/spec:chromium_unittests
+  GN_EXTRA_ARGS: 'is_component_ffmpeg = false'
+  BUILD_TARGET: electron:chromium_unittests
   TESTS_CONFIG: src/electron/spec/configs/unittests.yml
 
 # Build targets options.
@@ -234,7 +234,6 @@ step-gn-gen-default: &step-gn-gen-default
 step-electron-build: &step-electron-build
   run:
     name: Electron build
-    no_output_timeout: 30m
     command: |
       cd src
       ninja -C out/Default electron -j $NUMBER_OF_NINJA_PROCESSES
@@ -437,7 +436,7 @@ step-maybe-native-mksnapshot-gn-gen: &step-maybe-native-mksnapshot-gn-gen
     command: |
       if [ "$BUILD_NATIVE_MKSNAPSHOT" == "1" ]; then
         cd src
-        gn gen out/native_mksnapshot --args='import("'$GN_CONFIG'") cc_wrapper="'"$SCCACHE_PATH"'" v8_snapshot_toolchain="'"$MKSNAPSHOT_TOOLCHAIN"'"'" $GN_EXTRA_ARGS v8_enable_embedded_builtins = false"
+        gn gen out/native_mksnapshot --args='import("'$GN_CONFIG'") cc_wrapper="'"$SCCACHE_PATH"'" v8_snapshot_toolchain="'"$MKSNAPSHOT_TOOLCHAIN"'"'" $GN_EXTRA_ARGS"
       else
         echo 'Skipping native mksnapshot GN gen for non arm build'
       fi
@@ -445,7 +444,6 @@ step-maybe-native-mksnapshot-gn-gen: &step-maybe-native-mksnapshot-gn-gen
 step-maybe-native-mksnapshot-build: &step-maybe-native-mksnapshot-build
   run:
     name: Native mksnapshot build (arm/arm64)
-    no_output_timeout: 30m
     command: |
       if [ "$BUILD_NATIVE_MKSNAPSHOT" == "1" ]; then
         cd src
@@ -703,8 +701,7 @@ steps-native-tests: &steps-native-tests
           python src/electron/script/native-tests.py run \
             --config $TESTS_CONFIG \
             --tests-dir src/out/Default \
-            --output-dir test_results  \
-            $TESTS_ARGS
+            --output-dir test_results
 
     - store_artifacts:
         path: test_results
@@ -947,7 +944,7 @@ jobs:
     <<: *steps-electron-build-for-publish
 
   linux-arm-native-mksnapshot:
-    <<: *machine-linux-2xlarge
+    <<: *machine-linux-medium
     environment:
       <<: *env-linux-medium
       <<: *env-arm
@@ -1005,7 +1002,7 @@ jobs:
     <<: *steps-electron-build-for-publish
 
   linux-arm64-native-mksnapshot:
-    <<: *machine-linux-2xlarge
+    <<: *machine-linux-medium
     environment:
       <<: *env-linux-medium
       <<: *env-arm64
@@ -1089,6 +1086,7 @@ jobs:
     environment:
       <<: *env-linux-2xlarge
       <<: *env-unittests
+      <<: *env-testing-build
       <<: *env-enable-sccache
       <<: *env-headless-testing
     <<: *steps-native-tests
@@ -1525,13 +1523,3 @@ workflows:
       - linux-x64-unittests:
           requires:
             - linux-checkout-for-native-tests
-
-      - linux-x64-disabled-unittests:
-          requires:
-            - linux-checkout-for-native-tests
-
-      - linux-checkout-for-native-tests-with-no-patches
-
-      - linux-x64-chromium-unittests:
-          requires:
-            - linux-checkout-for-native-tests-with-no-patches

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,4 +1,4 @@
-#### Description of Change
+##### Description of Change
 <!--
 Thank you for your Pull Request. Please provide a description above and review
 the requirements below.
@@ -6,7 +6,7 @@ the requirements below.
 Contributors guide: https://github.com/electron/electron/blob/master/CONTRIBUTING.md
 -->
 
-#### Checklist
+##### Checklist
 <!-- Remove items that do not apply. For completed items, change [ ] to [x]. -->
 
 - [ ] PR description included and stakeholders cc'd
@@ -14,9 +14,9 @@ Contributors guide: https://github.com/electron/electron/blob/master/CONTRIBUTIN
 - [ ] tests are [changed or added](https://github.com/electron/electron/blob/master/docs/development/testing.md)
 - [ ] relevant documentation is changed or added
 - [ ] PR title follows semantic [commit guidelines](https://github.com/electron/electron/blob/master/docs/development/pull-requests.md#commit-message-guidelines)
-- [ ] [PR release notes](https://github.com/electron/clerk/blob/master/README.md) describe the change in a way relevant to app developers, and are [capitalized, punctuated, and past tense](https://github.com/electron/clerk/blob/master/README.md#examples).
 
 
-#### Release Notes
+##### Release Notes
+<!-- Used to describe release notes for future release versions. See https://github.com/electron/clerk/blob/master/README.md for details. -->
 
-Notes: <!-- Please add a one-line description for app developers to read in the release notes, or `no-notes` if no notes relevant to app developers. Examples and help on special cases: https://github.com/electron/clerk/blob/master/README.md#examples -->
+Notes: <!-- One-line Change Summary Here-->

.github/config.yml

@@ -36,15 +36,13 @@ newPRWelcomeComment: |
 firstPRMergeComment: >
   Congrats on merging your first pull request! 🎉🎉🎉
 
-# Configuration for trop - https://github.com/electron/trop
+# Configuration for trop - https://github.com/codebytere/trop
 
 watchedProject:
   name: Backports
 
-# Users authorized to run manual trop backports
 authorizedUsers:
   - alexeykuzmin
-  - BinaryMuse
   - ckerr
   - codebytere
   - deepak1556

.gitignore

@@ -16,6 +16,13 @@
 *.vcxproj.user
 *.xcodeproj
 /.idea/
+/brightray/brightray.opensdf
+/brightray/brightray.sdf
+/brightray/brightray.sln
+/brightray/brightray.suo
+/brightray/brightray.v12.suo
+/brightray/brightray.vcxproj*
+/brightray/brightray.xcodeproj/
 /dist/
 /external_binaries/
 /out/
@@ -56,6 +63,3 @@ spec/.hash
 
 # Eslint Cache
 .eslintcache
-
-# Generated native addon files
-/spec/fixtures/native-addon/echo/build/

BUILD.gn

@@ -1,19 +1,18 @@
-import("//build/config/locales.gni")
-import("//build/config/ui.gni")
-import("//build/config/win/manifest.gni")
-import("//pdf/features.gni")
-import("//third_party/ffmpeg/ffmpeg_options.gni")
-import("//tools/generate_library_loader/generate_library_loader.gni")
-import("//tools/grit/grit_rule.gni")
-import("//tools/grit/repack.gni")
-import("//tools/v8_context_snapshot/v8_context_snapshot.gni")
-import("//v8/snapshot_toolchain.gni")
 import("build/asar.gni")
-import("build/js_wrap.gni")
 import("build/npm.gni")
 import("buildflags/buildflags.gni")
 import("electron_paks.gni")
 import("filenames.gni")
+import("//build/config/locales.gni")
+import("//build/config/win/manifest.gni")
+import("//pdf/features.gni")
+import("//services/service_manager/public/service_manifest.gni")
+import("//third_party/ffmpeg/ffmpeg_options.gni")
+import("//third_party/widevine/cdm/widevine.gni")
+import("//tools/grit/grit_rule.gni")
+import("//tools/grit/repack.gni")
+import("//tools/v8_context_snapshot/v8_context_snapshot.gni")
+import("//v8/snapshot_toolchain.gni")
 
 if (is_mac) {
   import("//build/config/mac/rules.gni")
@@ -27,13 +26,6 @@ if (is_linux) {
   pkg_config("gio_unix") {
     packages = [ "gio-unix-2.0" ]
   }
-
-  pkg_config("libnotify_config") {
-    packages = [
-      "glib-2.0",
-      "gdk-pixbuf-2.0",
-    ]
-  }
 }
 
 branding = read_file("atom/app/BRANDING.json", "json")
@@ -53,8 +45,26 @@ config("branding") {
   ]
 }
 
-npm_action("atom_browserify_sandbox_unwrapped") {
-  script = "browserify"
+npm_action("atom_browserify_sandbox") {
+  deps = [
+    ":atom_js2c_copy",
+  ]
+
+  sandbox_args = [
+    "lib/sandboxed_renderer/init.js",
+    "-r",
+    "./lib/sandboxed_renderer/api/exports/electron.js:electron",
+    "-r",
+    "./lib/sandboxed_renderer/api/exports/fs.js:fs",
+    "-r",
+    "./lib/sandboxed_renderer/api/exports/os.js:os",
+    "-r",
+    "./lib/sandboxed_renderer/api/exports/path.js:path",
+    "-r",
+    "./lib/sandboxed_renderer/api/exports/child_process.js:child_process",
+    "-t",
+    "aliasify",
+  ]
 
   inputs = [
     # FIXME(zcbenz): The dependencies of these files are not listed here, so
@@ -62,73 +72,41 @@ npm_action("atom_browserify_sandbox_unwrapped") {
     # Use a script to generate all dependencies and put them here.
     "lib/sandboxed_renderer/init.js",
     "lib/sandboxed_renderer/api/exports/electron.js",
+    "lib/sandboxed_renderer/api/exports/fs.js",
+    "lib/sandboxed_renderer/api/exports/os.js",
+    "lib/sandboxed_renderer/api/exports/path.js",
+    "lib/sandboxed_renderer/api/exports/child_process.js",
   ]
-
-  outputs = [
-    "$target_gen_dir/js2c/preload_bundle_unwrapped.js",
-  ]
-
-  args = [
-    "lib/sandboxed_renderer/init.js",
-    "-r",
-    "./lib/sandboxed_renderer/api/exports/electron.js:electron",
-    "-t",
-    "aliasify",
-    "--standalone",
-    "sandboxed_preload",
-    "-o",
-    rebase_path(outputs[0]),
-  ]
-}
-
-npm_action("atom_browserify_isolated_unwrapped") {
-  script = "browserify"
-
-  inputs = [
-    "lib/isolated_renderer/init.js",
-  ]
-
-  outputs = [
-    "$target_gen_dir/js2c/isolated_bundle_unwrapped.js",
-  ]
-
-  args = [
-    "lib/isolated_renderer/init.js",
-    "-t",
-    "aliasify",
-    "--standalone",
-    "isolated_preload",
-    "-o",
-    rebase_path(outputs[0]),
-  ]
-}
-
-js_wrap("atom_browserify_isolated") {
-  deps = [
-    ":atom_browserify_isolated_unwrapped",
-  ]
-
-  inputs = [
-    "$target_gen_dir/js2c/isolated_bundle_unwrapped.js",
-  ]
-
-  outputs = [
-    "$target_gen_dir/js2c/isolated_bundle.js",
-  ]
-}
-
-js_wrap("atom_browserify_sandbox") {
-  deps = [
-    ":atom_browserify_sandbox_unwrapped",
-  ]
-
-  inputs = [
-    "$target_gen_dir/js2c/preload_bundle_unwrapped.js",
-  ]
-
   outputs = [
     "$target_gen_dir/js2c/preload_bundle.js",
   ]
+
+  script = "browserify"
+  args = sandbox_args + [
+           "-o",
+           rebase_path(outputs[0]),
+         ]
+}
+
+npm_action("atom_browserify_isolated") {
+  deps = [
+    ":atom_js2c_copy",
+  ]
+
+  inputs = [
+    "lib/isolated_renderer/init.js",
+  ]
+  outputs = [
+    "$target_gen_dir/js2c/isolated_bundle.js",
+  ]
+
+  script = "browserify"
+  args = inputs + [
+           "-t",
+           "aliasify",
+           "-o",
+           rebase_path(outputs[0]),
+         ]
 }
 
 copy("atom_js2c_copy") {
@@ -148,25 +126,23 @@ action("atom_js2c") {
     ":atom_js2c_copy",
   ]
 
+  js2c_sources = filenames.js2c_sources
+
   browserify_sources = [
     "$target_gen_dir/js2c/isolated_bundle.js",
     "$target_gen_dir/js2c/preload_bundle.js",
   ]
 
-  sources = browserify_sources + [
-              "$target_gen_dir/js2c/asar.js",
-              "$target_gen_dir/js2c/asar_init.js",
-            ]
+  inputs = js2c_sources + browserify_sources
 
-  inputs = sources
   outputs = [
-    "$root_gen_dir/atom_natives.cc",
+    "$target_gen_dir/atom_natives.h",
   ]
 
   script = "tools/js2c.py"
   args = [ rebase_path("//third_party/electron_node") ] +
          rebase_path(outputs, root_build_dir) +
-         rebase_path(sources, root_build_dir)
+         [ rebase_path("$target_gen_dir/js2c", root_build_dir) ]
 }
 
 asar("js2asar") {
@@ -183,8 +159,6 @@ asar("js2asar") {
       "lib/browser/api/views/button.js",
       "lib/browser/api/views/label-button.js",
       "lib/browser/api/views/layout-manager.js",
-      "lib/browser/api/views/md-text-button.js",
-      "lib/browser/api/views/resize-area.js",
       "lib/browser/api/views/text-field.js",
     ]
   }
@@ -210,53 +184,18 @@ grit("resources") {
     "electron_resources.pak",
   ]
 
-  # Mojo manifest overlays are generated.
-  source_is_generated = true
   grit_flags = [
     "-E",
     "target_gen_dir=" + rebase_path(target_gen_dir, root_build_dir),
   ]
 
   deps = [
-    ":copy_shell_devtools_discovery_page",
+    ":electron_content_manifest_overlays",
   ]
 
   output_dir = "$target_gen_dir"
 }
 
-copy("copy_shell_devtools_discovery_page") {
-  sources = [
-    "//content/shell/resources/shell_devtools_discovery_page.html",
-  ]
-  outputs = [
-    "$target_gen_dir/shell_devtools_discovery_page.html",
-  ]
-}
-
-if (is_linux) {
-  generate_library_loader("libnotify_loader") {
-    name = "LibNotifyLoader"
-    output_h = "libnotify_loader.h"
-    output_cc = "libnotify_loader.cc"
-    header = "<libnotify/notify.h>"
-    config = ":libnotify_config"
-
-    functions = [
-      "notify_is_initted",
-      "notify_init",
-      "notify_get_server_caps",
-      "notify_get_server_info",
-      "notify_notification_new",
-      "notify_notification_add_action",
-      "notify_notification_set_image_from_pixbuf",
-      "notify_notification_set_timeout",
-      "notify_notification_set_hint_string",
-      "notify_notification_show",
-      "notify_notification_close",
-    ]
-  }
-}
-
 static_library("electron_lib") {
   configs += [ "//v8:external_startup_data" ]
   configs += [ "//third_party/electron_node:node_internals" ]
@@ -265,39 +204,28 @@ static_library("electron_lib") {
 
   deps = [
     ":atom_js2c",
+    "brightray",
     "buildflags",
     "chromium_src:chrome",
-    "manifests",
     "native_mate",
     "//base",
-    "//base:base_static",
     "//base:i18n",
     "//chrome/app/resources:platform_locale_settings",
     "//components/certificate_transparency",
     "//components/net_log",
     "//components/network_session_configurator/common",
     "//components/prefs",
-    "//components/spellcheck/renderer",
-    "//components/viz/host",
     "//components/viz/service",
     "//content/public/app:both",
-    "//content/public/browser",
     "//content/public/child",
     "//content/public/common:service_names",
     "//gin",
-    "//media/capture/mojom:video_capture",
     "//media/mojo/interfaces",
-    "//net:extras",
     "//net:net_resources",
-    "//net:net_with_v8",
     "//ppapi/host",
     "//ppapi/proxy",
     "//ppapi/shared_impl",
-    "//services/audio/public/mojom:constants",
-    "//services/device/public/mojom",
     "//services/proxy_resolver:lib",
-    "//services/video_capture/public/mojom:constants",
-    "//services/viz/privileged/interfaces/compositing",
     "//skia",
     "//third_party/blink/public:blink",
     "//third_party/boringssl",
@@ -312,6 +240,12 @@ static_library("electron_lib") {
     "//v8",
   ]
 
+  # TODO: this requires a visibility patch to chromium src. it would be better
+  # to use the publicly-available API, which I think is mojo-based. Once
+  # electron switches to using the public API, we can remove this from the deps
+  # list and remove the visibility patch from chromium.
+  deps += [ "//services/device/wake_lock/power_save_blocker" ]
+
   include_dirs = [
     "chromium_src",
     ".",
@@ -322,13 +256,9 @@ static_library("electron_lib") {
     "//third_party/blink/renderer",
   ]
 
-  defines = [ "V8_DEPRECATION_WARNINGS" ]
+  defines = []
   libs = []
 
-  if (is_linux) {
-    defines += [ "GDK_DISABLE_DEPRECATION_WARNINGS" ]
-  }
-
   extra_source_filters = []
   if (!is_linux) {
     extra_source_filters += [
@@ -357,6 +287,8 @@ static_library("electron_lib") {
       "*_views.cc",
       "*_views.h",
       "*\bviews/*",
+      "*/autofill_popup.cc",
+      "*/autofill_popup.h",
     ]
   }
 
@@ -365,6 +297,16 @@ static_library("electron_lib") {
   sources = filenames.lib_sources
   set_sources_assignment_filter(sources_assignment_filter)
 
+  sources += [
+    "$target_gen_dir/atom_natives.h",
+    "//extensions/browser/app_window/size_constraints.cc",
+    "//extensions/browser/app_window/size_constraints.h",
+    "//extensions/common/constants.cc",
+    "//extensions/common/constants.h",
+    "//extensions/common/url_pattern.cc",
+    "//extensions/common/url_pattern.h",
+  ]
+
   if (is_component_build) {
     defines += [ "NODE_SHARED_MODE" ]
   }
@@ -381,10 +323,6 @@ static_library("electron_lib") {
       "//third_party/crashpad/crashpad/client",
       "//ui/accelerated_widget_mac",
     ]
-    sources += [
-      "atom/browser/ui/views/autofill_popup_view.cc",
-      "atom/browser/ui/views/autofill_popup_view.h",
-    ]
     include_dirs += [
       # NOTE(nornagon): other chromium files use the full path to include
       # crashpad; this is just here for compatibility between GN and GYP, so that
@@ -417,10 +355,8 @@ static_library("electron_lib") {
   }
   if (is_linux) {
     deps += [
-      ":libnotify_loader",
       "//build/config/linux/gtk",
       "//chrome/browser/ui/libgtkui",
-      "//dbus",
       "//device/bluetooth",
       "//ui/events/devices/x11",
       "//ui/events/platform/x11",
@@ -437,6 +373,7 @@ static_library("electron_lib") {
     sources += filenames.lib_sources_nss
   }
   if (is_win) {
+    sources += filenames.lib_sources_win
     libs += [ "dwmapi.lib" ]
   }
   if (is_linux || is_win) {
@@ -457,13 +394,12 @@ static_library("electron_lib") {
 
   if (enable_osr) {
     sources += [
-      "atom/browser/osr/osr_host_display_client.cc",
-      "atom/browser/osr/osr_host_display_client.h",
-      "atom/browser/osr/osr_host_display_client_mac.mm",
+      "atom/browser/api/atom_api_web_contents_osr.cc",
+      "atom/browser/osr/osr_output_device.cc",
+      "atom/browser/osr/osr_output_device.h",
       "atom/browser/osr/osr_render_widget_host_view.cc",
       "atom/browser/osr/osr_render_widget_host_view.h",
-      "atom/browser/osr/osr_video_consumer.cc",
-      "atom/browser/osr/osr_video_consumer.h",
+      "atom/browser/osr/osr_render_widget_host_view_mac.mm",
       "atom/browser/osr/osr_view_proxy.cc",
       "atom/browser/osr/osr_view_proxy.h",
       "atom/browser/osr/osr_web_contents_view.cc",
@@ -499,10 +435,6 @@ static_library("electron_lib") {
       "atom/browser/api/views/atom_api_label_button.h",
       "atom/browser/api/views/atom_api_layout_manager.cc",
       "atom/browser/api/views/atom_api_layout_manager.h",
-      "atom/browser/api/views/atom_api_md_text_button.cc",
-      "atom/browser/api/views/atom_api_md_text_button.h",
-      "atom/browser/api/views/atom_api_resize_area.cc",
-      "atom/browser/api/views/atom_api_resize_area.h",
       "atom/browser/api/views/atom_api_text_field.cc",
       "atom/browser/api/views/atom_api_text_field.h",
     ]
@@ -520,6 +452,16 @@ static_library("electron_lib") {
   if (enable_pepper_flash) {
     deps += [ "components/pepper_flash" ]
   }
+
+  if (enable_widevine) {
+    sources += [
+      "//chrome/renderer/media/chrome_key_systems.cc",
+      "//chrome/renderer/media/chrome_key_systems.h",
+      "//chrome/renderer/media/chrome_key_systems_provider.cc",
+      "//chrome/renderer/media/chrome_key_systems_provider.h",
+    ]
+    deps += [ "//components/cdm/renderer" ]
+  }
 }
 
 electron_paks("packed_resources") {
@@ -618,7 +560,7 @@ if (is_mac) {
     }
     info_plist = "atom/common/resources/mac/Info.plist"
 
-    electron_version = read_file("ELECTRON_VERSION", "trim string")
+    electron_version = read_file("VERSION", "trim string")
     extra_substitutions = [
       "ATOM_BUNDLE_ID=$electron_mac_bundle_id.framework",
       "ELECTRON_VERSION=$electron_version",
@@ -637,11 +579,6 @@ if (is_mac) {
       "ServiceManagement.framework",
       "StoreKit.framework",
     ]
-
-    if (enable_osr) {
-      libs += [ "IOSurface.framework" ]
-    }
-
     ldflags = [
       "-F",
       rebase_path("external_binaries", root_build_dir),
@@ -662,10 +599,6 @@ if (is_mac) {
     deps = [
       ":electron_framework+link",
     ]
-    if (!is_mas_build) {
-      deps += [ "//sandbox/mac:seatbelt" ]
-    }
-    defines = [ "HELPER_EXECUTABLE" ]
     sources = filenames.app_sources
     include_dirs = [ "." ]
     info_plist = "atom/renderer/resources/mac/Info.plist"
@@ -674,12 +607,6 @@ if (is_mac) {
       "-rpath",
       "@executable_path/../../..",
     ]
-    if (is_component_build) {
-      ldflags += [
-        "-rpath",
-        "@executable_path/../../../../../..",
-      ]
-    }
   }
 
   bundle_data("electron_app_framework_bundle_data") {
@@ -888,6 +815,75 @@ if (is_mac) {
   }
 }
 
+group("electron_tests") {
+  testonly = true
+
+  deps = [
+    ":chromium_browsertests",
+    ":chromium_unittests",
+  ]
+}
+
+group("chromium_unittests") {
+  testonly = true
+
+  deps = [
+    "//base:base_unittests",
+    "//cc:cc_unittests",
+    "//content/test:content_unittests",
+    "//crypto:crypto_unittests",
+    "//device:device_unittests",
+    "//gin:gin_unittests",
+    "//gpu:gpu_unittests",
+    "//ipc:ipc_tests",
+    "//media:media_unittests",
+    "//media/capture:capture_unittests",
+    "//media/midi:midi_unittests",
+    "//media/mojo:media_mojo_unittests",
+    "//mojo:mojo_unittests",
+    "//net:net_unittests",
+    "//ppapi:ppapi_unittests",
+    "//skia:skia_unittests",
+    "//sql:sql_unittests",
+    "//storage:storage_unittests",
+    "//third_party/angle/src/tests:angle_unittests",
+    "//third_party/blink/public:all_blink",
+    "//third_party/blink/public:test_support",
+    "//third_party/leveldatabase:env_chromium_unittests",
+    "//ui/base:ui_base_unittests",
+    "//ui/compositor:compositor_unittests",
+    "//ui/display:display_unittests",
+    "//ui/events:events_unittests",
+    "//ui/gl:gl_unittests",
+    "//url:url_unittests",
+    "//url/ipc:url_ipc_unittests",
+    "//v8/test/unittests:unittests",
+  ]
+
+  if (enable_basic_printing) {
+    deps += [ "//printing:printing_unittests" ]
+  }
+
+  if (is_linux) {
+    deps += [
+      "//net:disk_cache_memory_test",
+      "//sandbox/linux:sandbox_linux_unittests",
+    ]
+
+    if (use_dbus) {
+      deps += [ "//dbus:dbus_unittests" ]
+    }
+  }
+}
+
+group("chromium_browsertests") {
+  testonly = true
+
+  deps = [
+    "//content/test:content_browsertests",
+  ]
+}
+
 template("dist_zip") {
   _runtime_deps_target = "${target_name}__deps"
   _runtime_deps_file =
@@ -946,7 +942,7 @@ group("licenses") {
 
 copy("electron_version") {
   sources = [
-    "ELECTRON_VERSION",
+    "VERSION",
   ]
   outputs = [
     "$root_build_dir/version",
@@ -959,9 +955,6 @@ dist_zip("electron_dist_zip") {
     ":licenses",
     ":electron_version",
   ]
-  if (is_linux) {
-    data_deps += [ "//sandbox/linux:chrome_sandbox" ]
-  }
   outputs = [
     "$root_build_dir/dist.zip",
   ]
@@ -998,7 +991,30 @@ dist_zip("electron_mksnapshot_zip") {
 }
 
 group("electron") {
-  public_deps = [
+  deps = [
     ":electron_app",
   ]
 }
+
+group("electron_content_manifest_overlays") {
+  deps = [
+    ":electron_content_browser_manifest_overlay",
+    ":electron_content_packaged_services_manifest_overlay",
+  ]
+}
+
+service_manifest("electron_content_packaged_services_manifest_overlay") {
+  source = "//electron/manifests/electron_content_packaged_services_manifest_overlay.json"
+  packaged_services = [ "//services/proxy_resolver:proxy_resolver_manifest" ]
+
+  if (enable_basic_printing) {
+    packaged_services += [
+      "//chrome/services/printing:manifest",
+      "//components/services/pdf_compositor:pdf_compositor_manifest",
+    ]
+  }
+}
+
+service_manifest("electron_content_browser_manifest_overlay") {
+  source = "//electron/manifests/electron_content_browser_manifest_overlay.json"
+}

DEPS

@@ -10,9 +10,9 @@ gclient_gn_args = [
 
 vars = {
   'chromium_version':
-    '73.0.3683.121',
+    '69.0.3497.128',
   'node_version':
-    'a86a4a160dc520c61a602c949a32a1bc4c0fc633',
+    '8bc5d171a0873c0ba49f9433798bc8b67399788c',
 
   'boto_version': 'f7574aa6cc2c819430c1f05e9a1a1a666ef8169b',
   'pyyaml_version': '3.12',
@@ -107,7 +107,7 @@ hooks = [
     'action': [
       'python',
       '-c',
-      'import os; os.chdir("src"); os.chdir("electron"); os.system("npm install")',
+      'import os, subprocess; os.chdir(os.path.join("src", "electron")); subprocess.check_call(["python", "script/lib/npm.py", "install"]);',
     ],
   },
   {
@@ -117,7 +117,7 @@ hooks = [
     'action': [
       'python',
       '-c',
-      'import os; os.chdir("src"); os.chdir("electron"); os.chdir("vendor"); os.chdir("boto"); os.system("python setup.py build");',
+      'import os, subprocess; os.chdir(os.path.join("src", "electron", "vendor", "boto")); subprocess.check_call(["python", "setup.py", "build"]);',
     ],
   },
   {
@@ -127,9 +127,9 @@ hooks = [
     'action': [
       'python',
       '-c',
-      'import os; os.chdir("src"); os.chdir("electron"); os.chdir("vendor"); os.chdir("requests"); os.system("python setup.py build");',
+      'import os, subprocess; os.chdir(os.path.join("src", "electron", "vendor", "requests")); subprocess.check_call(["python", "setup.py", "build"]);',
     ],
-  }
+  },
 ]
 
 recursedeps = [

ELECTRON_VERSION

@@ -1 +0,0 @@
-5.0.1

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2013-2019 GitHub Inc.
+Copyright (c) 2013-2018 GitHub Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

README.md

@@ -3,7 +3,6 @@
 
 [![CircleCI Build Status](https://circleci.com/gh/electron/electron/tree/master.svg?style=shield)](https://circleci.com/gh/electron/electron/tree/master)
 [![AppVeyor Build Status](https://windows-ci.electronjs.org/api/projects/status/nilyf07hcef14dvj/branch/master?svg=true)](https://windows-ci.electronjs.org/project/AppVeyor/electron/branch/master)
-[![Azure Pipelines Build Status](https://github.visualstudio.com/electron/_apis/build/status/electron-builds/electron-osx-testing?branchName=master)](https://github.visualstudio.com/electron/_build/latest?definitionId=36)
 [![devDependency Status](https://david-dm.org/electron/electron/dev-status.svg)](https://david-dm.org/electron/electron?type=dev)
 [![Join the Electron Community on Slack](https://atom-slack.herokuapp.com/badge.svg)](https://atom-slack.herokuapp.com/)
 

VERSION

@@ -0,0 +1 @@
+4.2.1

appveyor.yml

@@ -81,6 +81,8 @@ test_script:
       if ((-Not (Test-Path Env:\ELECTRON_RELEASE)) -And ($env:GN_CONFIG -in "testing", "release")) {
         $env:RUN_TESTS="true"
       }
+  - if "%RUN_TESTS%"=="true" ( echo Verifying non proprietary ffmpeg & python electron\script\verify-ffmpeg.py --build-dir out\Default --source-root %cd% --ffmpeg-path out\ffmpeg )
+  - if "%RUN_TESTS%"=="true" ( echo Verifying mksnapshot & python electron\script\verify-mksnapshot.py --build-dir out\Default --source-root %cd% )
   - ps: >-
       if ($env:RUN_TESTS -eq 'true') {
         New-Item .\out\Default\gen\node_headers\Release -Type directory
@@ -89,12 +91,8 @@ test_script:
         echo "Skipping tests for $env:GN_CONFIG build"
       }
   - cd electron
-  - if "%RUN_TESTS%"=="true" ( echo Running test suite & npm run test -- --ci --enable-logging)
+  - if "%RUN_TESTS%"=="true" ( echo Running test suite & npm run test -- --ci )
   - cd ..
-  - if "%RUN_TESTS%"=="true" ( echo Verifying non proprietary ffmpeg & python electron\script\verify-ffmpeg.py --build-dir out\Default --source-root %cd% --ffmpeg-path out\ffmpeg )
-  - echo "About to verify mksnapshot"
-  - if "%RUN_TESTS%"=="true" ( echo Verifying mksnapshot & python electron\script\verify-mksnapshot.py --build-dir out\Default --source-root %cd% )
-  - echo "Done verifying mksnapshot"
 deploy_script:
   - cd electron
   - ps: >-

atom/app/atom_content_client.cc

@@ -7,18 +7,23 @@
 #include <string>
 #include <vector>
 
+#include "atom/browser/browser.h"
+#include "atom/common/atom_version.h"
+#include "atom/common/chrome_version.h"
 #include "atom/common/options_switches.h"
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
+#include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/public/common/content_constants.h"
+#include "content/public/common/content_switches.h"
 #include "content/public/common/pepper_plugin_info.h"
+#include "content/public/common/user_agent.h"
 #include "electron/buildflags/buildflags.h"
 #include "ppapi/shared_impl/ppapi_permissions.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/base/resource/resource_bundle.h"
 #include "url/url_constants.h"
 // In SHARED_INTERMEDIATE_DIR.
 #include "widevine_cdm_version.h"  // NOLINT(build/include)
@@ -171,59 +176,86 @@ void ConvertStringWithSeparatorToVector(std::vector<std::string>* vec,
                              base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
 }
 
+std::string RemoveWhitespace(const std::string& str) {
+  std::string trimmed;
+  if (base::RemoveChars(str, " ", &trimmed))
+    return trimmed;
+  else
+    return str;
+}
+
+bool IsBrowserProcess() {
+  const base::CommandLine* command_line =
+      base::CommandLine::ForCurrentProcess();
+  std::string process_type =
+      command_line->GetSwitchValueASCII(::switches::kProcessType);
+  return process_type.empty();
+}
+
+std::string BuildDefaultUserAgent() {
+  return "Chrome/" CHROME_VERSION_STRING " " ATOM_PRODUCT_NAME
+         "/" ATOM_VERSION_STRING;
+}
+
 }  // namespace
 
 AtomContentClient::AtomContentClient() {}
 
 AtomContentClient::~AtomContentClient() {}
 
+std::string AtomContentClient::GetProduct() const {
+  return "Chrome/" CHROME_VERSION_STRING;
+}
+
+std::string AtomContentClient::GetUserAgent() const {
+  if (IsBrowserProcess()) {
+    if (user_agent_override_.empty()) {
+      auto* browser = Browser::Get();
+      std::string name = RemoveWhitespace(browser->GetName());
+      std::string user_agent;
+      if (name == ATOM_PRODUCT_NAME) {
+        user_agent = BuildDefaultUserAgent();
+      } else {
+        user_agent = base::StringPrintf(
+            "%s/%s Chrome/%s " ATOM_PRODUCT_NAME "/" ATOM_VERSION_STRING,
+            name.c_str(), browser->GetVersion().c_str(), CHROME_VERSION_STRING);
+      }
+      return content::BuildUserAgentFromProduct(user_agent);
+    }
+    return user_agent_override_;
+  }
+  // In a renderer process the user agent should be provided on the CLI
+  // If it's not we just fallback to the default one, this should never happen
+  // but we want to handle it gracefully
+  const base::CommandLine* command_line =
+      base::CommandLine::ForCurrentProcess();
+  std::string cli_user_agent = command_line->GetSwitchValueASCII("user-agent");
+  if (cli_user_agent.empty())
+    return BuildDefaultUserAgent();
+  return cli_user_agent;
+}
+
+void AtomContentClient::SetUserAgent(const std::string& user_agent) {
+  user_agent_override_ = user_agent;
+}
+
 base::string16 AtomContentClient::GetLocalizedString(int message_id) const {
   return l10n_util::GetStringUTF16(message_id);
 }
 
-base::StringPiece AtomContentClient::GetDataResource(
-    int resource_id,
-    ui::ScaleFactor scale_factor) const {
-  return ui::ResourceBundle::GetSharedInstance().GetRawDataResourceForScale(
-      resource_id, scale_factor);
-}
-
-gfx::Image& AtomContentClient::GetNativeImageNamed(int resource_id) const {
-  return ui::ResourceBundle::GetSharedInstance().GetNativeImageNamed(
-      resource_id);
-}
-
-base::RefCountedMemory* AtomContentClient::GetDataResourceBytes(
-    int resource_id) const {
-  return ui::ResourceBundle::GetSharedInstance().LoadDataResourceBytes(
-      resource_id);
-}
-
 void AtomContentClient::AddAdditionalSchemes(Schemes* schemes) {
+  schemes->standard_schemes.push_back("chrome-extension");
+
   std::vector<std::string> splited;
   ConvertStringWithSeparatorToVector(&splited, ",",
-                                     switches::kServiceWorkerSchemes);
+                                     switches::kRegisterServiceWorkerSchemes);
   for (const std::string& scheme : splited)
     schemes->service_worker_schemes.push_back(scheme);
   schemes->service_worker_schemes.push_back(url::kFileScheme);
 
-  ConvertStringWithSeparatorToVector(&splited, ",", switches::kStandardSchemes);
-  for (const std::string& scheme : splited)
-    schemes->standard_schemes.push_back(scheme);
-  schemes->standard_schemes.push_back("chrome-extension");
-
   ConvertStringWithSeparatorToVector(&splited, ",", switches::kSecureSchemes);
   for (const std::string& scheme : splited)
     schemes->secure_schemes.push_back(scheme);
-
-  ConvertStringWithSeparatorToVector(&splited, ",",
-                                     switches::kBypassCSPSchemes);
-  for (const std::string& scheme : splited)
-    schemes->csp_bypassing_schemes.push_back(scheme);
-
-  ConvertStringWithSeparatorToVector(&splited, ",", switches::kCORSSchemes);
-  for (const std::string& scheme : splited)
-    schemes->cors_enabled_schemes.push_back(scheme);
 }
 
 void AtomContentClient::AddPepperPlugins(

atom/app/atom_content_client.h

@@ -9,22 +9,22 @@
 #include <string>
 #include <vector>
 
-#include "content/public/common/content_client.h"
+#include "brightray/common/content_client.h"
 
 namespace atom {
 
-class AtomContentClient : public content::ContentClient {
+class AtomContentClient : public brightray::ContentClient {
  public:
   AtomContentClient();
   ~AtomContentClient() override;
 
+  std::string GetUserAgent() const override;
+  void SetUserAgent(const std::string& user_agent);
+
  protected:
   // content::ContentClient:
+  std::string GetProduct() const override;
   base::string16 GetLocalizedString(int message_id) const override;
-  base::StringPiece GetDataResource(int resource_id,
-                                    ui::ScaleFactor) const override;
-  gfx::Image& GetNativeImageNamed(int resource_id) const override;
-  base::RefCountedMemory* GetDataResourceBytes(int resource_id) const override;
   void AddAdditionalSchemes(Schemes* schemes) override;
   void AddPepperPlugins(
       std::vector<content::PepperPluginInfo>* plugins) override;
@@ -33,6 +33,8 @@ class AtomContentClient : public content::ContentClient {
       std::vector<media::CdmHostFilePath>* cdm_host_file_paths) override;
 
  private:
+  std::string user_agent_override_ = "";
+
   DISALLOW_COPY_AND_ASSIGN(AtomContentClient);
 };
 

atom/app/atom_library_main.mm

@@ -7,11 +7,11 @@
 #include "atom/app/atom_main_delegate.h"
 #include "atom/app/node_main.h"
 #include "atom/common/atom_command_line.h"
-#include "atom/common/mac/main_application_bundle.h"
 #include "base/at_exit.h"
 #include "base/i18n/icu_util.h"
 #include "base/mac/bundle_locations.h"
 #include "base/mac/scoped_nsautorelease_pool.h"
+#include "brightray/common/mac/main_application_bundle.h"
 #include "content/public/app/content_main.h"
 
 int AtomMain(int argc, char* argv[]) {
@@ -28,7 +28,7 @@ int AtomInitializeICUandStartNode(int argc, char* argv[]) {
   base::AtExitManager atexit_manager;
   base::mac::ScopedNSAutoreleasePool pool;
   base::mac::SetOverrideFrameworkBundlePath(
-      atom::MainApplicationBundlePath()
+      brightray::MainApplicationBundlePath()
           .Append("Contents")
           .Append("Frameworks")
           .Append(ATOM_PRODUCT_NAME " Framework.framework"));

atom/app/atom_main.cc

@@ -5,7 +5,6 @@
 #include "atom/app/atom_main.h"
 
 #include <cstdlib>
-#include <memory>
 #include <vector>
 
 #if defined(OS_WIN)
@@ -31,7 +30,6 @@
 #include "atom/app/atom_main_delegate.h"  // NOLINT
 #include "content/public/app/content_main.h"
 #else  // defined(OS_LINUX)
-#include <mach-o/dyld.h>
 #include <unistd.h>
 #include <cstdio>
 #include "atom/app/atom_library_main.h"
@@ -43,10 +41,6 @@
 #include "base/i18n/icu_util.h"
 #include "electron/buildflags/buildflags.h"
 
-#if defined(HELPER_EXECUTABLE) && !defined(MAS_BUILD)
-#include "sandbox/mac/seatbelt_exec.h"  // nogncheck
-#endif
-
 namespace {
 
 #if BUILDFLAG(ENABLE_RUN_AS_NODE)
@@ -213,35 +207,6 @@ int main(int argc, char* argv[]) {
   }
 #endif
 
-#if defined(HELPER_EXECUTABLE) && !defined(MAS_BUILD)
-  uint32_t exec_path_size = 0;
-  int rv = _NSGetExecutablePath(NULL, &exec_path_size);
-  if (rv != -1) {
-    fprintf(stderr, "_NSGetExecutablePath: get length failed\n");
-    abort();
-  }
-
-  std::unique_ptr<char[]> exec_path(new char[exec_path_size]);
-  rv = _NSGetExecutablePath(exec_path.get(), &exec_path_size);
-  if (rv != 0) {
-    fprintf(stderr, "_NSGetExecutablePath: get path failed\n");
-    abort();
-  }
-  sandbox::SeatbeltExecServer::CreateFromArgumentsResult seatbelt =
-      sandbox::SeatbeltExecServer::CreateFromArguments(exec_path.get(), argc,
-                                                       argv);
-  if (seatbelt.sandbox_required) {
-    if (!seatbelt.server) {
-      fprintf(stderr, "Failed to create seatbelt sandbox server.\n");
-      abort();
-    }
-    if (!seatbelt.server->InitializeSandbox()) {
-      fprintf(stderr, "Failed to initialize sandbox.\n");
-      abort();
-    }
-  }
-#endif  // defined(HELPER_EXECUTABLE) && !defined(MAS_BUILD)
-
   return AtomMain(argc, argv);
 }
 

atom/app/atom_main_delegate.cc

@@ -8,13 +8,10 @@
 #include <memory>
 #include <string>
 
-#if defined(OS_LINUX)
-#include <glib.h>  // for g_setenv()
-#endif
-
 #include "atom/app/atom_content_client.h"
 #include "atom/browser/atom_browser_client.h"
 #include "atom/browser/relauncher.h"
+#include "atom/common/google_api_key.h"
 #include "atom/common/options_switches.h"
 #include "atom/renderer/atom_renderer_client.h"
 #include "atom/renderer/atom_sandboxed_renderer_client.h"
@@ -23,17 +20,12 @@
 #include "base/debug/stack_trace.h"
 #include "base/environment.h"
 #include "base/logging.h"
-#include "base/mac/bundle_locations.h"
-#include "base/path_service.h"
 #include "chrome/common/chrome_paths.h"
 #include "content/public/common/content_switches.h"
-#include "electron/buildflags/buildflags.h"
 #include "ipc/ipc_buildflags.h"
-#include "services/service_manager/embedder/switches.h"
 #include "services/service_manager/sandbox/switches.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
-#include "ui/base/ui_base_switches.h"
 
 #if BUILDFLAG(IPC_MESSAGE_LOG_ENABLED)
 #define IPC_MESSAGE_MACROS_LOG_ENABLED
@@ -58,25 +50,6 @@ bool IsBrowserProcess(base::CommandLine* cmd) {
   return process_type.empty();
 }
 
-// Returns true if this subprocess type needs the ResourceBundle initialized
-// and resources loaded.
-bool SubprocessNeedsResourceBundle(const std::string& process_type) {
-  return
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
-      // The zygote process opens the resources for the renderers.
-      process_type == service_manager::switches::kZygoteProcess ||
-#endif
-#if defined(OS_MACOSX)
-      // Mac needs them too for scrollbar related images and for sandbox
-      // profiles.
-      process_type == ::switches::kPpapiPluginProcess ||
-      process_type == ::switches::kPpapiBrokerProcess ||
-      process_type == ::switches::kGpuProcess ||
-#endif
-      process_type == ::switches::kRendererProcess ||
-      process_type == ::switches::kUtilityProcess;
-}
-
 #if defined(OS_WIN)
 void InvalidParameterHandler(const wchar_t*,
                              const wchar_t*,
@@ -89,37 +62,6 @@ void InvalidParameterHandler(const wchar_t*,
 
 }  // namespace
 
-void LoadResourceBundle(const std::string& locale) {
-  const bool initialized = ui::ResourceBundle::HasSharedInstance();
-  if (initialized)
-    ui::ResourceBundle::CleanupSharedInstance();
-
-  // Load other resource files.
-  base::FilePath pak_dir;
-#if defined(OS_MACOSX)
-  pak_dir =
-      base::mac::FrameworkBundlePath().Append(FILE_PATH_LITERAL("Resources"));
-#else
-  base::PathService::Get(base::DIR_MODULE, &pak_dir);
-#endif
-
-  ui::ResourceBundle::InitSharedInstanceWithLocale(
-      locale, nullptr, ui::ResourceBundle::LOAD_COMMON_RESOURCES);
-  ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
-  bundle.ReloadLocaleResources(locale);
-  bundle.AddDataPackFromPath(pak_dir.Append(FILE_PATH_LITERAL("resources.pak")),
-                             ui::SCALE_FACTOR_NONE);
-#if BUILDFLAG(ENABLE_PDF_VIEWER)
-  NOTIMPLEMENTED()
-      << "Hi, whoever's fixing PDF support! Thanks! The pdf "
-         "viewer resources haven't been ported over to the GN build yet, so "
-         "you'll probably need to change this bit of code.";
-  bundle.AddDataPackFromPath(
-      pak_dir.Append(FILE_PATH_LITERAL("pdf_viewer_resources.pak")),
-      ui::GetSupportedScaleFactors()[0]);
-#endif  // BUILDFLAG(ENABLE_PDF_VIEWER)
-}
-
 AtomMainDelegate::AtomMainDelegate() {}
 
 AtomMainDelegate::~AtomMainDelegate() {}
@@ -159,19 +101,23 @@ bool AtomMainDelegate::BasicStartupComplete(int* exit_code) {
   // Logging with pid and timestamp.
   logging::SetLogItems(true, false, true, false);
 
-  // Enable convient stack printing. This is enabled by default in non-official
-  // builds.
-  if (env->HasVar("ELECTRON_ENABLE_STACK_DUMPING"))
+  // Enable convient stack printing.
+#if defined(DEBUG) && defined(OS_LINUX)
+  bool enable_stack_dumping = true;
+#else
+  bool enable_stack_dumping = env->HasVar("ELECTRON_ENABLE_STACK_DUMPING");
+#endif
+#if defined(ARCH_CPU_ARM_FAMILY) && defined(ARCH_CPU_32_BITS)
+  // For 32bit ARM enabling stack printing would end up crashing.
+  // https://github.com/electron/electron/pull/11230#issuecomment-363232482
+  enable_stack_dumping = false;
+#endif
+  if (enable_stack_dumping)
     base::debug::EnableInProcessStackDumping();
 
-  if (env->HasVar("ELECTRON_DISABLE_SANDBOX"))
-    command_line->AppendSwitch(service_manager::switches::kNoSandbox);
-
   chrome::RegisterPathProvider();
 
 #if defined(OS_MACOSX)
-  OverrideChildProcessPath();
-  OverrideFrameworkBundlePath();
   SetUpBundleOverrides();
 #endif
 
@@ -183,60 +129,30 @@ bool AtomMainDelegate::BasicStartupComplete(int* exit_code) {
   base::win::DisableHandleVerifier();
 #endif
 
-  content_client_ = std::make_unique<AtomContentClient>();
-  SetContentClient(content_client_.get());
-
-  return false;
-}
-
-void AtomMainDelegate::PostEarlyInitialization(bool is_running_tests) {
-  std::string custom_locale;
-  ui::ResourceBundle::InitSharedInstanceWithLocale(
-      custom_locale, nullptr, ui::ResourceBundle::LOAD_COMMON_RESOURCES);
-  auto* cmd_line = base::CommandLine::ForCurrentProcess();
-  if (cmd_line->HasSwitch(::switches::kLang)) {
-    const std::string locale = cmd_line->GetSwitchValueASCII(::switches::kLang);
-    const base::FilePath locale_file_path =
-        ui::ResourceBundle::GetSharedInstance().GetLocaleFilePath(locale, true);
-    if (!locale_file_path.empty()) {
-      custom_locale = locale;
-#if defined(OS_LINUX)
-      /* When built with USE_GLIB, libcc's GetApplicationLocaleInternal() uses
-       * glib's g_get_language_names(), which keys off of getenv("LC_ALL") */
-      g_setenv("LC_ALL", custom_locale.c_str(), TRUE);
-#endif
-    }
-  }
-
-#if defined(OS_MACOSX)
-  if (custom_locale.empty())
-    l10n_util::OverrideLocaleWithCocoaLocale();
-#endif
-
-  LoadResourceBundle(custom_locale);
-
-  AtomBrowserClient::SetApplicationLocale(
-      l10n_util::GetApplicationLocale(custom_locale));
+  return brightray::MainDelegate::BasicStartupComplete(exit_code);
 }
 
 void AtomMainDelegate::PreSandboxStartup() {
+  brightray::MainDelegate::PreSandboxStartup();
+
   auto* command_line = base::CommandLine::ForCurrentProcess();
 
-  std::string process_type =
-      command_line->GetSwitchValueASCII(::switches::kProcessType);
-
-  // Initialize ResourceBundle which handles files loaded from external
-  // sources. The language should have been passed in to us from the
-  // browser process as a command line flag.
-  if (SubprocessNeedsResourceBundle(process_type)) {
-    std::string locale = command_line->GetSwitchValueASCII(::switches::kLang);
-    LoadResourceBundle(locale);
-  }
-
   // Only append arguments for browser process.
   if (!IsBrowserProcess(command_line))
     return;
 
+  if (!command_line->HasSwitch(switches::kEnableMixedSandbox)) {
+    if (command_line->HasSwitch(switches::kEnableSandbox)) {
+      // Disable setuid sandbox since it is not longer required on
+      // linux(namespace sandbox is available on most distros).
+      command_line->AppendSwitch(
+          service_manager::switches::kDisableSetuidSandbox);
+    } else {
+      // Disable renderer sandbox for most of node's functions.
+      command_line->AppendSwitch(service_manager::switches::kNoSandbox);
+    }
+  }
+
   // Allow file:// URIs to read other file:// URIs by default.
   command_line->AppendSwitch(::switches::kAllowFileAccessFromFiles);
 
@@ -246,7 +162,7 @@ void AtomMainDelegate::PreSandboxStartup() {
 #endif
 }
 
-void AtomMainDelegate::PreCreateMainMessageLoop() {
+void AtomMainDelegate::PreContentInitialization() {
 #if defined(OS_MACOSX)
   RegisterAtomCrApp();
 #endif
@@ -296,12 +212,9 @@ bool AtomMainDelegate::DelaySandboxInitialization(
 }
 #endif
 
-bool AtomMainDelegate::ShouldLockSchemeRegistry() {
-  return false;
-}
-
-bool AtomMainDelegate::ShouldCreateFeatureList() {
-  return false;
+std::unique_ptr<brightray::ContentClient>
+AtomMainDelegate::CreateContentClient() {
+  return std::make_unique<AtomContentClient>();
 }
 
 }  // namespace atom

atom/app/atom_main_delegate.h

@@ -8,14 +8,12 @@
 #include <memory>
 #include <string>
 
-#include "content/public/app/content_main_delegate.h"
-#include "content/public/common/content_client.h"
+#include "brightray/common/content_client.h"
+#include "brightray/common/main_delegate.h"
 
 namespace atom {
 
-void LoadResourceBundle(const std::string& locale);
-
-class AtomMainDelegate : public content::ContentMainDelegate {
+class AtomMainDelegate : public brightray::MainDelegate {
  public:
   AtomMainDelegate();
   ~AtomMainDelegate() override;
@@ -24,8 +22,7 @@ class AtomMainDelegate : public content::ContentMainDelegate {
   // content::ContentMainDelegate:
   bool BasicStartupComplete(int* exit_code) override;
   void PreSandboxStartup() override;
-  void PreCreateMainMessageLoop() override;
-  void PostEarlyInitialization(bool is_running_tests) override;
+  void PreContentInitialization() override;
   content::ContentBrowserClient* CreateContentBrowserClient() override;
   content::ContentRendererClient* CreateContentRendererClient() override;
   content::ContentUtilityClient* CreateContentUtilityClient() override;
@@ -36,18 +33,20 @@ class AtomMainDelegate : public content::ContentMainDelegate {
   bool ShouldSendMachPort(const std::string& process_type) override;
   bool DelaySandboxInitialization(const std::string& process_type) override;
 #endif
-  bool ShouldLockSchemeRegistry() override;
-  bool ShouldCreateFeatureList() override;
+
+  // brightray::MainDelegate:
+  std::unique_ptr<brightray::ContentClient> CreateContentClient() override;
+#if defined(OS_MACOSX)
+  void OverrideChildProcessPath() override;
+  void OverrideFrameworkBundlePath() override;
+#endif
 
  private:
 #if defined(OS_MACOSX)
-  void OverrideChildProcessPath();
-  void OverrideFrameworkBundlePath();
   void SetUpBundleOverrides();
 #endif
 
   std::unique_ptr<content::ContentBrowserClient> browser_client_;
-  std::unique_ptr<content::ContentClient> content_client_;
   std::unique_ptr<content::ContentRendererClient> renderer_client_;
   std::unique_ptr<content::ContentUtilityClient> utility_client_;
 

atom/app/atom_main_delegate_mac.mm

@@ -5,8 +5,6 @@
 #include "atom/app/atom_main_delegate.h"
 
 #include "atom/browser/mac/atom_application.h"
-#include "atom/common/application_info.h"
-#include "atom/common/mac/main_application_bundle.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/mac/bundle_locations.h"
@@ -14,6 +12,8 @@
 #include "base/mac/scoped_nsautorelease_pool.h"
 #include "base/path_service.h"
 #include "base/strings/sys_string_conversions.h"
+#include "brightray/common/application_info.h"
+#include "brightray/common/mac/main_application_bundle.h"
 #include "content/public/common/content_paths.h"
 
 namespace atom {
@@ -21,7 +21,9 @@ namespace atom {
 namespace {
 
 base::FilePath GetFrameworksPath() {
-  return MainApplicationBundlePath().Append("Contents").Append("Frameworks");
+  return brightray::MainApplicationBundlePath()
+      .Append("Contents")
+      .Append("Frameworks");
 }
 
 base::FilePath GetHelperAppPath(const base::FilePath& frameworks_path,
@@ -44,7 +46,8 @@ void AtomMainDelegate::OverrideChildProcessPath() {
   base::FilePath helper_path =
       GetHelperAppPath(frameworks_path, ATOM_PRODUCT_NAME);
   if (!base::PathExists(helper_path))
-    helper_path = GetHelperAppPath(frameworks_path, GetApplicationName());
+    helper_path =
+        GetHelperAppPath(frameworks_path, brightray::GetApplicationName());
   if (!base::PathExists(helper_path))
     LOG(FATAL) << "Unable to find helper app";
   base::PathService::Override(content::CHILD_PROCESS_EXE, helper_path);
@@ -52,7 +55,7 @@ void AtomMainDelegate::OverrideChildProcessPath() {
 
 void AtomMainDelegate::SetUpBundleOverrides() {
   base::mac::ScopedNSAutoreleasePool pool;
-  NSBundle* bundle = MainApplicationBundle();
+  NSBundle* bundle = brightray::MainApplicationBundle();
   std::string base_bundle_id =
       base::SysNSStringToUTF8([bundle bundleIdentifier]);
   NSString* team_id = [bundle objectForInfoDictionaryKey:@"ElectronTeamID"];

atom/app/manifests.cc

@@ -1,44 +0,0 @@
-// Copyright (c) 2019 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#include "atom/app/manifests.h"
-
-#include "base/no_destructor.h"
-#include "printing/buildflags/buildflags.h"
-#include "services/proxy_resolver/proxy_resolver_manifest.h"
-#include "services/service_manager/public/cpp/manifest_builder.h"
-
-#if BUILDFLAG(ENABLE_PRINTING)
-#include "components/services/pdf_compositor/pdf_compositor_manifest.h"
-#endif
-
-#if BUILDFLAG(ENABLE_PRINT_PREVIEW)
-#include "chrome/services/printing/manifest.h"
-#endif
-
-const service_manager::Manifest& GetElectronContentBrowserOverlayManifest() {
-  static base::NoDestructor<service_manager::Manifest> manifest{
-      service_manager::ManifestBuilder()
-          .WithDisplayName("Electron (browser process)")
-          .RequireCapability("device", "device:geolocation_control")
-          .RequireCapability("proxy_resolver", "factory")
-          .RequireCapability("chrome_printing", "converter")
-          .RequireCapability("pdf_compositor", "compositor")
-          .Build()};
-  return *manifest;
-}
-
-const std::vector<service_manager::Manifest>&
-GetElectronPackagedServicesOverlayManifest() {
-  static base::NoDestructor<std::vector<service_manager::Manifest>> manifests{{
-      proxy_resolver::GetManifest(),
-#if BUILDFLAG(ENABLE_PRINTING)
-      pdf_compositor::GetManifest(),
-#endif
-#if BUILDFLAG(ENABLE_PRINT_PREVIEW)
-      chrome_printing::GetManifest(),
-#endif
-  }};
-  return *manifests;
-}

atom/app/manifests.h

@@ -1,16 +0,0 @@
-// Copyright (c) 2019 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#ifndef ATOM_APP_MANIFESTS_H_
-#define ATOM_APP_MANIFESTS_H_
-
-#include <vector>
-
-#include "services/service_manager/public/cpp/manifest.h"
-
-const service_manager::Manifest& GetElectronContentBrowserOverlayManifest();
-const std::vector<service_manager::Manifest>&
-GetElectronPackagedServicesOverlayManifest();
-
-#endif  // ATOM_APP_MANIFESTS_H_

atom/app/node_main.cc

@@ -16,7 +16,7 @@
 #include "atom/common/node_bindings.h"
 #include "base/command_line.h"
 #include "base/feature_list.h"
-#include "base/task/task_scheduler/task_scheduler.h"
+#include "base/task_scheduler/task_scheduler.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "gin/array_buffer.h"
 #include "gin/public/isolate_holder.h"
@@ -96,7 +96,6 @@ int NodeMain(int argc, char* argv[]) {
       }
     } while (more == true);
 
-    node_debugger.Stop();
     exit_code = node::EmitExit(env);
     node::RunAtExit(env);
     gin_env.platform()->DrainTasks(env->isolate());

atom/browser/api/atom_api_app.cc

@@ -7,13 +7,13 @@
 #include <string>
 #include <vector>
 
+#include "atom/app/atom_content_client.h"
 #include "atom/browser/api/atom_api_menu.h"
 #include "atom/browser/api/atom_api_session.h"
 #include "atom/browser/api/atom_api_web_contents.h"
 #include "atom/browser/api/gpuinfo_manager.h"
 #include "atom/browser/atom_browser_context.h"
 #include "atom/browser/atom_browser_main_parts.h"
-#include "atom/browser/atom_paths.h"
 #include "atom/browser/login_handler.h"
 #include "atom/browser/relauncher.h"
 #include "atom/common/atom_command_line.h"
@@ -30,7 +30,9 @@
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/path_service.h"
-#include "base/system/sys_info.h"
+#include "base/strings/string_util.h"
+#include "base/sys_info.h"
+#include "brightray/browser/brightray_paths.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/icon_manager.h"
 #include "chrome/common/chrome_paths.h"
@@ -42,11 +44,13 @@
 #include "content/public/browser/client_certificate_delegate.h"
 #include "content/public/browser/gpu_data_manager.h"
 #include "content/public/browser/render_frame_host.h"
+#include "content/public/common/content_client.h"
 #include "content/public/common/content_switches.h"
 #include "media/audio/audio_manager.h"
 #include "native_mate/object_template_builder.h"
 #include "net/ssl/client_cert_identity.h"
 #include "net/ssl/ssl_cert_request_info.h"
+#include "services/network/public/cpp/network_switches.h"
 #include "services/service_manager/sandbox/switches.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/image/image.h"
@@ -63,7 +67,6 @@
 #endif
 
 #if defined(OS_MACOSX)
-#include <CoreFoundation/CoreFoundation.h>
 #include "atom/browser/ui/cocoa/atom_bundle_mover.h"
 #endif
 
@@ -394,15 +397,15 @@ IconLoader::IconSize GetIconSizeByString(const std::string& size) {
 // Return the path constant from string.
 int GetPathConstant(const std::string& name) {
   if (name == "appData")
-    return DIR_APP_DATA;
+    return brightray::DIR_APP_DATA;
   else if (name == "userData")
-    return DIR_USER_DATA;
+    return brightray::DIR_USER_DATA;
   else if (name == "cache")
-    return DIR_CACHE;
+    return brightray::DIR_CACHE;
   else if (name == "userCache")
-    return DIR_USER_CACHE;
+    return brightray::DIR_USER_CACHE;
   else if (name == "logs")
-    return DIR_APP_LOGS;
+    return brightray::DIR_APP_LOGS;
   else if (name == "home")
     return base::DIR_HOME;
   else if (name == "temp")
@@ -533,11 +536,18 @@ int ImportIntoCertStore(CertificateManagerModel* model,
 }
 #endif
 
-void OnIconDataAvailable(util::Promise promise, gfx::Image* icon) {
+void OnIconDataAvailable(v8::Isolate* isolate,
+                         const App::FileIconCallback& callback,
+                         gfx::Image* icon) {
+  v8::Locker locker(isolate);
+  v8::HandleScope handle_scope(isolate);
+
   if (icon && !icon->IsEmpty()) {
-    promise.Resolve(*icon);
+    callback.Run(v8::Null(isolate), *icon);
   } else {
-    promise.RejectWithErrorMessage("Failed to get file icon.");
+    v8::Local<v8::String> error_message =
+        v8::String::NewFromUtf8(isolate, "Failed to get file icon.");
+    callback.Run(v8::Exception::Error(error_message), gfx::Image());
   }
 }
 
@@ -675,7 +685,7 @@ void App::OnLogin(scoped_refptr<LoginHandler> login_handler,
   content::WebContents* web_contents = login_handler->GetWebContents();
   if (web_contents) {
     prevent_default = Emit(
-        "login", WebContents::FromOrCreate(isolate(), web_contents),
+        "login", WebContents::CreateFrom(isolate(), web_contents),
         request_details, login_handler->auth_info(),
         base::Bind(&PassLoginInformation, base::RetainedRef(login_handler)));
   }
@@ -689,7 +699,7 @@ bool App::CanCreateWindow(
     content::RenderFrameHost* opener,
     const GURL& opener_url,
     const GURL& opener_top_level_frame_url,
-    const url::Origin& source_origin,
+    const GURL& source_origin,
     content::mojom::WindowContainerType container_type,
     const GURL& target_url,
     const content::Referrer& referrer,
@@ -706,12 +716,9 @@ bool App::CanCreateWindow(
   content::WebContents* web_contents =
       content::WebContents::FromRenderFrameHost(opener);
   if (web_contents) {
-    auto api_web_contents = WebContents::From(isolate(), web_contents);
-    // No need to emit any event if the WebContents is not available in JS.
-    if (!api_web_contents.IsEmpty()) {
-      api_web_contents->OnCreateWindow(target_url, referrer, frame_name,
-                                       disposition, additional_features, body);
-    }
+    auto api_web_contents = WebContents::CreateFrom(isolate(), web_contents);
+    api_web_contents->OnCreateWindow(target_url, referrer, frame_name,
+                                     disposition, additional_features, body);
   }
 
   return false;
@@ -730,7 +737,7 @@ void App::AllowCertificateError(
   v8::Locker locker(isolate());
   v8::HandleScope handle_scope(isolate());
   bool prevent_default = Emit(
-      "certificate-error", WebContents::FromOrCreate(isolate(), web_contents),
+      "certificate-error", WebContents::CreateFrom(isolate(), web_contents),
       request_url, net::ErrorToString(cert_error), ssl_info.cert, callback);
 
   // Deny the certificate by default.
@@ -757,7 +764,7 @@ void App::SelectClientCertificate(
 
   bool prevent_default =
       Emit("select-client-certificate",
-           WebContents::FromOrCreate(isolate(), web_contents),
+           WebContents::CreateFrom(isolate(), web_contents),
            cert_request_info->host_and_port.ToString(), std::move(client_certs),
            base::Bind(&OnClientCertificateSelected, isolate(), shared_delegate,
                       shared_identities));
@@ -779,24 +786,24 @@ void App::OnGpuProcessCrashed(base::TerminationStatus status) {
 
 void App::BrowserChildProcessLaunchedAndConnected(
     const content::ChildProcessData& data) {
-  ChildProcessLaunched(data.process_type, data.GetProcess().Handle());
+  ChildProcessLaunched(data.process_type, data.handle);
 }
 
 void App::BrowserChildProcessHostDisconnected(
     const content::ChildProcessData& data) {
-  ChildProcessDisconnected(base::GetProcId(data.GetProcess().Handle()));
+  ChildProcessDisconnected(base::GetProcId(data.handle));
 }
 
 void App::BrowserChildProcessCrashed(
     const content::ChildProcessData& data,
     const content::ChildProcessTerminationInfo& info) {
-  ChildProcessDisconnected(base::GetProcId(data.GetProcess().Handle()));
+  ChildProcessDisconnected(base::GetProcId(data.handle));
 }
 
 void App::BrowserChildProcessKilled(
     const content::ChildProcessData& data,
     const content::ChildProcessTerminationInfo& info) {
-  ChildProcessDisconnected(base::GetProcId(data.GetProcess().Handle()));
+  ChildProcessDisconnected(base::GetProcId(data.handle));
 }
 
 void App::RenderProcessReady(content::RenderProcessHost* host) {
@@ -874,45 +881,6 @@ std::string App::GetLocale() {
   return g_browser_process->GetApplicationLocale();
 }
 
-std::string App::GetLocaleCountryCode() {
-  std::string region;
-#if defined(OS_WIN)
-  WCHAR locale_name[LOCALE_NAME_MAX_LENGTH] = {0};
-
-  if (GetLocaleInfoEx(LOCALE_NAME_USER_DEFAULT, LOCALE_SISO3166CTRYNAME,
-                      (LPWSTR)&locale_name,
-                      sizeof(locale_name) / sizeof(WCHAR)) ||
-      GetLocaleInfoEx(LOCALE_NAME_SYSTEM_DEFAULT, LOCALE_SISO3166CTRYNAME,
-                      (LPWSTR)&locale_name,
-                      sizeof(locale_name) / sizeof(WCHAR))) {
-    base::WideToUTF8(locale_name, wcslen(locale_name), &region);
-  }
-#elif defined(OS_MACOSX)
-  CFLocaleRef locale = CFLocaleCopyCurrent();
-  CFStringRef value = CFStringRef(
-      static_cast<CFTypeRef>(CFLocaleGetValue(locale, kCFLocaleCountryCode)));
-  const CFIndex kCStringSize = 128;
-  char temporaryCString[kCStringSize] = {0};
-  CFStringGetCString(value, temporaryCString, kCStringSize,
-                     kCFStringEncodingUTF8);
-  region = temporaryCString;
-#else
-  const char* locale_ptr = setlocale(LC_TIME, NULL);
-  if (!locale_ptr)
-    locale_ptr = setlocale(LC_NUMERIC, NULL);
-  if (locale_ptr) {
-    std::string locale = locale_ptr;
-    std::string::size_type rpos = locale.find('.');
-    if (rpos != std::string::npos)
-      locale = locale.substr(0, rpos);
-    rpos = locale.find('_');
-    if (rpos != std::string::npos && rpos + 1 < locale.size())
-      region = locale.substr(rpos + 1);
-  }
-#endif
-  return region.size() == 2 ? region : std::string();
-}
-
 void App::OnSecondInstance(const base::CommandLine::StringVector& cmd,
                            const base::FilePath& cwd) {
   Emit("second-instance", cmd, cwd);
@@ -929,7 +897,7 @@ bool App::RequestSingleInstanceLock() {
     return true;
 
   base::FilePath user_dir;
-  base::PathService::Get(DIR_USER_DATA, &user_dir);
+  base::PathService::Get(brightray::DIR_USER_DATA, &user_dir);
 
   auto cb = base::Bind(&App::OnSecondInstance, base::Unretained(this));
 
@@ -1123,14 +1091,16 @@ JumpListResult App::SetJumpList(v8::Local<v8::Value> val,
 }
 #endif  // defined(OS_WIN)
 
-v8::Local<v8::Promise> App::GetFileIcon(const base::FilePath& path,
-                                        mate::Arguments* args) {
-  util::Promise promise(isolate());
-  v8::Local<v8::Promise> handle = promise.GetHandle();
+void App::GetFileIcon(const base::FilePath& path, mate::Arguments* args) {
+  mate::Dictionary options;
+  IconLoader::IconSize icon_size;
+  FileIconCallback callback;
+
+  v8::Locker locker(isolate());
+  v8::HandleScope handle_scope(isolate());
+
   base::FilePath normalized_path = path.NormalizePathSeparators();
 
-  IconLoader::IconSize icon_size;
-  mate::Dictionary options;
   if (!args->GetNext(&options)) {
     icon_size = IconLoader::IconSize::NORMAL;
   } else {
@@ -1139,18 +1109,22 @@ v8::Local<v8::Promise> App::GetFileIcon(const base::FilePath& path,
     icon_size = GetIconSizeByString(icon_size_string);
   }
 
+  if (!args->GetNext(&callback)) {
+    args->ThrowError("Missing required callback function");
+    return;
+  }
+
   auto* icon_manager = AtomBrowserMainParts::Get()->GetIconManager();
   gfx::Image* icon =
       icon_manager->LookupIconFromFilepath(normalized_path, icon_size);
   if (icon) {
-    promise.Resolve(*icon);
+    callback.Run(v8::Null(isolate()), *icon);
   } else {
     icon_manager->LoadIcon(
         normalized_path, icon_size,
-        base::BindOnce(&OnIconDataAvailable, std::move(promise)),
+        base::Bind(&OnIconDataAvailable, isolate(), callback),
         &cancelable_task_tracker_);
   }
-  return handle;
 }
 
 std::vector<mate::Dictionary> App::GetAppMetrics(v8::Isolate* isolate) {
@@ -1198,30 +1172,30 @@ v8::Local<v8::Value> App::GetGPUFeatureStatus(v8::Isolate* isolate) {
 v8::Local<v8::Promise> App::GetGPUInfo(v8::Isolate* isolate,
                                        const std::string& info_type) {
   auto* const gpu_data_manager = content::GpuDataManagerImpl::GetInstance();
-  util::Promise promise(isolate);
-  v8::Local<v8::Promise> handle = promise.GetHandle();
+  scoped_refptr<util::Promise> promise = new util::Promise(isolate);
   if (info_type != "basic" && info_type != "complete") {
-    promise.RejectWithErrorMessage(
+    promise->RejectWithErrorMessage(
         "Invalid info type. Use 'basic' or 'complete'");
-    return handle;
+    return promise->GetHandle();
   }
   std::string reason;
   if (!gpu_data_manager->GpuAccessAllowed(&reason)) {
-    promise.RejectWithErrorMessage("GPU access not allowed. Reason: " + reason);
-    return handle;
+    promise->RejectWithErrorMessage("GPU access not allowed. Reason: " +
+                                    reason);
+    return promise->GetHandle();
   }
 
   auto* const info_mgr = GPUInfoManager::GetInstance();
   if (info_type == "complete") {
 #if defined(OS_WIN) || defined(OS_MACOSX)
-    info_mgr->FetchCompleteInfo(std::move(promise));
+    info_mgr->FetchCompleteInfo(promise);
 #else
-    info_mgr->FetchBasicInfo(std::move(promise));
+    info_mgr->FetchBasicInfo(promise);
 #endif
   } else /* (info_type == "basic") */ {
-    info_mgr->FetchBasicInfo(std::move(promise));
+    info_mgr->FetchBasicInfo(promise);
   }
-  return handle;
+  return promise->GetHandle();
 }
 
 static void RemoveNoSandboxSwitch(base::CommandLine* command_line) {
@@ -1251,6 +1225,31 @@ void App::EnableSandbox(mate::Arguments* args) {
   command_line->AppendSwitch(switches::kEnableSandbox);
 }
 
+void App::EnableMixedSandbox(mate::Arguments* args) {
+  if (Browser::Get()->is_ready()) {
+    args->ThrowError(
+        "app.enableMixedSandbox() can only be called "
+        "before app is ready");
+    return;
+  }
+
+  auto* command_line = base::CommandLine::ForCurrentProcess();
+  RemoveNoSandboxSwitch(command_line);
+  command_line->AppendSwitch(switches::kEnableMixedSandbox);
+}
+
+void App::SetUserAgentFallback(const std::string& user_agent) {
+  AtomContentClient* client =
+      static_cast<AtomContentClient*>(content::GetContentClient());
+  client->SetUserAgent(user_agent);
+}
+
+std::string App::GetUserAgentFallback() {
+  AtomContentClient* client =
+      static_cast<AtomContentClient*>(content::GetContentClient());
+  return client->GetUserAgent();
+}
+
 #if defined(OS_MACOSX)
 bool App::MoveToApplicationsFolder(mate::Arguments* args) {
   return ui::cocoa::AtomBundleMover::Move(args);
@@ -1309,11 +1308,6 @@ void App::BuildPrototype(v8::Isolate* isolate,
                  base::Bind(&Browser::InvalidateCurrentActivity, browser))
       .SetMethod("updateCurrentActivity",
                  base::Bind(&Browser::UpdateCurrentActivity, browser))
-      // TODO(juturu): Remove in 2.0, deprecate before then with warnings
-      .SetMethod("moveToApplicationsFolder", &App::MoveToApplicationsFolder)
-      .SetMethod("isInApplicationsFolder", &App::IsInApplicationsFolder)
-#endif
-#if defined(OS_MACOSX) || defined(OS_LINUX)
       .SetMethod("setAboutPanelOptions",
                  base::Bind(&Browser::SetAboutPanelOptions, browser))
       .SetMethod("showAboutPanel",
@@ -1334,7 +1328,6 @@ void App::BuildPrototype(v8::Isolate* isolate,
       .SetMethod("getPath", &App::GetPath)
       .SetMethod("setDesktopName", &App::SetDesktopName)
       .SetMethod("getLocale", &App::GetLocale)
-      .SetMethod("getLocaleCountryCode", &App::GetLocaleCountryCode)
 #if defined(USE_NSS_CERTS)
       .SetMethod("importCertificate", &App::ImportCertificate)
 #endif
@@ -1354,11 +1347,19 @@ void App::BuildPrototype(v8::Isolate* isolate,
       .SetMethod("getAppMetrics", &App::GetAppMetrics)
       .SetMethod("getGPUFeatureStatus", &App::GetGPUFeatureStatus)
       .SetMethod("getGPUInfo", &App::GetGPUInfo)
+// TODO(juturu): Remove in 2.0, deprecate before then with warnings
+#if defined(OS_MACOSX)
+      .SetMethod("moveToApplicationsFolder", &App::MoveToApplicationsFolder)
+      .SetMethod("isInApplicationsFolder", &App::IsInApplicationsFolder)
+#endif
 #if defined(MAS_BUILD)
       .SetMethod("startAccessingSecurityScopedResource",
                  &App::StartAccessingSecurityScopedResource)
 #endif
-      .SetMethod("enableSandbox", &App::EnableSandbox);
+      .SetProperty("userAgentFallback", &App::GetUserAgentFallback,
+                   &App::SetUserAgentFallback)
+      .SetMethod("enableSandbox", &App::EnableSandbox)
+      .SetMethod("enableMixedSandbox", &App::EnableMixedSandbox);
 }
 
 }  // namespace api
@@ -1367,6 +1368,25 @@ void App::BuildPrototype(v8::Isolate* isolate,
 
 namespace {
 
+void AppendSwitch(const std::string& switch_string, mate::Arguments* args) {
+  auto* command_line = base::CommandLine::ForCurrentProcess();
+
+  if (base::EndsWith(switch_string, "-path",
+                     base::CompareCase::INSENSITIVE_ASCII) ||
+      switch_string == network::switches::kLogNetLog) {
+    base::FilePath path;
+    args->GetNext(&path);
+    command_line->AppendSwitchPath(switch_string, path);
+    return;
+  }
+
+  std::string value;
+  if (args->GetNext(&value))
+    command_line->AppendSwitchASCII(switch_string, value);
+  else
+    command_line->AppendSwitch(switch_string);
+}
+
 #if defined(OS_MACOSX)
 int DockBounce(const std::string& type) {
   int request_id = -1;
@@ -1387,11 +1407,14 @@ void Initialize(v8::Local<v8::Object> exports,
                 v8::Local<v8::Context> context,
                 void* priv) {
   v8::Isolate* isolate = context->GetIsolate();
+  auto* command_line = base::CommandLine::ForCurrentProcess();
+
   mate::Dictionary dict(isolate, exports);
-  dict.Set("App", atom::api::App::GetConstructor(isolate)
-                      ->GetFunction(context)
-                      .ToLocalChecked());
+  dict.Set("App", atom::api::App::GetConstructor(isolate)->GetFunction());
   dict.Set("app", atom::api::App::Create(isolate));
+  dict.SetMethod("appendSwitch", &AppendSwitch);
+  dict.SetMethod("appendArgument", base::Bind(&base::CommandLine::AppendArg,
+                                              base::Unretained(command_line)));
 #if defined(OS_MACOSX)
   auto browser = base::Unretained(Browser::Get());
   dict.SetMethod("dockBounce", &DockBounce);
@@ -1413,4 +1436,4 @@ void Initialize(v8::Local<v8::Object> exports,
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_app, Initialize)
+NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_browser_app, Initialize)

atom/browser/api/atom_api_app.h

@@ -141,7 +141,7 @@ class App : public AtomBrowserClient::Delegate,
   bool CanCreateWindow(content::RenderFrameHost* opener,
                        const GURL& opener_url,
                        const GURL& opener_top_level_frame_url,
-                       const url::Origin& source_origin,
+                       const GURL& source_origin,
                        content::mojom::WindowContainerType container_type,
                        const GURL& target_url,
                        const content::Referrer& referrer,
@@ -182,7 +182,6 @@ class App : public AtomBrowserClient::Delegate,
 
   void SetDesktopName(const std::string& desktop_name);
   std::string GetLocale();
-  std::string GetLocaleCountryCode();
   void OnSecondInstance(const base::CommandLine::StringVector& cmd,
                         const base::FilePath& cwd);
   bool HasSingleInstanceLock() const;
@@ -198,14 +197,16 @@ class App : public AtomBrowserClient::Delegate,
   void ImportCertificate(const base::DictionaryValue& options,
                          const net::CompletionCallback& callback);
 #endif
-  v8::Local<v8::Promise> GetFileIcon(const base::FilePath& path,
-                                     mate::Arguments* args);
+  void GetFileIcon(const base::FilePath& path, mate::Arguments* args);
 
   std::vector<mate::Dictionary> GetAppMetrics(v8::Isolate* isolate);
   v8::Local<v8::Value> GetGPUFeatureStatus(v8::Isolate* isolate);
   v8::Local<v8::Promise> GetGPUInfo(v8::Isolate* isolate,
                                     const std::string& info_type);
   void EnableSandbox(mate::Arguments* args);
+  void EnableMixedSandbox(mate::Arguments* args);
+  void SetUserAgentFallback(const std::string& user_agent);
+  std::string GetUserAgentFallback();
 
 #if defined(OS_MACOSX)
   bool MoveToApplicationsFolder(mate::Arguments* args);

atom/browser/api/atom_api_auto_updater.cc

@@ -147,11 +147,9 @@ void Initialize(v8::Local<v8::Object> exports,
   v8::Isolate* isolate = context->GetIsolate();
   mate::Dictionary dict(isolate, exports);
   dict.Set("autoUpdater", AutoUpdater::Create(isolate));
-  dict.Set("AutoUpdater", AutoUpdater::GetConstructor(isolate)
-                              ->GetFunction(context)
-                              .ToLocalChecked());
+  dict.Set("AutoUpdater", AutoUpdater::GetConstructor(isolate)->GetFunction());
 }
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_auto_updater, Initialize)
+NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_browser_auto_updater, Initialize)

atom/browser/api/atom_api_browser_view.cc

@@ -159,9 +159,8 @@ void Initialize(v8::Local<v8::Object> exports,
   v8::Isolate* isolate = context->GetIsolate();
   BrowserView::SetConstructor(isolate, base::Bind(&BrowserView::New));
 
-  mate::Dictionary browser_view(isolate, BrowserView::GetConstructor(isolate)
-                                             ->GetFunction(context)
-                                             .ToLocalChecked());
+  mate::Dictionary browser_view(
+      isolate, BrowserView::GetConstructor(isolate)->GetFunction());
   browser_view.SetMethod("fromId",
                          &mate::TrackableObject<BrowserView>::FromWeakMapID);
   browser_view.SetMethod("getAllViews",
@@ -172,4 +171,4 @@ void Initialize(v8::Local<v8::Object> exports,
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_browser_view, Initialize)
+NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_browser_browser_view, Initialize)

atom/browser/api/atom_api_browser_window.cc

@@ -18,10 +18,8 @@
 #include "atom/common/options_switches.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
-#include "content/browser/renderer_host/render_widget_host_owner_delegate.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
-#include "gin/converter.h"
 #include "native_mate/dictionary.h"
 #include "ui/gl/gpu_switching_manager.h"
 
@@ -76,6 +74,10 @@ BrowserWindow::BrowserWindow(v8::Isolate* isolate,
   mate::Dictionary(isolate, web_contents->GetWrapper())
       .Set("browserWindowOptions", options);
 
+  // Tell the content module to initialize renderer widget with transparent
+  // mode.
+  ui::GpuSwitchingManager::SetTransparent(window()->transparent());
+
   // Associate with BrowserWindow.
   web_contents->SetOwnerWindow(window());
 
@@ -131,7 +133,7 @@ void BrowserWindow::RenderViewCreated(
       render_view_host->GetProcess()->GetID(),
       render_view_host->GetRoutingID());
   if (impl)
-    impl->owner_delegate()->SetBackgroundOpaque(false);
+    impl->SetBackgroundOpaque(false);
 }
 
 void BrowserWindow::DidFirstVisuallyNonEmptyPaint() {
@@ -239,7 +241,7 @@ void BrowserWindow::OnCloseButtonClicked(bool* prevent_default) {
     return;
 
   if (web_contents()->NeedToFireBeforeUnload())
-    web_contents()->DispatchBeforeUnload(false /* auto_cancel */);
+    web_contents()->DispatchBeforeUnload();
   else
     web_contents()->Close();
 }
@@ -312,29 +314,7 @@ void BrowserWindow::SetBackgroundColor(const std::string& color_name) {
 }
 
 void BrowserWindow::SetBrowserView(v8::Local<v8::Value> value) {
-  TopLevelWindow::ResetBrowserViews();
-  TopLevelWindow::AddBrowserView(value);
-#if defined(OS_MACOSX)
-  UpdateDraggableRegions(nullptr, draggable_regions_);
-#endif
-}
-
-void BrowserWindow::AddBrowserView(v8::Local<v8::Value> value) {
-  TopLevelWindow::AddBrowserView(value);
-#if defined(OS_MACOSX)
-  UpdateDraggableRegions(nullptr, draggable_regions_);
-#endif
-}
-
-void BrowserWindow::RemoveBrowserView(v8::Local<v8::Value> value) {
-  TopLevelWindow::RemoveBrowserView(value);
-#if defined(OS_MACOSX)
-  UpdateDraggableRegions(nullptr, draggable_regions_);
-#endif
-}
-
-void BrowserWindow::ResetBrowserViews() {
-  TopLevelWindow::ResetBrowserViews();
+  TopLevelWindow::SetBrowserView(value);
 #if defined(OS_MACOSX)
   UpdateDraggableRegions(nullptr, draggable_regions_);
 #endif
@@ -342,7 +322,7 @@ void BrowserWindow::ResetBrowserViews() {
 
 void BrowserWindow::SetVibrancy(v8::Isolate* isolate,
                                 v8::Local<v8::Value> value) {
-  std::string type = gin::V8ToString(isolate, value);
+  std::string type = mate::V8ToString(value);
 
   auto* render_view_host = web_contents()->GetRenderViewHost();
   if (render_view_host) {
@@ -350,8 +330,7 @@ void BrowserWindow::SetVibrancy(v8::Isolate* isolate,
         render_view_host->GetProcess()->GetID(),
         render_view_host->GetRoutingID());
     if (impl)
-      impl->owner_delegate()->SetBackgroundOpaque(
-          type.empty() ? !window_->transparent() : false);
+      impl->SetBackgroundOpaque(type.empty() ? !window_->transparent() : false);
   }
 
   TopLevelWindow::SetVibrancy(isolate, value);
@@ -481,4 +460,4 @@ void Initialize(v8::Local<v8::Object> exports,
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_window, Initialize)
+NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_browser_window, Initialize)

atom/browser/api/atom_api_browser_window.h

@@ -72,9 +72,6 @@ class BrowserWindow : public TopLevelWindow,
   void Blur() override;
   void SetBackgroundColor(const std::string& color_name) override;
   void SetBrowserView(v8::Local<v8::Value> value) override;
-  void AddBrowserView(v8::Local<v8::Value> value) override;
-  void RemoveBrowserView(v8::Local<v8::Value> value) override;
-  void ResetBrowserViews() override;
   void SetVibrancy(v8::Isolate* isolate, v8::Local<v8::Value> value) override;
 
   // BrowserWindow APIs.
@@ -85,7 +82,7 @@ class BrowserWindow : public TopLevelWindow,
 
  private:
 #if defined(OS_MACOSX)
-  void OverrideNSWindowContentView(InspectableWebContents* iwc);
+  void OverrideNSWindowContentView(brightray::InspectableWebContents* iwc);
 #endif
 
   // Helpers.

atom/browser/api/atom_api_browser_window_mac.mm

@@ -8,9 +8,9 @@
 
 #include "atom/browser/native_browser_view.h"
 #include "atom/browser/native_window_mac.h"
-#include "atom/browser/ui/inspectable_web_contents_view.h"
 #include "atom/common/draggable_region.h"
 #include "base/mac/scoped_nsobject.h"
+#include "brightray/browser/inspectable_web_contents_view.h"
 
 @interface NSView (WebContentsView)
 - (void)setMouseDownCanMoveWindow:(BOOL)can_move;
@@ -55,13 +55,13 @@ std::vector<gfx::Rect> CalculateNonDraggableRegions(
 
 }  // namespace
 
-void BrowserWindow::OverrideNSWindowContentView(InspectableWebContents* iwc) {
+void BrowserWindow::OverrideNSWindowContentView(
+    brightray::InspectableWebContents* iwc) {
   // Make NativeWindow use a NSView as content view.
   static_cast<NativeWindowMac*>(window())->OverrideNSWindowContentView();
   // Add webview to contentView.
-  NSView* webView = iwc->GetView()->GetNativeView().GetNativeNSView();
-  NSView* contentView =
-      [window()->GetNativeWindow().GetNativeNSWindow() contentView];
+  NSView* webView = iwc->GetView()->GetNativeView();
+  NSView* contentView = [window()->GetNativeWindow() contentView];
   [webView setFrame:[contentView bounds]];
 
   // ensure that buttons view is floated to top of view hierarchy
@@ -81,7 +81,7 @@ void BrowserWindow::UpdateDraggableRegions(
   // All ControlRegionViews should be added as children of the WebContentsView,
   // because WebContentsView will be removed and re-added when entering and
   // leaving fullscreen mode.
-  NSView* webView = web_contents()->GetNativeView().GetNativeNSView();
+  NSView* webView = web_contents()->GetNativeView();
   NSInteger webViewWidth = NSWidth([webView bounds]);
   NSInteger webViewHeight = NSHeight([webView bounds]);
 
@@ -109,10 +109,8 @@ void BrowserWindow::UpdateDraggableRegions(
         DraggableRegionsToSkRegion(regions), webViewWidth, webViewHeight);
   }
 
-  auto browser_views = window_->browser_views();
-  for (NativeBrowserView* view : browser_views) {
-    (view)->UpdateDraggableRegions(drag_exclude_rects);
-  }
+  if (window_->browser_view())
+    window_->browser_view()->UpdateDraggableRegions(drag_exclude_rects);
 
   // Create and add a ControlRegionView for each region that needs to be
   // excluded from the dragging.

atom/browser/api/atom_api_content_tracing.cc

@@ -8,10 +8,8 @@
 #include "atom/common/native_mate_converters/callback.h"
 #include "atom/common/native_mate_converters/file_path_converter.h"
 #include "atom/common/native_mate_converters/value_converter.h"
-#include "atom/common/promise_util.h"
 #include "base/bind.h"
 #include "base/files/file_util.h"
-#include "base/threading/thread_restrictions.h"
 #include "content/public/browser/tracing_controller.h"
 #include "native_mate/dictionary.h"
 
@@ -60,11 +58,6 @@ scoped_refptr<TracingController::TraceDataEndpoint> GetTraceDataEndpoint(
     const base::FilePath& path,
     const CompletionCallback& callback) {
   base::FilePath result_file_path = path;
-
-  // base::CreateTemporaryFile prevents blocking so we need to allow it
-  // for now since offloading this to a different sequence would require
-  // changing the api shape
-  base::ThreadRestrictions::ScopedAllowIO allow_io;
   if (result_file_path.empty() && !base::CreateTemporaryFile(&result_file_path))
     LOG(ERROR) << "Creating temporary file failed";
 
@@ -72,72 +65,28 @@ scoped_refptr<TracingController::TraceDataEndpoint> GetTraceDataEndpoint(
       result_file_path, base::Bind(callback, result_file_path));
 }
 
-void OnRecordingStopped(const atom::util::CopyablePromise& promise,
-                        const base::FilePath& path) {
-  promise.GetPromise().Resolve(path);
-}
-
-v8::Local<v8::Promise> StopRecording(v8::Isolate* isolate,
-                                     const base::FilePath& path) {
-  atom::util::Promise promise(isolate);
-  v8::Local<v8::Promise> handle = promise.GetHandle();
-
-  // TODO(zcbenz): Remove the use of CopyablePromise when the
-  // CreateFileEndpoint API accepts OnceCallback.
-  TracingController::GetInstance()->StopTracing(GetTraceDataEndpoint(
-      path,
-      base::Bind(&OnRecordingStopped, atom::util::CopyablePromise(promise))));
-  return handle;
-}
-
-void OnCategoriesAvailable(atom::util::Promise promise,
-                           const std::set<std::string>& categories) {
-  promise.Resolve(categories);
-}
-
-v8::Local<v8::Promise> GetCategories(v8::Isolate* isolate) {
-  atom::util::Promise promise(isolate);
-  v8::Local<v8::Promise> handle = promise.GetHandle();
-
-  // Note: This method always succeeds.
-  TracingController::GetInstance()->GetCategories(
-      base::BindOnce(&OnCategoriesAvailable, std::move(promise)));
-  return handle;
-}
-
-void OnTracingStarted(atom::util::Promise promise) {
-  promise.Resolve();
-}
-
-v8::Local<v8::Promise> StartTracing(
-    v8::Isolate* isolate,
-    const base::trace_event::TraceConfig& trace_config) {
-  atom::util::Promise promise(isolate);
-  v8::Local<v8::Promise> handle = promise.GetHandle();
-
-  // Note: This method always succeeds.
-  TracingController::GetInstance()->StartTracing(
-      trace_config, base::BindOnce(&OnTracingStarted, std::move(promise)));
-  return handle;
-}
-
-bool GetTraceBufferUsage(
-    const base::RepeatingCallback<void(float, size_t)>& callback) {
-  return TracingController::GetInstance()->GetTraceBufferUsage(
-      base::BindOnce(callback));
+void StopRecording(const base::FilePath& path,
+                   const CompletionCallback& callback) {
+  TracingController::GetInstance()->StopTracing(
+      GetTraceDataEndpoint(path, callback));
 }
 
 void Initialize(v8::Local<v8::Object> exports,
                 v8::Local<v8::Value> unused,
                 v8::Local<v8::Context> context,
                 void* priv) {
+  auto controller = base::Unretained(TracingController::GetInstance());
   mate::Dictionary dict(context->GetIsolate(), exports);
-  dict.SetMethod("getCategories", &GetCategories);
-  dict.SetMethod("startRecording", &StartTracing);
+  dict.SetMethod("getCategories",
+                 base::Bind(&TracingController::GetCategories, controller));
+  dict.SetMethod("startRecording",
+                 base::Bind(&TracingController::StartTracing, controller));
   dict.SetMethod("stopRecording", &StopRecording);
-  dict.SetMethod("getTraceBufferUsage", &GetTraceBufferUsage);
+  dict.SetMethod(
+      "getTraceBufferUsage",
+      base::Bind(&TracingController::GetTraceBufferUsage, controller));
 }
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_content_tracing, Initialize)
+NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_browser_content_tracing, Initialize)

atom/browser/api/atom_api_cookies.cc

@@ -12,11 +12,9 @@
 #include "atom/common/native_mate_converters/callback.h"
 #include "atom/common/native_mate_converters/gurl_converter.h"
 #include "atom/common/native_mate_converters/value_converter.h"
-#include "base/task/post_task.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "content/public/browser/browser_context.h"
-#include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
 #include "native_mate/dictionary.h"
 #include "native_mate/object_template_builder.h"
@@ -136,96 +134,67 @@ inline net::CookieStore* GetCookieStore(
   return getter->GetURLRequestContext()->cookie_store();
 }
 
-void ResolvePromiseWithCookies(util::Promise promise,
-                               const net::CookieList& cookie_list) {
-  promise.Resolve(cookie_list);
-}
-
-void ResolvePromise(util::Promise promise) {
-  promise.Resolve();
-}
-
-// Resolve |promise| in UI thread.
-void ResolvePromiseInUI(util::Promise promise) {
-  base::PostTaskWithTraits(FROM_HERE, {BrowserThread::UI},
-                           base::BindOnce(ResolvePromise, std::move(promise)));
-}
-
 // Run |callback| on UI thread.
-void RunCallbackInUI(base::OnceClosure callback) {
-  base::PostTaskWithTraits(FROM_HERE, {BrowserThread::UI}, std::move(callback));
+void RunCallbackInUI(const base::Closure& callback) {
+  BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, callback);
 }
 
 // Remove cookies from |list| not matching |filter|, and pass it to |callback|.
 void FilterCookies(std::unique_ptr<base::DictionaryValue> filter,
-                   util::Promise promise,
+                   const Cookies::GetCallback& callback,
                    const net::CookieList& list) {
   net::CookieList result;
   for (const auto& cookie : list) {
     if (MatchesCookie(filter.get(), cookie))
       result.push_back(cookie);
   }
-
-  base::PostTaskWithTraits(
-      FROM_HERE, {BrowserThread::UI},
-      base::BindOnce(ResolvePromiseWithCookies, std::move(promise), result));
+  RunCallbackInUI(base::Bind(callback, Cookies::SUCCESS, result));
 }
 
 // Receives cookies matching |filter| in IO thread.
 void GetCookiesOnIO(scoped_refptr<net::URLRequestContextGetter> getter,
                     std::unique_ptr<base::DictionaryValue> filter,
-                    util::Promise promise) {
+                    const Cookies::GetCallback& callback) {
   std::string url;
   filter->GetString("url", &url);
 
   auto filtered_callback =
-      base::BindOnce(FilterCookies, std::move(filter), std::move(promise));
+      base::Bind(FilterCookies, base::Passed(&filter), callback);
 
   // Empty url will match all url cookies.
   if (url.empty())
-    GetCookieStore(getter)->GetAllCookiesAsync(std::move(filtered_callback));
+    GetCookieStore(getter)->GetAllCookiesAsync(filtered_callback);
   else
-    GetCookieStore(getter)->GetAllCookiesForURLAsync(
-        GURL(url), std::move(filtered_callback));
+    GetCookieStore(getter)->GetAllCookiesForURLAsync(GURL(url),
+                                                     filtered_callback);
 }
 
 // Removes cookie with |url| and |name| in IO thread.
-void RemoveCookieOnIO(scoped_refptr<net::URLRequestContextGetter> getter,
-                      const GURL& url,
-                      const std::string& name,
-                      util::Promise promise) {
+void RemoveCookieOnIOThread(scoped_refptr<net::URLRequestContextGetter> getter,
+                            const GURL& url,
+                            const std::string& name,
+                            const base::Closure& callback) {
   GetCookieStore(getter)->DeleteCookieAsync(
-      url, name, base::BindOnce(ResolvePromiseInUI, std::move(promise)));
-}
-
-// Resolves/rejects the |promise| in UI thread.
-void SettlePromiseInUI(util::Promise promise, const std::string& errmsg) {
-  if (errmsg.empty()) {
-    promise.Resolve();
-  } else {
-    promise.RejectWithErrorMessage(errmsg);
-  }
+      url, name, base::BindOnce(RunCallbackInUI, callback));
 }
 
 // Callback of SetCookie.
-void OnSetCookie(util::Promise promise, bool success) {
-  const std::string errmsg = success ? "" : "Setting cookie failed";
+void OnSetCookie(const Cookies::SetCallback& callback, bool success) {
   RunCallbackInUI(
-      base::BindOnce(SettlePromiseInUI, std::move(promise), errmsg));
+      base::Bind(callback, success ? Cookies::SUCCESS : Cookies::FAILED));
 }
 
 // Flushes cookie store in IO thread.
 void FlushCookieStoreOnIOThread(
     scoped_refptr<net::URLRequestContextGetter> getter,
-    util::Promise promise) {
-  GetCookieStore(getter)->FlushStore(
-      base::BindOnce(ResolvePromiseInUI, std::move(promise)));
+    const base::Closure& callback) {
+  GetCookieStore(getter)->FlushStore(base::BindOnce(RunCallbackInUI, callback));
 }
 
 // Sets cookie with |details| in IO thread.
 void SetCookieOnIO(scoped_refptr<net::URLRequestContextGetter> getter,
                    std::unique_ptr<base::DictionaryValue> details,
-                   util::Promise promise) {
+                   const Cookies::SetCallback& callback) {
   std::string url, name, value, domain, path;
   bool secure = false;
   bool http_only = false;
@@ -266,7 +235,7 @@ void SetCookieOnIO(scoped_refptr<net::URLRequestContextGetter> getter,
           GURL(url), name, value, domain, path, creation_time, expiration_time,
           last_access_time, secure, http_only,
           net::CookieSameSite::DEFAULT_MODE, net::COOKIE_PRIORITY_DEFAULT));
-  auto completion_callback = base::BindOnce(OnSetCookie, std::move(promise));
+  auto completion_callback = base::BindOnce(OnSetCookie, callback);
   if (!canonical_cookie || !canonical_cookie->IsCanonical()) {
     std::move(completion_callback).Run(false);
     return;
@@ -296,61 +265,44 @@ Cookies::Cookies(v8::Isolate* isolate, AtomBrowserContext* browser_context)
 
 Cookies::~Cookies() {}
 
-v8::Local<v8::Promise> Cookies::Get(const base::DictionaryValue& filter) {
-  util::Promise promise(isolate());
-  v8::Local<v8::Promise> handle = promise.GetHandle();
-
+void Cookies::Get(const base::DictionaryValue& filter,
+                  const GetCallback& callback) {
   auto copy = base::DictionaryValue::From(
       base::Value::ToUniquePtrValue(filter.Clone()));
   auto* getter = browser_context_->GetRequestContext();
-  base::PostTaskWithTraits(
-      FROM_HERE, {BrowserThread::IO},
+  content::BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
       base::BindOnce(GetCookiesOnIO, base::RetainedRef(getter), std::move(copy),
-                     std::move(promise)));
-
-  return handle;
+                     callback));
 }
 
-v8::Local<v8::Promise> Cookies::Remove(const GURL& url,
-                                       const std::string& name) {
-  util::Promise promise(isolate());
-  v8::Local<v8::Promise> handle = promise.GetHandle();
-
+void Cookies::Remove(const GURL& url,
+                     const std::string& name,
+                     const base::Closure& callback) {
   auto* getter = browser_context_->GetRequestContext();
-  base::PostTaskWithTraits(
-      FROM_HERE, {BrowserThread::IO},
-      base::BindOnce(RemoveCookieOnIO, base::RetainedRef(getter), url, name,
-                     std::move(promise)));
-
-  return handle;
+  content::BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
+      base::BindOnce(RemoveCookieOnIOThread, base::RetainedRef(getter), url,
+                     name, callback));
 }
 
-v8::Local<v8::Promise> Cookies::Set(const base::DictionaryValue& details) {
-  util::Promise promise(isolate());
-  v8::Local<v8::Promise> handle = promise.GetHandle();
-
+void Cookies::Set(const base::DictionaryValue& details,
+                  const SetCallback& callback) {
   auto copy = base::DictionaryValue::From(
       base::Value::ToUniquePtrValue(details.Clone()));
   auto* getter = browser_context_->GetRequestContext();
-  base::PostTaskWithTraits(
-      FROM_HERE, {BrowserThread::IO},
+  content::BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
       base::BindOnce(SetCookieOnIO, base::RetainedRef(getter), std::move(copy),
-                     std::move(promise)));
-
-  return handle;
+                     callback));
 }
 
-v8::Local<v8::Promise> Cookies::FlushStore() {
-  util::Promise promise(isolate());
-  v8::Local<v8::Promise> handle = promise.GetHandle();
-
+void Cookies::FlushStore(const base::Closure& callback) {
   auto* getter = browser_context_->GetRequestContext();
-  base::PostTaskWithTraits(
-      FROM_HERE, {BrowserThread::IO},
+  content::BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
       base::BindOnce(FlushCookieStoreOnIOThread, base::RetainedRef(getter),
-                     std::move(promise)));
-
-  return handle;
+                     callback));
 }
 
 void Cookies::OnCookieChanged(const CookieDetails* details) {

atom/browser/api/atom_api_cookies.h

@@ -10,7 +10,6 @@
 
 #include "atom/browser/api/trackable_object.h"
 #include "atom/browser/net/cookie_details.h"
-#include "atom/common/promise_util.h"
 #include "base/callback_list.h"
 #include "native_mate/handle.h"
 #include "net/cookies/canonical_cookie.h"
@@ -36,6 +35,9 @@ class Cookies : public mate::TrackableObject<Cookies> {
     FAILED,
   };
 
+  using GetCallback = base::Callback<void(Error, const net::CookieList&)>;
+  using SetCallback = base::Callback<void(Error)>;
+
   static mate::Handle<Cookies> Create(v8::Isolate* isolate,
                                       AtomBrowserContext* browser_context);
 
@@ -47,10 +49,12 @@ class Cookies : public mate::TrackableObject<Cookies> {
   Cookies(v8::Isolate* isolate, AtomBrowserContext* browser_context);
   ~Cookies() override;
 
-  v8::Local<v8::Promise> Get(const base::DictionaryValue& filter);
-  v8::Local<v8::Promise> Set(const base::DictionaryValue& details);
-  v8::Local<v8::Promise> Remove(const GURL& url, const std::string& name);
-  v8::Local<v8::Promise> FlushStore();
+  void Get(const base::DictionaryValue& filter, const GetCallback& callback);
+  void Remove(const GURL& url,
+              const std::string& name,
+              const base::Closure& callback);
+  void Set(const base::DictionaryValue& details, const SetCallback& callback);
+  void FlushStore(const base::Closure& callback);
 
   // CookieChangeNotifier subscription:
   void OnCookieChanged(const CookieDetails*);

atom/browser/api/atom_api_debugger.cc

@@ -61,26 +61,23 @@ void Debugger::DispatchProtocolMessage(DevToolsAgentHost* agent_host,
       params.Swap(params_value);
     Emit("message", method, params);
   } else {
-    auto it = pending_requests_.find(id);
-    if (it == pending_requests_.end())
+    auto send_command_callback = pending_requests_[id];
+    pending_requests_.erase(id);
+    if (send_command_callback.is_null())
       return;
-
-    atom::util::Promise promise = std::move(it->second);
-    pending_requests_.erase(it);
-
-    base::DictionaryValue* error = nullptr;
-    if (dict->GetDictionary("error", &error)) {
-      std::string message;
-      error->GetString("message", &message);
-      promise.RejectWithErrorMessage(message);
-    } else {
-      base::DictionaryValue* result_body = nullptr;
-      base::DictionaryValue result;
-      if (dict->GetDictionary("result", &result_body)) {
-        result.Swap(result_body);
-      }
-      promise.Resolve(result);
+    base::DictionaryValue* error_body = nullptr;
+    base::DictionaryValue error;
+    bool has_error;
+    if ((has_error = dict->GetDictionary("error", &error_body))) {
+      error.Swap(error_body);
     }
+
+    base::DictionaryValue* result_body = nullptr;
+    base::DictionaryValue result;
+    if (dict->GetDictionary("result", &result_body))
+      result.Swap(result_body);
+    send_command_callback.Run(has_error ? error.Clone() : base::Value(),
+                              result);
   }
 }
 
@@ -128,27 +125,23 @@ void Debugger::Detach() {
   AgentHostClosed(agent_host_.get());
 }
 
-v8::Local<v8::Promise> Debugger::SendCommand(mate::Arguments* args) {
-  atom::util::Promise promise(isolate());
-  v8::Local<v8::Promise> handle = promise.GetHandle();
-
-  if (!agent_host_) {
-    promise.RejectWithErrorMessage("No target available");
-    return handle;
-  }
+void Debugger::SendCommand(mate::Arguments* args) {
+  if (!agent_host_)
+    return;
 
   std::string method;
   if (!args->GetNext(&method)) {
-    promise.RejectWithErrorMessage("Invalid method");
-    return handle;
+    args->ThrowError();
+    return;
   }
-
   base::DictionaryValue command_params;
   args->GetNext(&command_params);
+  SendCommandCallback callback;
+  args->GetNext(&callback);
 
   base::DictionaryValue request;
   int request_id = ++previous_request_id_;
-  pending_requests_.emplace(request_id, std::move(promise));
+  pending_requests_[request_id] = callback;
   request.SetInteger("id", request_id);
   request.SetString("method", method);
   if (!command_params.empty())
@@ -158,13 +151,16 @@ v8::Local<v8::Promise> Debugger::SendCommand(mate::Arguments* args) {
   std::string json_args;
   base::JSONWriter::Write(request, &json_args);
   agent_host_->DispatchProtocolMessage(this, json_args);
-
-  return handle;
 }
 
 void Debugger::ClearPendingRequests() {
-  for (auto& it : pending_requests_)
-    it.second.RejectWithErrorMessage("target closed while handling command");
+  if (pending_requests_.empty())
+    return;
+  base::Value error(base::Value::Type::DICTIONARY);
+  base::Value error_msg("target closed while handling command");
+  error.SetKey("message", std::move(error_msg));
+  for (const auto& it : pending_requests_)
+    it.second.Run(error, base::Value());
 }
 
 // static
@@ -198,11 +194,9 @@ void Initialize(v8::Local<v8::Object> exports,
                 void* priv) {
   v8::Isolate* isolate = context->GetIsolate();
   mate::Dictionary(isolate, exports)
-      .Set("Debugger", Debugger::GetConstructor(isolate)
-                           ->GetFunction(context)
-                           .ToLocalChecked());
+      .Set("Debugger", Debugger::GetConstructor(isolate)->GetFunction());
 }
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_debugger, Initialize);
+NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_browser_debugger, Initialize);

atom/browser/api/atom_api_debugger.h

@@ -9,7 +9,6 @@
 #include <string>
 
 #include "atom/browser/api/trackable_object.h"
-#include "atom/common/promise_util.h"
 #include "base/callback.h"
 #include "base/values.h"
 #include "content/public/browser/devtools_agent_host_client.h"
@@ -33,6 +32,9 @@ class Debugger : public mate::TrackableObject<Debugger>,
                  public content::DevToolsAgentHostClient,
                  public content::WebContentsObserver {
  public:
+  using SendCommandCallback =
+      base::Callback<void(const base::Value&, const base::Value&)>;
+
   static mate::Handle<Debugger> Create(v8::Isolate* isolate,
                                        content::WebContents* web_contents);
 
@@ -54,12 +56,12 @@ class Debugger : public mate::TrackableObject<Debugger>,
                               content::RenderFrameHost* new_rfh) override;
 
  private:
-  using PendingRequestMap = std::map<int, atom::util::Promise>;
+  using PendingRequestMap = std::map<int, SendCommandCallback>;
 
   void Attach(mate::Arguments* args);
   bool IsAttached();
   void Detach();
-  v8::Local<v8::Promise> SendCommand(mate::Arguments* args);
+  void SendCommand(mate::Arguments* args);
   void ClearPendingRequests();
 
   content::WebContents* web_contents_;  // Weak Reference.

atom/browser/api/atom_api_desktop_capturer.cc

@@ -14,7 +14,6 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_restrictions.h"
 #include "chrome/browser/media/webrtc/desktop_media_list.h"
-#include "chrome/browser/media/webrtc/window_icon_util.h"
 #include "content/public/browser/desktop_capture.h"
 #include "native_mate/dictionary.h"
 #include "third_party/webrtc/modules/desktop_capture/desktop_capture_options.h"
@@ -43,12 +42,6 @@ struct Converter<atom::api::DesktopCapturer::Source> {
              atom::api::NativeImage::Create(
                  isolate, gfx::Image(source.media_list_source.thumbnail)));
     dict.Set("display_id", source.display_id);
-    if (source.fetch_icon) {
-      dict.Set(
-          "appIcon",
-          atom::api::NativeImage::Create(
-              isolate, gfx::Image(GetWindowIcon(source.media_list_source.id))));
-    }
     return ConvertToV8(isolate, dict);
   }
 };
@@ -67,9 +60,7 @@ DesktopCapturer::~DesktopCapturer() {}
 
 void DesktopCapturer::StartHandling(bool capture_window,
                                     bool capture_screen,
-                                    const gfx::Size& thumbnail_size,
-                                    bool fetch_window_icons) {
-  fetch_window_icons_ = fetch_window_icons;
+                                    const gfx::Size& thumbnail_size) {
 #if defined(OS_WIN)
   if (content::desktop_capture::CreateDesktopCaptureOptions()
           .allow_directx_capturer()) {
@@ -88,6 +79,10 @@ void DesktopCapturer::StartHandling(bool capture_window,
   capture_screen_ = capture_screen;
 
   {
+    // Remove this once
+    // https://bugs.chromium.org/p/chromium/issues/detail?id=795340 is fixed.
+    base::ScopedAllowBaseSyncPrimitivesForTesting
+        scoped_allow_base_sync_primitives;
     // Initialize the source list.
     // Apply the new thumbnail size and restart capture.
     if (capture_window) {
@@ -139,8 +134,8 @@ void DesktopCapturer::UpdateSourcesList(DesktopMediaList* list) {
     capture_window_ = false;
     const auto& media_list_sources = list->GetSources();
     for (const auto& media_list_source : media_list_sources) {
-      window_sources.emplace_back(DesktopCapturer::Source{
-          media_list_source, std::string(), fetch_window_icons_});
+      window_sources.emplace_back(
+          DesktopCapturer::Source{media_list_source, std::string()});
     }
     std::move(window_sources.begin(), window_sources.end(),
               std::back_inserter(captured_sources_));
@@ -192,7 +187,7 @@ void DesktopCapturer::UpdateSourcesList(DesktopMediaList* list) {
   }
 
   if (!capture_window_ && !capture_screen_)
-    Emit("finished", captured_sources_, fetch_window_icons_);
+    Emit("finished", captured_sources_);
 }
 
 // static
@@ -226,4 +221,4 @@ void Initialize(v8::Local<v8::Object> exports,
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_desktop_capturer, Initialize);
+NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_browser_desktop_capturer, Initialize);

atom/browser/api/atom_api_desktop_capturer.h

@@ -9,7 +9,7 @@
 #include <string>
 #include <vector>
 
-#include "atom/browser/api/trackable_object.h"
+#include "atom/browser/api/event_emitter.h"
 #include "chrome/browser/media/webrtc/desktop_media_list_observer.h"
 #include "chrome/browser/media/webrtc/native_desktop_media_list.h"
 #include "native_mate/handle.h"
@@ -18,16 +18,13 @@ namespace atom {
 
 namespace api {
 
-class DesktopCapturer : public mate::TrackableObject<DesktopCapturer>,
+class DesktopCapturer : public mate::EventEmitter<DesktopCapturer>,
                         public DesktopMediaListObserver {
  public:
   struct Source {
     DesktopMediaList::Source media_list_source;
     // Will be an empty string if not available.
     std::string display_id;
-
-    // Whether or not this source should provide an icon.
-    bool fetch_icon = false;
   };
 
   static mate::Handle<DesktopCapturer> Create(v8::Isolate* isolate);
@@ -37,8 +34,7 @@ class DesktopCapturer : public mate::TrackableObject<DesktopCapturer>,
 
   void StartHandling(bool capture_window,
                      bool capture_screen,
-                     const gfx::Size& thumbnail_size,
-                     bool fetch_window_icons);
+                     const gfx::Size& thumbnail_size);
 
  protected:
   explicit DesktopCapturer(v8::Isolate* isolate);
@@ -63,7 +59,6 @@ class DesktopCapturer : public mate::TrackableObject<DesktopCapturer>,
   std::vector<DesktopCapturer::Source> captured_sources_;
   bool capture_window_ = false;
   bool capture_screen_ = false;
-  bool fetch_window_icons_ = false;
 #if defined(OS_WIN)
   bool using_directx_capturer_ = false;
 #endif  // defined(OS_WIN)

atom/browser/api/atom_api_dialog.cc

@@ -12,7 +12,6 @@
 #include "atom/browser/ui/file_dialog.h"
 #include "atom/browser/ui/message_box.h"
 #include "atom/common/native_mate_converters/callback.h"
-#include "atom/common/native_mate_converters/file_dialog_converter.h"
 #include "atom/common/native_mate_converters/file_path_converter.h"
 #include "atom/common/native_mate_converters/image_converter.h"
 #include "atom/common/native_mate_converters/net_converter.h"
@@ -20,6 +19,50 @@
 
 #include "atom/common/node_includes.h"
 
+namespace mate {
+
+template <>
+struct Converter<file_dialog::Filter> {
+  static bool FromV8(v8::Isolate* isolate,
+                     v8::Local<v8::Value> val,
+                     file_dialog::Filter* out) {
+    mate::Dictionary dict;
+    if (!ConvertFromV8(isolate, val, &dict))
+      return false;
+    if (!dict.Get("name", &(out->first)))
+      return false;
+    if (!dict.Get("extensions", &(out->second)))
+      return false;
+    return true;
+  }
+};
+
+template <>
+struct Converter<file_dialog::DialogSettings> {
+  static bool FromV8(v8::Isolate* isolate,
+                     v8::Local<v8::Value> val,
+                     file_dialog::DialogSettings* out) {
+    mate::Dictionary dict;
+    if (!ConvertFromV8(isolate, val, &dict))
+      return false;
+    dict.Get("window", &(out->parent_window));
+    dict.Get("title", &(out->title));
+    dict.Get("message", &(out->message));
+    dict.Get("buttonLabel", &(out->button_label));
+    dict.Get("nameFieldLabel", &(out->name_field_label));
+    dict.Get("defaultPath", &(out->default_path));
+    dict.Get("filters", &(out->filters));
+    dict.Get("properties", &(out->properties));
+    dict.Get("showsTagField", &(out->shows_tag_field));
+#if defined(MAS_BUILD)
+    dict.Get("securityScopedBookmarks", &(out->security_scoped_bookmarks));
+#endif
+    return true;
+  }
+};
+
+}  // namespace mate
+
 namespace {
 
 void ShowMessageBox(int type,
@@ -96,4 +139,4 @@ void Initialize(v8::Local<v8::Object> exports,
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_dialog, Initialize)
+NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_browser_dialog, Initialize)

atom/browser/api/atom_api_download_item.cc

@@ -8,7 +8,6 @@
 
 #include "atom/browser/atom_browser_main_parts.h"
 #include "atom/common/native_mate_converters/callback.h"
-#include "atom/common/native_mate_converters/file_dialog_converter.h"
 #include "atom/common/native_mate_converters/file_path_converter.h"
 #include "atom/common/native_mate_converters/gurl_converter.h"
 #include "base/strings/utf_string_conversions.h"
@@ -103,7 +102,7 @@ bool DownloadItem::IsPaused() const {
 }
 
 void DownloadItem::Resume() {
-  download_item_->Resume(true /* user_gesture */);
+  download_item_->Resume();
 }
 
 bool DownloadItem::CanResume() const {
@@ -166,15 +165,6 @@ base::FilePath DownloadItem::GetSavePath() const {
   return save_path_;
 }
 
-file_dialog::DialogSettings DownloadItem::GetSaveDialogOptions() const {
-  return dialog_options_;
-}
-
-void DownloadItem::SetSaveDialogOptions(
-    const file_dialog::DialogSettings& options) {
-  dialog_options_ = options;
-}
-
 std::string DownloadItem::GetLastModifiedTime() const {
   return download_item_->GetLastModifiedTime();
 }
@@ -210,8 +200,6 @@ void DownloadItem::BuildPrototype(v8::Isolate* isolate,
       .SetMethod("isDone", &DownloadItem::IsDone)
       .SetMethod("setSavePath", &DownloadItem::SetSavePath)
       .SetMethod("getSavePath", &DownloadItem::GetSavePath)
-      .SetMethod("setSaveDialogOptions", &DownloadItem::SetSaveDialogOptions)
-      .SetMethod("getSaveDialogOptions", &DownloadItem::GetSaveDialogOptions)
       .SetMethod("getLastModifiedTime", &DownloadItem::GetLastModifiedTime)
       .SetMethod("getETag", &DownloadItem::GetETag)
       .SetMethod("getStartTime", &DownloadItem::GetStartTime);
@@ -244,11 +232,10 @@ void Initialize(v8::Local<v8::Object> exports,
                 void* priv) {
   v8::Isolate* isolate = context->GetIsolate();
   mate::Dictionary(isolate, exports)
-      .Set("DownloadItem", atom::api::DownloadItem::GetConstructor(isolate)
-                               ->GetFunction(context)
-                               .ToLocalChecked());
+      .Set("DownloadItem",
+           atom::api::DownloadItem::GetConstructor(isolate)->GetFunction());
 }
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_download_item, Initialize);
+NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_browser_download_item, Initialize);

atom/browser/api/atom_api_download_item.h

@@ -9,7 +9,6 @@
 #include <vector>
 
 #include "atom/browser/api/trackable_object.h"
-#include "atom/browser/ui/file_dialog.h"
 #include "base/files/file_path.h"
 #include "components/download/public/common/download_item.h"
 #include "native_mate/handle.h"
@@ -45,8 +44,6 @@ class DownloadItem : public mate::TrackableObject<DownloadItem>,
   bool IsDone() const;
   void SetSavePath(const base::FilePath& path);
   base::FilePath GetSavePath() const;
-  file_dialog::DialogSettings GetSaveDialogOptions() const;
-  void SetSaveDialogOptions(const file_dialog::DialogSettings& options);
   std::string GetLastModifiedTime() const;
   std::string GetETag() const;
   double GetStartTime() const;
@@ -61,7 +58,6 @@ class DownloadItem : public mate::TrackableObject<DownloadItem>,
 
  private:
   base::FilePath save_path_;
-  file_dialog::DialogSettings dialog_options_;
   download::DownloadItem* download_item_;
 
   DISALLOW_COPY_AND_ASSIGN(DownloadItem);

atom/browser/api/atom_api_event.cc

@@ -23,4 +23,4 @@ void Initialize(v8::Local<v8::Object> exports,
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_event, Initialize)
+NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_browser_event, Initialize)

atom/browser/api/atom_api_global_shortcut.cc

@@ -5,7 +5,6 @@
 #include "atom/browser/api/atom_api_global_shortcut.h"
 
 #include <string>
-#include <vector>
 
 #include "atom/browser/api/atom_api_system_preferences.h"
 #include "atom/common/native_mate_converters/accelerator_converter.h"
@@ -68,29 +67,6 @@ void GlobalShortcut::OnKeyPressed(const ui::Accelerator& accelerator) {
   accelerator_callback_map_[accelerator].Run();
 }
 
-bool GlobalShortcut::RegisterAll(
-    const std::vector<ui::Accelerator>& accelerators,
-    const base::Closure& callback) {
-  std::vector<ui::Accelerator> registered;
-
-  for (auto& accelerator : accelerators) {
-#if defined(OS_MACOSX)
-    if (RegisteringMediaKeyForUntrustedClient(accelerator))
-      return false;
-
-    GlobalShortcutListener* listener = GlobalShortcutListener::GetInstance();
-    if (!listener->RegisterAccelerator(accelerator, this)) {
-      // unregister all shortcuts if any failed
-      UnregisterSome(registered);
-      return false;
-    }
-#endif
-    registered.push_back(accelerator);
-    accelerator_callback_map_[accelerator] = callback;
-  }
-  return true;
-}
-
 bool GlobalShortcut::Register(const ui::Accelerator& accelerator,
                               const base::Closure& callback) {
 #if defined(OS_MACOSX)
@@ -116,13 +92,6 @@ void GlobalShortcut::Unregister(const ui::Accelerator& accelerator) {
                                                                this);
 }
 
-void GlobalShortcut::UnregisterSome(
-    const std::vector<ui::Accelerator>& accelerators) {
-  for (auto& accelerator : accelerators) {
-    Unregister(accelerator);
-  }
-}
-
 bool GlobalShortcut::IsRegistered(const ui::Accelerator& accelerator) {
   return ContainsKey(accelerator_callback_map_, accelerator);
 }
@@ -142,7 +111,6 @@ void GlobalShortcut::BuildPrototype(v8::Isolate* isolate,
                                     v8::Local<v8::FunctionTemplate> prototype) {
   prototype->SetClassName(mate::StringToV8(isolate, "GlobalShortcut"));
   mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate())
-      .SetMethod("registerAll", &GlobalShortcut::RegisterAll)
       .SetMethod("register", &GlobalShortcut::Register)
       .SetMethod("isRegistered", &GlobalShortcut::IsRegistered)
       .SetMethod("unregister", &GlobalShortcut::Unregister)
@@ -166,4 +134,4 @@ void Initialize(v8::Local<v8::Object> exports,
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_global_shortcut, Initialize)
+NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_browser_global_shortcut, Initialize)

atom/browser/api/atom_api_global_shortcut.h

@@ -7,7 +7,6 @@
 
 #include <map>
 #include <string>
-#include <vector>
 
 #include "atom/browser/api/trackable_object.h"
 #include "base/callback.h"
@@ -34,13 +33,10 @@ class GlobalShortcut : public extensions::GlobalShortcutListener::Observer,
  private:
   typedef std::map<ui::Accelerator, base::Closure> AcceleratorCallbackMap;
 
-  bool RegisterAll(const std::vector<ui::Accelerator>& accelerators,
-                   const base::Closure& callback);
   bool Register(const ui::Accelerator& accelerator,
                 const base::Closure& callback);
   bool IsRegistered(const ui::Accelerator& accelerator);
   void Unregister(const ui::Accelerator& accelerator);
-  void UnregisterSome(const std::vector<ui::Accelerator>& accelerators);
   void UnregisterAll();
 
   // GlobalShortcutListener::Observer implementation.

atom/browser/api/atom_api_in_app_purchase.cc

@@ -132,12 +132,11 @@ void Initialize(v8::Local<v8::Object> exports,
   v8::Isolate* isolate = context->GetIsolate();
   mate::Dictionary dict(isolate, exports);
   dict.Set("inAppPurchase", InAppPurchase::Create(isolate));
-  dict.Set("InAppPurchase", InAppPurchase::GetConstructor(isolate)
-                                ->GetFunction(context)
-                                .ToLocalChecked());
+  dict.Set("InAppPurchase",
+           InAppPurchase::GetConstructor(isolate)->GetFunction());
 #endif
 }
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_in_app_purchase, Initialize)
+NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_browser_in_app_purchase, Initialize)

atom/browser/api/atom_api_menu.cc

@@ -90,7 +90,7 @@ void Menu::ExecuteCommand(int command_id, int flags) {
                        command_id);
 }
 
-void Menu::OnMenuWillShow(ui::SimpleMenuModel* source) {
+void Menu::MenuWillShow(ui::SimpleMenuModel* source) {
   v8::Locker locker(isolate());
   v8::HandleScope handle_scope(isolate());
   menu_will_show_.Run(GetWrapper());
@@ -233,9 +233,7 @@ void Initialize(v8::Local<v8::Object> exports,
   Menu::SetConstructor(isolate, base::Bind(&Menu::New));
 
   mate::Dictionary dict(isolate, exports);
-  dict.Set(
-      "Menu",
-      Menu::GetConstructor(isolate)->GetFunction(context).ToLocalChecked());
+  dict.Set("Menu", Menu::GetConstructor(isolate)->GetFunction());
 #if defined(OS_MACOSX)
   dict.SetMethod("setApplicationMenu", &Menu::SetApplicationMenu);
   dict.SetMethod("sendActionToFirstResponder",
@@ -245,4 +243,4 @@ void Initialize(v8::Local<v8::Object> exports,
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_menu, Initialize)
+NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_browser_menu, Initialize)

atom/browser/api/atom_api_menu.h

@@ -53,7 +53,7 @@ class Menu : public mate::TrackableObject<Menu>,
       ui::Accelerator* accelerator) const override;
   bool ShouldRegisterAcceleratorForCommandId(int command_id) const override;
   void ExecuteCommand(int command_id, int event_flags) override;
-  void OnMenuWillShow(ui::SimpleMenuModel* source) override;
+  void MenuWillShow(ui::SimpleMenuModel* source) override;
 
   virtual void PopupAt(TopLevelWindow* window,
                        int x,

atom/browser/api/atom_api_menu_mac.mm

@@ -9,8 +9,6 @@
 #include "base/mac/scoped_sending_event.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/sys_string_conversions.h"
-#include "base/task/post_task.h"
-#include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
 
@@ -45,7 +43,7 @@ void MenuMac::PopupAt(TopLevelWindow* window,
   auto popup = base::Bind(&MenuMac::PopupOnUI, weak_factory_.GetWeakPtr(),
                           native_window->GetWeakPtr(), window->weak_map_id(), x,
                           y, positioning_item, callback);
-  base::PostTaskWithTraits(FROM_HERE, {BrowserThread::UI}, popup);
+  BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, popup);
 }
 
 void MenuMac::PopupOnUI(const base::WeakPtr<NativeWindow>& native_window,
@@ -56,7 +54,7 @@ void MenuMac::PopupOnUI(const base::WeakPtr<NativeWindow>& native_window,
                         base::Closure callback) {
   if (!native_window)
     return;
-  NSWindow* nswindow = native_window->GetNativeWindow().GetNativeNSWindow();
+  NSWindow* nswindow = native_window->GetNativeWindow();
 
   auto close_callback = base::Bind(
       &MenuMac::OnClosed, weak_factory_.GetWeakPtr(), window_id, callback);
@@ -99,7 +97,7 @@ void MenuMac::PopupOnUI(const base::WeakPtr<NativeWindow>& native_window,
 
   [popup_controllers_[window_id] setCloseCallback:close_callback];
   // Make sure events can be pumped while the menu is up.
-  base::MessageLoopCurrent::ScopedNestableTaskAllower allow;
+  base::MessageLoop::ScopedNestableTaskAllower allow;
 
   // One of the events that could be pumped is |window.close()|.
   // User-initiated event-tracking loops protect against this by

atom/browser/api/atom_api_net.cc

@@ -31,9 +31,7 @@ void Net::BuildPrototype(v8::Isolate* isolate,
 }
 
 v8::Local<v8::Value> Net::URLRequest(v8::Isolate* isolate) {
-  return URLRequest::GetConstructor(isolate)
-      ->GetFunction(isolate->GetCurrentContext())
-      .ToLocalChecked();
+  return URLRequest::GetConstructor(isolate)->GetFunction();
 }
 
 }  // namespace api
@@ -55,10 +53,9 @@ void Initialize(v8::Local<v8::Object> exports,
 
   mate::Dictionary dict(isolate, exports);
   dict.Set("net", Net::Create(isolate));
-  dict.Set("Net",
-           Net::GetConstructor(isolate)->GetFunction(context).ToLocalChecked());
+  dict.Set("Net", Net::GetConstructor(isolate)->GetFunction());
 }
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_net, Initialize)
+NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_browser_net, Initialize)

atom/browser/api/atom_api_net_log.cc

@@ -7,11 +7,10 @@
 #include <utility>
 
 #include "atom/browser/atom_browser_context.h"
-#include "atom/browser/net/system_network_context_manager.h"
+#include "atom/browser/atom_browser_main_parts.h"
 #include "atom/common/native_mate_converters/callback.h"
 #include "atom/common/native_mate_converters/file_path_converter.h"
 #include "base/command_line.h"
-#include "chrome/browser/browser_process.h"
 #include "components/net_log/chrome_net_log.h"
 #include "content/public/browser/storage_partition.h"
 #include "native_mate/dictionary.h"
@@ -28,8 +27,8 @@ NetLog::NetLog(v8::Isolate* isolate, AtomBrowserContext* browser_context)
     : browser_context_(browser_context) {
   Init(isolate);
 
-  net_log_writer_ = g_browser_process->system_network_context_manager()
-                        ->GetNetExportFileWriter();
+  net_log_writer_ =
+      atom::AtomBrowserMainParts::Get()->net_log()->net_export_file_writer();
   net_log_writer_->AddObserver(this);
 }
 

atom/browser/api/atom_api_notification.cc

@@ -5,13 +5,13 @@
 #include "atom/browser/api/atom_api_notification.h"
 
 #include "atom/browser/api/atom_api_menu.h"
-#include "atom/browser/atom_browser_client.h"
 #include "atom/browser/browser.h"
 #include "atom/common/native_mate_converters/gfx_converter.h"
 #include "atom/common/native_mate_converters/image_converter.h"
 #include "atom/common/native_mate_converters/string16_converter.h"
 #include "base/guid.h"
 #include "base/strings/utf_string_conversions.h"
+#include "brightray/browser/browser_client.h"
 #include "native_mate/constructor.h"
 #include "native_mate/dictionary.h"
 #include "native_mate/object_template_builder.h"
@@ -22,10 +22,10 @@
 
 namespace mate {
 template <>
-struct Converter<atom::NotificationAction> {
+struct Converter<brightray::NotificationAction> {
   static bool FromV8(v8::Isolate* isolate,
                      v8::Local<v8::Value> val,
-                     atom::NotificationAction* out) {
+                     brightray::NotificationAction* out) {
     mate::Dictionary dict;
     if (!ConvertFromV8(isolate, val, &dict))
       return false;
@@ -38,7 +38,7 @@ struct Converter<atom::NotificationAction> {
   }
 
   static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
-                                   atom::NotificationAction val) {
+                                   brightray::NotificationAction val) {
     mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
     dict.Set("text", val.text);
     dict.Set("type", val.type);
@@ -56,8 +56,7 @@ Notification::Notification(v8::Isolate* isolate,
                            mate::Arguments* args) {
   InitWith(isolate, wrapper);
 
-  presenter_ = static_cast<AtomBrowserClient*>(AtomBrowserClient::Get())
-                   ->GetNotificationPresenter();
+  presenter_ = brightray::BrowserClient::Get()->GetNotificationPresenter();
 
   mate::Dictionary opts;
   if (args->GetNext(&opts)) {
@@ -120,7 +119,7 @@ base::string16 Notification::GetSound() const {
   return sound_;
 }
 
-std::vector<atom::NotificationAction> Notification::GetActions() const {
+std::vector<brightray::NotificationAction> Notification::GetActions() const {
   return actions_;
 }
 
@@ -158,7 +157,7 @@ void Notification::SetSound(const base::string16& new_sound) {
 }
 
 void Notification::SetActions(
-    const std::vector<atom::NotificationAction>& actions) {
+    const std::vector<brightray::NotificationAction>& actions) {
   actions_ = actions;
 }
 
@@ -201,7 +200,7 @@ void Notification::Show() {
   if (presenter_) {
     notification_ = presenter_->CreateNotification(this, base::GenerateGUID());
     if (notification_) {
-      atom::NotificationOptions options;
+      brightray::NotificationOptions options;
       options.title = title_;
       options.subtitle = subtitle_;
       options.msg = body_;
@@ -219,8 +218,7 @@ void Notification::Show() {
 }
 
 bool Notification::IsSupported() {
-  return !!static_cast<AtomBrowserClient*>(AtomBrowserClient::Get())
-               ->GetNotificationPresenter();
+  return !!brightray::BrowserClient::Get()->GetNotificationPresenter();
 }
 
 // static
@@ -263,13 +261,12 @@ void Initialize(v8::Local<v8::Object> exports,
   Notification::SetConstructor(isolate, base::Bind(&Notification::New));
 
   mate::Dictionary dict(isolate, exports);
-  dict.Set("Notification", Notification::GetConstructor(isolate)
-                               ->GetFunction(context)
-                               .ToLocalChecked());
+  dict.Set("Notification",
+           Notification::GetConstructor(isolate)->GetFunction());
 
   dict.SetMethod("isSupported", &Notification::IsSupported);
 }
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_common_notification, Initialize)
+NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_common_notification, Initialize)

atom/browser/api/atom_api_notification.h

@@ -10,10 +10,10 @@
 #include <vector>
 
 #include "atom/browser/api/trackable_object.h"
-#include "atom/browser/notifications/notification.h"
-#include "atom/browser/notifications/notification_delegate.h"
-#include "atom/browser/notifications/notification_presenter.h"
 #include "base/strings/utf_string_conversions.h"
+#include "brightray/browser/notification.h"
+#include "brightray/browser/notification_delegate.h"
+#include "brightray/browser/notification_presenter.h"
 #include "native_mate/handle.h"
 #include "ui/gfx/image/image.h"
 
@@ -22,7 +22,7 @@ namespace atom {
 namespace api {
 
 class Notification : public mate::TrackableObject<Notification>,
-                     public NotificationDelegate {
+                     public brightray::NotificationDelegate {
  public:
   static mate::WrappableBase* New(mate::Arguments* args);
   static bool IsSupported();
@@ -55,7 +55,7 @@ class Notification : public mate::TrackableObject<Notification>,
   bool GetHasReply() const;
   base::string16 GetReplyPlaceholder() const;
   base::string16 GetSound() const;
-  std::vector<atom::NotificationAction> GetActions() const;
+  std::vector<brightray::NotificationAction> GetActions() const;
   base::string16 GetCloseButtonText() const;
 
   // Prop Setters
@@ -66,7 +66,7 @@ class Notification : public mate::TrackableObject<Notification>,
   void SetHasReply(bool new_has_reply);
   void SetReplyPlaceholder(const base::string16& new_reply_placeholder);
   void SetSound(const base::string16& sound);
-  void SetActions(const std::vector<atom::NotificationAction>& actions);
+  void SetActions(const std::vector<brightray::NotificationAction>& actions);
   void SetCloseButtonText(const base::string16& text);
 
  private:
@@ -80,12 +80,12 @@ class Notification : public mate::TrackableObject<Notification>,
   bool has_reply_ = false;
   base::string16 reply_placeholder_;
   base::string16 sound_;
-  std::vector<atom::NotificationAction> actions_;
+  std::vector<brightray::NotificationAction> actions_;
   base::string16 close_button_text_;
 
-  atom::NotificationPresenter* presenter_;
+  brightray::NotificationPresenter* presenter_;
 
-  base::WeakPtr<atom::Notification> notification_;
+  base::WeakPtr<brightray::Notification> notification_;
 
   DISALLOW_COPY_AND_ASSIGN(Notification);
 };

atom/browser/api/atom_api_power_monitor.cc

@@ -84,19 +84,19 @@ void PowerMonitor::OnResume() {
   Emit("resume");
 }
 
-ui::IdleState PowerMonitor::QuerySystemIdleState(v8::Isolate* isolate,
-                                                 int idle_threshold) {
+void PowerMonitor::QuerySystemIdleState(v8::Isolate* isolate,
+                                        int idle_threshold,
+                                        const ui::IdleCallback& callback) {
   if (idle_threshold > 0) {
-    return ui::CalculateIdleState(idle_threshold);
+    ui::CalculateIdleState(idle_threshold, callback);
   } else {
     isolate->ThrowException(v8::Exception::TypeError(mate::StringToV8(
         isolate, "Invalid idle threshold, must be greater than 0")));
-    return ui::IDLE_STATE_UNKNOWN;
   }
 }
 
-int PowerMonitor::QuerySystemIdleTime() {
-  return ui::CalculateIdleTime();
+void PowerMonitor::QuerySystemIdleTime(const ui::IdleTimeCallback& callback) {
+  ui::CalculateIdleTime(callback);
 }
 
 // static
@@ -122,8 +122,8 @@ void PowerMonitor::BuildPrototype(v8::Isolate* isolate,
       .SetMethod("blockShutdown", &PowerMonitor::BlockShutdown)
       .SetMethod("unblockShutdown", &PowerMonitor::UnblockShutdown)
 #endif
-      .SetMethod("_querySystemIdleState", &PowerMonitor::QuerySystemIdleState)
-      .SetMethod("_querySystemIdleTime", &PowerMonitor::QuerySystemIdleTime);
+      .SetMethod("querySystemIdleState", &PowerMonitor::QuerySystemIdleState)
+      .SetMethod("querySystemIdleTime", &PowerMonitor::QuerySystemIdleTime);
 }
 
 }  // namespace api
@@ -141,11 +141,10 @@ void Initialize(v8::Local<v8::Object> exports,
   v8::Isolate* isolate = context->GetIsolate();
   mate::Dictionary dict(isolate, exports);
   dict.Set("powerMonitor", PowerMonitor::Create(isolate));
-  dict.Set("PowerMonitor", PowerMonitor::GetConstructor(isolate)
-                               ->GetFunction(context)
-                               .ToLocalChecked());
+  dict.Set("PowerMonitor",
+           PowerMonitor::GetConstructor(isolate)->GetFunction());
 }
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_power_monitor, Initialize)
+NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_browser_power_monitor, Initialize)

atom/browser/api/atom_api_power_monitor.h

@@ -46,8 +46,10 @@ class PowerMonitor : public mate::TrackableObject<PowerMonitor>,
   void OnResume() override;
 
  private:
-  ui::IdleState QuerySystemIdleState(v8::Isolate* isolate, int idle_threshold);
-  int QuerySystemIdleTime();
+  void QuerySystemIdleState(v8::Isolate* isolate,
+                            int idle_threshold,
+                            const ui::IdleCallback& callback);
+  void QuerySystemIdleTime(const ui::IdleTimeCallback& callback);
 
 #if defined(OS_WIN)
   // Static callback invoked when a message comes in to our messaging window.

atom/browser/api/atom_api_power_save_blocker.cc

@@ -6,13 +6,9 @@
 
 #include <string>
 
-#include "base/task/post_task.h"
+#include "base/task_scheduler/post_task.h"
 #include "base/threading/thread_task_runner_handle.h"
-#include "content/public/common/service_manager_connection.h"
 #include "native_mate/dictionary.h"
-#include "services/device/public/mojom/constants.mojom.h"
-#include "services/device/public/mojom/wake_lock_provider.mojom.h"
-#include "services/service_manager/public/cpp/connector.h"
 
 #include "atom/common/node_includes.h"
 
@@ -43,19 +39,16 @@ namespace atom {
 namespace api {
 
 PowerSaveBlocker::PowerSaveBlocker(v8::Isolate* isolate)
-    : current_lock_type_(device::mojom::WakeLockType::kPreventAppSuspension),
-      is_wake_lock_active_(false) {
+    : current_blocker_type_(
+          device::mojom::WakeLockType::kPreventAppSuspension) {
   Init(isolate);
 }
 
 PowerSaveBlocker::~PowerSaveBlocker() {}
 
 void PowerSaveBlocker::UpdatePowerSaveBlocker() {
-  if (wake_lock_types_.empty()) {
-    if (is_wake_lock_active_) {
-      GetWakeLock()->CancelWakeLock();
-      is_wake_lock_active_ = false;
-    }
+  if (power_save_blocker_types_.empty()) {
+    power_save_blocker_.reset();
     return;
   }
 
@@ -65,57 +58,45 @@ void PowerSaveBlocker::UpdatePowerSaveBlocker() {
   // higher precedence level than |WakeLockType::kPreventAppSuspension|.
   //
   // Only the highest-precedence blocker type takes effect.
-  device::mojom::WakeLockType new_lock_type =
+  device::mojom::WakeLockType new_blocker_type =
       device::mojom::WakeLockType::kPreventAppSuspension;
-  for (const auto& element : wake_lock_types_) {
+  for (const auto& element : power_save_blocker_types_) {
     if (element.second == device::mojom::WakeLockType::kPreventDisplaySleep) {
-      new_lock_type = device::mojom::WakeLockType::kPreventDisplaySleep;
+      new_blocker_type = device::mojom::WakeLockType::kPreventDisplaySleep;
       break;
     }
   }
 
-  if (current_lock_type_ != new_lock_type) {
-    GetWakeLock()->ChangeType(new_lock_type, base::DoNothing());
-    current_lock_type_ = new_lock_type;
+  if (!power_save_blocker_ || new_blocker_type != current_blocker_type_) {
+    auto new_blocker = std::make_unique<device::PowerSaveBlocker>(
+        new_blocker_type, device::mojom::WakeLockReason::kOther,
+        ATOM_PRODUCT_NAME, base::ThreadTaskRunnerHandle::Get(),
+        // This task runner may be used by some device service
+        // implementation bits to interface with dbus client code, which in
+        // turn imposes some subtle thread affinity on the clients. We
+        // therefore require a single-thread runner.
+        base::CreateSingleThreadTaskRunnerWithTraits(
+            {base::MayBlock(), base::TaskPriority::BACKGROUND}));
+    power_save_blocker_.swap(new_blocker);
+    current_blocker_type_ = new_blocker_type;
   }
-  if (!is_wake_lock_active_) {
-    GetWakeLock()->RequestWakeLock();
-    is_wake_lock_active_ = true;
-  }
-}
-
-device::mojom::WakeLock* PowerSaveBlocker::GetWakeLock() {
-  if (!wake_lock_) {
-    device::mojom::WakeLockProviderPtr wake_lock_provider;
-    DCHECK(content::ServiceManagerConnection::GetForProcess());
-    auto* connector =
-        content::ServiceManagerConnection::GetForProcess()->GetConnector();
-    connector->BindInterface(device::mojom::kServiceName,
-                             mojo::MakeRequest(&wake_lock_provider));
-
-    wake_lock_provider->GetWakeLockWithoutContext(
-        device::mojom::WakeLockType::kPreventAppSuspension,
-        device::mojom::WakeLockReason::kOther, ATOM_PRODUCT_NAME,
-        mojo::MakeRequest(&wake_lock_));
-  }
-  return wake_lock_.get();
 }
 
 int PowerSaveBlocker::Start(device::mojom::WakeLockType type) {
   static int count = 0;
-  wake_lock_types_[count] = type;
+  power_save_blocker_types_[count] = type;
   UpdatePowerSaveBlocker();
   return count++;
 }
 
 bool PowerSaveBlocker::Stop(int id) {
-  bool success = wake_lock_types_.erase(id) > 0;
+  bool success = power_save_blocker_types_.erase(id) > 0;
   UpdatePowerSaveBlocker();
   return success;
 }
 
 bool PowerSaveBlocker::IsStarted(int id) {
-  return wake_lock_types_.find(id) != wake_lock_types_.end();
+  return power_save_blocker_types_.find(id) != power_save_blocker_types_.end();
 }
 
 // static
@@ -151,4 +132,4 @@ void Initialize(v8::Local<v8::Object> exports,
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_power_save_blocker, Initialize);
+NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_browser_power_save_blocker, Initialize);

atom/browser/api/atom_api_power_save_blocker.h

@@ -10,7 +10,7 @@
 
 #include "atom/browser/api/trackable_object.h"
 #include "native_mate/handle.h"
-#include "services/device/public/mojom/wake_lock.mojom.h"
+#include "services/device/wake_lock/power_save_blocker/power_save_blocker.h"
 
 namespace mate {
 class Dictionary;
@@ -37,19 +37,14 @@ class PowerSaveBlocker : public mate::TrackableObject<PowerSaveBlocker> {
   bool Stop(int id);
   bool IsStarted(int id);
 
-  device::mojom::WakeLock* GetWakeLock();
+  std::unique_ptr<device::PowerSaveBlocker> power_save_blocker_;
 
-  // Current wake lock level.
-  device::mojom::WakeLockType current_lock_type_;
-
-  // Whether the wake lock is currently active.
-  bool is_wake_lock_active_;
+  // Current blocker type used by |power_save_blocker_|
+  device::mojom::WakeLockType current_blocker_type_;
 
   // Map from id to the corresponding blocker type for each request.
   using WakeLockTypeMap = std::map<int, device::mojom::WakeLockType>;
-  WakeLockTypeMap wake_lock_types_;
-
-  device::mojom::WakeLockPtr wake_lock_;
+  WakeLockTypeMap power_save_blocker_types_;
 
   DISALLOW_COPY_AND_ASSIGN(PowerSaveBlocker);
 };

atom/browser/api/atom_api_protocol.cc

@@ -24,119 +24,47 @@
 
 using content::BrowserThread;
 
+namespace atom {
+
+namespace api {
+
 namespace {
 
 // List of registered custom standard schemes.
 std::vector<std::string> g_standard_schemes;
 
-struct SchemeOptions {
-  bool standard = false;
-  bool secure = false;
-  bool bypassCSP = false;
-  bool allowServiceWorkers = false;
-  bool supportFetchAPI = false;
-  bool corsEnabled = false;
-};
-
-struct CustomScheme {
-  std::string scheme;
-  SchemeOptions options;
-};
-
 }  // namespace
 
-namespace mate {
-
-template <>
-struct Converter<CustomScheme> {
-  static bool FromV8(v8::Isolate* isolate,
-                     v8::Local<v8::Value> val,
-                     CustomScheme* out) {
-    mate::Dictionary dict;
-    if (!ConvertFromV8(isolate, val, &dict))
-      return false;
-    if (!dict.Get("scheme", &(out->scheme)))
-      return false;
-    mate::Dictionary opt;
-    // options are optional. Default values specified in SchemeOptions are used
-    if (dict.Get("privileges", &opt)) {
-      opt.Get("standard", &(out->options.standard));
-      opt.Get("supportFetchAPI", &(out->options.supportFetchAPI));
-      opt.Get("secure", &(out->options.secure));
-      opt.Get("bypassCSP", &(out->options.bypassCSP));
-      opt.Get("allowServiceWorkers", &(out->options.allowServiceWorkers));
-      opt.Get("supportFetchAPI", &(out->options.supportFetchAPI));
-      opt.Get("corsEnabled", &(out->options.corsEnabled));
-    }
-    return true;
-  }
-};
-
-}  // namespace mate
-
-namespace atom {
-
-namespace api {
-
 std::vector<std::string> GetStandardSchemes() {
   return g_standard_schemes;
 }
 
-void RegisterSchemesAsPrivileged(v8::Local<v8::Value> val,
-                                 mate::Arguments* args) {
-  std::vector<CustomScheme> custom_schemes;
-  if (!mate::ConvertFromV8(args->isolate(), val, &custom_schemes)) {
-    args->ThrowError("Argument must be an array of custom schemes.");
-    return;
+void RegisterStandardSchemes(const std::vector<std::string>& schemes,
+                             mate::Arguments* args) {
+  g_standard_schemes = schemes;
+
+  mate::Dictionary opts;
+  bool secure = false;
+  args->GetNext(&opts) && opts.Get("secure", &secure);
+
+  // Dynamically register the schemes.
+  auto* policy = content::ChildProcessSecurityPolicy::GetInstance();
+  for (const std::string& scheme : schemes) {
+    url::AddStandardScheme(scheme.c_str(), url::SCHEME_WITH_HOST);
+    if (secure) {
+      url::AddSecureScheme(scheme.c_str());
+    }
+    policy->RegisterWebSafeScheme(scheme);
   }
 
-  std::vector<std::string> secure_schemes, cspbypassing_schemes, fetch_schemes,
-      service_worker_schemes, cors_schemes;
-  for (const auto& custom_scheme : custom_schemes) {
-    // Register scheme to privileged list (https, wss, data, chrome-extension)
-    if (custom_scheme.options.standard) {
-      auto* policy = content::ChildProcessSecurityPolicy::GetInstance();
-      url::AddStandardScheme(custom_scheme.scheme.c_str(),
-                             url::SCHEME_WITH_HOST);
-      g_standard_schemes.push_back(custom_scheme.scheme);
-      policy->RegisterWebSafeScheme(custom_scheme.scheme);
-    }
-    if (custom_scheme.options.secure) {
-      secure_schemes.push_back(custom_scheme.scheme);
-      url::AddSecureScheme(custom_scheme.scheme.c_str());
-    }
-    if (custom_scheme.options.bypassCSP) {
-      cspbypassing_schemes.push_back(custom_scheme.scheme);
-      url::AddCSPBypassingScheme(custom_scheme.scheme.c_str());
-    }
-    if (custom_scheme.options.corsEnabled) {
-      cors_schemes.push_back(custom_scheme.scheme);
-      url::AddCorsEnabledScheme(custom_scheme.scheme.c_str());
-    }
-    if (custom_scheme.options.supportFetchAPI) {
-      fetch_schemes.push_back(custom_scheme.scheme);
-    }
-    if (custom_scheme.options.allowServiceWorkers) {
-      service_worker_schemes.push_back(custom_scheme.scheme);
-    }
-  }
-
-  const auto AppendSchemesToCmdLine = [](const char* switch_name,
-                                         std::vector<std::string> schemes) {
-    // Add the schemes to command line switches, so child processes can also
-    // register them.
+  // Add the schemes to command line switches, so child processes can also
+  // register them.
+  base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
+      atom::switches::kStandardSchemes, base::JoinString(schemes, ","));
+  if (secure) {
     base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
-        switch_name, base::JoinString(schemes, ","));
-  };
-
-  AppendSchemesToCmdLine(atom::switches::kSecureSchemes, secure_schemes);
-  AppendSchemesToCmdLine(atom::switches::kBypassCSPSchemes,
-                         cspbypassing_schemes);
-  AppendSchemesToCmdLine(atom::switches::kCORSSchemes, cors_schemes);
-  AppendSchemesToCmdLine(atom::switches::kFetchSchemes, fetch_schemes);
-  AppendSchemesToCmdLine(atom::switches::kServiceWorkerSchemes,
-                         service_worker_schemes);
-  AppendSchemesToCmdLine(atom::switches::kStandardSchemes, g_standard_schemes);
+        atom::switches::kSecureSchemes, base::JoinString(schemes, ","));
+  }
 }
 
 Protocol::Protocol(v8::Isolate* isolate, AtomBrowserContext* browser_context)
@@ -145,14 +73,20 @@ Protocol::Protocol(v8::Isolate* isolate, AtomBrowserContext* browser_context)
 }
 
 Protocol::~Protocol() {}
+
+void Protocol::RegisterServiceWorkerSchemes(
+    const std::vector<std::string>& schemes) {
+  atom::AtomBrowserClient::SetCustomServiceWorkerSchemes(schemes);
+}
+
 void Protocol::UnregisterProtocol(const std::string& scheme,
                                   mate::Arguments* args) {
   CompletionCallback callback;
   args->GetNext(&callback);
   auto* getter = static_cast<URLRequestContextGetter*>(
       browser_context_->GetRequestContext());
-  base::PostTaskWithTraitsAndReplyWithResult(
-      FROM_HERE, {content::BrowserThread::IO},
+  content::BrowserThread::PostTaskAndReplyWithResult(
+      content::BrowserThread::IO, FROM_HERE,
       base::BindOnce(&Protocol::UnregisterProtocolInIO,
                      base::RetainedRef(getter), scheme),
       base::BindOnce(&Protocol::OnIOCompleted, GetWeakPtr(), callback));
@@ -169,30 +103,22 @@ Protocol::ProtocolError Protocol::UnregisterProtocolInIO(
   return PROTOCOL_OK;
 }
 
-bool IsProtocolHandledInIO(
-    scoped_refptr<URLRequestContextGetter> request_context_getter,
-    const std::string& scheme) {
-  bool is_handled =
-      request_context_getter->job_factory()->IsHandledProtocol(scheme);
-  return is_handled;
-}
-
-void PromiseCallback(util::Promise promise, bool handled) {
-  promise.Resolve(handled);
-}
-
-v8::Local<v8::Promise> Protocol::IsProtocolHandled(const std::string& scheme) {
-  util::Promise promise(isolate());
-  v8::Local<v8::Promise> handle = promise.GetHandle();
+void Protocol::IsProtocolHandled(const std::string& scheme,
+                                 const BooleanCallback& callback) {
   auto* getter = static_cast<URLRequestContextGetter*>(
       browser_context_->GetRequestContext());
+  content::BrowserThread::PostTaskAndReplyWithResult(
+      content::BrowserThread::IO, FROM_HERE,
+      base::Bind(&Protocol::IsProtocolHandledInIO, base::RetainedRef(getter),
+                 scheme),
+      callback);
+}
 
-  base::PostTaskWithTraitsAndReplyWithResult(
-      FROM_HERE, {content::BrowserThread::IO},
-      base::BindOnce(&IsProtocolHandledInIO, base::RetainedRef(getter), scheme),
-      base::BindOnce(&PromiseCallback, std::move(promise)));
-
-  return handle;
+// static
+bool Protocol::IsProtocolHandledInIO(
+    scoped_refptr<URLRequestContextGetter> request_context_getter,
+    const std::string& scheme) {
+  return request_context_getter->job_factory()->IsHandledProtocol(scheme);
 }
 
 void Protocol::UninterceptProtocol(const std::string& scheme,
@@ -201,8 +127,8 @@ void Protocol::UninterceptProtocol(const std::string& scheme,
   args->GetNext(&callback);
   auto* getter = static_cast<URLRequestContextGetter*>(
       browser_context_->GetRequestContext());
-  base::PostTaskWithTraitsAndReplyWithResult(
-      FROM_HERE, {content::BrowserThread::IO},
+  content::BrowserThread::PostTaskAndReplyWithResult(
+      content::BrowserThread::IO, FROM_HERE,
       base::BindOnce(&Protocol::UninterceptProtocolInIO,
                      base::RetainedRef(getter), scheme),
       base::BindOnce(&Protocol::OnIOCompleted, GetWeakPtr(), callback));
@@ -262,6 +188,8 @@ void Protocol::BuildPrototype(v8::Isolate* isolate,
                               v8::Local<v8::FunctionTemplate> prototype) {
   prototype->SetClassName(mate::StringToV8(isolate, "Protocol"));
   mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate())
+      .SetMethod("registerServiceWorkerSchemes",
+                 &Protocol::RegisterServiceWorkerSchemes)
       .SetMethod("registerStringProtocol",
                  &Protocol::RegisterProtocol<URLRequestStringJob>)
       .SetMethod("registerBufferProtocol",
@@ -293,16 +221,16 @@ void Protocol::BuildPrototype(v8::Isolate* isolate,
 
 namespace {
 
-void RegisterSchemesAsPrivileged(v8::Local<v8::Value> val,
-                                 mate::Arguments* args) {
+void RegisterStandardSchemes(const std::vector<std::string>& schemes,
+                             mate::Arguments* args) {
   if (atom::Browser::Get()->is_ready()) {
     args->ThrowError(
-        "protocol.registerSchemesAsPrivileged should be called before "
+        "protocol.registerStandardSchemes should be called before "
         "app is ready");
     return;
   }
 
-  atom::api::RegisterSchemesAsPrivileged(val, args);
+  atom::api::RegisterStandardSchemes(schemes, args);
 }
 
 void Initialize(v8::Local<v8::Object> exports,
@@ -311,10 +239,10 @@ void Initialize(v8::Local<v8::Object> exports,
                 void* priv) {
   v8::Isolate* isolate = context->GetIsolate();
   mate::Dictionary dict(isolate, exports);
-  dict.SetMethod("registerSchemesAsPrivileged", &RegisterSchemesAsPrivileged);
+  dict.SetMethod("registerStandardSchemes", &RegisterStandardSchemes);
   dict.SetMethod("getStandardSchemes", &atom::api::GetStandardSchemes);
 }
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_protocol, Initialize)
+NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_browser_protocol, Initialize)

atom/browser/api/atom_api_protocol.h

@@ -14,11 +14,8 @@
 #include "atom/browser/api/trackable_object.h"
 #include "atom/browser/atom_browser_context.h"
 #include "atom/browser/net/atom_url_request_job_factory.h"
-#include "atom/common/promise_util.h"
 #include "base/callback.h"
 #include "base/memory/weak_ptr.h"
-#include "base/task/post_task.h"
-#include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
 #include "native_mate/arguments.h"
 #include "native_mate/dictionary.h"
@@ -34,15 +31,15 @@ namespace atom {
 namespace api {
 
 std::vector<std::string> GetStandardSchemes();
-
-void RegisterSchemesAsPrivileged(v8::Local<v8::Value> val,
-                                 mate::Arguments* args);
+void RegisterStandardSchemes(const std::vector<std::string>& schemes,
+                             mate::Arguments* args);
 
 class Protocol : public mate::TrackableObject<Protocol> {
  public:
   using Handler =
       base::Callback<void(const base::DictionaryValue&, v8::Local<v8::Value>)>;
   using CompletionCallback = base::Callback<void(v8::Local<v8::Value>)>;
+  using BooleanCallback = base::Callback<void(bool)>;
 
   static mate::Handle<Protocol> Create(v8::Isolate* isolate,
                                        AtomBrowserContext* browser_context);
@@ -95,6 +92,9 @@ class Protocol : public mate::TrackableObject<Protocol> {
     DISALLOW_COPY_AND_ASSIGN(CustomProtocolHandler);
   };
 
+  // Register schemes that can handle service worker.
+  void RegisterServiceWorkerSchemes(const std::vector<std::string>& schemes);
+
   // Register the protocol with certain request job.
   template <typename RequestJob>
   void RegisterProtocol(const std::string& scheme,
@@ -104,8 +104,8 @@ class Protocol : public mate::TrackableObject<Protocol> {
     args->GetNext(&callback);
     auto* getter = static_cast<URLRequestContextGetter*>(
         browser_context_->GetRequestContext());
-    base::PostTaskWithTraitsAndReplyWithResult(
-        FROM_HERE, {content::BrowserThread::IO},
+    content::BrowserThread::PostTaskAndReplyWithResult(
+        content::BrowserThread::IO, FROM_HERE,
         base::BindOnce(&Protocol::RegisterProtocolInIO<RequestJob>,
                        base::RetainedRef(getter), isolate(), scheme, handler),
         base::BindOnce(&Protocol::OnIOCompleted, GetWeakPtr(), callback));
@@ -134,7 +134,11 @@ class Protocol : public mate::TrackableObject<Protocol> {
       const std::string& scheme);
 
   // Whether the protocol has handler registered.
-  v8::Local<v8::Promise> IsProtocolHandled(const std::string& scheme);
+  void IsProtocolHandled(const std::string& scheme,
+                         const BooleanCallback& callback);
+  static bool IsProtocolHandledInIO(
+      scoped_refptr<URLRequestContextGetter> request_context_getter,
+      const std::string& scheme);
 
   // Replace the protocol handler with a new one.
   template <typename RequestJob>
@@ -145,8 +149,8 @@ class Protocol : public mate::TrackableObject<Protocol> {
     args->GetNext(&callback);
     auto* getter = static_cast<URLRequestContextGetter*>(
         browser_context_->GetRequestContext());
-    base::PostTaskWithTraitsAndReplyWithResult(
-        FROM_HERE, {content::BrowserThread::IO},
+    content::BrowserThread::PostTaskAndReplyWithResult(
+        content::BrowserThread::IO, FROM_HERE,
         base::BindOnce(&Protocol::InterceptProtocolInIO<RequestJob>,
                        base::RetainedRef(getter), isolate(), scheme, handler),
         base::BindOnce(&Protocol::OnIOCompleted, GetWeakPtr(), callback));

atom/browser/api/atom_api_render_process_preferences.cc

@@ -26,7 +26,7 @@ bool IsWebContents(v8::Isolate* isolate, content::RenderProcessHost* process) {
   if (!web_contents)
     return false;
 
-  auto api_web_contents = WebContents::FromOrCreate(isolate, web_contents);
+  auto api_web_contents = WebContents::CreateFrom(isolate, web_contents);
   auto type = api_web_contents->GetType();
   return type == WebContents::Type::BROWSER_WINDOW ||
          type == WebContents::Type::WEB_VIEW;
@@ -87,5 +87,5 @@ void Initialize(v8::Local<v8::Object> exports,
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_render_process_preferences,
-                                 Initialize)
+NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_browser_render_process_preferences,
+                                  Initialize)

atom/browser/api/atom_api_screen.cc

@@ -164,11 +164,9 @@ void Initialize(v8::Local<v8::Object> exports,
   v8::Isolate* isolate = context->GetIsolate();
   mate::Dictionary dict(isolate, exports);
   dict.Set("screen", Screen::Create(isolate));
-  dict.Set(
-      "Screen",
-      Screen::GetConstructor(isolate)->GetFunction(context).ToLocalChecked());
+  dict.Set("Screen", Screen::GetConstructor(isolate)->GetFunction());
 }
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_common_screen, Initialize)
+NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_common_screen, Initialize)

atom/browser/api/atom_api_session.cc

@@ -19,7 +19,6 @@
 #include "atom/browser/atom_browser_main_parts.h"
 #include "atom/browser/atom_permission_manager.h"
 #include "atom/browser/browser.h"
-#include "atom/browser/media/media_device_id_salt.h"
 #include "atom/browser/net/atom_cert_verifier.h"
 #include "atom/browser/session_preferences.h"
 #include "atom/common/native_mate_converters/callback.h"
@@ -32,7 +31,7 @@
 #include "base/guid.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
-#include "base/task/post_task.h"
+#include "brightray/browser/media/media_device_id_salt.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/common/pref_names.h"
 #include "components/download/public/common/download_danger_type.h"
@@ -40,7 +39,6 @@
 #include "components/prefs/value_map_pref_store.h"
 #include "components/proxy_config/proxy_config_dictionary.h"
 #include "components/proxy_config/proxy_config_pref_names.h"
-#include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/download_item_utils.h"
 #include "content/public/browser/download_manager_delegate.h"
@@ -61,6 +59,7 @@
 
 #include "atom/common/node_includes.h"
 
+using atom::api::Cookies;
 using content::BrowserThread;
 using content::StoragePartition;
 
@@ -212,12 +211,12 @@ std::map<uint32_t, v8::Global<v8::Object>> g_sessions;
 
 // Runs the callback in UI thread.
 void RunCallbackInUI(const base::Callback<void()>& callback) {
-  base::PostTaskWithTraits(FROM_HERE, {BrowserThread::UI}, callback);
+  BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, callback);
 }
 template <typename... T>
 void RunCallbackInUI(const base::Callback<void(T...)>& callback, T... result) {
-  base::PostTaskWithTraits(FROM_HERE, {BrowserThread::UI},
-                           base::BindOnce(callback, result...));
+  BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
+                          base::BindOnce(callback, result...));
 }
 
 // Callback of HttpCache::GetBackend.
@@ -360,7 +359,7 @@ void DestroyGlobalHandle(v8::Isolate* isolate,
   if (!global_handle.IsEmpty()) {
     v8::Local<v8::Value> local_handle = global_handle.Get(isolate);
     if (local_handle->IsObject()) {
-      v8::Local<v8::Object> object = local_handle->ToObject(isolate);
+      v8::Local<v8::Object> object = local_handle->ToObject();
       void* ptr = object->GetAlignedPointerFromInternalField(0);
       if (!ptr)
         return;
@@ -422,8 +421,8 @@ void Session::ResolveProxy(
 
 template <Session::CacheAction action>
 void Session::DoCacheAction(const net::CompletionCallback& callback) {
-  base::PostTaskWithTraits(
-      FROM_HERE, {BrowserThread::IO},
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
       base::BindOnce(&DoCacheActionInIO,
                      WrapRefCounted(browser_context_->GetRequestContext()),
                      action, callback));
@@ -441,11 +440,12 @@ void Session::ClearStorageData(mate::Arguments* args) {
   if (options.storage_types & StoragePartition::REMOVE_DATA_MASK_COOKIES) {
     // Reset media device id salt when cookies are cleared.
     // https://w3c.github.io/mediacapture-main/#dom-mediadeviceinfo-deviceid
-    MediaDeviceIDSalt::Reset(browser_context()->prefs());
+    brightray::MediaDeviceIDSalt::Reset(browser_context()->prefs());
   }
-  storage_partition->ClearData(options.storage_types, options.quota_types,
-                               options.origin, base::Time(), base::Time::Max(),
-                               base::Bind(&OnClearStorageDataDone, callback));
+  storage_partition->ClearData(
+      options.storage_types, options.quota_types, options.origin,
+      content::StoragePartition::OriginMatcherFunction(), base::Time(),
+      base::Time::Max(), base::Bind(&OnClearStorageDataDone, callback));
 }
 
 void Session::FlushStorageData() {
@@ -471,14 +471,13 @@ void Session::SetProxy(const mate::Dictionary& options,
   if (!pac_url.empty()) {
     browser_context_->in_memory_pref_store()->SetValue(
         proxy_config::prefs::kProxy,
-        std::make_unique<base::Value>(ProxyConfigDictionary::CreatePacScript(
-            pac_url, true /* pac_mandatory */)),
+        ProxyConfigDictionary::CreatePacScript(pac_url,
+                                               true /* pac_mandatory */),
         WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
   } else {
     browser_context_->in_memory_pref_store()->SetValue(
         proxy_config::prefs::kProxy,
-        std::make_unique<base::Value>(ProxyConfigDictionary::CreateFixedServers(
-            proxy_rules, bypass_list)),
+        ProxyConfigDictionary::CreateFixedServers(proxy_rules, bypass_list),
         WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
   }
 
@@ -533,8 +532,8 @@ void Session::SetCertVerifyProc(v8::Local<v8::Value> val,
     return;
   }
 
-  base::PostTaskWithTraits(
-      FROM_HERE, {BrowserThread::IO},
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
       base::BindOnce(&SetCertVerifyProcInIO,
                      WrapRefCounted(browser_context_->GetRequestContext()),
                      base::Bind(&WrapVerifyProc, proc)));
@@ -568,8 +567,8 @@ void Session::ClearHostResolverCache(mate::Arguments* args) {
   base::Closure callback;
   args->GetNext(&callback);
 
-  base::PostTaskWithTraits(
-      FROM_HERE, {BrowserThread::IO},
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
       base::BindOnce(&ClearHostResolverCacheInIO,
                      WrapRefCounted(browser_context_->GetRequestContext()),
                      callback));
@@ -584,16 +583,16 @@ void Session::ClearAuthCache(mate::Arguments* args) {
   base::Closure callback;
   args->GetNext(&callback);
 
-  base::PostTaskWithTraits(
-      FROM_HERE, {BrowserThread::IO},
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
       base::BindOnce(&ClearAuthCacheInIO,
                      WrapRefCounted(browser_context_->GetRequestContext()),
                      options, callback));
 }
 
 void Session::AllowNTLMCredentialsForDomains(const std::string& domains) {
-  base::PostTaskWithTraits(
-      FROM_HERE, {BrowserThread::IO},
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
       base::BindOnce(&AllowNTLMCredentialsForDomainsInIO,
                      WrapRefCounted(browser_context_->GetRequestContext()),
                      domains));
@@ -623,8 +622,8 @@ void Session::GetBlobData(const std::string& uuid,
     return;
 
   AtomBlobReader* blob_reader = browser_context()->GetBlobReader();
-  base::PostTaskWithTraits(
-      FROM_HERE, {BrowserThread::IO},
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
       base::BindOnce(&AtomBlobReader::StartReading,
                      base::Unretained(blob_reader), uuid, callback));
 }
@@ -784,8 +783,6 @@ void Session::BuildPrototype(v8::Isolate* isolate,
 
 namespace {
 
-using atom::api::Cookies;
-using atom::api::Protocol;
 using atom::api::Session;
 
 v8::Local<v8::Value> FromPartition(const std::string& partition,
@@ -805,18 +802,11 @@ void Initialize(v8::Local<v8::Object> exports,
                 void* priv) {
   v8::Isolate* isolate = context->GetIsolate();
   mate::Dictionary dict(isolate, exports);
-  dict.Set(
-      "Session",
-      Session::GetConstructor(isolate)->GetFunction(context).ToLocalChecked());
-  dict.Set(
-      "Cookies",
-      Cookies::GetConstructor(isolate)->GetFunction(context).ToLocalChecked());
-  dict.Set(
-      "Protocol",
-      Protocol::GetConstructor(isolate)->GetFunction(context).ToLocalChecked());
+  dict.Set("Session", Session::GetConstructor(isolate)->GetFunction());
+  dict.Set("Cookies", Cookies::GetConstructor(isolate)->GetFunction());
   dict.SetMethod("fromPartition", &FromPartition);
 }
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_session, Initialize)
+NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_browser_session, Initialize)

atom/browser/api/atom_api_system_preferences.cc

@@ -37,12 +37,6 @@ bool SystemPreferences::IsInvertedColorScheme() {
   return color_utils::IsInvertedColorScheme();
 }
 
-#if !defined(OS_WIN)
-bool SystemPreferences::IsHighContrastColorScheme() {
-  return false;
-}
-#endif  // !defined(OS_WIN)
-
 // static
 mate::Handle<SystemPreferences> SystemPreferences::Create(
     v8::Isolate* isolate) {
@@ -55,13 +49,10 @@ void SystemPreferences::BuildPrototype(
     v8::Local<v8::FunctionTemplate> prototype) {
   prototype->SetClassName(mate::StringToV8(isolate, "SystemPreferences"));
   mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate())
-#if defined(OS_WIN) || defined(OS_MACOSX)
-      .SetMethod("getColor", &SystemPreferences::GetColor)
-      .SetMethod("getAccentColor", &SystemPreferences::GetAccentColor)
-#endif
-
 #if defined(OS_WIN)
+      .SetMethod("getAccentColor", &SystemPreferences::GetAccentColor)
       .SetMethod("isAeroGlassEnabled", &SystemPreferences::IsAeroGlassEnabled)
+      .SetMethod("getColor", &SystemPreferences::GetColor)
 #elif defined(OS_MACOSX)
       .SetMethod("postNotification", &SystemPreferences::PostNotification)
       .SetMethod("subscribeNotification",
@@ -92,7 +83,6 @@ void SystemPreferences::BuildPrototype(
                  &SystemPreferences::GetAppLevelAppearance)
       .SetMethod("setAppLevelAppearance",
                  &SystemPreferences::SetAppLevelAppearance)
-      .SetMethod("getSystemColor", &SystemPreferences::GetSystemColor)
       .SetMethod("isTrustedAccessibilityClient",
                  &SystemPreferences::IsTrustedAccessibilityClient)
       .SetMethod("getMediaAccessStatus",
@@ -101,8 +91,6 @@ void SystemPreferences::BuildPrototype(
 #endif
       .SetMethod("isInvertedColorScheme",
                  &SystemPreferences::IsInvertedColorScheme)
-      .SetMethod("isHighContrastColorScheme",
-                 &SystemPreferences::IsHighContrastColorScheme)
       .SetMethod("isDarkMode", &SystemPreferences::IsDarkMode);
 }
 
@@ -121,11 +109,10 @@ void Initialize(v8::Local<v8::Object> exports,
   v8::Isolate* isolate = context->GetIsolate();
   mate::Dictionary dict(isolate, exports);
   dict.Set("systemPreferences", SystemPreferences::Create(isolate));
-  dict.Set("SystemPreferences", SystemPreferences::GetConstructor(isolate)
-                                    ->GetFunction(context)
-                                    .ToLocalChecked());
+  dict.Set("SystemPreferences",
+           SystemPreferences::GetConstructor(isolate)->GetFunction());
 }
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_system_preferences, Initialize);
+NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_browser_system_preferences, Initialize);

atom/browser/api/atom_api_system_preferences.h

@@ -49,13 +49,12 @@ class SystemPreferences : public mate::EventEmitter<SystemPreferences>
   static void BuildPrototype(v8::Isolate* isolate,
                              v8::Local<v8::FunctionTemplate> prototype);
 
-#if defined(OS_WIN) || defined(OS_MACOSX)
-  std::string GetAccentColor();
-  std::string GetColor(const std::string& color, mate::Arguments* args);
-#endif
 #if defined(OS_WIN)
   bool IsAeroGlassEnabled();
 
+  std::string GetAccentColor();
+  std::string GetColor(const std::string& color, mate::Arguments* args);
+
   void InitializeWindow();
 
   // gfx::SysColorChangeListener:
@@ -69,8 +68,7 @@ class SystemPreferences : public mate::EventEmitter<SystemPreferences>
       base::Callback<void(const std::string&, const base::DictionaryValue&)>;
 
   void PostNotification(const std::string& name,
-                        const base::DictionaryValue& user_info,
-                        mate::Arguments* args);
+                        const base::DictionaryValue& user_info);
   int SubscribeNotification(const std::string& name,
                             const NotificationCallback& callback);
   void UnsubscribeNotification(int id);
@@ -93,8 +91,6 @@ class SystemPreferences : public mate::EventEmitter<SystemPreferences>
   void RemoveUserDefault(const std::string& name);
   bool IsSwipeTrackingFromScrollEventsEnabled();
 
-  std::string GetSystemColor(const std::string& color, mate::Arguments* args);
-
   static bool IsTrustedAccessibilityClient(bool prompt);
 
   // TODO(codebytere): Write tests for these methods once we
@@ -112,13 +108,15 @@ class SystemPreferences : public mate::EventEmitter<SystemPreferences>
 #endif
   bool IsDarkMode();
   bool IsInvertedColorScheme();
-  bool IsHighContrastColorScheme();
 
  protected:
   explicit SystemPreferences(v8::Isolate* isolate);
   ~SystemPreferences() override;
 
 #if defined(OS_MACOSX)
+  void DoPostNotification(const std::string& name,
+                          const base::DictionaryValue& user_info,
+                          NotificationCenterKind kind);
   int DoSubscribeNotification(const std::string& name,
                               const NotificationCallback& callback,
                               NotificationCenterKind kind);
@@ -151,8 +149,6 @@ class SystemPreferences : public mate::EventEmitter<SystemPreferences>
 
   bool invertered_color_scheme_;
 
-  bool high_contrast_color_scheme_;
-
   std::unique_ptr<gfx::ScopedSysColorChangeListener> color_change_listener_;
 #endif
   DISALLOW_COPY_AND_ASSIGN(SystemPreferences);

atom/browser/api/atom_api_system_preferences_mac.mm

@@ -13,8 +13,6 @@
 #include "atom/browser/mac/dict_util.h"
 #include "atom/common/native_mate_converters/gurl_converter.h"
 #include "atom/common/native_mate_converters/value_converter.h"
-#include "base/mac/sdk_forward_declarations.h"
-#include "base/strings/stringprintf.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/values.h"
 #include "native_mate/object_template_builder.h"
@@ -106,35 +104,12 @@ std::string ConvertAuthorizationStatus(AVAuthorizationStatusMac status) {
   }
 }
 
-// Convert color to RGBA value like "aabbccdd"
-std::string ToRGBA(NSColor* color) {
-  return base::StringPrintf(
-      "%02X%02X%02X%02X", (int)(color.redComponent * 0xFF),
-      (int)(color.greenComponent * 0xFF), (int)(color.blueComponent * 0xFF),
-      (int)(color.alphaComponent * 0xFF));
-}
-
-// Convert color to RGB hex value like "#ABCDEF"
-std::string ToRGBHex(NSColor* color) {
-  return base::StringPrintf("#%02X%02X%02X", (int)(color.redComponent * 0xFF),
-                            (int)(color.greenComponent * 0xFF),
-                            (int)(color.blueComponent * 0xFF));
-}
-
 }  // namespace
 
-void SystemPreferences::PostNotification(const std::string& name,
-                                         const base::DictionaryValue& user_info,
-                                         mate::Arguments* args) {
-  bool immediate = false;
-  args->GetNext(&immediate);
-
-  NSDistributedNotificationCenter* center =
-      [NSDistributedNotificationCenter defaultCenter];
-  [center postNotificationName:base::SysUTF8ToNSString(name)
-                        object:nil
-                      userInfo:DictionaryValueToNSDictionary(user_info)
-            deliverImmediately:immediate];
+void SystemPreferences::PostNotification(
+    const std::string& name,
+    const base::DictionaryValue& user_info) {
+  DoPostNotification(name, user_info, kNSDistributedNotificationCenter);
 }
 
 int SystemPreferences::SubscribeNotification(
@@ -151,10 +126,7 @@ void SystemPreferences::UnsubscribeNotification(int request_id) {
 void SystemPreferences::PostLocalNotification(
     const std::string& name,
     const base::DictionaryValue& user_info) {
-  NSNotificationCenter* center = [NSNotificationCenter defaultCenter];
-  [center postNotificationName:base::SysUTF8ToNSString(name)
-                        object:nil
-                      userInfo:DictionaryValueToNSDictionary(user_info)];
+  DoPostNotification(name, user_info, kNSNotificationCenter);
 }
 
 int SystemPreferences::SubscribeLocalNotification(
@@ -170,11 +142,7 @@ void SystemPreferences::UnsubscribeLocalNotification(int request_id) {
 void SystemPreferences::PostWorkspaceNotification(
     const std::string& name,
     const base::DictionaryValue& user_info) {
-  NSNotificationCenter* center =
-      [[NSWorkspace sharedWorkspace] notificationCenter];
-  [center postNotificationName:base::SysUTF8ToNSString(name)
-                        object:nil
-                      userInfo:DictionaryValueToNSDictionary(user_info)];
+  DoPostNotification(name, user_info, kNSWorkspaceNotificationCenter);
 }
 
 int SystemPreferences::SubscribeWorkspaceNotification(
@@ -188,6 +156,29 @@ void SystemPreferences::UnsubscribeWorkspaceNotification(int request_id) {
   DoUnsubscribeNotification(request_id, kNSWorkspaceNotificationCenter);
 }
 
+void SystemPreferences::DoPostNotification(
+    const std::string& name,
+    const base::DictionaryValue& user_info,
+    NotificationCenterKind kind) {
+  NSNotificationCenter* center;
+  switch (kind) {
+    case kNSDistributedNotificationCenter:
+      center = [NSDistributedNotificationCenter defaultCenter];
+      break;
+    case kNSNotificationCenter:
+      center = [NSNotificationCenter defaultCenter];
+      break;
+    case kNSWorkspaceNotificationCenter:
+      center = [[NSWorkspace sharedWorkspace] notificationCenter];
+      break;
+    default:
+      break;
+  }
+  [center postNotificationName:base::SysUTF8ToNSString(name)
+                        object:nil
+                      userInfo:DictionaryValueToNSDictionary(user_info)];
+}
+
 int SystemPreferences::DoSubscribeNotification(
     const std::string& name,
     const NotificationCallback& callback,
@@ -395,133 +386,12 @@ void SystemPreferences::SetUserDefault(const std::string& name,
   }
 }
 
-std::string SystemPreferences::GetAccentColor() {
-  NSColor* sysColor = nil;
-  if (@available(macOS 10.14, *))
-    sysColor = [NSColor controlAccentColor];
-
-  return ToRGBA(sysColor);
-}
-
-std::string SystemPreferences::GetSystemColor(const std::string& color,
-                                              mate::Arguments* args) {
-  NSColor* sysColor = nil;
-  if (color == "blue") {
-    sysColor = [NSColor systemBlueColor];
-  } else if (color == "brown") {
-    sysColor = [NSColor systemBrownColor];
-  } else if (color == "gray") {
-    sysColor = [NSColor systemGrayColor];
-  } else if (color == "green") {
-    sysColor = [NSColor systemGreenColor];
-  } else if (color == "orange") {
-    sysColor = [NSColor systemOrangeColor];
-  } else if (color == "pink") {
-    sysColor = [NSColor systemPinkColor];
-  } else if (color == "purple") {
-    sysColor = [NSColor systemPurpleColor];
-  } else if (color == "red") {
-    sysColor = [NSColor systemRedColor];
-  } else if (color == "yellow") {
-    sysColor = [NSColor systemYellowColor];
-  } else {
-    args->ThrowError("Unknown system color: " + color);
-    return "";
-  }
-
-  return ToRGBHex(sysColor);
-}
-
 // static
 bool SystemPreferences::IsTrustedAccessibilityClient(bool prompt) {
   NSDictionary* options = @{(id)kAXTrustedCheckOptionPrompt : @(prompt)};
   return AXIsProcessTrustedWithOptions((CFDictionaryRef)options);
 }
 
-std::string SystemPreferences::GetColor(const std::string& color,
-                                        mate::Arguments* args) {
-  NSColor* sysColor = nil;
-  if (color == "alternate-selected-control-text") {
-    sysColor = [NSColor alternateSelectedControlTextColor];
-  } else if (color == "control-background") {
-    sysColor = [NSColor controlBackgroundColor];
-  } else if (color == "control") {
-    sysColor = [NSColor controlColor];
-  } else if (color == "control-text") {
-    sysColor = [NSColor controlTextColor];
-  } else if (color == "disabled-control") {
-    sysColor = [NSColor disabledControlTextColor];
-  } else if (color == "find-highlight") {
-    if (@available(macOS 10.14, *))
-      sysColor = [NSColor findHighlightColor];
-  } else if (color == "grid") {
-    sysColor = [NSColor gridColor];
-  } else if (color == "header-text") {
-    sysColor = [NSColor headerTextColor];
-  } else if (color == "highlight") {
-    sysColor = [NSColor highlightColor];
-  } else if (color == "keyboard-focus-indicator") {
-    sysColor = [NSColor keyboardFocusIndicatorColor];
-  } else if (color == "label") {
-    sysColor = [NSColor labelColor];
-  } else if (color == "link") {
-    sysColor = [NSColor linkColor];
-  } else if (color == "placeholder-text") {
-    sysColor = [NSColor placeholderTextColor];
-  } else if (color == "quaternary-label") {
-    sysColor = [NSColor quaternaryLabelColor];
-  } else if (color == "scrubber-textured-background") {
-    if (@available(macOS 10.12.2, *))
-      sysColor = [NSColor scrubberTexturedBackgroundColor];
-  } else if (color == "secondary-label") {
-    sysColor = [NSColor secondaryLabelColor];
-  } else if (color == "selected-content-background") {
-    if (@available(macOS 10.14, *))
-      sysColor = [NSColor selectedContentBackgroundColor];
-  } else if (color == "selected-control") {
-    sysColor = [NSColor selectedControlColor];
-  } else if (color == "selected-control-text") {
-    sysColor = [NSColor selectedControlTextColor];
-  } else if (color == "selected-menu-item-text") {
-    sysColor = [NSColor selectedMenuItemTextColor];
-  } else if (color == "selected-text-background") {
-    sysColor = [NSColor selectedTextBackgroundColor];
-  } else if (color == "selected-text") {
-    sysColor = [NSColor selectedTextColor];
-  } else if (color == "separator") {
-    if (@available(macOS 10.14, *))
-      sysColor = [NSColor separatorColor];
-  } else if (color == "shadow") {
-    sysColor = [NSColor shadowColor];
-  } else if (color == "tertiary-label") {
-    sysColor = [NSColor tertiaryLabelColor];
-  } else if (color == "text-background") {
-    sysColor = [NSColor textBackgroundColor];
-  } else if (color == "text") {
-    sysColor = [NSColor textColor];
-  } else if (color == "under-page-background") {
-    sysColor = [NSColor underPageBackgroundColor];
-  } else if (color == "unemphasized-selected-content-background") {
-    if (@available(macOS 10.14, *))
-      sysColor = [NSColor unemphasizedSelectedContentBackgroundColor];
-  } else if (color == "unemphasized-selected-text-background") {
-    if (@available(macOS 10.14, *))
-      sysColor = [NSColor unemphasizedSelectedTextBackgroundColor];
-  } else if (color == "unemphasized-selected-text") {
-    if (@available(macOS 10.14, *))
-      sysColor = [NSColor unemphasizedSelectedTextColor];
-  } else if (color == "window-background") {
-    sysColor = [NSColor windowBackgroundColor];
-  } else if (color == "window-frame-text") {
-    sysColor = [NSColor windowFrameTextColor];
-  } else {
-    args->ThrowError("Unknown color: " + color);
-    return "";
-  }
-
-  return ToRGBHex(sysColor);
-}
-
 std::string SystemPreferences::GetMediaAccessStatus(
     const std::string& media_type,
     mate::Arguments* args) {
@@ -542,27 +412,25 @@ std::string SystemPreferences::GetMediaAccessStatus(
 v8::Local<v8::Promise> SystemPreferences::AskForMediaAccess(
     v8::Isolate* isolate,
     const std::string& media_type) {
-  util::Promise promise(isolate);
-  v8::Local<v8::Promise> handle = promise.GetHandle();
+  scoped_refptr<util::Promise> promise = new util::Promise(isolate);
 
   if (auto type = ParseMediaType(media_type)) {
     if (@available(macOS 10.14, *)) {
-      __block util::Promise p = std::move(promise);
       [AVCaptureDevice requestAccessForMediaType:type
                                completionHandler:^(BOOL granted) {
                                  dispatch_async(dispatch_get_main_queue(), ^{
-                                   p.Resolve(!!granted);
+                                   promise->Resolve(!!granted);
                                  });
                                }];
     } else {
       // access always allowed pre-10.14 Mojave
-      promise.Resolve(true);
+      promise->Resolve(true);
     }
   } else {
-    promise.RejectWithErrorMessage("Invalid media type");
+    promise->RejectWithErrorMessage("Invalid media type");
   }
 
-  return handle;
+  return promise->GetHandle();
 }
 
 void SystemPreferences::RemoveUserDefault(const std::string& name) {

atom/browser/api/atom_api_system_preferences_win.cc

@@ -20,18 +20,6 @@ namespace {
 const wchar_t kSystemPreferencesWindowClass[] =
     L"Electron_SystemPreferencesHostWindow";
 
-bool g_is_high_contract_color_scheme = false;
-bool g_is_high_contract_color_scheme_initialized = false;
-
-void UpdateHighContrastColorScheme() {
-  HIGHCONTRAST high_contrast = {0};
-  high_contrast.cbSize = sizeof(HIGHCONTRAST);
-  g_is_high_contract_color_scheme =
-      SystemParametersInfo(SPI_GETHIGHCONTRAST, 0, &high_contrast, 0) &&
-      ((high_contrast.dwFlags & HCF_HIGHCONTRASTON) != 0);
-  g_is_high_contract_color_scheme_initialized = true;
-}
-
 }  // namespace
 
 namespace api {
@@ -40,12 +28,6 @@ bool SystemPreferences::IsAeroGlassEnabled() {
   return ui::win::IsAeroGlassEnabled();
 }
 
-bool SystemPreferences::IsHighContrastColorScheme() {
-  if (!g_is_high_contract_color_scheme_initialized)
-    UpdateHighContrastColorScheme();
-  return g_is_high_contract_color_scheme;
-}
-
 std::string hexColorDWORDToRGBA(DWORD color) {
   DWORD rgba = color << 8 | color >> 24;
   std::ostringstream stream;
@@ -137,7 +119,6 @@ std::string SystemPreferences::GetColor(const std::string& color,
 
 void SystemPreferences::InitializeWindow() {
   invertered_color_scheme_ = IsInvertedColorScheme();
-  high_contrast_color_scheme_ = IsHighContrastColorScheme();
 
   // Wait until app is ready before creating sys color listener
   // Creating this listener before the app is ready causes global shortcuts
@@ -188,9 +169,6 @@ LRESULT CALLBACK SystemPreferences::WndProc(HWND hwnd,
       Emit("accent-color-changed", hexColorDWORDToRGBA(new_color));
       current_color_ = new_color_string;
     }
-  } else if (message == WM_SYSCOLORCHANGE ||
-             (message == WM_SETTINGCHANGE && wparam == SPI_SETHIGHCONTRAST)) {
-    UpdateHighContrastColorScheme();
   }
   return ::DefWindowProc(hwnd, message, wparam, lparam);
 }
@@ -201,13 +179,6 @@ void SystemPreferences::OnSysColorChange() {
     invertered_color_scheme_ = new_invertered_color_scheme;
     Emit("inverted-color-scheme-changed", new_invertered_color_scheme);
   }
-
-  bool new_high_contrast_color_scheme = IsHighContrastColorScheme();
-  if (new_high_contrast_color_scheme != high_contrast_color_scheme_) {
-    high_contrast_color_scheme_ = new_high_contrast_color_scheme;
-    Emit("high-contrast-color-scheme-changed", new_high_contrast_color_scheme);
-  }
-
   Emit("color-changed");
 }
 

atom/browser/api/atom_api_top_level_window.cc

@@ -20,7 +20,6 @@
 #include "atom/common/native_mate_converters/value_converter.h"
 #include "atom/common/options_switches.h"
 #include "electron/buildflags/buildflags.h"
-#include "gin/converter.h"
 #include "native_mate/handle.h"
 #include "native_mate/persistent_dictionary.h"
 
@@ -159,7 +158,7 @@ void TopLevelWindow::OnWindowClosed() {
   Emit("closed");
 
   RemoveFromParentChildWindows();
-  TopLevelWindow::ResetBrowserViews();
+  ResetBrowserView();
 
   // Destroy the native class when window is closed.
   base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, GetDestroyClosure());
@@ -267,7 +266,7 @@ void TopLevelWindow::OnWindowAlwaysOnTopChanged() {
   Emit("always-on-top-changed", IsAlwaysOnTop());
 }
 
-void TopLevelWindow::OnExecuteAppCommand(const std::string& command_name) {
+void TopLevelWindow::OnExecuteWindowsCommand(const std::string& command_name) {
   Emit("app-command", command_name);
 }
 
@@ -294,7 +293,6 @@ void TopLevelWindow::OnWindowMessage(UINT message,
 #endif
 
 void TopLevelWindow::SetContentView(mate::Handle<View> view) {
-  ResetBrowserViews();
   content_view_.Reset(isolate(), view.ToV8());
   window_->SetContentView(view->view());
 }
@@ -645,8 +643,7 @@ void TopLevelWindow::SetFocusable(bool focusable) {
 void TopLevelWindow::SetMenu(v8::Isolate* isolate, v8::Local<v8::Value> value) {
   mate::Handle<Menu> menu;
   if (value->IsObject() &&
-      gin::V8ToString(
-          isolate, value->ToObject(isolate)->GetConstructorName()) == "Menu" &&
+      mate::V8ToString(value->ToObject()->GetConstructorName()) == "Menu" &&
       mate::ConvertFromV8(isolate, value, &menu) && !menu.IsEmpty()) {
     menu_.Reset(isolate, menu.ToV8());
     window_->SetMenu(menu->model());
@@ -659,11 +656,6 @@ void TopLevelWindow::SetMenu(v8::Isolate* isolate, v8::Local<v8::Value> value) {
   }
 }
 
-void TopLevelWindow::RemoveMenu() {
-  menu_.Reset();
-  window_->SetMenu(nullptr);
-}
-
 void TopLevelWindow::SetParentWindow(v8::Local<v8::Value> value,
                                      mate::Arguments* args) {
   if (IsModal()) {
@@ -677,7 +669,6 @@ void TopLevelWindow::SetParentWindow(v8::Local<v8::Value> value,
     parent_window_.Reset();
     window_->SetParentWindow(nullptr);
   } else if (mate::ConvertFromV8(isolate(), value, &parent)) {
-    RemoveFromParentChildWindows();
     parent_window_.Reset(isolate(), value);
     window_->SetParentWindow(parent->window_.get());
     parent->child_windows_.Set(isolate(), weak_map_id(), GetWrapper());
@@ -687,37 +678,18 @@ void TopLevelWindow::SetParentWindow(v8::Local<v8::Value> value,
 }
 
 void TopLevelWindow::SetBrowserView(v8::Local<v8::Value> value) {
-  ResetBrowserViews();
-  AddBrowserView(value);
-}
+  ResetBrowserView();
 
-void TopLevelWindow::AddBrowserView(v8::Local<v8::Value> value) {
   mate::Handle<BrowserView> browser_view;
-  if (value->IsObject() &&
-      mate::ConvertFromV8(isolate(), value, &browser_view)) {
-    auto get_that_view = browser_views_.find(browser_view->weak_map_id());
-    if (get_that_view == browser_views_.end()) {
-      window_->AddBrowserView(browser_view->view());
-      browser_view->web_contents()->SetOwnerWindow(window_.get());
-      browser_views_[browser_view->weak_map_id()].Reset(isolate(), value);
-    }
+  if (value->IsNull() || value->IsUndefined()) {
+    window_->SetBrowserView(nullptr);
+  } else if (mate::ConvertFromV8(isolate(), value, &browser_view)) {
+    window_->SetBrowserView(browser_view->view());
+    browser_view->web_contents()->SetOwnerWindow(window_.get());
+    browser_view_.Reset(isolate(), value);
   }
 }
 
-void TopLevelWindow::RemoveBrowserView(v8::Local<v8::Value> value) {
-  mate::Handle<BrowserView> browser_view;
-  if (value->IsObject() &&
-      mate::ConvertFromV8(isolate(), value, &browser_view)) {
-    auto get_that_view = browser_views_.find(browser_view->weak_map_id());
-    if (get_that_view != browser_views_.end()) {
-      window_->RemoveBrowserView(browser_view->view());
-      browser_view->web_contents()->SetOwnerWindow(nullptr);
-
-      (*get_that_view).second.Reset(isolate(), value);
-      browser_views_.erase(get_that_view);
-    }
-  }
-}
 v8::Local<v8::Value> TopLevelWindow::GetNativeWindowHandle() {
   // TODO(MarshallOfSound): Replace once
   // https://chromium-review.googlesource.com/c/chromium/src/+/1253094/ has
@@ -768,7 +740,7 @@ void TopLevelWindow::SetAutoHideCursor(bool auto_hide) {
 
 void TopLevelWindow::SetVibrancy(v8::Isolate* isolate,
                                  v8::Local<v8::Value> value) {
-  std::string type = gin::V8ToString(isolate, value);
+  std::string type = mate::V8ToString(value);
   window_->SetVibrancy(type);
 }
 
@@ -872,29 +844,12 @@ std::vector<v8::Local<v8::Object>> TopLevelWindow::GetChildWindows() const {
   return child_windows_.Values(isolate());
 }
 
-v8::Local<v8::Value> TopLevelWindow::GetBrowserView(
-    mate::Arguments* args) const {
-  if (browser_views_.size() == 0) {
-    return v8::Null(isolate());
-  } else if (browser_views_.size() == 1) {
-    auto first_view = browser_views_.begin();
-    return v8::Local<v8::Value>::New(isolate(), (*first_view).second);
-  } else {
-    args->ThrowError(
-        "BrowserWindow have multiple BrowserViews, "
-        "Use getBrowserViews() instead");
+v8::Local<v8::Value> TopLevelWindow::GetBrowserView() const {
+  if (browser_view_.IsEmpty()) {
     return v8::Null(isolate());
   }
-}
 
-std::vector<v8::Local<v8::Value>> TopLevelWindow::GetBrowserViews() const {
-  std::vector<v8::Local<v8::Value>> ret;
-
-  for (auto const& views_iter : browser_views_) {
-    ret.push_back(v8::Local<v8::Value>::New(isolate(), views_iter.second));
-  }
-
-  return ret;
+  return v8::Local<v8::Value>::New(isolate(), browser_view_);
 }
 
 bool TopLevelWindow::IsModal() const {
@@ -986,21 +941,17 @@ int32_t TopLevelWindow::GetID() const {
   return weak_map_id();
 }
 
-void TopLevelWindow::ResetBrowserViews() {
-  for (auto& item : browser_views_) {
-    mate::Handle<BrowserView> browser_view;
-    if (mate::ConvertFromV8(isolate(),
-                            v8::Local<v8::Value>::New(isolate(), item.second),
-                            &browser_view) &&
-        !browser_view.IsEmpty()) {
-      window_->RemoveBrowserView(browser_view->view());
-      browser_view->web_contents()->SetOwnerWindow(nullptr);
-    }
+void TopLevelWindow::ResetBrowserView() {
+  if (browser_view_.IsEmpty())
+    return;
 
-    item.second.Reset();
+  mate::Handle<BrowserView> browser_view;
+  if (mate::ConvertFromV8(isolate(), GetBrowserView(), &browser_view) &&
+      !browser_view.IsEmpty()) {
+    browser_view->web_contents()->SetOwnerWindow(nullptr);
   }
 
-  browser_views_.clear();
+  browser_view_.Reset();
 }
 
 void TopLevelWindow::RemoveFromParentChildWindows() {
@@ -1108,11 +1059,10 @@ void TopLevelWindow::BuildPrototype(v8::Isolate* isolate,
       .SetMethod("setContentProtection", &TopLevelWindow::SetContentProtection)
       .SetMethod("setFocusable", &TopLevelWindow::SetFocusable)
       .SetMethod("setMenu", &TopLevelWindow::SetMenu)
-      .SetMethod("removeMenu", &TopLevelWindow::RemoveMenu)
+#if !defined(OS_WIN)
       .SetMethod("setParentWindow", &TopLevelWindow::SetParentWindow)
+#endif
       .SetMethod("setBrowserView", &TopLevelWindow::SetBrowserView)
-      .SetMethod("addBrowserView", &TopLevelWindow::AddBrowserView)
-      .SetMethod("removeBrowserView", &TopLevelWindow::RemoveBrowserView)
       .SetMethod("getNativeWindowHandle",
                  &TopLevelWindow::GetNativeWindowHandle)
       .SetMethod("setProgressBar", &TopLevelWindow::SetProgressBar)
@@ -1150,7 +1100,6 @@ void TopLevelWindow::BuildPrototype(v8::Isolate* isolate,
       .SetMethod("getParentWindow", &TopLevelWindow::GetParentWindow)
       .SetMethod("getChildWindows", &TopLevelWindow::GetChildWindows)
       .SetMethod("getBrowserView", &TopLevelWindow::GetBrowserView)
-      .SetMethod("getBrowserViews", &TopLevelWindow::GetBrowserViews)
       .SetMethod("isModal", &TopLevelWindow::IsModal)
       .SetMethod("setThumbarButtons", &TopLevelWindow::SetThumbarButtons)
 #if defined(TOOLKIT_VIEWS)
@@ -1185,9 +1134,8 @@ void Initialize(v8::Local<v8::Object> exports,
   v8::Isolate* isolate = context->GetIsolate();
   TopLevelWindow::SetConstructor(isolate, base::Bind(&TopLevelWindow::New));
 
-  mate::Dictionary constructor(isolate, TopLevelWindow::GetConstructor(isolate)
-                                            ->GetFunction(context)
-                                            .ToLocalChecked());
+  mate::Dictionary constructor(
+      isolate, TopLevelWindow::GetConstructor(isolate)->GetFunction());
   constructor.SetMethod("fromId",
                         &mate::TrackableObject<TopLevelWindow>::FromWeakMapID);
   constructor.SetMethod("getAllWindows",
@@ -1199,4 +1147,4 @@ void Initialize(v8::Local<v8::Object> exports,
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_top_level_window, Initialize)
+NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_browser_top_level_window, Initialize)

atom/browser/api/atom_api_top_level_window.h

@@ -14,8 +14,6 @@
 #include "atom/browser/native_window.h"
 #include "atom/browser/native_window_observer.h"
 #include "atom/common/api/atom_api_native_image.h"
-#include "base/task/post_task.h"
-#include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
 #include "native_mate/handle.h"
 
@@ -80,7 +78,7 @@ class TopLevelWindow : public mate::TrackableObject<TopLevelWindow>,
   void OnWindowEnterHtmlFullScreen() override;
   void OnWindowLeaveHtmlFullScreen() override;
   void OnWindowAlwaysOnTopChanged() override;
-  void OnExecuteAppCommand(const std::string& command_name) override;
+  void OnExecuteWindowsCommand(const std::string& command_name) override;
   void OnTouchBarItemResult(const std::string& item_id,
                             const base::DictionaryValue& details) override;
   void OnNewWindowForTab() override;
@@ -165,13 +163,8 @@ class TopLevelWindow : public mate::TrackableObject<TopLevelWindow>,
   void SetContentProtection(bool enable);
   void SetFocusable(bool focusable);
   void SetMenu(v8::Isolate* isolate, v8::Local<v8::Value> menu);
-  void RemoveMenu();
   void SetParentWindow(v8::Local<v8::Value> value, mate::Arguments* args);
   virtual void SetBrowserView(v8::Local<v8::Value> value);
-  virtual void AddBrowserView(v8::Local<v8::Value> value);
-  virtual void RemoveBrowserView(v8::Local<v8::Value> value);
-  virtual std::vector<v8::Local<v8::Value>> GetBrowserViews() const;
-  virtual void ResetBrowserViews();
   v8::Local<v8::Value> GetNativeWindowHandle();
   void SetProgressBar(double progress, mate::Arguments* args);
   void SetOverlayIcon(const gfx::Image& overlay,
@@ -202,7 +195,7 @@ class TopLevelWindow : public mate::TrackableObject<TopLevelWindow>,
   v8::Local<v8::Value> GetContentView() const;
   v8::Local<v8::Value> GetParentWindow() const;
   std::vector<v8::Local<v8::Object>> GetChildWindows() const;
-  v8::Local<v8::Value> GetBrowserView(mate::Arguments* args) const;
+  v8::Local<v8::Value> GetBrowserView() const;
   bool IsModal() const;
 
   // Extra APIs added in JS.
@@ -233,8 +226,8 @@ class TopLevelWindow : public mate::TrackableObject<TopLevelWindow>,
 
   template <typename... Args>
   void EmitEventSoon(base::StringPiece eventName) {
-    base::PostTaskWithTraits(
-        FROM_HERE, {content::BrowserThread::UI},
+    content::BrowserThread::PostTask(
+        content::BrowserThread::UI, FROM_HERE,
         base::BindOnce(base::IgnoreResult(&TopLevelWindow::Emit<Args...>),
                        weak_factory_.GetWeakPtr(), eventName));
   }
@@ -245,7 +238,7 @@ class TopLevelWindow : public mate::TrackableObject<TopLevelWindow>,
 #endif
 
   v8::Global<v8::Value> content_view_;
-  std::map<int32_t, v8::Global<v8::Value>> browser_views_;
+  v8::Global<v8::Value> browser_view_;
   v8::Global<v8::Value> menu_;
   v8::Global<v8::Value> parent_window_;
   KeyWeakMap<int> child_windows_;

atom/browser/api/atom_api_tray.cc

@@ -254,11 +254,9 @@ void Initialize(v8::Local<v8::Object> exports,
   Tray::SetConstructor(isolate, base::Bind(&Tray::New));
 
   mate::Dictionary dict(isolate, exports);
-  dict.Set(
-      "Tray",
-      Tray::GetConstructor(isolate)->GetFunction(context).ToLocalChecked());
+  dict.Set("Tray", Tray::GetConstructor(isolate)->GetFunction());
 }
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_tray, Initialize)
+NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_browser_tray, Initialize)

atom/browser/api/atom_api_view.cc

@@ -76,9 +76,8 @@ void Initialize(v8::Local<v8::Object> exports,
   v8::Isolate* isolate = context->GetIsolate();
   View::SetConstructor(isolate, base::Bind(&View::New));
 
-  mate::Dictionary constructor(
-      isolate,
-      View::GetConstructor(isolate)->GetFunction(context).ToLocalChecked());
+  mate::Dictionary constructor(isolate,
+                               View::GetConstructor(isolate)->GetFunction());
 
   mate::Dictionary dict(isolate, exports);
   dict.Set("View", constructor);
@@ -86,4 +85,4 @@ void Initialize(v8::Local<v8::Object> exports,
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_view, Initialize)
+NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_browser_view, Initialize)

atom/browser/api/atom_api_web_contents.cc

@@ -23,8 +23,6 @@
 #include "atom/browser/native_window.h"
 #include "atom/browser/net/atom_network_delegate.h"
 #include "atom/browser/ui/drag_util.h"
-#include "atom/browser/ui/inspectable_web_contents.h"
-#include "atom/browser/ui/inspectable_web_contents_view.h"
 #include "atom/browser/web_contents_permission_helper.h"
 #include "atom/browser/web_contents_preferences.h"
 #include "atom/browser/web_contents_zoom_controller.h"
@@ -47,18 +45,19 @@
 #include "atom/common/native_mate_converters/value_converter.h"
 #include "atom/common/options_switches.h"
 #include "base/message_loop/message_loop.h"
-#include "base/no_destructor.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/values.h"
+#include "brightray/browser/inspectable_web_contents.h"
+#include "brightray/browser/inspectable_web_contents_view.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/ssl/security_state_tab_helper.h"
 #include "content/browser/frame_host/frame_tree_node.h"
 #include "content/browser/frame_host/render_frame_host_manager.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_view_base.h"
-#include "content/common/widget_messages.h"
+#include "content/common/view_messages.h"
 #include "content/public/browser/child_process_security_policy.h"
 #include "content/public/browser/download_request_utils.h"
 #include "content/public/browser/favicon_status.h"
@@ -81,12 +80,13 @@
 #include "native_mate/dictionary.h"
 #include "native_mate/object_template_builder.h"
 #include "net/url_request/url_request_context.h"
-#include "third_party/blink/public/mojom/frame/find_in_page.mojom.h"
 #include "third_party/blink/public/platform/web_input_event.h"
+#include "third_party/blink/public/web/web_find_options.h"
 #include "ui/display/screen.h"
 #include "ui/events/base_event_utils.h"
 
 #if BUILDFLAG(ENABLE_OSR)
+#include "atom/browser/osr/osr_output_device.h"
 #include "atom/browser/osr/osr_render_widget_host_view.h"
 #include "atom/browser/osr/osr_web_contents_view.h"
 #endif
@@ -240,7 +240,7 @@ namespace api {
 namespace {
 
 content::ServiceWorkerContext* GetServiceWorkerContext(
-    content::WebContents* web_contents) {
+    const content::WebContents* web_contents) {
   auto* context = web_contents->GetBrowserContext();
   auto* site_instance = web_contents->GetSiteInstance();
   if (!context || !site_instance)
@@ -255,11 +255,12 @@ content::ServiceWorkerContext* GetServiceWorkerContext(
 }
 
 // Called when CapturePage is done.
-void OnCapturePageDone(util::Promise promise, const SkBitmap& bitmap) {
+void OnCapturePageDone(const base::Callback<void(const gfx::Image&)>& callback,
+                       const SkBitmap& bitmap) {
   // Hack to enable transparency in captured image
   // TODO(nitsakh) Remove hack once fixed in chromium
   const_cast<SkBitmap&>(bitmap).setAlphaType(kPremul_SkAlphaType);
-  promise.Resolve(gfx::Image::CreateFrom1xBitmap(bitmap));
+  callback.Run(gfx::Image::CreateFrom1xBitmap(bitmap));
 }
 
 }  // namespace
@@ -286,24 +287,21 @@ struct WebContents::FrameDispatchHelper {
 };
 
 WebContents::WebContents(v8::Isolate* isolate,
-                         content::WebContents* web_contents)
-    : content::WebContentsObserver(web_contents), type_(REMOTE) {
-  web_contents->SetUserAgentOverride(GetBrowserContext()->GetUserAgent(),
-                                     false);
-  Init(isolate);
-  AttachAsUserData(web_contents);
-  InitZoomController(web_contents, mate::Dictionary::CreateEmpty(isolate));
-}
-
-WebContents::WebContents(v8::Isolate* isolate,
-                         std::unique_ptr<content::WebContents> web_contents,
+                         content::WebContents* web_contents,
                          Type type)
-    : content::WebContentsObserver(web_contents.get()), type_(type) {
-  DCHECK(type != REMOTE) << "Can't take ownership of a remote WebContents";
-  auto session = Session::CreateFrom(isolate, GetBrowserContext());
-  session_.Reset(isolate, session.ToV8());
-  InitWithSessionAndOptions(isolate, std::move(web_contents), session,
-                            mate::Dictionary::CreateEmpty(isolate));
+    : content::WebContentsObserver(web_contents), type_(type) {
+  const mate::Dictionary options = mate::Dictionary::CreateEmpty(isolate);
+  if (type == REMOTE) {
+    web_contents->SetUserAgentOverride(GetBrowserContext()->GetUserAgent(),
+                                       false);
+    Init(isolate);
+    AttachAsUserData(web_contents);
+    InitZoomController(web_contents, options);
+  } else {
+    auto session = Session::CreateFrom(isolate, GetBrowserContext());
+    session_.Reset(isolate, session.ToV8());
+    InitWithSessionAndOptions(isolate, web_contents, session, options);
+  }
 }
 
 WebContents::WebContents(v8::Isolate* isolate,
@@ -389,7 +387,7 @@ WebContents::WebContents(v8::Isolate* isolate,
     web_contents = content::WebContents::Create(params);
   }
 
-  InitWithSessionAndOptions(isolate, std::move(web_contents), session, options);
+  InitWithSessionAndOptions(isolate, web_contents.release(), session, options);
 }
 
 void WebContents::InitZoomController(content::WebContents* web_contents,
@@ -401,47 +399,43 @@ void WebContents::InitZoomController(content::WebContents* web_contents,
     zoom_controller_->SetDefaultZoomFactor(zoom_factor);
 }
 
-void WebContents::InitWithSessionAndOptions(
-    v8::Isolate* isolate,
-    std::unique_ptr<content::WebContents> owned_web_contents,
-    mate::Handle<api::Session> session,
-    const mate::Dictionary& options) {
-  Observe(owned_web_contents.get());
-  // TODO(zcbenz): Make InitWithWebContents take unique_ptr.
-  // At the time of writing we are going through a refactoring and I don't want
-  // to make other people's work harder.
-  InitWithWebContents(owned_web_contents.release(), session->browser_context(),
-                      IsGuest());
+void WebContents::InitWithSessionAndOptions(v8::Isolate* isolate,
+                                            content::WebContents* web_contents,
+                                            mate::Handle<api::Session> session,
+                                            const mate::Dictionary& options) {
+  Observe(web_contents);
+  InitWithWebContents(web_contents, session->browser_context(), IsGuest());
 
   managed_web_contents()->GetView()->SetDelegate(this);
 
-  auto* prefs = web_contents()->GetMutableRendererPrefs();
+  auto* prefs = web_contents->GetMutableRendererPrefs();
   prefs->accept_languages = g_browser_process->GetApplicationLocale();
 
 #if defined(OS_LINUX) || defined(OS_WIN)
   // Update font settings.
-  static const base::NoDestructor<gfx::FontRenderParams> params(
-      gfx::GetFontRenderParams(gfx::FontRenderParamsQuery(), nullptr));
-  prefs->should_antialias_text = params->antialiasing;
-  prefs->use_subpixel_positioning = params->subpixel_positioning;
-  prefs->hinting = params->hinting;
-  prefs->use_autohinter = params->autohinter;
-  prefs->use_bitmaps = params->use_bitmaps;
-  prefs->subpixel_rendering = params->subpixel_rendering;
+  CR_DEFINE_STATIC_LOCAL(
+      const gfx::FontRenderParams, params,
+      (gfx::GetFontRenderParams(gfx::FontRenderParamsQuery(), nullptr)));
+  prefs->should_antialias_text = params.antialiasing;
+  prefs->use_subpixel_positioning = params.subpixel_positioning;
+  prefs->hinting = params.hinting;
+  prefs->use_autohinter = params.autohinter;
+  prefs->use_bitmaps = params.use_bitmaps;
+  prefs->subpixel_rendering = params.subpixel_rendering;
 #endif
 
   // Save the preferences in C++.
-  new WebContentsPreferences(web_contents(), options);
+  new WebContentsPreferences(web_contents, options);
 
   // Initialize permission helper.
-  WebContentsPermissionHelper::CreateForWebContents(web_contents());
+  WebContentsPermissionHelper::CreateForWebContents(web_contents);
   // Initialize security state client.
-  SecurityStateTabHelper::CreateForWebContents(web_contents());
+  SecurityStateTabHelper::CreateForWebContents(web_contents);
   // Initialize zoom controller.
-  InitZoomController(web_contents(), options);
+  InitZoomController(web_contents, options);
 
-  web_contents()->SetUserAgentOverride(GetBrowserContext()->GetUserAgent(),
-                                       false);
+  web_contents->SetUserAgentOverride(GetBrowserContext()->GetUserAgent(),
+                                     false);
 
   if (IsGuest()) {
     NativeWindow* owner_window = nullptr;
@@ -457,7 +451,7 @@ void WebContents::InitWithSessionAndOptions(
   }
 
   Init(isolate);
-  AttachAsUserData(web_contents());
+  AttachAsUserData(web_contents);
 }
 
 WebContents::~WebContents() {
@@ -468,9 +462,9 @@ WebContents::~WebContents() {
     RenderViewDeleted(web_contents()->GetRenderViewHost());
 
     if (type_ == WEB_VIEW) {
-      DCHECK(!web_contents()->GetOuterWebContents())
-          << "Should never manually destroy an attached webview";
       // For webview simply destroy the WebContents immediately.
+      // TODO(zcbenz): Add an internal API for webview instead of using
+      // destroy(), so we don't have to add a special branch here.
       DestroyWebContents(false /* async */);
     } else if (type_ == BROWSER_WINDOW && owner_window()) {
       // For BrowserWindow we should close the window and clean up everything
@@ -530,10 +524,10 @@ void WebContents::WebContentsCreated(content::WebContents* source_contents,
                                      const std::string& frame_name,
                                      const GURL& target_url,
                                      content::WebContents* new_contents) {
-  ChildWebContentsTracker::CreateForWebContents(new_contents);
-  auto* tracker = ChildWebContentsTracker::FromWebContents(new_contents);
-  tracker->url = target_url;
-  tracker->frame_name = frame_name;
+  v8::Locker locker(isolate());
+  v8::HandleScope handle_scope(isolate());
+  auto api_web_contents = CreateFrom(isolate(), new_contents, BROWSER_WINDOW);
+  Emit("-web-contents-created", api_web_contents, target_url, frame_name);
 }
 
 void WebContents::AddNewContents(
@@ -543,17 +537,13 @@ void WebContents::AddNewContents(
     const gfx::Rect& initial_rect,
     bool user_gesture,
     bool* was_blocked) {
-  auto* tracker = ChildWebContentsTracker::FromWebContents(new_contents.get());
-  DCHECK(tracker);
-
+  new ChildWebContentsTracker(new_contents.get());
   v8::Locker locker(isolate());
   v8::HandleScope handle_scope(isolate());
-  auto api_web_contents =
-      CreateAndTake(isolate(), std::move(new_contents), BROWSER_WINDOW);
+  auto api_web_contents = CreateFrom(isolate(), new_contents.release());
   if (Emit("-add-new-contents", api_web_contents, disposition, user_gesture,
            initial_rect.x(), initial_rect.y(), initial_rect.width(),
-           initial_rect.height(), tracker->url, tracker->frame_name)) {
-    // TODO(zcbenz): Can we make this sync?
+           initial_rect.height())) {
     api_web_contents->DestroyWebContents(true /* async */);
   }
 }
@@ -597,7 +587,7 @@ void WebContents::SetContentsBounds(content::WebContents* source,
 
 void WebContents::CloseContents(content::WebContents* source) {
   Emit("close");
-#if defined(TOOLKIT_VIEWS)
+#if defined(TOOLKIT_VIEWS) && !defined(OS_MACOSX)
   HideAutofillPopup();
 #endif
   if (managed_web_contents())
@@ -615,15 +605,15 @@ void WebContents::UpdateTargetURL(content::WebContents* source,
   Emit("update-target-url", url);
 }
 
-bool WebContents::HandleKeyboardEvent(
+void WebContents::HandleKeyboardEvent(
     content::WebContents* source,
     const content::NativeWebKeyboardEvent& event) {
   if (type_ == WEB_VIEW && embedder_) {
     // Send the unhandled keyboard events back to the embedder.
-    return embedder_->HandleKeyboardEvent(source, event);
+    embedder_->HandleKeyboardEvent(source, event);
   } else {
     // Go to the default keyboard handling.
-    return CommonWebContentsDelegate::HandleKeyboardEvent(source, event);
+    CommonWebContentsDelegate::HandleKeyboardEvent(source, event);
   }
 }
 
@@ -723,7 +713,7 @@ void WebContents::FindReply(content::WebContents* web_contents,
 bool WebContents::CheckMediaAccessPermission(
     content::RenderFrameHost* render_frame_host,
     const GURL& security_origin,
-    blink::MediaStreamType type) {
+    content::MediaStreamType type) {
   auto* web_contents =
       content::WebContents::FromRenderFrameHost(render_frame_host);
   auto* permission_helper =
@@ -766,8 +756,7 @@ void WebContents::OnAudioStateChanged(bool audible) {
   Emit("-audio-state-changed", audible);
 }
 
-void WebContents::BeforeUnloadFired(bool proceed,
-                                    const base::TimeTicks& proceed_time) {
+void WebContents::BeforeUnloadFired(const base::TimeTicks& proceed_time) {
   // Do nothing, we override this method just to avoid compilation error since
   // there are two virtual functions named BeforeUnloadFired.
 }
@@ -780,29 +769,8 @@ void WebContents::RenderViewCreated(content::RenderViewHost* render_view_host) {
     impl->disable_hidden_ = !background_throttling_;
 }
 
-void WebContents::RenderViewHostChanged(content::RenderViewHost* old_host,
-                                        content::RenderViewHost* new_host) {
-  currently_committed_process_id_ = new_host->GetProcess()->GetID();
-}
-
 void WebContents::RenderViewDeleted(content::RenderViewHost* render_view_host) {
-  // This event is necessary for tracking any states with respect to
-  // intermediate render view hosts aka speculative render view hosts. Currently
-  // used by object-registry.js to ref count remote objects.
   Emit("render-view-deleted", render_view_host->GetProcess()->GetID());
-
-  if (-1 == currently_committed_process_id_ ||
-      render_view_host->GetProcess()->GetID() ==
-          currently_committed_process_id_) {
-    currently_committed_process_id_ = -1;
-
-    // When the RVH that has been deleted is the current RVH it means that the
-    // the web contents are being closed. This is communicated by this event.
-    // Currently tracked by guest-window-manager.js to destroy the
-    // BrowserWindow.
-    Emit("current-render-view-deleted",
-         render_view_host->GetProcess()->GetID());
-  }
 }
 
 void WebContents::RenderProcessGone(base::TerminationStatus status) {
@@ -839,8 +807,10 @@ void WebContents::DidChangeThemeColor(SkColor theme_color) {
 
 void WebContents::DocumentLoadedInFrame(
     content::RenderFrameHost* render_frame_host) {
-  if (!render_frame_host->GetParent())
+  if (!render_frame_host->GetParent()) {
+    is_dom_ready_ = true;
     Emit("dom-ready");
+  }
 }
 
 void WebContents::DidFinishLoad(content::RenderFrameHost* render_frame_host,
@@ -867,6 +837,7 @@ void WebContents::DidFailLoad(content::RenderFrameHost* render_frame_host,
 }
 
 void WebContents::DidStartLoading() {
+  is_dom_ready_ = false;
   Emit("did-start-loading");
 }
 
@@ -999,8 +970,8 @@ void WebContents::DevToolsFocused() {
 void WebContents::DevToolsOpened() {
   v8::Locker locker(isolate());
   v8::HandleScope handle_scope(isolate());
-  auto handle =
-      FromOrCreate(isolate(), managed_web_contents()->GetDevToolsWebContents());
+  auto handle = WebContents::CreateFrom(
+      isolate(), managed_web_contents()->GetDevToolsWebContents());
   devtools_web_contents_.Reset(isolate(), handle.ToV8());
 
   // Set inspected tabID.
@@ -1010,7 +981,8 @@ void WebContents::DevToolsOpened() {
 
   // Inherit owner window in devtools when it doesn't have one.
   auto* devtools = managed_web_contents()->GetDevToolsWebContents();
-  bool has_window = devtools->GetUserData(NativeWindowRelay::UserDataKey());
+  bool has_window =
+      devtools->GetUserData(NativeWindowRelay::kNativeWindowRelayUserDataKey);
   if (owner_window() && !has_window)
     handle->SetOwnerWindow(devtools, owner_window());
 
@@ -1025,7 +997,7 @@ void WebContents::DevToolsClosed() {
   Emit("devtools-closed");
 }
 
-#if defined(TOOLKIT_VIEWS)
+#if defined(TOOLKIT_VIEWS) && !defined(OS_MACOSX)
 void WebContents::ShowAutofillPopup(content::RenderFrameHost* frame_host,
                                     const gfx::RectF& bounds,
                                     const std::vector<base::string16>& values,
@@ -1050,7 +1022,7 @@ void WebContents::ShowAutofillPopup(content::RenderFrameHost* frame_host,
 bool WebContents::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(WebContents, message)
-    IPC_MESSAGE_HANDLER_CODE(WidgetHostMsg_SetCursor, OnCursorChange,
+    IPC_MESSAGE_HANDLER_CODE(ViewHostMsg_SetCursor, OnCursorChange,
                              handled = false)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
@@ -1072,7 +1044,7 @@ bool WebContents::OnMessageReceived(const IPC::Message& message,
         FrameDispatchHelper::OnSetTemporaryZoomLevel)
     IPC_MESSAGE_FORWARD_DELAY_REPLY(AtomFrameHostMsg_GetZoomLevel, &helper,
                                     FrameDispatchHelper::OnGetZoomLevel)
-#if defined(TOOLKIT_VIEWS)
+#if defined(TOOLKIT_VIEWS) && !defined(OS_MACOSX)
     IPC_MESSAGE_HANDLER(AtomAutofillFrameHostMsg_ShowPopup, ShowAutofillPopup)
     IPC_MESSAGE_HANDLER(AtomAutofillFrameHostMsg_HidePopup, HideAutofillPopup)
 #endif
@@ -1126,7 +1098,7 @@ void WebContents::NavigationEntryCommitted(
 void WebContents::SetBackgroundThrottling(bool allowed) {
   background_throttling_ = allowed;
 
-  auto* contents = web_contents();
+  const auto* contents = web_contents();
   if (!contents) {
     return;
   }
@@ -1136,7 +1108,7 @@ void WebContents::SetBackgroundThrottling(bool allowed) {
     return;
   }
 
-  auto* render_process_host = render_view_host->GetProcess();
+  const auto* render_process_host = render_view_host->GetProcess();
   if (!render_process_host) {
     return;
   }
@@ -1185,9 +1157,8 @@ void WebContents::LoadURL(const GURL& url, const mate::Dictionary& options) {
   if (!options.Get("httpReferrer", &params.referrer)) {
     GURL http_referrer;
     if (options.Get("httpReferrer", &http_referrer))
-      params.referrer =
-          content::Referrer(http_referrer.GetAsReferrer(),
-                            network::mojom::ReferrerPolicy::kDefault);
+      params.referrer = content::Referrer(http_referrer.GetAsReferrer(),
+                                          blink::kWebReferrerPolicyDefault);
   }
 
   std::string user_agent;
@@ -1330,16 +1301,14 @@ void WebContents::OpenDevTools(mate::Arguments* args) {
   if (type_ == WEB_VIEW || !owner_window()) {
     state = "detach";
   }
-  bool activate = true;
   if (args && args->Length() == 1) {
     mate::Dictionary options;
     if (args->GetNext(&options)) {
       options.Get("mode", &state);
-      options.Get("activate", &activate);
     }
   }
   managed_web_contents()->SetDockState(state);
-  managed_web_contents()->ShowDevTools(activate);
+  managed_web_contents()->ShowDevTools();
 }
 
 void WebContents::CloseDevTools() {
@@ -1374,8 +1343,8 @@ void WebContents::EnableDeviceEmulation(
         frame_host ? frame_host->GetView()->GetRenderWidgetHost() : nullptr;
     if (!widget_host)
       return;
-    widget_host->Send(new WidgetMsg_EnableDeviceEmulation(
-        widget_host->GetRoutingID(), params));
+    widget_host->Send(
+        new ViewMsg_EnableDeviceEmulation(widget_host->GetRoutingID(), params));
   }
 }
 
@@ -1390,7 +1359,7 @@ void WebContents::DisableDeviceEmulation() {
     if (!widget_host)
       return;
     widget_host->Send(
-        new WidgetMsg_DisableDeviceEmulation(widget_host->GetRoutingID()));
+        new ViewMsg_DisableDeviceEmulation(widget_host->GetRoutingID()));
   }
 }
 
@@ -1483,6 +1452,10 @@ bool WebContents::IsCurrentlyAudible() {
   return web_contents()->IsCurrentlyAudible();
 }
 
+bool WebContents::IsDOMReady() const {
+  return is_dom_ready_;
+}
+
 #if BUILDFLAG(ENABLE_PRINTING)
 void WebContents::Print(mate::Arguments* args) {
   bool silent = false, print_background = false;
@@ -1518,11 +1491,11 @@ void WebContents::Print(mate::Arguments* args) {
 
 std::vector<printing::PrinterBasicInfo> WebContents::GetPrinterList() {
   std::vector<printing::PrinterBasicInfo> printers;
-  auto print_backend = printing::PrintBackend::CreateInstance(nullptr);
   {
     // TODO(deepak1556): Deprecate this api in favor of an
     // async version and post a non blocing task call.
     base::ThreadRestrictions::ScopedAllowIO allow_io;
+    auto print_backend = printing::PrintBackend::CreateInstance(nullptr);
     print_backend->EnumeratePrinters(&printers);
   }
   return printers;
@@ -1599,22 +1572,17 @@ void WebContents::ReplaceMisspelling(const base::string16& word) {
 }
 
 uint32_t WebContents::FindInPage(mate::Arguments* args) {
+  uint32_t request_id = GetNextRequestId();
   base::string16 search_text;
+  blink::WebFindOptions options;
   if (!args->GetNext(&search_text) || search_text.empty()) {
     args->ThrowError("Must provide a non-empty search content");
     return 0;
   }
 
-  uint32_t request_id = GetNextRequestId();
-  mate::Dictionary dict;
-  auto options = blink::mojom::FindOptions::New();
-  if (args->GetNext(&dict)) {
-    dict.Get("forward", &options->forward);
-    dict.Get("matchCase", &options->match_case);
-    dict.Get("findNext", &options->find_next);
-  }
+  args->GetNext(&options);
 
-  web_contents()->Find(request_id, search_text, std::move(options));
+  web_contents()->Find(request_id, search_text, options);
   return request_id;
 }
 
@@ -1672,41 +1640,13 @@ bool WebContents::SendIPCMessageWithSender(bool internal,
                                            const std::string& channel,
                                            const base::ListValue& args,
                                            int32_t sender_id) {
-  std::vector<content::RenderFrameHost*> target_hosts;
-  if (!send_to_all) {
-    auto* frame_host = web_contents()->GetMainFrame();
-    if (frame_host) {
-      target_hosts.push_back(frame_host);
-    }
-  } else {
-    target_hosts = web_contents()->GetAllFrames();
+  auto* frame_host = web_contents()->GetMainFrame();
+  if (frame_host) {
+    return frame_host->Send(new AtomFrameMsg_Message(frame_host->GetRoutingID(),
+                                                     internal, send_to_all,
+                                                     channel, args, sender_id));
   }
-
-  bool handled = false;
-  for (auto* frame_host : target_hosts) {
-    handled = frame_host->Send(
-                  new AtomFrameMsg_Message(frame_host->GetRoutingID(), internal,
-                                           false, channel, args, sender_id)) ||
-              handled;
-  }
-  return handled;
-}
-
-bool WebContents::SendIPCMessageToFrame(bool internal,
-                                        bool send_to_all,
-                                        int32_t frame_id,
-                                        const std::string& channel,
-                                        const base::ListValue& args) {
-  auto frames = web_contents()->GetAllFrames();
-  auto iter = std::find_if(frames.begin(), frames.end(), [frame_id](auto* f) {
-    return f->GetRoutingID() == frame_id;
-  });
-  if (iter == frames.end())
-    return false;
-  if (!(*iter)->IsRenderFrameLive())
-    return false;
-  return (*iter)->Send(new AtomFrameMsg_Message(
-      frame_id, internal, send_to_all, channel, args, 0 /* sender_id */));
+  return false;
 }
 
 void WebContents::SendInputEvent(v8::Isolate* isolate,
@@ -1805,25 +1745,28 @@ void WebContents::StartDrag(const mate::Dictionary& item,
 
   // Start dragging.
   if (!files.empty()) {
-    base::MessageLoopCurrent::ScopedNestableTaskAllower allow;
+    base::MessageLoop::ScopedNestableTaskAllower allow;
     DragFileItems(files, icon->image(), web_contents()->GetNativeView());
   } else {
     args->ThrowError("Must specify either 'file' or 'files' option");
   }
 }
 
-v8::Local<v8::Promise> WebContents::CapturePage(mate::Arguments* args) {
+void WebContents::CapturePage(mate::Arguments* args) {
   gfx::Rect rect;
-  util::Promise promise(isolate());
-  v8::Local<v8::Promise> handle = promise.GetHandle();
+  base::Callback<void(const gfx::Image&)> callback;
 
-  // get rect arguments if they exist
-  args->GetNext(&rect);
+  if (!(args->Length() == 1 && args->GetNext(&callback)) &&
+      !(args->Length() == 2 && args->GetNext(&rect) &&
+        args->GetNext(&callback))) {
+    args->ThrowError();
+    return;
+  }
 
   auto* const view = web_contents()->GetRenderWidgetHostView();
   if (!view) {
-    promise.Resolve(gfx::Image());
-    return handle;
+    callback.Run(gfx::Image());
+    return;
   }
 
   // Capture full page if user doesn't specify a |rect|.
@@ -1842,8 +1785,7 @@ v8::Local<v8::Promise> WebContents::CapturePage(mate::Arguments* args) {
     bitmap_size = gfx::ScaleToCeiledSize(view_size, scale);
 
   view->CopyFromSurface(gfx::Rect(rect.origin(), view_size), bitmap_size,
-                        base::BindOnce(&OnCapturePageDone, std::move(promise)));
-  return handle;
+                        base::BindOnce(&OnCapturePageDone, callback));
 }
 
 void WebContents::OnCursorChange(const content::WebCursor& cursor) {
@@ -2138,6 +2080,7 @@ void WebContents::BuildPrototype(v8::Isolate* isolate,
       .SetMethod("setAudioMuted", &WebContents::SetAudioMuted)
       .SetMethod("isAudioMuted", &WebContents::IsAudioMuted)
       .SetMethod("isCurrentlyAudible", &WebContents::IsCurrentlyAudible)
+      .SetMethod("isDomReady", &WebContents::IsDOMReady)
       .SetMethod("undo", &WebContents::Undo)
       .SetMethod("redo", &WebContents::Redo)
       .SetMethod("cut", &WebContents::Cut)
@@ -2149,20 +2092,18 @@ void WebContents::BuildPrototype(v8::Isolate* isolate,
       .SetMethod("unselect", &WebContents::Unselect)
       .SetMethod("replace", &WebContents::Replace)
       .SetMethod("replaceMisspelling", &WebContents::ReplaceMisspelling)
-      .SetMethod("findInPage", &WebContents::FindInPage)
+      .SetMethod("_findInPage", &WebContents::FindInPage)
       .SetMethod("stopFindInPage", &WebContents::StopFindInPage)
       .SetMethod("focus", &WebContents::Focus)
       .SetMethod("isFocused", &WebContents::IsFocused)
       .SetMethod("tabTraverse", &WebContents::TabTraverse)
       .SetMethod("_send", &WebContents::SendIPCMessage)
-      .SetMethod("_sendToFrame", &WebContents::SendIPCMessageToFrame)
       .SetMethod("sendInputEvent", &WebContents::SendInputEvent)
       .SetMethod("beginFrameSubscription", &WebContents::BeginFrameSubscription)
       .SetMethod("endFrameSubscription", &WebContents::EndFrameSubscription)
       .SetMethod("startDrag", &WebContents::StartDrag)
       .SetMethod("isGuest", &WebContents::IsGuest)
       .SetMethod("attachToIframe", &WebContents::AttachToIframe)
-      .SetMethod("detachFromOuterFrame", &WebContents::DetachFromOuterFrame)
       .SetMethod("isOffscreen", &WebContents::IsOffScreen)
 #if BUILDFLAG(ENABLE_OSR)
       .SetMethod("startPainting", &WebContents::StartPainting)
@@ -2173,9 +2114,9 @@ void WebContents::BuildPrototype(v8::Isolate* isolate,
 #endif
       .SetMethod("invalidate", &WebContents::Invalidate)
       .SetMethod("setZoomLevel", &WebContents::SetZoomLevel)
-      .SetMethod("getZoomLevel", &WebContents::GetZoomLevel)
+      .SetMethod("_getZoomLevel", &WebContents::GetZoomLevel)
       .SetMethod("setZoomFactor", &WebContents::SetZoomFactor)
-      .SetMethod("getZoomFactor", &WebContents::GetZoomFactor)
+      .SetMethod("_getZoomFactor", &WebContents::GetZoomFactor)
       .SetMethod("getType", &WebContents::GetType)
       .SetMethod("_getPreloadPath", &WebContents::GetPreloadPath)
       .SetMethod("getWebPreferences", &WebContents::GetWebPreferences)
@@ -2221,7 +2162,7 @@ void WebContents::OnRendererMessage(content::RenderFrameHost* frame_host,
                                     const std::string& channel,
                                     const base::ListValue& args) {
   // webContents.emit(channel, new Event(), args...);
-  EmitWithSender(channel, frame_host, nullptr, args);
+  Emit(channel, args);
 }
 
 void WebContents::OnRendererMessageSync(content::RenderFrameHost* frame_host,
@@ -2248,40 +2189,32 @@ void WebContents::OnRendererMessageTo(content::RenderFrameHost* frame_host,
 }
 
 // static
-mate::Handle<WebContents> WebContents::Create(v8::Isolate* isolate,
-                                              const mate::Dictionary& options) {
-  return mate::CreateHandle(isolate, new WebContents(isolate, options));
-}
-
-// static
-mate::Handle<WebContents> WebContents::CreateAndTake(
-    v8::Isolate* isolate,
-    std::unique_ptr<content::WebContents> web_contents,
-    Type type) {
-  return mate::CreateHandle(
-      isolate, new WebContents(isolate, std::move(web_contents), type));
-}
-
-// static
-mate::Handle<WebContents> WebContents::From(
+mate::Handle<WebContents> WebContents::CreateFrom(
     v8::Isolate* isolate,
     content::WebContents* web_contents) {
+  // We have an existing WebContents object in JS.
   auto* existing = TrackableObject::FromWrappedClass(isolate, web_contents);
   if (existing)
     return mate::CreateHandle(isolate, static_cast<WebContents*>(existing));
-  else
-    return mate::Handle<WebContents>();
+
+  // Otherwise create a new WebContents wrapper object.
+  return mate::CreateHandle(isolate,
+                            new WebContents(isolate, web_contents, REMOTE));
+}
+
+mate::Handle<WebContents> WebContents::CreateFrom(
+    v8::Isolate* isolate,
+    content::WebContents* web_contents,
+    Type type) {
+  // Otherwise create a new WebContents wrapper object.
+  return mate::CreateHandle(isolate,
+                            new WebContents(isolate, web_contents, type));
 }
 
 // static
-mate::Handle<WebContents> WebContents::FromOrCreate(
-    v8::Isolate* isolate,
-    content::WebContents* web_contents) {
-  auto existing = From(isolate, web_contents);
-  if (!existing.IsEmpty())
-    return existing;
-  else
-    return mate::CreateHandle(isolate, new WebContents(isolate, web_contents));
+mate::Handle<WebContents> WebContents::Create(v8::Isolate* isolate,
+                                              const mate::Dictionary& options) {
+  return mate::CreateHandle(isolate, new WebContents(isolate, options));
 }
 
 }  // namespace api
@@ -2298,9 +2231,7 @@ void Initialize(v8::Local<v8::Object> exports,
                 void* priv) {
   v8::Isolate* isolate = context->GetIsolate();
   mate::Dictionary dict(isolate, exports);
-  dict.Set("WebContents", WebContents::GetConstructor(isolate)
-                              ->GetFunction(context)
-                              .ToLocalChecked());
+  dict.Set("WebContents", WebContents::GetConstructor(isolate)->GetFunction());
   dict.SetMethod("create", &WebContents::Create);
   dict.SetMethod("fromId", &mate::TrackableObject<WebContents>::FromWeakMapID);
   dict.SetMethod("getAllWebContents",
@@ -2309,4 +2240,4 @@ void Initialize(v8::Local<v8::Object> exports,
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_web_contents, Initialize)
+NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_browser_web_contents, Initialize)

atom/browser/api/atom_api_web_contents.h

@@ -15,7 +15,6 @@
 #include "atom/browser/common_web_contents_delegate.h"
 #include "atom/browser/ui/autofill_popup.h"
 #include "base/observer_list.h"
-#include "base/observer_list_types.h"
 #include "content/common/cursors/webcursor.h"
 #include "content/public/browser/keyboard_event_processing_result.h"
 #include "content/public/browser/web_contents.h"
@@ -35,6 +34,10 @@ namespace blink {
 struct WebDeviceEmulationParams;
 }
 
+namespace brightray {
+class InspectableWebContents;
+}
+
 namespace mate {
 class Arguments;
 class Dictionary;
@@ -48,7 +51,6 @@ namespace atom {
 
 class AtomBrowserContext;
 class AtomJavaScriptDialogManager;
-class InspectableWebContents;
 class WebContentsZoomController;
 class WebViewGuestDelegate;
 class FrameSubscriber;
@@ -61,13 +63,10 @@ namespace api {
 
 // Certain events are only in WebContentsDelegate, provide our own Observer to
 // dispatch those events.
-class ExtendedWebContentsObserver : public base::CheckedObserver {
+class ExtendedWebContentsObserver {
  public:
   virtual void OnCloseContents() {}
   virtual void OnRendererResponsive() {}
-
- protected:
-  ~ExtendedWebContentsObserver() override {}
 };
 
 // Wrapper around the content::WebContents.
@@ -84,29 +83,18 @@ class WebContents : public mate::TrackableObject<WebContents>,
     OFF_SCREEN,       // Used for offscreen rendering
   };
 
-  // Create a new WebContents and return the V8 wrapper of it.
-  static mate::Handle<WebContents> Create(v8::Isolate* isolate,
-                                          const mate::Dictionary& options);
-
-  // Create a new V8 wrapper for an existing |web_content|.
-  //
-  // The lifetime of |web_contents| will be managed by this class.
-  static mate::Handle<WebContents> CreateAndTake(
-      v8::Isolate* isolate,
-      std::unique_ptr<content::WebContents> web_contents,
-      Type type);
-
-  // Get the V8 wrapper of |web_content|, return empty handle if not wrapped.
-  static mate::Handle<WebContents> From(v8::Isolate* isolate,
-                                        content::WebContents* web_content);
-
-  // Get the V8 wrapper of the |web_contents|, or create one if not existed.
-  //
-  // The lifetime of |web_contents| is NOT managed by this class, and the type
-  // of this wrapper is always REMOTE.
-  static mate::Handle<WebContents> FromOrCreate(
+  // Create from an existing WebContents.
+  static mate::Handle<WebContents> CreateFrom(
       v8::Isolate* isolate,
       content::WebContents* web_contents);
+  static mate::Handle<WebContents> CreateFrom(
+      v8::Isolate* isolate,
+      content::WebContents* web_contents,
+      Type type);
+
+  // Create a new WebContents.
+  static mate::Handle<WebContents> Create(v8::Isolate* isolate,
+                                          const mate::Dictionary& options);
 
   static void BuildPrototype(v8::Isolate* isolate,
                              v8::Local<v8::FunctionTemplate> prototype);
@@ -167,6 +155,7 @@ class WebContents : public mate::TrackableObject<WebContents>,
   void SetAudioMuted(bool muted);
   bool IsAudioMuted();
   bool IsCurrentlyAudible();
+  bool IsDOMReady() const;
   void SetEmbedder(const WebContents* embedder);
   void SetDevToolsWebContents(const WebContents* devtools);
   v8::Local<v8::Value> GetNativeView() const;
@@ -218,12 +207,6 @@ class WebContents : public mate::TrackableObject<WebContents>,
                                 const base::ListValue& args,
                                 int32_t sender_id = 0);
 
-  bool SendIPCMessageToFrame(bool internal,
-                             bool send_to_all,
-                             int32_t frame_id,
-                             const std::string& channel,
-                             const base::ListValue& args);
-
   // Send WebInputEvent to the page.
   void SendInputEvent(v8::Isolate* isolate, v8::Local<v8::Value> input_event);
 
@@ -236,13 +219,12 @@ class WebContents : public mate::TrackableObject<WebContents>,
 
   // Captures the page with |rect|, |callback| would be called when capturing is
   // done.
-  v8::Local<v8::Promise> CapturePage(mate::Arguments* args);
+  void CapturePage(mate::Arguments* args);
 
   // Methods for creating <webview>.
   bool IsGuest() const;
   void AttachToIframe(content::WebContents* embedder_web_contents,
                       int embedder_frame_id);
-  void DetachFromOuterFrame();
 
   // Methods for offscreen rendering
   bool IsOffScreen() const;
@@ -309,30 +291,23 @@ class WebContents : public mate::TrackableObject<WebContents>,
     observers_.AddObserver(obs);
   }
   void RemoveObserver(ExtendedWebContentsObserver* obs) {
-    // Trying to remove from an empty collection leads to an access violation
-    if (observers_.might_have_observers())
-      observers_.RemoveObserver(obs);
+    observers_.RemoveObserver(obs);
   }
 
   bool EmitNavigationEvent(const std::string& event,
                            content::NavigationHandle* navigation_handle);
 
  protected:
-  // Does not manage lifetime of |web_contents|.
-  WebContents(v8::Isolate* isolate, content::WebContents* web_contents);
-  // Takes over ownership of |web_contents|.
   WebContents(v8::Isolate* isolate,
-              std::unique_ptr<content::WebContents> web_contents,
+              content::WebContents* web_contents,
               Type type);
-  // Creates a new content::WebContents.
   WebContents(v8::Isolate* isolate, const mate::Dictionary& options);
   ~WebContents() override;
 
-  void InitWithSessionAndOptions(
-      v8::Isolate* isolate,
-      std::unique_ptr<content::WebContents> web_contents,
-      mate::Handle<class Session> session,
-      const mate::Dictionary& options);
+  void InitWithSessionAndOptions(v8::Isolate* isolate,
+                                 content::WebContents* web_contents,
+                                 mate::Handle<class Session> session,
+                                 const mate::Dictionary& options);
 
   // content::WebContentsDelegate:
   bool DidAddMessageToConsole(content::WebContents* source,
@@ -363,7 +338,7 @@ class WebContents : public mate::TrackableObject<WebContents>,
   void CloseContents(content::WebContents* source) override;
   void ActivateContents(content::WebContents* contents) override;
   void UpdateTargetURL(content::WebContents* source, const GURL& url) override;
-  bool HandleKeyboardEvent(
+  void HandleKeyboardEvent(
       content::WebContents* source,
       const content::NativeWebKeyboardEvent& event) override;
   content::KeyboardEventProcessingResult PreHandleKeyboardEvent(
@@ -391,7 +366,7 @@ class WebContents : public mate::TrackableObject<WebContents>,
                  bool final_update) override;
   bool CheckMediaAccessPermission(content::RenderFrameHost* render_frame_host,
                                   const GURL& security_origin,
-                                  blink::MediaStreamType type) override;
+                                  content::MediaStreamType type) override;
   void RequestMediaAccessPermission(
       content::WebContents* web_contents,
       const content::MediaStreamRequest& request,
@@ -407,11 +382,8 @@ class WebContents : public mate::TrackableObject<WebContents>,
   void OnAudioStateChanged(bool audible) override;
 
   // content::WebContentsObserver:
-  void BeforeUnloadFired(bool proceed,
-                         const base::TimeTicks& proceed_time) override;
+  void BeforeUnloadFired(const base::TimeTicks& proceed_time) override;
   void RenderViewCreated(content::RenderViewHost*) override;
-  void RenderViewHostChanged(content::RenderViewHost* old_host,
-                             content::RenderViewHost* new_host) override;
   void RenderViewDeleted(content::RenderViewHost*) override;
   void RenderProcessGone(base::TerminationStatus status) override;
   void DocumentLoadedInFrame(
@@ -449,10 +421,10 @@ class WebContents : public mate::TrackableObject<WebContents>,
       content::WebContentsObserver::MediaStoppedReason reason) override;
   void DidChangeThemeColor(SkColor theme_color) override;
 
-  // InspectableWebContentsDelegate:
+  // brightray::InspectableWebContentsDelegate:
   void DevToolsReloadPage() override;
 
-  // InspectableWebContentsViewDelegate:
+  // brightray::InspectableWebContentsViewDelegate:
   void DevToolsFocused() override;
   void DevToolsOpened() override;
   void DevToolsClosed() override;
@@ -537,13 +509,12 @@ class WebContents : public mate::TrackableObject<WebContents>,
   // Whether to enable devtools.
   bool enable_devtools_ = true;
 
+  // Whether page's document is ready.
+  bool is_dom_ready_ = false;
+
   // Observers of this WebContents.
   base::ObserverList<ExtendedWebContentsObserver> observers_;
 
-  // The ID of the process of the currently committed RenderViewHost.
-  // -1 means no speculative RVH has been committed yet.
-  int currently_committed_process_id_ = -1;
-
   DISALLOW_COPY_AND_ASSIGN(WebContents);
 };
 

atom/browser/api/atom_api_web_contents_mac.mm

@@ -17,7 +17,7 @@ bool WebContents::IsFocused() const {
     return false;
 
   if (GetType() != BACKGROUND_PAGE) {
-    auto window = [web_contents()->GetNativeView().GetNativeNSView() window];
+    auto window = [web_contents()->GetNativeView() window];
     // On Mac the render widget host view does not lose focus when the window
     // loses focus so check if the top level window is the key window.
     if (window && ![window isKeyWindow])

atom/browser/api/atom_api_web_contents_osr.cc

@@ -4,12 +4,9 @@
 
 #include "atom/browser/api/atom_api_web_contents.h"
 
-#include "content/browser/web_contents/web_contents_impl.h"
-
-#if BUILDFLAG(ENABLE_OSR)
 #include "atom/browser/osr/osr_render_widget_host_view.h"
 #include "atom/browser/osr/osr_web_contents_view.h"
-#endif
+#include "content/browser/web_contents/web_contents_impl.h"
 
 // Including both web_contents_impl.h and node.h would introduce a error, we
 // have to isolate the usage of WebContentsImpl into a clean file to fix it:
@@ -19,13 +16,6 @@ namespace atom {
 
 namespace api {
 
-void WebContents::DetachFromOuterFrame() {
-  // See detach_webview_frame.patch on how to detach.
-  auto* impl = static_cast<content::WebContentsImpl*>(web_contents());
-  impl->GetRenderManagerForTesting()->RemoveOuterDelegateFrame();
-}
-
-#if BUILDFLAG(ENABLE_OSR)
 OffScreenWebContentsView* WebContents::GetOffScreenWebContentsView() const {
   if (IsOffScreen()) {
     const auto* impl =
@@ -45,7 +35,6 @@ OffScreenRenderWidgetHostView* WebContents::GetOffScreenRenderWidgetHostView()
     return nullptr;
   }
 }
-#endif
 
 }  // namespace api
 

atom/browser/api/atom_api_web_contents_view.cc

@@ -6,8 +6,8 @@
 
 #include "atom/browser/api/atom_api_web_contents.h"
 #include "atom/browser/browser.h"
-#include "atom/browser/ui/inspectable_web_contents_view.h"
 #include "atom/common/api/constructor.h"
+#include "brightray/browser/inspectable_web_contents_view.h"
 #include "content/public/browser/web_contents_user_data.h"
 #include "native_mate/dictionary.h"
 
@@ -31,22 +31,20 @@ class WebContentsViewRelay
 
   atom::api::WebContentsView* view_ = nullptr;
 
-  WEB_CONTENTS_USER_DATA_KEY_DECL();
-
   DISALLOW_COPY_AND_ASSIGN(WebContentsViewRelay);
 };
 
-WEB_CONTENTS_USER_DATA_KEY_IMPL(WebContentsViewRelay)
-
 }  // namespace
 
+DEFINE_WEB_CONTENTS_USER_DATA_KEY(WebContentsViewRelay);
+
 namespace atom {
 
 namespace api {
 
 WebContentsView::WebContentsView(v8::Isolate* isolate,
                                  mate::Handle<WebContents> web_contents,
-                                 InspectableWebContents* iwc)
+                                 brightray::InspectableWebContents* iwc)
 #if defined(OS_MACOSX)
     : View(new DelayedNativeViewHost(iwc->GetView()->GetNativeView())),
 #else
@@ -131,4 +129,4 @@ void Initialize(v8::Local<v8::Object> exports,
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_web_contents_view, Initialize)
+NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_browser_web_contents_view, Initialize)

atom/browser/api/atom_api_web_contents_view.h

@@ -9,9 +9,11 @@
 #include "content/public/browser/web_contents_observer.h"
 #include "native_mate/handle.h"
 
-namespace atom {
-
+namespace brightray {
 class InspectableWebContents;
+}
+
+namespace atom {
 
 namespace api {
 
@@ -28,7 +30,7 @@ class WebContentsView : public View, public content::WebContentsObserver {
  protected:
   WebContentsView(v8::Isolate* isolate,
                   mate::Handle<WebContents> web_contents,
-                  InspectableWebContents* iwc);
+                  brightray::InspectableWebContents* iwc);
   ~WebContentsView() override;
 
   // content::WebContentsObserver:

atom/browser/api/atom_api_web_request.cc

@@ -12,8 +12,6 @@
 #include "atom/common/native_mate_converters/callback.h"
 #include "atom/common/native_mate_converters/net_converter.h"
 #include "atom/common/native_mate_converters/value_converter.h"
-#include "base/task/post_task.h"
-#include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
 #include "native_mate/dictionary.h"
 #include "native_mate/object_template_builder.h"
@@ -31,7 +29,7 @@ struct Converter<URLPattern> {
     if (!ConvertFromV8(isolate, val, &pattern))
       return false;
     *out = URLPattern(URLPattern::SCHEME_ALL);
-    return out->Parse(pattern) == URLPattern::ParseResult::kSuccess;
+    return out->Parse(pattern) == URLPattern::PARSE_SUCCESS;
   }
 };
 
@@ -99,8 +97,8 @@ void WebRequest::SetListener(Method method, Event type, mate::Arguments* args) {
       browser_context_->GetRequestContext());
   if (!url_request_context_getter)
     return;
-  base::PostTaskWithTraits(
-      FROM_HERE, {BrowserThread::IO},
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
       base::BindOnce(&CallNetworkDelegateMethod<Method, Event, Listener>,
                      base::RetainedRef(url_request_context_getter), method,
                      type, std::move(patterns), std::move(listener)));

atom/browser/api/atom_api_web_view_manager.cc

@@ -55,4 +55,4 @@ void Initialize(v8::Local<v8::Object> exports,
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_web_view_manager, Initialize)
+NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_browser_web_view_manager, Initialize)

atom/browser/api/event_emitter.cc

@@ -5,7 +5,6 @@
 #include "atom/browser/api/event_emitter.h"
 
 #include "atom/browser/api/event.h"
-#include "content/public/browser/render_frame_host.h"
 #include "native_mate/arguments.h"
 #include "native_mate/dictionary.h"
 #include "native_mate/object_template_builder.h"
@@ -35,8 +34,7 @@ v8::Local<v8::Object> CreateEventObject(v8::Isolate* isolate) {
   }
 
   return v8::Local<v8::ObjectTemplate>::New(isolate, event_template)
-      ->NewInstance(isolate->GetCurrentContext())
-      .ToLocalChecked();
+      ->NewInstance();
 }
 
 }  // namespace
@@ -57,10 +55,7 @@ v8::Local<v8::Object> CreateJSEvent(v8::Isolate* isolate,
   } else {
     event = CreateEventObject(isolate);
   }
-  mate::Dictionary dict(isolate, event);
-  dict.Set("sender", object);
-  if (sender)
-    dict.Set("frameId", sender->GetRoutingID());
+  mate::Dictionary(isolate, event).Set("sender", object);
   return event;
 }
 

atom/browser/api/event_emitter.h

@@ -8,7 +8,6 @@
 #include <vector>
 
 #include "atom/common/api/event_emitter_caller.h"
-#include "content/public/browser/browser_thread.h"
 #include "native_mate/wrappable.h"
 
 namespace content {
@@ -98,13 +97,11 @@ class EventEmitter : public Wrappable<T> {
   bool EmitWithEvent(const base::StringPiece& name,
                      v8::Local<v8::Object> event,
                      const Args&... args) {
-    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
     v8::Locker locker(isolate());
     v8::HandleScope handle_scope(isolate());
     EmitEvent(isolate(), GetWrapper(), name, event, args...);
     return event->Get(StringToV8(isolate(), "defaultPrevented"))
-        ->BooleanValue(isolate()->GetCurrentContext())
-        .ToChecked();
+        ->BooleanValue();
   }
 
   DISALLOW_COPY_AND_ASSIGN(EventEmitter);

atom/browser/api/frame_subscriber.cc

@@ -4,12 +4,13 @@
 
 #include "atom/browser/api/frame_subscriber.h"
 
-#include <utility>
-
 #include "atom/common/native_mate_converters/gfx_converter.h"
-#include "content/public/browser/render_view_host.h"
-#include "content/public/browser/render_widget_host.h"
-#include "content/public/browser/render_widget_host_view.h"
+#include "components/viz/common/frame_sinks/copy_output_request.h"
+#include "components/viz/service/frame_sinks/frame_sink_manager_impl.h"
+#include "components/viz/service/surfaces/surface_manager.h"
+#include "content/browser/compositor/surface_utils.h"
+#include "content/browser/renderer_host/render_widget_host_view_base.h"
+#include "ui/gfx/geometry/rect_conversions.h"
 #include "ui/gfx/skbitmap_operations.h"
 
 #include "atom/common/node_includes.h"
@@ -18,8 +19,6 @@ namespace atom {
 
 namespace api {
 
-constexpr static int kMaxFrameRate = 30;
-
 FrameSubscriber::FrameSubscriber(v8::Isolate* isolate,
                                  content::WebContents* web_contents,
                                  const FrameCaptureCallback& callback,
@@ -28,123 +27,48 @@ FrameSubscriber::FrameSubscriber(v8::Isolate* isolate,
       isolate_(isolate),
       callback_(callback),
       only_dirty_(only_dirty),
-      weak_ptr_factory_(this) {
-  content::RenderViewHost* rvh = web_contents->GetRenderViewHost();
-  if (rvh)
-    AttachToHost(rvh->GetWidget());
-}
+      weak_ptr_factory_(this) {}
 
 FrameSubscriber::~FrameSubscriber() = default;
 
-void FrameSubscriber::AttachToHost(content::RenderWidgetHost* host) {
-  host_ = host;
+gfx::Rect FrameSubscriber::GetDamageRect() {
+  auto* view = web_contents()->GetRenderWidgetHostView();
+  if (view == nullptr)
+    return gfx::Rect();
 
-  // The view can be null if the renderer process has crashed.
-  // (https://crbug.com/847363)
-  if (!host_->GetView())
-    return;
+  auto* view_base = static_cast<content::RenderWidgetHostViewBase*>(view);
+  viz::SurfaceManager* surface_manager =
+      content::GetFrameSinkManager()->surface_manager();
+  viz::Surface* surface =
+      surface_manager->GetSurfaceForId(view_base->GetCurrentSurfaceId());
+  if (surface == nullptr)
+    return gfx::Rect();
 
-  // Create and configure the video capturer.
-  video_capturer_ = host_->GetView()->CreateVideoCapturer();
-  video_capturer_->SetResolutionConstraints(
-      host_->GetView()->GetViewBounds().size(),
-      host_->GetView()->GetViewBounds().size(), true);
-  video_capturer_->SetAutoThrottlingEnabled(false);
-  video_capturer_->SetMinSizeChangePeriod(base::TimeDelta());
-  video_capturer_->SetFormat(media::PIXEL_FORMAT_ARGB,
-                             gfx::ColorSpace::CreateREC709());
-  video_capturer_->SetMinCapturePeriod(base::TimeDelta::FromSeconds(1) /
-                                       kMaxFrameRate);
-  video_capturer_->Start(this);
-}
-
-void FrameSubscriber::DetachFromHost() {
-  if (!host_)
-    return;
-  video_capturer_.reset();
-  host_ = nullptr;
-}
-
-void FrameSubscriber::RenderViewCreated(content::RenderViewHost* host) {
-  if (!host_)
-    AttachToHost(host->GetWidget());
-}
-
-void FrameSubscriber::RenderViewDeleted(content::RenderViewHost* host) {
-  if (host->GetWidget() == host_) {
-    DetachFromHost();
+  if (surface->HasActiveFrame()) {
+    const viz::CompositorFrame& frame = surface->GetActiveFrame();
+    viz::RenderPass* root_pass = frame.render_pass_list.back().get();
+    gfx::Size frame_size = root_pass->output_rect.size();
+    gfx::Rect damage_rect =
+        gfx::ToEnclosingRect(gfx::RectF(root_pass->damage_rect));
+    damage_rect.Intersect(gfx::Rect(frame_size));
+    return gfx::ScaleToEnclosedRect(damage_rect,
+                                    1.0f / frame.device_scale_factor());
+  } else {
+    return gfx::Rect();
   }
 }
 
-void FrameSubscriber::RenderViewHostChanged(content::RenderViewHost* old_host,
-                                            content::RenderViewHost* new_host) {
-  if ((old_host && old_host->GetWidget() == host_) || (!old_host && !host_)) {
-    DetachFromHost();
-    AttachToHost(new_host->GetWidget());
-  }
+void FrameSubscriber::DidReceiveCompositorFrame() {
+  auto* view = web_contents()->GetRenderWidgetHostView();
+  if (view == nullptr)
+    return;
+
+  view->CopyFromSurface(
+      gfx::Rect(), view->GetViewBounds().size(),
+      base::BindOnce(&FrameSubscriber::Done, weak_ptr_factory_.GetWeakPtr(),
+                     GetDamageRect()));
 }
 
-void FrameSubscriber::OnFrameCaptured(
-    base::ReadOnlySharedMemoryRegion data,
-    ::media::mojom::VideoFrameInfoPtr info,
-    const gfx::Rect& update_rect,
-    const gfx::Rect& content_rect,
-    viz::mojom::FrameSinkVideoConsumerFrameCallbacksPtr callbacks) {
-  gfx::Size view_size = host_->GetView()->GetViewBounds().size();
-  if (view_size != content_rect.size()) {
-    video_capturer_->SetResolutionConstraints(view_size, view_size, true);
-    video_capturer_->RequestRefreshFrame();
-    return;
-  }
-
-  if (!data.IsValid()) {
-    callbacks->Done();
-    return;
-  }
-  base::ReadOnlySharedMemoryMapping mapping = data.Map();
-  if (!mapping.IsValid()) {
-    DLOG(ERROR) << "Shared memory mapping failed.";
-    return;
-  }
-  if (mapping.size() <
-      media::VideoFrame::AllocationSize(info->pixel_format, info->coded_size)) {
-    DLOG(ERROR) << "Shared memory size was less than expected.";
-    return;
-  }
-
-  // The SkBitmap's pixels will be marked as immutable, but the installPixels()
-  // API requires a non-const pointer. So, cast away the const.
-  void* const pixels = const_cast<void*>(mapping.memory());
-
-  // Call installPixels() with a |releaseProc| that: 1) notifies the capturer
-  // that this consumer has finished with the frame, and 2) releases the shared
-  // memory mapping.
-  struct FramePinner {
-    // Keeps the shared memory that backs |frame_| mapped.
-    base::ReadOnlySharedMemoryMapping mapping;
-    // Prevents FrameSinkVideoCapturer from recycling the shared memory that
-    // backs |frame_|.
-    viz::mojom::FrameSinkVideoConsumerFrameCallbacksPtr releaser;
-  };
-
-  SkBitmap bitmap;
-  bitmap.installPixels(
-      SkImageInfo::MakeN32(content_rect.width(), content_rect.height(),
-                           kPremul_SkAlphaType),
-      pixels,
-      media::VideoFrame::RowBytes(media::VideoFrame::kARGBPlane,
-                                  info->pixel_format, info->coded_size.width()),
-      [](void* addr, void* context) {
-        delete static_cast<FramePinner*>(context);
-      },
-      new FramePinner{std::move(mapping), std::move(callbacks)});
-  bitmap.setImmutable();
-
-  Done(content_rect, bitmap);
-}
-
-void FrameSubscriber::OnStopped() {}
-
 void FrameSubscriber::Done(const gfx::Rect& damage, const SkBitmap& frame) {
   if (frame.drawsNothing())
     return;

atom/browser/api/frame_subscriber.h

@@ -5,13 +5,13 @@
 #ifndef ATOM_BROWSER_API_FRAME_SUBSCRIBER_H_
 #define ATOM_BROWSER_API_FRAME_SUBSCRIBER_H_
 
-#include <memory>
+#include "content/public/browser/web_contents.h"
 
 #include "base/callback.h"
 #include "base/memory/weak_ptr.h"
-#include "components/viz/host/client_frame_sink_video_capturer.h"
-#include "content/public/browser/web_contents.h"
+#include "components/viz/common/frame_sinks/copy_output_result.h"
 #include "content/public/browser/web_contents_observer.h"
+#include "ui/gfx/image/image.h"
 #include "v8/include/v8.h"
 
 namespace atom {
@@ -20,8 +20,7 @@ namespace api {
 
 class WebContents;
 
-class FrameSubscriber : public content::WebContentsObserver,
-                        public viz::mojom::FrameSinkVideoConsumer {
+class FrameSubscriber : public content::WebContentsObserver {
  public:
   using FrameCaptureCallback =
       base::Callback<void(v8::Local<v8::Value>, v8::Local<v8::Value>)>;
@@ -33,32 +32,14 @@ class FrameSubscriber : public content::WebContentsObserver,
   ~FrameSubscriber() override;
 
  private:
-  void AttachToHost(content::RenderWidgetHost* host);
-  void DetachFromHost();
-
-  void RenderViewCreated(content::RenderViewHost* host) override;
-  void RenderViewDeleted(content::RenderViewHost* host) override;
-  void RenderViewHostChanged(content::RenderViewHost* old_host,
-                             content::RenderViewHost* new_host) override;
-
-  // viz::mojom::FrameSinkVideoConsumer implementation.
-  void OnFrameCaptured(
-      base::ReadOnlySharedMemoryRegion data,
-      ::media::mojom::VideoFrameInfoPtr info,
-      const gfx::Rect& update_rect,
-      const gfx::Rect& content_rect,
-      viz::mojom::FrameSinkVideoConsumerFrameCallbacksPtr callbacks) override;
-  void OnStopped() override;
-
+  gfx::Rect GetDamageRect();
+  void DidReceiveCompositorFrame() override;
   void Done(const gfx::Rect& damage, const SkBitmap& frame);
 
   v8::Isolate* isolate_;
   FrameCaptureCallback callback_;
   bool only_dirty_;
 
-  content::RenderWidgetHost* host_;
-  std::unique_ptr<viz::ClientFrameSinkVideoCapturer> video_capturer_;
-
   base::WeakPtrFactory<FrameSubscriber> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(FrameSubscriber);

atom/browser/api/gpu_info_enumerator.cc

@@ -107,18 +107,6 @@ void GPUInfoEnumerator::EndOverlayCapability() {
   value_stack.pop();
 }
 
-void GPUInfoEnumerator::BeginDx12VulkanVersionInfo() {
-  value_stack.push(std::move(current));
-  current = std::make_unique<base::DictionaryValue>();
-}
-
-void GPUInfoEnumerator::EndDx12VulkanVersionInfo() {
-  auto& top_value = value_stack.top();
-  top_value->SetDictionary(kDx12VulkanVersionInfoKey, std::move(current));
-  current = std::move(top_value);
-  value_stack.pop();
-}
-
 std::unique_ptr<base::DictionaryValue> GPUInfoEnumerator::GetDictionary() {
   return std::move(current);
 }

atom/browser/api/gpu_info_enumerator.h

@@ -24,7 +24,6 @@ class GPUInfoEnumerator final : public gpu::GPUInfo::Enumerator {
       "videoEncodeAcceleratorSupportedProfile";
   const char* kAuxAttributesKey = "auxAttributes";
   const char* kOverlayCapabilityKey = "overlayCapability";
-  const char* kDx12VulkanVersionInfoKey = "dx12VulkanVersionInfo";
 
  public:
   GPUInfoEnumerator();
@@ -45,8 +44,6 @@ class GPUInfoEnumerator final : public gpu::GPUInfo::Enumerator {
   void EndAuxAttributes() override;
   void BeginOverlayCapability() override;
   void EndOverlayCapability() override;
-  void BeginDx12VulkanVersionInfo() override;
-  void EndDx12VulkanVersionInfo() override;
   std::unique_ptr<base::DictionaryValue> GetDictionary();
 
  private:

atom/browser/api/gpuinfo_manager.cc

@@ -3,9 +3,6 @@
 // found in the LICENSE file.
 
 #include "atom/browser/api/gpuinfo_manager.h"
-
-#include <utility>
-
 #include "atom/browser/api/gpu_info_enumerator.h"
 #include "base/memory/singleton.h"
 #include "base/threading/thread_task_runner_handle.h"
@@ -45,8 +42,8 @@ void GPUInfoManager::ProcessCompleteInfo() {
   const auto result = EnumerateGPUInfo(gpu_data_manager_->GetGPUInfo());
   // We have received the complete information, resolve all promises that
   // were waiting for this info.
-  for (auto& promise : complete_info_promise_set_) {
-    promise.Resolve(*result);
+  for (const auto& promise : complete_info_promise_set_) {
+    promise->Resolve(*result);
   }
   complete_info_promise_set_.clear();
 }
@@ -61,8 +58,8 @@ void GPUInfoManager::OnGpuInfoUpdate() {
 }
 
 // Should be posted to the task runner
-void GPUInfoManager::CompleteInfoFetcher(util::Promise promise) {
-  complete_info_promise_set_.emplace_back(std::move(promise));
+void GPUInfoManager::CompleteInfoFetcher(scoped_refptr<util::Promise> promise) {
+  complete_info_promise_set_.push_back(promise);
 
   if (NeedsCompleteGpuInfoCollection()) {
     gpu_data_manager_->RequestCompleteGpuInfoIfNeeded();
@@ -71,18 +68,18 @@ void GPUInfoManager::CompleteInfoFetcher(util::Promise promise) {
   }
 }
 
-void GPUInfoManager::FetchCompleteInfo(util::Promise promise) {
+void GPUInfoManager::FetchCompleteInfo(scoped_refptr<util::Promise> promise) {
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::BindOnce(&GPUInfoManager::CompleteInfoFetcher,
-                                base::Unretained(this), std::move(promise)));
+                                base::Unretained(this), promise));
 }
 
 // This fetches the info synchronously, so no need to post to the task queue.
 // There cannot be multiple promises as they are resolved synchronously.
-void GPUInfoManager::FetchBasicInfo(util::Promise promise) {
+void GPUInfoManager::FetchBasicInfo(scoped_refptr<util::Promise> promise) {
   gpu::GPUInfo gpu_info;
   CollectBasicGraphicsInfo(&gpu_info);
-  promise.Resolve(*EnumerateGPUInfo(gpu_info));
+  promise->Resolve(*EnumerateGPUInfo(gpu_info));
 }
 
 std::unique_ptr<base::DictionaryValue> GPUInfoManager::EnumerateGPUInfo(

atom/browser/api/gpuinfo_manager.h

@@ -25,8 +25,8 @@ class GPUInfoManager : public content::GpuDataManagerObserver {
   GPUInfoManager();
   ~GPUInfoManager() override;
   bool NeedsCompleteGpuInfoCollection() const;
-  void FetchCompleteInfo(util::Promise promise);
-  void FetchBasicInfo(util::Promise promise);
+  void FetchCompleteInfo(scoped_refptr<util::Promise> promise);
+  void FetchBasicInfo(scoped_refptr<util::Promise> promise);
   void OnGpuInfoUpdate() override;
 
  private:
@@ -34,12 +34,12 @@ class GPUInfoManager : public content::GpuDataManagerObserver {
       gpu::GPUInfo gpu_info) const;
 
   // These should be posted to the task queue
-  void CompleteInfoFetcher(util::Promise promise);
+  void CompleteInfoFetcher(scoped_refptr<util::Promise> promise);
   void ProcessCompleteInfo();
 
   // This set maintains all the promises that should be fulfilled
   // once we have the complete information data
-  std::vector<util::Promise> complete_info_promise_set_;
+  std::vector<scoped_refptr<util::Promise>> complete_info_promise_set_;
   content::GpuDataManager* gpu_data_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(GPUInfoManager);

atom/browser/api/save_page_handler.cc

@@ -57,9 +57,7 @@ void SavePageHandler::OnDownloadUpdated(download::DownloadItem* item) {
       callback_.Run(v8::Null(isolate));
     } else {
       v8::Local<v8::String> error_message =
-          v8::String::NewFromUtf8(isolate, "Fail to save page",
-                                  v8::NewStringType::kNormal)
-              .ToLocalChecked();
+          v8::String::NewFromUtf8(isolate, "Fail to save page");
       callback_.Run(v8::Exception::Error(error_message));
     }
     Destroy(item);

atom/browser/api/stream_subscriber.cc

@@ -9,8 +9,6 @@
 #include "atom/browser/net/url_request_stream_job.h"
 #include "atom/common/api/event_emitter_caller.h"
 #include "atom/common/native_mate_converters/callback.h"
-#include "base/task/post_task.h"
-#include "content/public/browser/browser_task_traits.h"
 
 #include "atom/common/node_includes.h"
 
@@ -80,21 +78,23 @@ void StreamSubscriber::OnData(mate::Arguments* args) {
 
   // Pass the data to the URLJob in IO thread.
   std::vector<char> buffer(data, data + length);
-  base::PostTaskWithTraits(FROM_HERE, {content::BrowserThread::IO},
-                           base::Bind(&atom::URLRequestStreamJob::OnData,
-                                      url_job_, base::Passed(&buffer)));
+  content::BrowserThread::PostTask(
+      content::BrowserThread::IO, FROM_HERE,
+      base::Bind(&atom::URLRequestStreamJob::OnData, url_job_,
+                 base::Passed(&buffer)));
 }
 
 void StreamSubscriber::OnEnd(mate::Arguments* args) {
-  base::PostTaskWithTraits(
-      FROM_HERE, {content::BrowserThread::IO},
+  content::BrowserThread::PostTask(
+      content::BrowserThread::IO, FROM_HERE,
       base::Bind(&atom::URLRequestStreamJob::OnEnd, url_job_));
 }
 
 void StreamSubscriber::OnError(mate::Arguments* args) {
-  base::PostTaskWithTraits(FROM_HERE, {content::BrowserThread::IO},
-                           base::Bind(&atom::URLRequestStreamJob::OnError,
-                                      url_job_, net::ERR_FAILED));
+  content::BrowserThread::PostTask(
+      content::BrowserThread::IO, FROM_HERE,
+      base::Bind(&atom::URLRequestStreamJob::OnError, url_job_,
+                 net::ERR_FAILED));
 }
 
 void StreamSubscriber::RemoveAllListeners() {

atom/browser/api/views/atom_api_box_layout.cc

@@ -84,4 +84,4 @@ void Initialize(v8::Local<v8::Object> exports,
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_box_layout, Initialize)
+NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_browser_box_layout, Initialize)

atom/browser/api/views/atom_api_button.cc

@@ -13,10 +13,8 @@ namespace atom {
 
 namespace api {
 
-Button::Button(views::Button* impl) : View(impl) {
+Button::Button(views::Button* button) : View(button) {
   view()->set_owned_by_client();
-  // Make the button focusable as per the platform.
-  button()->SetFocusForPlatform();
 }
 
 Button::~Button() {}
@@ -57,4 +55,4 @@ void Initialize(v8::Local<v8::Object> exports,
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_button, Initialize)
+NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_browser_button, Initialize)

atom/browser/api/views/atom_api_button.h

@@ -27,8 +27,6 @@ class Button : public View, public views::ButtonListener {
   // views::ButtonListener:
   void ButtonPressed(views::Button* sender, const ui::Event& event) override;
 
-  views::Button* button() const { return static_cast<views::Button*>(view()); }
-
  private:
   DISALLOW_COPY_AND_ASSIGN(Button);
 };

atom/browser/api/views/atom_api_label_button.cc

@@ -7,6 +7,7 @@
 #include "atom/common/api/constructor.h"
 #include "base/strings/utf_string_conversions.h"
 #include "native_mate/dictionary.h"
+#include "ui/views/controls/button/label_button.h"
 
 #include "atom/common/node_includes.h"
 
@@ -14,29 +15,11 @@ namespace atom {
 
 namespace api {
 
-LabelButton::LabelButton(views::LabelButton* impl) : Button(impl) {}
-
 LabelButton::LabelButton(const std::string& text)
     : Button(new views::LabelButton(this, base::UTF8ToUTF16(text))) {}
 
 LabelButton::~LabelButton() {}
 
-const base::string16& LabelButton::GetText() const {
-  return label_button()->GetText();
-}
-
-void LabelButton::SetText(const base::string16& text) {
-  label_button()->SetText(text);
-}
-
-bool LabelButton::IsDefault() const {
-  return label_button()->is_default();
-}
-
-void LabelButton::SetIsDefault(bool is_default) {
-  label_button()->SetIsDefault(is_default);
-}
-
 // static
 mate::WrappableBase* LabelButton::New(mate::Arguments* args,
                                       const std::string& text) {
@@ -50,11 +33,6 @@ mate::WrappableBase* LabelButton::New(mate::Arguments* args,
 void LabelButton::BuildPrototype(v8::Isolate* isolate,
                                  v8::Local<v8::FunctionTemplate> prototype) {
   prototype->SetClassName(mate::StringToV8(isolate, "LabelButton"));
-  mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate())
-      .SetMethod("getText", &LabelButton::GetText)
-      .SetMethod("setText", &LabelButton::SetText)
-      .SetMethod("isDefault", &LabelButton::IsDefault)
-      .SetMethod("setIsDefault", &LabelButton::SetIsDefault);
 }
 
 }  // namespace api
@@ -77,4 +55,4 @@ void Initialize(v8::Local<v8::Object> exports,
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_label_button, Initialize)
+NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_browser_label_button, Initialize)

atom/browser/api/views/atom_api_label_button.h

@@ -8,7 +8,6 @@
 #include <string>
 
 #include "atom/browser/api/views/atom_api_button.h"
-#include "ui/views/controls/button/label_button.h"
 
 namespace atom {
 
@@ -22,20 +21,10 @@ class LabelButton : public Button {
   static void BuildPrototype(v8::Isolate* isolate,
                              v8::Local<v8::FunctionTemplate> prototype);
 
-  const base::string16& GetText() const;
-  void SetText(const base::string16& text);
-  bool IsDefault() const;
-  void SetIsDefault(bool is_default);
-
  protected:
-  explicit LabelButton(views::LabelButton* impl);
   explicit LabelButton(const std::string& text);
   ~LabelButton() override;
 
-  views::LabelButton* label_button() const {
-    return static_cast<views::LabelButton*>(view());
-  }
-
  private:
   DISALLOW_COPY_AND_ASSIGN(LabelButton);
 };

atom/browser/api/views/atom_api_layout_manager.cc

@@ -60,4 +60,4 @@ void Initialize(v8::Local<v8::Object> exports,
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_layout_manager, Initialize)
+NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_browser_layout_manager, Initialize)

atom/browser/api/views/atom_api_md_text_button.cc

@@ -1,57 +0,0 @@
-// Copyright (c) 2018 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#include "atom/browser/api/views/atom_api_md_text_button.h"
-
-#include "atom/common/api/constructor.h"
-#include "base/strings/utf_string_conversions.h"
-#include "native_mate/dictionary.h"
-
-#include "atom/common/node_includes.h"
-
-namespace atom {
-
-namespace api {
-
-MdTextButton::MdTextButton(const std::string& text)
-    : LabelButton(views::MdTextButton::Create(this, base::UTF8ToUTF16(text))) {}
-
-MdTextButton::~MdTextButton() {}
-
-// static
-mate::WrappableBase* MdTextButton::New(mate::Arguments* args,
-                                       const std::string& text) {
-  // Constructor call.
-  auto* view = new MdTextButton(text);
-  view->InitWith(args->isolate(), args->GetThis());
-  return view;
-}
-
-// static
-void MdTextButton::BuildPrototype(v8::Isolate* isolate,
-                                  v8::Local<v8::FunctionTemplate> prototype) {
-  prototype->SetClassName(mate::StringToV8(isolate, "MdTextButton"));
-}
-
-}  // namespace api
-
-}  // namespace atom
-
-namespace {
-
-using atom::api::MdTextButton;
-
-void Initialize(v8::Local<v8::Object> exports,
-                v8::Local<v8::Value> unused,
-                v8::Local<v8::Context> context,
-                void* priv) {
-  v8::Isolate* isolate = context->GetIsolate();
-  mate::Dictionary dict(isolate, exports);
-  dict.Set("MdTextButton", mate::CreateConstructor<MdTextButton>(
-                               isolate, base::Bind(&MdTextButton::New)));
-}
-
-}  // namespace
-
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_md_text_button, Initialize)

atom/browser/api/views/atom_api_md_text_button.h

@@ -1,41 +0,0 @@
-// Copyright (c) 2018 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#ifndef ATOM_BROWSER_API_VIEWS_ATOM_API_MD_TEXT_BUTTON_H_
-#define ATOM_BROWSER_API_VIEWS_ATOM_API_MD_TEXT_BUTTON_H_
-
-#include <string>
-
-#include "atom/browser/api/views/atom_api_label_button.h"
-#include "ui/views/controls/button/md_text_button.h"
-
-namespace atom {
-
-namespace api {
-
-class MdTextButton : public LabelButton {
- public:
-  static mate::WrappableBase* New(mate::Arguments* args,
-                                  const std::string& text);
-
-  static void BuildPrototype(v8::Isolate* isolate,
-                             v8::Local<v8::FunctionTemplate> prototype);
-
- protected:
-  explicit MdTextButton(const std::string& text);
-  ~MdTextButton() override;
-
-  views::MdTextButton* md_text_button() const {
-    return static_cast<views::MdTextButton*>(view());
-  }
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(MdTextButton);
-};
-
-}  // namespace api
-
-}  // namespace atom
-
-#endif  // ATOM_BROWSER_API_VIEWS_ATOM_API_MD_TEXT_BUTTON_H_

atom/browser/api/views/atom_api_resize_area.cc

@@ -1,60 +0,0 @@
-// Copyright (c) 2018 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#include "atom/browser/api/views/atom_api_resize_area.h"
-
-#include "atom/common/api/constructor.h"
-#include "native_mate/dictionary.h"
-
-#include "atom/common/node_includes.h"
-
-namespace atom {
-
-namespace api {
-
-ResizeArea::ResizeArea() : View(new views::ResizeArea(this)) {
-  view()->set_owned_by_client();
-}
-
-ResizeArea::~ResizeArea() {}
-
-void ResizeArea::OnResize(int resize_amount, bool done_resizing) {
-  Emit("resize", resize_amount, done_resizing);
-}
-
-// static
-mate::WrappableBase* ResizeArea::New(mate::Arguments* args) {
-  // Constructor call.
-  auto* view = new ResizeArea();
-  view->InitWith(args->isolate(), args->GetThis());
-  return view;
-}
-
-// static
-void ResizeArea::BuildPrototype(v8::Isolate* isolate,
-                                v8::Local<v8::FunctionTemplate> prototype) {
-  prototype->SetClassName(mate::StringToV8(isolate, "ResizeArea"));
-}
-
-}  // namespace api
-
-}  // namespace atom
-
-namespace {
-
-using atom::api::ResizeArea;
-
-void Initialize(v8::Local<v8::Object> exports,
-                v8::Local<v8::Value> unused,
-                v8::Local<v8::Context> context,
-                void* priv) {
-  v8::Isolate* isolate = context->GetIsolate();
-  mate::Dictionary dict(isolate, exports);
-  dict.Set("ResizeArea", mate::CreateConstructor<ResizeArea>(
-                             isolate, base::Bind(&ResizeArea::New)));
-}
-
-}  // namespace
-
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_resize_area, Initialize)

atom/browser/api/views/atom_api_resize_area.h

@@ -1,43 +0,0 @@
-// Copyright (c) 2018 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#ifndef ATOM_BROWSER_API_VIEWS_ATOM_API_RESIZE_AREA_H_
-#define ATOM_BROWSER_API_VIEWS_ATOM_API_RESIZE_AREA_H_
-
-#include "atom/browser/api/atom_api_view.h"
-#include "native_mate/handle.h"
-#include "ui/views/controls/resize_area.h"
-#include "ui/views/controls/resize_area_delegate.h"
-
-namespace atom {
-
-namespace api {
-
-class ResizeArea : public View, protected views::ResizeAreaDelegate {
- public:
-  static mate::WrappableBase* New(mate::Arguments* args);
-
-  static void BuildPrototype(v8::Isolate* isolate,
-                             v8::Local<v8::FunctionTemplate> prototype);
-
- protected:
-  void OnResize(int resize_amount, bool done_resizing) override;
-
- private:
-  ResizeArea();
-  ~ResizeArea() override;
-
-  views::ResizeArea* resize_area() const {
-    return static_cast<views::ResizeArea*>(view());
-  }
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(ResizeArea);
-};
-
-}  // namespace api
-
-}  // namespace atom
-
-#endif  // ATOM_BROWSER_API_VIEWS_ATOM_API_RESIZE_AREA_H_

atom/browser/api/views/atom_api_text_field.cc

@@ -64,4 +64,4 @@ void Initialize(v8::Local<v8::Object> exports,
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_text_field, Initialize)
+NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_browser_text_field, Initialize)

atom/browser/atom_blob_reader.cc

@@ -6,9 +6,7 @@
 
 #include <utility>
 
-#include "base/task/post_task.h"
 #include "content/browser/blob_storage/chrome_blob_storage_context.h"
-#include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
@@ -62,8 +60,8 @@ void AtomBlobReader::StartReading(
   auto blob_data_handle = blob_context_->context()->GetBlobDataFromUUID(uuid);
   auto callback = base::Bind(&RunCallbackInUI, completion_callback);
   if (!blob_data_handle) {
-    base::PostTaskWithTraits(FROM_HERE, {BrowserThread::UI},
-                             base::BindOnce(callback, nullptr, 0));
+    BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
+                            base::BindOnce(callback, nullptr, 0));
     return;
   }
 
@@ -118,8 +116,8 @@ void AtomBlobReader::BlobReadHelper::DidReadBlobData(
 
   char* data = new char[size];
   memcpy(data, blob_data->data(), size);
-  base::PostTaskWithTraits(FROM_HERE, {BrowserThread::UI},
-                           base::BindOnce(completion_callback_, data, size));
+  BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
+                          base::BindOnce(completion_callback_, data, size));
   delete this;
 }
 

atom/browser/atom_browser_client.cc

@@ -11,7 +11,6 @@
 #include <memory>
 #include <utility>
 
-#include "atom/app/manifests.h"
 #include "atom/browser/api/atom_api_app.h"
 #include "atom/browser/api/atom_api_protocol.h"
 #include "atom/browser/api/atom_api_web_contents.h"
@@ -22,37 +21,26 @@
 #include "atom/browser/atom_resource_dispatcher_host_delegate.h"
 #include "atom/browser/atom_speech_recognition_manager_delegate.h"
 #include "atom/browser/child_web_contents_tracker.h"
-#include "atom/browser/font_defaults.h"
 #include "atom/browser/io_thread.h"
-#include "atom/browser/media/media_capture_devices_dispatcher.h"
 #include "atom/browser/native_window.h"
-#include "atom/browser/notifications/notification_presenter.h"
-#include "atom/browser/notifications/platform_notification_service.h"
 #include "atom/browser/session_preferences.h"
-#include "atom/browser/ui/devtools_manager_delegate.h"
 #include "atom/browser/web_contents_permission_helper.h"
 #include "atom/browser/web_contents_preferences.h"
 #include "atom/browser/window_list.h"
-#include "atom/common/application_info.h"
+#include "atom/common/google_api_key.h"
 #include "atom/common/options_switches.h"
 #include "atom/common/platform_util.h"
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/files/file_util.h"
 #include "base/json/json_reader.h"
-#include "base/lazy_instance.h"
 #include "base/no_destructor.h"
-#include "base/path_service.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
-#include "base/task/post_task.h"
-#include "chrome/browser/browser_process.h"
-#include "chrome/common/chrome_version.h"
 #include "components/net_log/chrome_net_log.h"
 #include "content/public/browser/browser_ppapi_host.h"
-#include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/client_certificate_delegate.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
@@ -74,7 +62,6 @@
 #include "services/device/public/cpp/geolocation/location_provider.h"
 #include "services/network/public/cpp/resource_request_body.h"
 #include "services/proxy_resolver/public/mojom/proxy_resolver.mojom.h"
-#include "services/service_manager/sandbox/switches.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "v8/include/v8.h"
@@ -85,8 +72,6 @@
 #include "net/ssl/client_cert_store_win.h"
 #elif defined(OS_MACOSX)
 #include "net/ssl/client_cert_store_mac.h"
-#include "services/audio/public/mojom/constants.mojom.h"
-#include "services/video_capture/public/mojom/constants.mojom.h"
 #elif defined(USE_OPENSSL)
 #include "net/ssl/client_cert_store.h"
 #endif
@@ -99,17 +84,16 @@
 #include "atom/browser/fake_location_provider.h"
 #endif  // BUILDFLAG(OVERRIDE_LOCATION_PROVIDER)
 
-#if BUILDFLAG(ENABLE_TTS)
-#include "chrome/browser/speech/tts_controller_delegate_impl.h"
-#include "chrome/browser/speech/tts_message_filter.h"
-#endif  // BUILDFLAG(ENABLE_TTS)
-
 #if BUILDFLAG(ENABLE_PRINTING)
 #include "chrome/browser/printing/printing_message_filter.h"
 #include "chrome/services/printing/public/mojom/constants.mojom.h"
 #include "components/services/pdf_compositor/public/interfaces/pdf_compositor.mojom.h"
 #endif  // BUILDFLAG(ENABLE_PRINTING)
 
+#if BUILDFLAG(ENABLE_TTS)
+#include "chrome/browser/speech/tts_message_filter.h"
+#endif  // BUILDFLAG(ENABLE_TTS)
+
 using content::BrowserThread;
 
 namespace atom {
@@ -119,27 +103,19 @@ namespace {
 // Next navigation should not restart renderer process.
 bool g_suppress_renderer_process_restart = false;
 
+// Custom schemes to be registered to handle service worker.
+base::NoDestructor<std::string> g_custom_service_worker_schemes;
+
 bool IsSameWebSite(content::BrowserContext* browser_context,
-                   content::SiteInstance* site_instance,
+                   const GURL& src_url,
                    const GURL& dest_url) {
-  return site_instance->IsSameSiteWithURL(dest_url) ||
-         // `IsSameSiteWithURL` doesn't seem to work for some URIs such as
-         // `file:`, handle these scenarios by comparing only the site as
-         // defined by `GetSiteForURL`.
-         (content::SiteInstance::GetSiteForURL(browser_context, dest_url) ==
-          site_instance->GetSiteURL());
-}
-
-AtomBrowserClient* g_browser_client = nullptr;
-
-base::LazyInstance<std::string>::DestructorAtExit
-    g_io_thread_application_locale = LAZY_INSTANCE_INITIALIZER;
-
-base::NoDestructor<std::string> g_application_locale;
-
-void SetApplicationLocaleOnIOThread(const std::string& locale) {
-  DCHECK_CURRENTLY_ON(BrowserThread::IO);
-  g_io_thread_application_locale.Get() = locale;
+  return content::SiteInstance::IsSameWebSite(browser_context, src_url,
+                                              dest_url) ||
+         // `IsSameWebSite` doesn't seem to work for some URIs such as `file:`,
+         // handle these scenarios by comparing only the site as defined by
+         // `GetSiteForURL`.
+         content::SiteInstance::GetSiteForURL(browser_context, dest_url) ==
+             src_url;
 }
 
 }  // namespace
@@ -149,35 +125,19 @@ void AtomBrowserClient::SuppressRendererProcessRestartForOnce() {
   g_suppress_renderer_process_restart = true;
 }
 
-AtomBrowserClient* AtomBrowserClient::Get() {
-  return g_browser_client;
+void AtomBrowserClient::SetCustomServiceWorkerSchemes(
+    const std::vector<std::string>& schemes) {
+  *g_custom_service_worker_schemes = base::JoinString(schemes, ",");
 }
 
-// static
-void AtomBrowserClient::SetApplicationLocale(const std::string& locale) {
-  if (!BrowserThread::IsThreadInitialized(BrowserThread::IO) ||
-      !base::PostTaskWithTraits(
-          FROM_HERE, {BrowserThread::IO},
-          base::BindOnce(&SetApplicationLocaleOnIOThread, locale))) {
-    g_io_thread_application_locale.Get() = locale;
-  }
-  *g_application_locale = locale;
-}
+AtomBrowserClient::AtomBrowserClient() {}
 
-AtomBrowserClient::AtomBrowserClient() {
-  DCHECK(!g_browser_client);
-  g_browser_client = this;
-}
-
-AtomBrowserClient::~AtomBrowserClient() {
-  DCHECK(g_browser_client);
-  g_browser_client = nullptr;
-}
+AtomBrowserClient::~AtomBrowserClient() {}
 
 content::WebContents* AtomBrowserClient::GetWebContentsFromProcessID(
     int process_id) {
   // If the process is a pending process, we should use the web contents
-  // for the frame host passed into RegisterPendingProcess.
+  // for the frame host passed into OverrideSiteInstanceForNavigation.
   if (base::ContainsKey(pending_processes_, process_id))
     return pending_processes_[process_id];
 
@@ -186,37 +146,25 @@ content::WebContents* AtomBrowserClient::GetWebContentsFromProcessID(
   return WebContentsPreferences::GetWebContentsFromProcessID(process_id);
 }
 
-bool AtomBrowserClient::ShouldForceNewSiteInstance(
-    content::RenderFrameHost* current_rfh,
-    content::RenderFrameHost* speculative_rfh,
+bool AtomBrowserClient::ShouldCreateNewSiteInstance(
+    content::RenderFrameHost* render_frame_host,
     content::BrowserContext* browser_context,
-    const GURL& url,
-    bool has_response_started) const {
+    content::SiteInstance* current_instance,
+    const GURL& url) {
   if (url.SchemeIs(url::kJavaScriptScheme))
     // "javacript:" scheme should always use same SiteInstance
     return false;
 
-  content::SiteInstance* current_instance = current_rfh->GetSiteInstance();
-  content::SiteInstance* speculative_instance =
-      speculative_rfh ? speculative_rfh->GetSiteInstance() : nullptr;
   int process_id = current_instance->GetProcess()->GetID();
-  if (NavigationWasRedirectedCrossSite(browser_context, current_instance,
-                                       speculative_instance, url,
-                                       has_response_started)) {
-    // Navigation was redirected. We can't force the current, speculative or a
-    // new unrelated site instance to be used. Delegate to the content layer.
-    return false;
-  } else if (IsRendererSandboxed(process_id)) {
-    // Renderer is sandboxed, delegate the decision to the content layer for all
-    // origins.
-    return false;
-  } else if (!RendererUsesNativeWindowOpen(process_id)) {
-    // non-sandboxed renderers without native window.open should always create
-    // a new SiteInstance
-    return true;
-  } else {
-    auto* web_contents = content::WebContents::FromRenderFrameHost(current_rfh);
-    if (!ChildWebContentsTracker::FromWebContents(web_contents)) {
+  if (!IsRendererSandboxed(process_id)) {
+    if (!RendererUsesNativeWindowOpen(process_id)) {
+      // non-sandboxed renderers without native window.open should always create
+      // a new SiteInstance
+      return true;
+    }
+    auto* web_contents =
+        content::WebContents::FromRenderFrameHost(render_frame_host);
+    if (!ChildWebContentsTracker::IsChildWebContents(web_contents)) {
       // Root WebContents should always create new process to make sure
       // native addons are loaded correctly after reload / navigation.
       // (Non-root WebContents opened by window.open() should try to
@@ -226,26 +174,8 @@ bool AtomBrowserClient::ShouldForceNewSiteInstance(
   }
 
   // Create new a SiteInstance if navigating to a different site.
-  return !IsSameWebSite(browser_context, current_instance, url);
-}
-
-bool AtomBrowserClient::NavigationWasRedirectedCrossSite(
-    content::BrowserContext* browser_context,
-    content::SiteInstance* current_instance,
-    content::SiteInstance* speculative_instance,
-    const GURL& dest_url,
-    bool has_response_started) const {
-  bool navigation_was_redirected = false;
-  if (has_response_started) {
-    navigation_was_redirected =
-        !IsSameWebSite(browser_context, current_instance, dest_url);
-  } else {
-    navigation_was_redirected =
-        speculative_instance &&
-        !IsSameWebSite(browser_context, speculative_instance, dest_url);
-  }
-
-  return navigation_was_redirected;
+  auto src_url = current_instance->GetSiteURL();
+  return !IsSameWebSite(browser_context, src_url, url);
 }
 
 void AtomBrowserClient::AddProcessPreferences(
@@ -260,69 +190,29 @@ void AtomBrowserClient::RemoveProcessPreferences(int process_id) {
   process_preferences_.erase(process_id);
 }
 
-bool AtomBrowserClient::IsProcessObserved(int process_id) const {
+bool AtomBrowserClient::IsProcessObserved(int process_id) {
   base::AutoLock auto_lock(process_preferences_lock_);
   return process_preferences_.find(process_id) != process_preferences_.end();
 }
 
-bool AtomBrowserClient::IsRendererSandboxed(int process_id) const {
+bool AtomBrowserClient::IsRendererSandboxed(int process_id) {
   base::AutoLock auto_lock(process_preferences_lock_);
   auto it = process_preferences_.find(process_id);
   return it != process_preferences_.end() && it->second.sandbox;
 }
 
-bool AtomBrowserClient::RendererUsesNativeWindowOpen(int process_id) const {
+bool AtomBrowserClient::RendererUsesNativeWindowOpen(int process_id) {
   base::AutoLock auto_lock(process_preferences_lock_);
   auto it = process_preferences_.find(process_id);
   return it != process_preferences_.end() && it->second.native_window_open;
 }
 
-bool AtomBrowserClient::RendererDisablesPopups(int process_id) const {
+bool AtomBrowserClient::RendererDisablesPopups(int process_id) {
   base::AutoLock auto_lock(process_preferences_lock_);
   auto it = process_preferences_.find(process_id);
   return it != process_preferences_.end() && it->second.disable_popups;
 }
 
-std::string AtomBrowserClient::GetAffinityPreference(
-    content::RenderFrameHost* rfh) const {
-  auto* web_contents = content::WebContents::FromRenderFrameHost(rfh);
-  auto* web_preferences = WebContentsPreferences::From(web_contents);
-  std::string affinity;
-  if (web_preferences &&
-      web_preferences->GetPreference("affinity", &affinity) &&
-      !affinity.empty()) {
-    affinity = base::ToLowerASCII(affinity);
-  }
-
-  return affinity;
-}
-
-content::SiteInstance* AtomBrowserClient::GetSiteInstanceFromAffinity(
-    content::BrowserContext* browser_context,
-    const GURL& url,
-    content::RenderFrameHost* rfh) const {
-  std::string affinity = GetAffinityPreference(rfh);
-  if (!affinity.empty()) {
-    auto iter = site_per_affinities_.find(affinity);
-    GURL dest_site = content::SiteInstance::GetSiteForURL(browser_context, url);
-    if (iter != site_per_affinities_.end() &&
-        IsSameWebSite(browser_context, iter->second, dest_site)) {
-      return iter->second;
-    }
-  }
-
-  return nullptr;
-}
-
-void AtomBrowserClient::ConsiderSiteInstanceForAffinity(
-    content::RenderFrameHost* rfh,
-    content::SiteInstance* site_instance) {
-  std::string affinity = GetAffinityPreference(rfh);
-  if (!affinity.empty()) {
-    site_per_affinities_[affinity] = site_instance;
-  }
-}
-
 void AtomBrowserClient::RenderProcessWillLaunch(
     content::RenderProcessHost* host,
     service_manager::mojom::ServiceRequest* service_request) {
@@ -361,14 +251,6 @@ AtomBrowserClient::CreateSpeechRecognitionManagerDelegate() {
   return new AtomSpeechRecognitionManagerDelegate;
 }
 
-content::TtsControllerDelegate* AtomBrowserClient::GetTtsControllerDelegate() {
-#if BUILDFLAG(ENABLE_TTS)
-  return TtsControllerDelegateImpl::GetInstance();
-#else
-  return nullptr;
-#endif
-}
-
 void AtomBrowserClient::OverrideWebkitPrefs(content::RenderViewHost* host,
                                             content::WebPreferences* prefs) {
   prefs->javascript_enabled = true;
@@ -389,8 +271,6 @@ void AtomBrowserClient::OverrideWebkitPrefs(content::RenderViewHost* host,
   prefs->default_maximum_page_scale_factor = 1.f;
   prefs->navigate_on_drag_drop = false;
 
-  SetFontDefaults(prefs);
-
   // Custom preferences of guest page.
   auto* web_contents = content::WebContents::FromRenderViewHost(host);
   auto* web_preferences = WebContentsPreferences::From(web_contents);
@@ -398,59 +278,62 @@ void AtomBrowserClient::OverrideWebkitPrefs(content::RenderViewHost* host,
     web_preferences->OverrideWebkitPrefs(prefs);
 }
 
-content::ContentBrowserClient::SiteInstanceForNavigationType
-AtomBrowserClient::ShouldOverrideSiteInstanceForNavigation(
-    content::RenderFrameHost* current_rfh,
-    content::RenderFrameHost* speculative_rfh,
+void AtomBrowserClient::OverrideSiteInstanceForNavigation(
+    content::RenderFrameHost* rfh,
     content::BrowserContext* browser_context,
     const GURL& url,
-    bool has_response_started,
-    content::SiteInstance** affinity_site_instance) const {
+    bool has_request_started,
+    content::SiteInstance* candidate_instance,
+    content::SiteInstance** new_instance) {
   if (g_suppress_renderer_process_restart) {
     g_suppress_renderer_process_restart = false;
-    return SiteInstanceForNavigationType::ASK_CHROMIUM;
+    return;
   }
 
+  content::SiteInstance* current_instance = rfh->GetSiteInstance();
+  if (!ShouldCreateNewSiteInstance(rfh, browser_context, current_instance, url))
+    return;
+
   // Do we have an affinity site to manage ?
-  content::SiteInstance* site_instance_from_affinity =
-      GetSiteInstanceFromAffinity(browser_context, url, current_rfh);
-  if (site_instance_from_affinity) {
-    *affinity_site_instance = site_instance_from_affinity;
-    return SiteInstanceForNavigationType::FORCE_AFFINITY;
-  }
-
-  if (!ShouldForceNewSiteInstance(current_rfh, speculative_rfh, browser_context,
-                                  url, has_response_started)) {
-    return SiteInstanceForNavigationType::ASK_CHROMIUM;
-  }
-
-  // ShouldOverrideSiteInstanceForNavigation will be called more than once
-  // during a navigation (currently twice, on request and when it's about
-  // to commit in the renderer), look at
-  // RenderFrameHostManager::GetFrameHostForNavigation.
-  // In the default mode we should reuse the same site instance until the
-  // request commits otherwise it will get destroyed. Currently there is no
-  // unique lifetime tracker for a navigation request during site instance
-  // creation. We check for the state of the request, which should be one of
-  // (WAITING_FOR_RENDERER_RESPONSE, STARTED, RESPONSE_STARTED, FAILED) along
-  // with the availability of a speculative render frame host.
-  if (has_response_started) {
-    return SiteInstanceForNavigationType::FORCE_CURRENT;
-  }
-
-  return SiteInstanceForNavigationType::FORCE_CANDIDATE_OR_NEW;
-}
-
-void AtomBrowserClient::RegisterPendingSiteInstance(
-    content::RenderFrameHost* rfh,
-    content::SiteInstance* pending_site_instance) {
-  // Do we have an affinity site to manage?
-  ConsiderSiteInstanceForAffinity(rfh, pending_site_instance);
-
-  // Remember the original web contents for the pending renderer process.
   auto* web_contents = content::WebContents::FromRenderFrameHost(rfh);
-  auto* pending_process = pending_site_instance->GetProcess();
-  pending_processes_[pending_process->GetID()] = web_contents;
+  auto* web_preferences = WebContentsPreferences::From(web_contents);
+  std::string affinity;
+  if (web_preferences &&
+      web_preferences->GetPreference("affinity", &affinity) &&
+      !affinity.empty()) {
+    affinity = base::ToLowerASCII(affinity);
+    auto iter = site_per_affinities.find(affinity);
+    GURL dest_site = content::SiteInstance::GetSiteForURL(browser_context, url);
+    if (iter != site_per_affinities.end() &&
+        IsSameWebSite(browser_context, iter->second->GetSiteURL(), dest_site)) {
+      *new_instance = iter->second;
+    } else {
+      site_per_affinities[affinity] = candidate_instance;
+      *new_instance = candidate_instance;
+      // Remember the original web contents for the pending renderer process.
+      auto* pending_process = candidate_instance->GetProcess();
+      pending_processes_[pending_process->GetID()] = web_contents;
+    }
+  } else {
+    // OverrideSiteInstanceForNavigation will be called more than once during a
+    // navigation (currently twice, on request and when it's about to commit in
+    // the renderer), look at RenderFrameHostManager::GetFrameHostForNavigation.
+    // In the default mode we should resuse the same site instance until the
+    // request commits otherwise it will get destroyed. Currently there is no
+    // unique lifetime tracker for a navigation request during site instance
+    // creation. We check for the state of the request, which should be one of
+    // (WAITING_FOR_RENDERER_RESPONSE, STARTED, RESPONSE_STARTED, FAILED) along
+    // with the availability of a speculative render frame host.
+    if (has_request_started) {
+      *new_instance = current_instance;
+      return;
+    }
+
+    *new_instance = candidate_instance;
+    // Remember the original web contents for the pending renderer process.
+    auto* pending_process = candidate_instance->GetProcess();
+    pending_processes_[pending_process->GetID()] = web_contents;
+  }
 }
 
 void AtomBrowserClient::AppendExtraCommandLineSwitches(
@@ -471,14 +354,17 @@ void AtomBrowserClient::AppendExtraCommandLineSwitches(
     return;
 
   // Copy following switches to child process.
-  static const char* const kCommonSwitchNames[] = {
-      switches::kStandardSchemes,     switches::kEnableSandbox,
-      switches::kSecureSchemes,       switches::kBypassCSPSchemes,
-      switches::kCORSSchemes,         switches::kFetchSchemes,
-      switches::kServiceWorkerSchemes};
+  static const char* const kCommonSwitchNames[] = {switches::kStandardSchemes,
+                                                   switches::kEnableSandbox,
+                                                   switches::kSecureSchemes};
   command_line->CopySwitchesFrom(*base::CommandLine::ForCurrentProcess(),
                                  kCommonSwitchNames,
-                                 base::size(kCommonSwitchNames));
+                                 arraysize(kCommonSwitchNames));
+
+  // The registered service worker schemes.
+  if (!g_custom_service_worker_schemes->empty())
+    command_line->AppendSwitchASCII(switches::kRegisterServiceWorkerSchemes,
+                                    *g_custom_service_worker_schemes);
 
 #if defined(OS_WIN)
   // Append --app-user-model-id.
@@ -496,16 +382,6 @@ void AtomBrowserClient::AppendExtraCommandLineSwitches(
 
   content::WebContents* web_contents = GetWebContentsFromProcessID(process_id);
   if (web_contents) {
-    // devtools processes must be launched unsandboxed in order for the remote
-    // API to work in devtools extensions. This is due to the fact that the
-    // remote API assumes that it will only be used from the main frame, but
-    // devtools extensions are loaded from an iframe.
-    // It would be possible to sandbox devtools extensions processes by default
-    // if we made the remote API work with multiple frames.
-    if (web_contents->GetVisibleURL().SchemeIs("chrome-devtools")) {
-      command_line->AppendSwitch(service_manager::switches::kNoSandbox);
-      command_line->AppendSwitch(::switches::kNoZygote);
-    }
     auto* web_preferences = WebContentsPreferences::From(web_contents);
     if (web_preferences)
       web_preferences->AppendCommandLineSwitches(command_line);
@@ -514,16 +390,6 @@ void AtomBrowserClient::AppendExtraCommandLineSwitches(
   }
 }
 
-void AtomBrowserClient::AdjustUtilityServiceProcessCommandLine(
-    const service_manager::Identity& identity,
-    base::CommandLine* command_line) {
-#if defined(OS_MACOSX)
-  if (identity.name() == video_capture::mojom::kServiceName ||
-      identity.name() == audio::mojom::kServiceName)
-    command_line->AppendSwitch(::switches::kMessageLoopTypeUi);
-#endif
-}
-
 void AtomBrowserClient::DidCreatePpapiPlugin(content::BrowserPpapiHost* host) {
 #if BUILDFLAG(ENABLE_PEPPER_FLASH)
   host->GetPpapiHost()->AddHostFactoryFilter(
@@ -531,11 +397,11 @@ void AtomBrowserClient::DidCreatePpapiPlugin(content::BrowserPpapiHost* host) {
 #endif
 }
 
-// attempt to get api key from env
 std::string AtomBrowserClient::GetGeolocationApiKey() {
   std::unique_ptr<base::Environment> env(base::Environment::Create());
   std::string api_key;
-  env->GetVar("GOOGLE_API_KEY", &api_key);
+  if (!env->GetVar("GOOGLE_API_KEY", &api_key))
+    api_key = GOOGLEAPIS_API_KEY;
   return api_key;
 }
 
@@ -544,17 +410,6 @@ AtomBrowserClient::CreateQuotaPermissionContext() {
   return new AtomQuotaPermissionContext;
 }
 
-content::GeneratedCodeCacheSettings
-AtomBrowserClient::GetGeneratedCodeCacheSettings(
-    content::BrowserContext* context) {
-  // TODO(deepak1556): Use platform cache directory.
-  base::FilePath cache_path = context->GetPath();
-  // If we pass 0 for size, disk_cache will pick a default size using the
-  // heuristics based on available disk size. These are implemented in
-  // disk_cache::PreferredCacheSize in net/disk_cache/cache_util.cc.
-  return content::GeneratedCodeCacheSettings(true, 0, cache_path);
-}
-
 void AtomBrowserClient::AllowCertificateError(
     content::WebContents* web_contents,
     int cert_error,
@@ -595,7 +450,7 @@ bool AtomBrowserClient::CanCreateWindow(
     content::RenderFrameHost* opener,
     const GURL& opener_url,
     const GURL& opener_top_level_frame_url,
-    const url::Origin& source_origin,
+    const GURL& source_origin,
     content::mojom::WindowContainerType container_type,
     const GURL& target_url,
     const content::Referrer& referrer,
@@ -647,19 +502,14 @@ void AtomBrowserClient::GetAdditionalAllowedSchemesForFileSystem(
   additional_schemes->push_back(content::kChromeDevToolsScheme);
 }
 
-void AtomBrowserClient::GetAdditionalWebUISchemes(
-    std::vector<std::string>* additional_schemes) {
-  additional_schemes->push_back(content::kChromeDevToolsScheme);
-}
-
 void AtomBrowserClient::SiteInstanceDeleting(
     content::SiteInstance* site_instance) {
   // We are storing weak_ptr, is it fundamental to maintain the map up-to-date
   // when an instance is destroyed.
-  for (auto iter = site_per_affinities_.begin();
-       iter != site_per_affinities_.end(); ++iter) {
+  for (auto iter = site_per_affinities.begin();
+       iter != site_per_affinities.end(); ++iter) {
     if (iter->second == site_instance) {
-      site_per_affinities_.erase(iter);
+      site_per_affinities.erase(iter);
       break;
     }
   }
@@ -714,24 +564,27 @@ void AtomBrowserClient::RegisterOutOfProcessServices(
 #endif
 }
 
-base::Optional<service_manager::Manifest>
-AtomBrowserClient::GetServiceManifestOverlay(base::StringPiece name) {
-  if (name == content::mojom::kBrowserServiceName) {
-    return GetElectronContentBrowserOverlayManifest();
-  } else if (name == content::mojom::kPackagedServicesServiceName) {
-    service_manager::Manifest overlay;
-    overlay.packaged_services = GetElectronPackagedServicesOverlayManifest();
-    return overlay;
-  }
+std::unique_ptr<base::Value> AtomBrowserClient::GetServiceManifestOverlay(
+    base::StringPiece name) {
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
+  int id = -1;
+  if (name == content::mojom::kBrowserServiceName)
+    id = IDR_ELECTRON_CONTENT_BROWSER_MANIFEST_OVERLAY;
+  else if (name == content::mojom::kPackagedServicesServiceName)
+    id = IDR_ELECTRON_CONTENT_PACKAGED_SERVICES_MANIFEST_OVERLAY;
 
-  return base::nullopt;
+  if (id == -1)
+    return nullptr;
+
+  base::StringPiece manifest_contents = rb.GetRawDataResource(id);
+  return base::JSONReader::Read(manifest_contents);
 }
 
 net::NetLog* AtomBrowserClient::GetNetLog() {
-  return g_browser_process->net_log();
+  return AtomBrowserMainParts::Get()->net_log();
 }
 
-content::BrowserMainParts* AtomBrowserClient::CreateBrowserMainParts(
+brightray::BrowserMainParts* AtomBrowserClient::OverrideCreateBrowserMainParts(
     const content::MainFunctionParams& params) {
   return new AtomBrowserMainParts(params);
 }
@@ -820,11 +673,9 @@ bool AtomBrowserClient::HandleExternalProtocol(
     content::NavigationUIData* navigation_data,
     bool is_main_frame,
     ui::PageTransition page_transition,
-    bool has_user_gesture,
-    const std::string& method,
-    const net::HttpRequestHeaders& headers) {
-  base::PostTaskWithTraits(
-      FROM_HERE, {BrowserThread::UI},
+    bool has_user_gesture) {
+  BrowserThread::PostTask(
+      BrowserThread::UI, FROM_HERE,
       base::BindOnce(&HandleExternalProtocolInUI, url, web_contents_getter,
                      has_user_gesture));
   return true;
@@ -838,78 +689,11 @@ AtomBrowserClient::CreateThrottlesForNavigation(
   return throttles;
 }
 
-content::MediaObserver* AtomBrowserClient::GetMediaObserver() {
-  return MediaCaptureDevicesDispatcher::GetInstance();
-}
-
-content::DevToolsManagerDelegate*
-AtomBrowserClient::GetDevToolsManagerDelegate() {
-  return new DevToolsManagerDelegate;
-}
-
-NotificationPresenter* AtomBrowserClient::GetNotificationPresenter() {
-  if (!notification_presenter_) {
-    notification_presenter_.reset(NotificationPresenter::Create());
-  }
-  return notification_presenter_.get();
-}
-
-content::PlatformNotificationService*
-AtomBrowserClient::GetPlatformNotificationService() {
-  if (!notification_service_) {
-    notification_service_.reset(new PlatformNotificationService(this));
-  }
-  return notification_service_.get();
-}
-
-base::FilePath AtomBrowserClient::GetDefaultDownloadDirectory() {
-  // ~/Downloads
-  base::FilePath path;
-  if (base::PathService::Get(base::DIR_HOME, &path))
-    path = path.Append(FILE_PATH_LITERAL("Downloads"));
-
-  return path;
-}
-
-scoped_refptr<network::SharedURLLoaderFactory>
-AtomBrowserClient::GetSystemSharedURLLoaderFactory() {
-  if (!g_browser_process)
-    return nullptr;
-  return g_browser_process->shared_url_loader_factory();
-}
-
-void AtomBrowserClient::OnNetworkServiceCreated(
-    network::mojom::NetworkService* network_service) {
-  if (!g_browser_process)
-    return;
-  g_browser_process->system_network_context_manager()->OnNetworkServiceCreated(
-      network_service);
-}
-
-bool AtomBrowserClient::ShouldBypassCORB(int render_process_id) const {
+bool AtomBrowserClient::ShouldBypassCORB(int render_process_id) {
   // This is called on the network thread.
   base::AutoLock auto_lock(process_preferences_lock_);
   auto it = process_preferences_.find(render_process_id);
   return it != process_preferences_.end() && !it->second.web_security;
 }
 
-std::string AtomBrowserClient::GetProduct() const {
-  return "Chrome/" CHROME_VERSION_STRING;
-}
-
-std::string AtomBrowserClient::GetUserAgent() const {
-  return GetApplicationUserAgent();
-}
-
-std::string AtomBrowserClient::GetApplicationLocale() {
-  if (BrowserThread::CurrentlyOn(BrowserThread::IO))
-    return g_io_thread_application_locale.Get();
-  return *g_application_locale;
-}
-
-bool AtomBrowserClient::ShouldEnableStrictSiteIsolation() {
-  // Enable site isolation. It is off by default in Chromium <= 69.
-  return true;
-}
-
 }  // namespace atom

atom/browser/atom_browser_client.h

@@ -12,6 +12,7 @@
 #include <vector>
 
 #include "base/synchronization/lock.h"
+#include "brightray/browser/browser_client.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/render_process_host_observer.h"
 #include "net/ssl/client_cert_identity.h"
@@ -28,15 +29,10 @@ class SSLCertRequestInfo;
 namespace atom {
 
 class AtomResourceDispatcherHostDelegate;
-class NotificationPresenter;
-class PlatformNotificationService;
 
-class AtomBrowserClient : public content::ContentBrowserClient,
+class AtomBrowserClient : public brightray::BrowserClient,
                           public content::RenderProcessHostObserver {
  public:
-  static AtomBrowserClient* Get();
-  static void SetApplicationLocale(const std::string& locale);
-
   AtomBrowserClient();
   ~AtomBrowserClient() override;
 
@@ -49,50 +45,34 @@ class AtomBrowserClient : public content::ContentBrowserClient,
   // Don't force renderer process to restart for once.
   static void SuppressRendererProcessRestartForOnce();
 
-  NotificationPresenter* GetNotificationPresenter();
+  // Custom schemes to be registered to handle service worker.
+  static void SetCustomServiceWorkerSchemes(
+      const std::vector<std::string>& schemes);
 
-  void WebNotificationAllowed(int render_process_id,
-                              const base::Callback<void(bool, bool)>& callback);
-
-  // content::NavigatorDelegate
   std::vector<std::unique_ptr<content::NavigationThrottle>>
   CreateThrottlesForNavigation(content::NavigationHandle* handle) override;
 
-  // content::ContentBrowserClient:
-  std::string GetApplicationLocale() override;
-
-  // content::ContentBrowserClient:
-  bool ShouldEnableStrictSiteIsolation() override;
-
  protected:
+  // content::ContentBrowserClient:
   void RenderProcessWillLaunch(
       content::RenderProcessHost* host,
       service_manager::mojom::ServiceRequest* service_request) override;
   content::SpeechRecognitionManagerDelegate*
   CreateSpeechRecognitionManagerDelegate() override;
-  content::TtsControllerDelegate* GetTtsControllerDelegate() override;
   void OverrideWebkitPrefs(content::RenderViewHost* render_view_host,
                            content::WebPreferences* prefs) override;
-  SiteInstanceForNavigationType ShouldOverrideSiteInstanceForNavigation(
-      content::RenderFrameHost* current_rfh,
-      content::RenderFrameHost* speculative_rfh,
-      content::BrowserContext* browser_context,
-      const GURL& url,
-      bool has_request_started,
-      content::SiteInstance** affinity_site_instance) const override;
-  void RegisterPendingSiteInstance(
+  void OverrideSiteInstanceForNavigation(
       content::RenderFrameHost* render_frame_host,
-      content::SiteInstance* pending_site_instance) override;
+      content::BrowserContext* browser_context,
+      const GURL& dest_url,
+      bool has_request_started,
+      content::SiteInstance* candidate_instance,
+      content::SiteInstance** new_instance) override;
   void AppendExtraCommandLineSwitches(base::CommandLine* command_line,
                                       int child_process_id) override;
-  void AdjustUtilityServiceProcessCommandLine(
-      const service_manager::Identity& identity,
-      base::CommandLine* command_line) override;
   void DidCreatePpapiPlugin(content::BrowserPpapiHost* browser_host) override;
   std::string GetGeolocationApiKey() override;
   content::QuotaPermissionContext* CreateQuotaPermissionContext() override;
-  content::GeneratedCodeCacheSettings GetGeneratedCodeCacheSettings(
-      content::BrowserContext* context) override;
   void AllowCertificateError(
       content::WebContents* web_contents,
       int cert_error,
@@ -112,7 +92,7 @@ class AtomBrowserClient : public content::ContentBrowserClient,
   bool CanCreateWindow(content::RenderFrameHost* opener,
                        const GURL& opener_url,
                        const GURL& opener_top_level_frame_url,
-                       const url::Origin& source_origin,
+                       const GURL& source_origin,
                        content::mojom::WindowContainerType container_type,
                        const GURL& target_url,
                        const content::Referrer& referrer,
@@ -125,9 +105,7 @@ class AtomBrowserClient : public content::ContentBrowserClient,
                        bool opener_suppressed,
                        bool* no_javascript_access) override;
   void GetAdditionalAllowedSchemesForFileSystem(
-      std::vector<std::string>* additional_schemes) override;
-  void GetAdditionalWebUISchemes(
-      std::vector<std::string>* additional_schemes) override;
+      std::vector<std::string>* schemes) override;
   void SiteInstanceDeleting(content::SiteInstance* site_instance) override;
   std::unique_ptr<net::ClientCertStore> CreateClientCertStore(
       content::ResourceContext* resource_context) override;
@@ -138,23 +116,17 @@ class AtomBrowserClient : public content::ContentBrowserClient,
       bool in_memory,
       const base::FilePath& relative_partition_path) override;
   void RegisterOutOfProcessServices(OutOfProcessServiceMap* services) override;
-  base::Optional<service_manager::Manifest> GetServiceManifestOverlay(
+  std::unique_ptr<base::Value> GetServiceManifestOverlay(
       base::StringPiece name) override;
   net::NetLog* GetNetLog() override;
-  content::MediaObserver* GetMediaObserver() override;
-  content::DevToolsManagerDelegate* GetDevToolsManagerDelegate() override;
-  content::PlatformNotificationService* GetPlatformNotificationService()
-      override;
-  content::BrowserMainParts* CreateBrowserMainParts(
+
+  // brightray::BrowserClient:
+  brightray::BrowserMainParts* OverrideCreateBrowserMainParts(
       const content::MainFunctionParams&) override;
-  base::FilePath GetDefaultDownloadDirectory() override;
-  scoped_refptr<network::SharedURLLoaderFactory>
-  GetSystemSharedURLLoaderFactory() override;
-  void OnNetworkServiceCreated(
-      network::mojom::NetworkService* network_service) override;
-  bool ShouldBypassCORB(int render_process_id) const override;
-  std::string GetProduct() const override;
-  std::string GetUserAgent() const override;
+  void WebNotificationAllowed(
+      int render_process_id,
+      const base::Callback<void(bool, bool)>& callback) override;
+  bool ShouldBypassCORB(int render_process_id) override;
 
   // content::RenderProcessHostObserver:
   void RenderProcessHostDestroyed(content::RenderProcessHost* host) override;
@@ -169,9 +141,7 @@ class AtomBrowserClient : public content::ContentBrowserClient,
       content::NavigationUIData* navigation_data,
       bool is_main_frame,
       ui::PageTransition page_transition,
-      bool has_user_gesture,
-      const std::string& method,
-      const net::HttpRequestHeaders& headers) override;
+      bool has_user_gesture) override;
 
  private:
   struct ProcessPreferences {
@@ -181,30 +151,16 @@ class AtomBrowserClient : public content::ContentBrowserClient,
     bool web_security = true;
   };
 
-  bool ShouldForceNewSiteInstance(content::RenderFrameHost* current_rfh,
-                                  content::RenderFrameHost* speculative_rfh,
-                                  content::BrowserContext* browser_context,
-                                  const GURL& dest_url,
-                                  bool has_request_started) const;
-  bool NavigationWasRedirectedCrossSite(
-      content::BrowserContext* browser_context,
-      content::SiteInstance* current_instance,
-      content::SiteInstance* speculative_instance,
-      const GURL& dest_url,
-      bool has_request_started) const;
+  bool ShouldCreateNewSiteInstance(content::RenderFrameHost* render_frame_host,
+                                   content::BrowserContext* browser_context,
+                                   content::SiteInstance* current_instance,
+                                   const GURL& dest_url);
   void AddProcessPreferences(int process_id, ProcessPreferences prefs);
   void RemoveProcessPreferences(int process_id);
-  bool IsProcessObserved(int process_id) const;
-  bool IsRendererSandboxed(int process_id) const;
-  bool RendererUsesNativeWindowOpen(int process_id) const;
-  bool RendererDisablesPopups(int process_id) const;
-  std::string GetAffinityPreference(content::RenderFrameHost* rfh) const;
-  content::SiteInstance* GetSiteInstanceFromAffinity(
-      content::BrowserContext* browser_context,
-      const GURL& url,
-      content::RenderFrameHost* rfh) const;
-  void ConsiderSiteInstanceForAffinity(content::RenderFrameHost* rfh,
-                                       content::SiteInstance* site_instance);
+  bool IsProcessObserved(int process_id);
+  bool IsRendererSandboxed(int process_id);
+  bool RendererUsesNativeWindowOpen(int process_id);
+  bool RendererDisablesPopups(int process_id);
 
   // pending_render_process => web contents.
   std::map<int, content::WebContents*> pending_processes_;
@@ -212,17 +168,14 @@ class AtomBrowserClient : public content::ContentBrowserClient,
   std::map<int, base::ProcessId> render_process_host_pids_;
 
   // list of site per affinity. weak_ptr to prevent instance locking
-  std::map<std::string, content::SiteInstance*> site_per_affinities_;
+  std::map<std::string, content::SiteInstance*> site_per_affinities;
 
   std::unique_ptr<AtomResourceDispatcherHostDelegate>
       resource_dispatcher_host_delegate_;
 
-  std::unique_ptr<PlatformNotificationService> notification_service_;
-  std::unique_ptr<NotificationPresenter> notification_presenter_;
-
   Delegate* delegate_ = nullptr;
 
-  mutable base::Lock process_preferences_lock_;
+  base::Lock process_preferences_lock_;
   std::map<int, ProcessPreferences> process_preferences_;
 
   DISALLOW_COPY_AND_ASSIGN(AtomBrowserClient);

atom/browser/atom_browser_context.cc

@@ -6,26 +6,31 @@
 
 #include <utility>
 
+#include "atom/app/atom_content_client.h"
 #include "atom/browser/atom_blob_reader.h"
 #include "atom/browser/atom_browser_main_parts.h"
 #include "atom/browser/atom_download_manager_delegate.h"
-#include "atom/browser/atom_paths.h"
 #include "atom/browser/atom_permission_manager.h"
+#include "atom/browser/browser.h"
 #include "atom/browser/cookie_change_notifier.h"
 #include "atom/browser/net/resolve_proxy_helper.h"
 #include "atom/browser/pref_store_delegate.h"
 #include "atom/browser/special_storage_policy.h"
-#include "atom/browser/ui/inspectable_web_contents_impl.h"
 #include "atom/browser/web_view_manager.h"
-#include "atom/browser/zoom_level_delegate.h"
-#include "atom/common/application_info.h"
+#include "atom/common/atom_version.h"
+#include "atom/common/chrome_version.h"
 #include "atom/common/options_switches.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/path_service.h"
 #include "base/strings/string_util.h"
+#include "base/strings/stringprintf.h"
 #include "base/threading/sequenced_task_runner_handle.h"
 #include "base/threading/thread_restrictions.h"
+#include "brightray/browser/brightray_paths.h"
+#include "brightray/browser/inspectable_web_contents_impl.h"
+#include "brightray/browser/zoom_level_delegate.h"
+#include "brightray/common/application_info.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/pref_names.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
@@ -37,8 +42,9 @@
 #include "components/proxy_config/pref_proxy_config_tracker_impl.h"
 #include "components/proxy_config/proxy_config_pref_names.h"
 #include "content/browser/blob_storage/chrome_blob_storage_context.h"
-#include "content/public/browser/browser_thread.h"
 #include "content/public/browser/storage_partition.h"
+#include "content/public/common/content_client.h"
+#include "content/public/common/user_agent.h"
 #include "net/base/escape.h"
 
 using content::BrowserThread;
@@ -66,7 +72,9 @@ AtomBrowserContext::AtomBrowserContext(const std::string& partition,
       storage_policy_(new SpecialStoragePolicy),
       in_memory_(in_memory),
       weak_factory_(this) {
-  user_agent_ = GetApplicationUserAgent();
+  AtomContentClient* client =
+      static_cast<AtomContentClient*>(content::GetContentClient());
+  user_agent_ = client->GetUserAgent();
 
   // Read options.
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
@@ -76,10 +84,11 @@ AtomBrowserContext::AtomBrowserContext(const std::string& partition,
   base::StringToInt(command_line->GetSwitchValueASCII(switches::kDiskCacheSize),
                     &max_cache_size_);
 
-  if (!base::PathService::Get(DIR_USER_DATA, &path_)) {
-    base::PathService::Get(DIR_APP_DATA, &path_);
-    path_ = path_.Append(base::FilePath::FromUTF8Unsafe(GetApplicationName()));
-    base::PathService::Override(DIR_USER_DATA, path_);
+  if (!base::PathService::Get(brightray::DIR_USER_DATA, &path_)) {
+    base::PathService::Get(brightray::DIR_APP_DATA, &path_);
+    path_ = path_.Append(
+        base::FilePath::FromUTF8Unsafe(brightray::GetApplicationName()));
+    base::PathService::Override(brightray::DIR_USER_DATA, path_);
   }
 
   if (!in_memory && !partition.empty())
@@ -127,9 +136,9 @@ void AtomBrowserContext::InitPrefs() {
   registry->RegisterFilePathPref(prefs::kDownloadDefaultDirectory,
                                  download_dir);
   registry->RegisterDictionaryPref(prefs::kDevToolsFileSystemPaths);
-  InspectableWebContentsImpl::RegisterPrefs(registry.get());
-  MediaDeviceIDSalt::RegisterPrefs(registry.get());
-  ZoomLevelDelegate::RegisterPrefs(registry.get());
+  brightray::InspectableWebContentsImpl::RegisterPrefs(registry.get());
+  brightray::MediaDeviceIDSalt::RegisterPrefs(registry.get());
+  brightray::ZoomLevelDelegate::RegisterPrefs(registry.get());
   PrefProxyConfigTrackerImpl::RegisterPrefs(registry.get());
 
   prefs_ = prefs_factory.Create(
@@ -185,7 +194,7 @@ content::ResourceContext* AtomBrowserContext::GetResourceContext() {
 
 std::string AtomBrowserContext::GetMediaDeviceIDSalt() {
   if (!media_device_id_salt_.get())
-    media_device_id_salt_.reset(new MediaDeviceIDSalt(prefs_.get()));
+    media_device_id_salt_.reset(new brightray::MediaDeviceIDSalt(prefs_.get()));
   return media_device_id_salt_->GetSalt();
 }
 
@@ -193,7 +202,8 @@ std::unique_ptr<content::ZoomLevelDelegate>
 AtomBrowserContext::CreateZoomLevelDelegate(
     const base::FilePath& partition_path) {
   if (!IsOffTheRecord()) {
-    return std::make_unique<ZoomLevelDelegate>(prefs(), partition_path);
+    return std::make_unique<brightray::ZoomLevelDelegate>(prefs(),
+                                                          partition_path);
   }
   return std::unique_ptr<content::ZoomLevelDelegate>();
 }
@@ -261,11 +271,6 @@ AtomBrowserContext::GetBrowsingDataRemoverDelegate() {
   return nullptr;
 }
 
-content::ClientHintsControllerDelegate*
-AtomBrowserContext::GetClientHintsControllerDelegate() {
-  return nullptr;
-}
-
 net::URLRequestContextGetter*
 AtomBrowserContext::CreateRequestContextForStoragePartition(
     const base::FilePath& partition_path,

atom/browser/atom_browser_context.h

@@ -10,10 +10,10 @@
 #include <string>
 #include <vector>
 
-#include "atom/browser/media/media_device_id_salt.h"
 #include "atom/browser/net/url_request_context_getter.h"
 #include "base/memory/ref_counted_delete_on_sequence.h"
 #include "base/memory/weak_ptr.h"
+#include "brightray/browser/media/media_device_id_salt.h"
 #include "chrome/browser/net/proxy_config_monitor.h"
 #include "content/public/browser/browser_context.h"
 
@@ -88,8 +88,6 @@ class AtomBrowserContext
       content::ProtocolHandlerMap* protocol_handlers,
       content::URLRequestInterceptorScopedVector request_interceptors) override;
   net::URLRequestContextGetter* CreateMediaRequestContext() override;
-  content::ClientHintsControllerDelegate* GetClientHintsControllerDelegate()
-      override;
 
   CookieChangeNotifier* cookie_change_notifier() const {
     return cookie_change_notifier_.get();
@@ -154,7 +152,7 @@ class AtomBrowserContext
   std::unique_ptr<WebViewManager> guest_manager_;
   std::unique_ptr<AtomPermissionManager> permission_manager_;
   std::unique_ptr<AtomBlobReader> blob_reader_;
-  std::unique_ptr<MediaDeviceIDSalt> media_device_id_salt_;
+  std::unique_ptr<brightray::MediaDeviceIDSalt> media_device_id_salt_;
   scoped_refptr<ResolveProxyHelper> resolve_proxy_helper_;
   scoped_refptr<storage::SpecialStoragePolicy> storage_policy_;