Bump v5.0.0-beta.3

Merge pull request #16975 from electron/5-73
feat: upgrade to Chromium 73.0.3683.27
2026-04-10 03:01:51 -04:00 · 2019-02-14 17:33:14 -08:00 · 2019-02-14 17:31:14 -08:00 · 2019-02-14 15:39:54 -08:00 · 2019-02-14 14:10:32 -08:00 · 2019-02-15 02:28:31 +05:30
467 changed files with 6652 additions and 10815 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -231,14 +231,6 @@ step-gn-gen-default: &step-gn-gen-default
      cd src
      gn gen out/Default --args='import("'$GN_CONFIG'") cc_wrapper="'"$SCCACHE_PATH"'"'" $GN_EXTRA_ARGS"

-step-gn-check: &step-gn-check
-  run:
-    name: GN check
-    command: |
-      cd src
-      gn check out/Default //electron:electron_lib
-      gn check out/Default //electron:electron_app
-
 step-electron-build: &step-electron-build
  run:
    name: Electron build
@@ -500,38 +492,6 @@ step-maybe-generate-typescript-defs: &step-maybe-generate-typescript-defs
      fi

 # Lists of steps.
-steps-lint: &steps-lint
-  steps:
-    - *step-checkout-electron
-    - run:
-        name: Setup third_party Depot Tools
-        command: |
-          # "depot_tools" has to be checkout into "//third_party/depot_tools" so pylint.py can a "pylintrc" file.
-          git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git src/third_party/depot_tools
-          echo 'export PATH="$PATH:'"$PWD"'/src/third_party/depot_tools"' >> $BASH_ENV
-    - run:
-        name: Download GN Binary
-        command: |
-          chromium_revision="$(grep -A1 chromium_version src/electron/DEPS | tr -d '\n' | cut -d\' -f4)"
-
-          mkdir -p "buildtools/linux64"
-          curl -sL "https://chromium.googlesource.com/chromium/src/+/${chromium_revision}/buildtools/linux64/gn.sha1?format=TEXT" | base64 -d > "buildtools/linux64/gn.sha1"
-          echo 'export CHROMIUM_BUILDTOOLS_PATH="'"$PWD"'/buildtools"' >> $BASH_ENV
-
-          download_from_google_storage --bucket chromium-gn -s "buildtools/linux64/gn.sha1"
-    - run:
-        name: Run Lint
-        command: |
-          # gn.py tries to find a gclient root folder starting from the current dir.
-          # When it fails and returns "None" path, the whole script fails. Let's "fix" it.
-          touch .gclient
-          # Another option would be to checkout "buildtools" inside the Electron checkout,
-          # but then we would lint its contents (at least gn format), and it doesn't pass it.
-
-          cd src/electron
-          npm install
-          npm run lint
-
 steps-checkout: &steps-checkout
  steps:
    - *step-checkout-electron
@@ -575,15 +535,6 @@ steps-checkout: &steps-checkout
          - depot_tools
          - src

-steps-electron-gn-check: &steps-electron-gn-check
-  steps:
-    - attach_workspace:
-        at: .
-    - *step-depot-tools-add-to-path
-    - *step-setup-env-for-build
-    - *step-gn-gen-default
-    - *step-gn-check
-
 steps-electron-build: &steps-electron-build
  steps:
    - attach_workspace:
@@ -828,13 +779,6 @@ chromium-upgrade-branches: &chromium-upgrade-branches
 # List of all jobs.
 version: 2
 jobs:
-  # Layer 0: Lint. Standalone.
-  lint:
-    <<: *machine-linux-medium
-    environment:
-      <<: *env-linux-medium
-    <<: *steps-lint
-
  # Layer 1: Checkout.
  linux-checkout:
    <<: *machine-linux-2xlarge
@@ -873,13 +817,6 @@ jobs:
      <<: *env-enable-sccache
    <<: *steps-electron-build

-  linux-x64-debug-gn-check:
-    <<: *machine-linux-medium
-    environment:
-      <<: *env-linux-medium
-      <<: *env-debug-build
-    <<: *steps-electron-gn-check
-
  linux-x64-testing:
    <<: *machine-linux-2xlarge
    environment:
@@ -888,13 +825,6 @@ jobs:
      <<: *env-enable-sccache
    <<: *steps-electron-build-for-tests

-  linux-x64-testing-gn-check:
-    <<: *machine-linux-medium
-    environment:
-      <<: *env-linux-medium
-      <<: *env-testing-build
-    <<: *steps-electron-gn-check
-
  linux-x64-chromedriver:
    <<: *machine-linux-medium
    environment:
@@ -1035,14 +965,6 @@ jobs:
      <<: *env-enable-sccache
    <<: *steps-electron-build

-  linux-arm64-debug-gn-check:
-    <<: *machine-linux-medium
-    environment:
-      <<: *env-linux-medium
-      <<: *env-arm64
-      <<: *env-debug-build
-    <<: *steps-electron-gn-check
-
  linux-arm64-testing:
    <<: *machine-linux-2xlarge
    environment:
@@ -1053,14 +975,6 @@ jobs:
      TRIGGER_ARM_TEST: true
    <<: *steps-electron-build-for-tests

-  linux-arm64-testing-gn-check:
-    <<: *machine-linux-medium
-    environment:
-      <<: *env-linux-medium
-      <<: *env-arm64
-      <<: *env-testing-build
-    <<: *steps-electron-gn-check
-
  linux-arm64-chromedriver:
    <<: *machine-linux-medium
    environment:
@@ -1108,20 +1022,6 @@ jobs:
      <<: *env-enable-sccache
    <<: *steps-electron-build-for-tests

-  osx-debug-gn-check:
-    <<: *machine-mac
-    environment:
-      <<: *env-machine-mac
-      <<: *env-debug-build
-    <<: *steps-electron-gn-check
-
-  osx-testing-gn-check:
-    <<: *machine-mac
-    environment:
-      <<: *env-machine-mac
-      <<: *env-testing-build
-    <<: *steps-electron-gn-check
-
  osx-chromedriver:
    <<: *machine-mac
    environment:
@@ -1156,22 +1056,6 @@ jobs:
      <<: *env-enable-sccache
    <<: *steps-electron-build-for-tests

-  mas-debug-gn-check:
-    <<: *machine-mac
-    environment:
-      <<: *env-machine-mac
-      <<: *env-mas
-      <<: *env-debug-build
-    <<: *steps-electron-gn-check
-
-  mas-testing-gn-check:
-    <<: *machine-mac
-    environment:
-      <<: *env-machine-mac
-      <<: *env-mas
-      <<: *env-testing-build
-    <<: *steps-electron-gn-check
-
  mas-chromedriver:
    <<: *machine-mac
    environment:
@@ -1418,10 +1302,6 @@ jobs:

 workflows:
  version: 2
-  lint:
-    jobs:
-      - lint
-
  build-linux:
    jobs:
      - linux-checkout
@@ -1429,15 +1309,9 @@ workflows:
      - linux-x64-debug:
          requires:
            - linux-checkout
-      - linux-x64-debug-gn-check:
-          requires:
-            - linux-checkout
      - linux-x64-testing:
          requires:
            - linux-checkout
-      - linux-x64-testing-gn-check:
-          requires:
-            - linux-checkout
      - linux-x64-testing-tests:
          requires:
            - linux-x64-testing
@@ -1462,15 +1336,9 @@ workflows:
      - linux-arm64-debug:
          requires:
            - linux-checkout
-      - linux-arm64-debug-gn-check:
-          requires:
-            - linux-checkout
      - linux-arm64-testing:
          requires:
            - linux-checkout
-      - linux-arm64-testing-gn-check:
-          requires:
-            - linux-checkout

  build-mac:
    jobs:
@@ -1479,13 +1347,6 @@ workflows:
          requires:
            - mac-checkout

-      - osx-debug-gn-check:
-          requires:
-            - mac-checkout
-      - osx-testing-gn-check:
-          requires:
-            - mac-checkout
-
      - osx-testing-tests:
          requires:
            - osx-testing
@@ -1494,13 +1355,6 @@ workflows:
          requires:
            - mac-checkout

-      - mas-debug-gn-check:
-          requires:
-            - mac-checkout
-      - mas-testing-gn-check:
-          requires:
-            - mac-checkout
-
      - mas-testing-tests:
          requires:
            - mas-testing
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -1,33 +1,12 @@
 {
  "extends": "standard",
-  "parser": "@typescript-eslint/parser",
-  "plugins": ["@typescript-eslint"],
  "env": {
    "browser": true
  },
  "rules": {
    "no-var": "error",
-    "no-unused-vars": 0,
-    "no-global-assign": 0,
-    "@typescript-eslint/no-unused-vars": ["error", {
-      "vars": "all",
-      "args": "after-used",
-      "ignoreRestSiblings": false
-    }],
    "prefer-const": ["error", {
      "destructuring": "all"
    }]
-  },
-  "parserOptions": {
-    "ecmaVersion": 6,
-    "sourceType": "module"
-  },
-  "overrides": [
-    {
-      "files": "*.js",
-      "rules": {
-          "@typescript-eslint/no-unused-vars": "off"
-      }
-    }
-  ]
+  }
 }
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -3,18 +3,19 @@
 # https://help.github.com/articles/about-codeowners
 # https://git-scm.com/docs/gitignore

-# Most stuff in here is owned by the Community & Safety WG...
-/.github/* @electron/wg-community
+# Everything that falls through the cracks:
+* @electron/reviewers

-# ...except the Admin WG maintains this file.
-/.github/CODEOWNERS @electron/wg-admin
+# filename patterns
+*browser_view* @electron/browserview
+*notification* @electron/notifications
+*pdf* @electron/printing
+*printing* @electron/printing
+*updater* @electron/updater

-# Upgrades WG
-/patches/ @electron/wg-upgrades
-
-# Docs & Tooling WG
-/default_app/ @electron/wg-docs-tools
-/docs/ @electron/wg-docs-tools
-
-# Releases WG
-/npm/ @electron/wg-releases
+# directories
+/.github/ @electron/electrocats
+/default_app/ @electron/docs
+/docs/ @electron/docs
+/docs-translations/ @electron/i18n
+/npm/ @electron/electrocats
--- a/.github/ISSUE_TEMPLATE/Bug_report.md
+++ b/.github/ISSUE_TEMPLATE/Bug_report.md
@@ -4,39 +4,29 @@ about: Create a report to help us improve Electron

 ---

-* **Electron Version:**
-  * <!-- (output of `node_modules/.bin/electron --version`) e.g. 4.0.3 -->
-* **Operating System:**
-  * <!-- (Platform and Version) e.g. macOS 10.13.6 / Windows 10 (1803) / Ubuntu 18.04 x64 -->
-* **Last Known Working Electron version:**:
-  * <!-- (if applicable) e.g. 3.1.0 -->
+* Output of `node_modules/.bin/electron --version`:
+* Operating System (Platform and Version):
+* Output of `node_modules/.bin/electron --version` on last known working Electron version (if applicable):

-### Expected Behavior
-<!-- A clear and concise description of what you expected to happen. -->
+**Expected Behavior**
+A clear and concise description of what you expected to happen.

-### Actual Behavior
-<!-- A clear and concise description of what actually happened. -->
+**Actual behavior**
+A clear and concise description of what actually happened.

-### To Reproduce
-<!--
+**To Reproduce**
 Your best chance of getting this bug looked at quickly is to provide a REPOSITORY that can be cloned and run.
-->

-<!--
 You can fork [electron-quick-start](https://github.com/electron/electron-quick-start) and include a link to the branch with your changes.
-->

-<!--
 If you provide a URL, please list the commands required to clone/setup/run your repo e.g.
 ```sh
 $ git clone $YOUR_URL -b $BRANCH
 $ npm install
 $ npm start || electron .
 ```
-->
+**Screenshots**
+If applicable, add screenshots to help explain your problem.

-### Screenshots
-<!-- If applicable, add screenshots to help explain your problem. -->
-
-### Additional Information
-<!-- Add any other context about the problem here. -->
+**Additional Information**
+Add any other context about the problem here.
--- a/.github/ISSUE_TEMPLATE/Feature_request.md
+++ b/.github/ISSUE_TEMPLATE/Feature_request.md
@@ -4,14 +4,14 @@ about: Suggest an idea for Electron

 ---

-### Problem Description
-<!-- Is your feature request related to a problem? PLease add a clear and concise description of what the problem is. -->
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is.

-### Proposed Solution
-<!-- Describe the solution you'd like in a a clear and concise manner -->
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.

-### Alternatives Considered
-<!-- A clear and concise description of any alternative solutions or features you've considered. -->
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.

-### Additional Information
-<!-- Add any other context about the problem here. -->
+**Additional context**
+Add any other context or screenshots about the feature request here.
--- a/.github/ISSUE_TEMPLATE/mac-app-store-private-api-rejection.md
+++ b/.github/ISSUE_TEMPLATE/mac-app-store-private-api-rejection.md
@@ -0,0 +1,13 @@
+---
+name: Mac App Store Private API Rejection
+about: Your app was rejected from the Mac App Store for using private API's
+
+---
+
+* Electron Version: 
+
+**Rejection Email**
+Paste the contents of your rejection email here, censoring any private information such as app names.
+
+**Additional Information**
+Add any other context about the problem here.
--- a/.github/ISSUE_TEMPLATE/mac_app_store_private_api_rejection.md
+++ b/.github/ISSUE_TEMPLATE/mac_app_store_private_api_rejection.md
@@ -1,14 +0,0 @@
---
-name: Mac App Store Private API Rejection
-about: Your app was rejected from the Mac App Store for using private API's
-
---
-
-* **Electron Version:** 
-  * <!-- (output of `node_modules/.bin/electron --version`) e.g. 4.0.3 -->
-
-### Rejection Email
-<!-- Paste the contents of your rejection email here, censoring any private information such as app names.-->
-
-### Additional Information
-<!-- Add any other context about the problem here. -->
--- a/.github/ISSUE_TEMPLATE/security-report.md
+++ b/.github/ISSUE_TEMPLATE/security-report.md
@@ -4,7 +4,6 @@ about: Do not create an issue for security reports, send an email to security@el

 ---

-### Notice 
+Do not create an issue for security reports, send an email to:

-**DO NOT** create an issue for security reports.
-Send an email to: **security@electronjs.org**.
+security@electronjs.org
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -16,6 +16,7 @@ Contributors guide: https://github.com/electron/electron/blob/master/CONTRIBUTIN
 - [ ] 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

 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 -->
--- a/.github/config.yml
+++ b/.github/config.yml
@@ -50,7 +50,6 @@ authorizedUsers:
  - deepak1556
  - jkleinsc
  - MarshallOfSound
-  - miniak
  - nitsakh
  - nornagon
  - zcbenz
--- a/.gitignore
+++ b/.gitignore
@@ -59,6 +59,3 @@ spec/.hash

 # Generated native addon files
 /spec/fixtures/native-addon/echo/build/
-
-# If someone runs tsc this is where stuff will end up
-ts-gen
--- a/.vsts/lint.yml
+++ b/.vsts/lint.yml
@@ -0,0 +1,31 @@
+pool:
+  vmImage: 'Ubuntu 16.04'
+
+steps:
+- bash: |
+    # "depot_tools" has to be checkout into "//third_party/depot_tools" so pylint.py can a "pylintrc" file.
+    git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git "${AGENT_BUILDDIRECTORY}/third_party/depot_tools"
+    echo "##vso[task.setvariable variable=PATH]$PATH:${AGENT_BUILDDIRECTORY}/third_party/depot_tools"
+  displayName: Setup Depot Tools
+
+- bash: |
+    chromium_revision="$(grep -A1 chromium_version DEPS | tr -d '\n' | cut -d\' -f4)"
+    buildtools_revision="$(curl -sL "https://chromium.googlesource.com/chromium/src/+/${chromium_revision}/DEPS?format=TEXT" | base64 -d | grep buildtools_revision -A1 | tr -d '\n' | cut -d\' -f4)"
+
+    git clone https://chromium.googlesource.com/chromium/buildtools "${AGENT_TEMPDIRECTORY}/buildtools"
+    (cd "${AGENT_TEMPDIRECTORY}/buildtools" && git checkout "$buildtools_revision")
+    echo "##vso[task.setvariable variable=CHROMIUM_BUILDTOOLS_PATH]$AGENT_TEMPDIRECTORY/buildtools"
+
+    download_from_google_storage --bucket chromium-gn -s "${AGENT_TEMPDIRECTORY}/buildtools/linux64/gn.sha1"
+  displayName: Download gn binary
+
+- bash: |
+    # gn.py tries to find a gclient root folder starting from the current dir.
+    # When it fails and returns "None" path, the whole script fails. Let's "fix" it.
+    touch .gclient
+    # Another option would be to checkout "buildtools" inside the Electron checkout,
+    # but then we would lint its contents (at least gn format), and it doesn't pass it.
+
+    npm install
+    npm run lint
+  displayName: Run Lint
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -10,10 +10,8 @@ import("//tools/v8_context_snapshot/v8_context_snapshot.gni")
 import("//v8/snapshot_toolchain.gni")
 import("build/asar.gni")
 import("build/npm.gni")
-import("build/tsc.gni")
 import("buildflags/buildflags.gni")
 import("electron_paks.gni")
-import("filenames.auto.gni")
 import("filenames.gni")

 if (is_mac) {
@@ -54,26 +52,8 @@ config("branding") {
  ]
 }

-# We geneate the definitions twice here, once in //electron/electron.d.ts
-# and once in $target_gen_dir
-# The one in $target_gen_dir is used for the actual TSC build later one
-# and the one in //electron/electron.d.ts is used by your IDE (vscode)
-# for typescript prompting
-npm_action("build_electron_definitions") {
-  script = "gn-typescript-definitions"
-  args = [ rebase_path("$target_gen_dir/tsc/typings/electron.d.ts") ]
-  inputs = auto_filenames.api_docs + [ "package-lock.json" ]
-
-  outputs = [
-    "$target_gen_dir/tsc/typings/electron.d.ts",
-  ]
-}
-
 npm_action("atom_browserify_sandbox") {
  script = "browserify"
-  deps = [
-    ":build_electron_definitions",
-  ]

  inputs = [
    # FIXME(zcbenz): The dependencies of these files are not listed here, so
@@ -81,8 +61,6 @@ npm_action("atom_browserify_sandbox") {
    # Use a script to generate all dependencies and put them here.
    "lib/sandboxed_renderer/init.js",
    "lib/sandboxed_renderer/api/exports/electron.js",
-    "tsconfig.electron.json",
-    "tsconfig.json",
  ]

  outputs = [
@@ -95,12 +73,6 @@ npm_action("atom_browserify_sandbox") {
    "./lib/sandboxed_renderer/api/exports/electron.js:electron",
    "-t",
    "aliasify",
-    "-p",
-    "[",
-    "tsify",
-    "-p",
-    "tsconfig.electron.json",
-    "]",
    "-o",
    rebase_path(outputs[0]),
  ]
@@ -108,14 +80,9 @@ npm_action("atom_browserify_sandbox") {

 npm_action("atom_browserify_isolated") {
  script = "browserify"
-  deps = [
-    ":build_electron_definitions",
-  ]

  inputs = [
    "lib/isolated_renderer/init.js",
-    "tsconfig.electron.json",
-    "tsconfig.json",
  ]

  outputs = [
@@ -126,12 +93,6 @@ npm_action("atom_browserify_isolated") {
    "lib/isolated_renderer/init.js",
    "-t",
    "aliasify",
-    "-p",
-    "[",
-    "tsify",
-    "-p",
-    "tsconfig.electron.json",
-    "]",
    "-o",
    rebase_path(outputs[0]),
  ]
@@ -175,15 +136,7 @@ action("atom_js2c") {
         rebase_path(sources, root_build_dir)
 }

-target_gen_electron_js = "$target_gen_dir/js/electron"
-target_gen_default_app_js = "$target_gen_dir/js/default_app"
-
-typescript_build("lib_js") {
-  deps = [
-    ":build_electron_definitions",
-  ]
-  type_root = rebase_path("$target_gen_dir/tsc/electron/typings")
-
+asar("js2asar") {
  sources = filenames.js_sources
  if (enable_desktop_capturer) {
    sources += [
@@ -202,65 +155,18 @@ typescript_build("lib_js") {
      "lib/browser/api/views/text-field.js",
    ]
  }
-
-  output_gen_dir = target_gen_electron_js
-  output_dir_name = "lib"
-  tsconfig = "tsconfig.electron.json"
-}
-
-asar("electron_asar") {
-  deps = [
-    ":lib_js",
-  ]
-
-  root = "$target_gen_electron_js/electron/lib"
-  sources = get_target_outputs(":lib_js")
  outputs = [
    "$root_out_dir/resources/electron.asar",
  ]
+  root = "lib"
 }

-typescript_build("default_app_js") {
-  deps = [
-    ":build_electron_definitions",
-  ]
-  type_root = rebase_path("$target_gen_dir/tsc/electron/typings")
-
-  sources = filenames.default_app_ts_sources
-
-  output_gen_dir = target_gen_default_app_js
-  output_dir_name = "default_app"
-  tsconfig = "tsconfig.default_app.json"
-}
-
-copy("default_app_static") {
-  sources = filenames.default_app_static_sources
-  outputs = [
-    "$target_gen_default_app_js/{{source}}",
-  ]
-}
-
-copy("default_app_octicon_deps") {
-  sources = filenames.default_app_octicon_sources
-  outputs = [
-    "$target_gen_default_app_js/electron/default_app/octicon/{{source_file_part}}",
-  ]
-}
-
-asar("default_app_asar") {
-  deps = [
-    ":default_app_js",
-    ":default_app_octicon_deps",
-    ":default_app_static",
-  ]
-
-  root = "$target_gen_default_app_js/electron/default_app"
-  sources = get_target_outputs(":default_app_js") +
-            get_target_outputs(":default_app_static") +
-            get_target_outputs(":default_app_octicon_deps")
+asar("app2asar") {
+  sources = filenames.default_app_sources
  outputs = [
    "$root_out_dir/resources/default_app.asar",
  ]
+  root = "default_app"
 }

 grit("resources") {
@@ -326,13 +232,13 @@ static_library("electron_lib") {

  deps = [
    ":atom_js2c",
-    ":resources",
    "buildflags",
    "chromium_src:chrome",
    "manifests",
    "native_mate",
+    "//base",
    "//base:base_static",
-    "//base/allocator:buildflags",
+    "//base:i18n",
    "//chrome/app/resources:platform_locale_settings",
    "//components/certificate_transparency",
    "//components/net_log",
@@ -341,12 +247,10 @@ static_library("electron_lib") {
    "//components/spellcheck/renderer",
    "//components/viz/host",
    "//components/viz/service",
+    "//content/public/app:both",
    "//content/public/browser",
    "//content/public/child",
    "//content/public/common:service_names",
-    "//content/public/renderer",
-    "//content/public/utility",
-    "//device/bluetooth",
    "//gin",
    "//media/capture/mojom:video_capture",
    "//media/mojo/interfaces",
@@ -356,9 +260,7 @@ static_library("electron_lib") {
    "//ppapi/host",
    "//ppapi/proxy",
    "//ppapi/shared_impl",
-    "//printing/buildflags",
    "//services/audio/public/mojom:constants",
-    "//services/device/public/cpp/geolocation",
    "//services/device/public/mojom",
    "//services/proxy_resolver:lib",
    "//services/video_capture/public/mojom:constants",
@@ -373,17 +275,8 @@ static_library("electron_lib") {
    "//third_party/widevine/cdm:headers",
    "//ui/events:dom_keycode_converter",
    "//ui/gl",
-    "//ui/native_theme",
-    "//ui/shell_dialogs",
    "//ui/views",
    "//v8",
-    "//v8:v8_libplatform",
-  ]
-
-  public_deps = [
-    "//base",
-    "//base:i18n",
-    "//content/public/app:both",
  ]

  include_dirs = [
@@ -431,6 +324,8 @@ static_library("electron_lib") {
      "*_views.cc",
      "*_views.h",
      "*\bviews/*",
+      "*/autofill_popup.cc",
+      "*/autofill_popup.h",
    ]
  }

@@ -455,10 +350,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
@@ -498,6 +389,9 @@ static_library("electron_lib") {
      "//device/bluetooth",
      "//ui/events/devices/x11",
      "//ui/events/platform/x11",
+      "//ui/native_theme",
+      "//ui/views/controls/webview",
+      "//ui/wm",
    ]
    configs += [ ":gio_unix" ]
    defines += [
@@ -509,20 +403,9 @@ static_library("electron_lib") {
  }
  if (is_win) {
    libs += [ "dwmapi.lib" ]
-    deps += [
-      "//third_party/breakpad:breakpad_handler",
-      "//third_party/breakpad:breakpad_sender",
-      "//ui/native_theme:native_theme_browser",
-      "//ui/wm/public",
-    ]
-    public_deps += [ "//sandbox/win:sandbox" ]
  }
  if (is_linux || is_win) {
-    deps += [
-      "//third_party/breakpad:client",
-      "//ui/views/controls/webview",
-      "//ui/wm",
-    ]
+    deps += [ "//third_party/breakpad:client" ]
    include_dirs += [ "//third_party/breakpad" ]
  }

@@ -710,7 +593,6 @@ if (is_mac) {
    libs = [
      "AVFoundation.framework",
      "Carbon.framework",
-      "LocalAuthentication.framework",
      "QuartzCore.framework",
      "Quartz.framework",
      "Security.framework",
@@ -833,9 +715,9 @@ if (is_mac) {

  bundle_data("electron_app_resources") {
    public_deps = [
-      ":default_app_asar",
+      ":app2asar",
      ":electron_app_strings_bundle_data",
-      ":electron_asar",
+      ":js2asar",
    ]
    sources = [
      "$root_out_dir/resources/default_app.asar",
@@ -881,13 +763,12 @@ if (is_mac) {
    sources = filenames.app_sources
    include_dirs = [ "." ]
    deps = [
-      ":default_app_asar",
+      ":app2asar",
      ":electron_app_manifest",
-      ":electron_asar",
      ":electron_lib",
+      ":js2asar",
      ":packed_resources",
      "//content:sandbox_helper_win",
-      "//electron/buildflags",
      "//ui/strings",
    ]

@@ -916,7 +797,17 @@ if (is_mac) {
        # TODO: we should be generating our .rc files more like how chrome does
        "atom/browser/resources/win/atom.ico",
        "atom/browser/resources/win/atom.rc",
-        "atom/browser/resources/win/resource.h",
+        "atom/browser/resources/win/resources.h",
+      ]
+
+      deps += [
+        "//third_party/breakpad:breakpad_handler",
+        "//third_party/breakpad:breakpad_sender",
+        "//ui/native_theme:native_theme_browser",
+        "//ui/shell_dialogs",
+        "//ui/views/controls/webview",
+        "//ui/wm",
+        "//ui/wm/public",
      ]

      libs = [
@@ -1026,9 +917,6 @@ dist_zip("electron_dist_zip") {
    ":licenses",
    ":electron_version",
  ]
-  if (is_linux) {
-    data_deps += [ "//sandbox/linux:chrome_sandbox" ]
-  }
  outputs = [
    "$root_build_dir/dist.zip",
  ]
--- a/12
+++ b/12
@@ -10,9 +10,9 @@ gclient_gn_args = [

 vars = {
  'chromium_version':
-    '74.0.3724.8',
+    '73.0.3683.27',
  'node_version':
-    '5e32b02e3c180c9997d60fe85042d335b6d9a588',
+    'fac6d766c143db8db05bb3b0c0871df8f032363c',

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

 recursedeps = [
--- a/2
+++ b/2
@@ -1 +1 @@
-6.0.0-nightly.20190311
+5.0.0-beta.3
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@
 [![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/)

-:memo: Available Translations: 🇨🇳 🇹🇼 🇧🇷 🇪🇸 🇰🇷 🇯🇵 🇷🇺 🇫🇷 🇹🇭 🇳🇱 🇹🇷 🇮🇩 🇺🇦 🇨🇿 🇮🇹 🇵🇱.
+:memo: Available Translations: 🇨🇳 🇹🇼 🇧🇷 🇪🇸 🇰🇷 🇯🇵 🇷🇺 🇫🇷 🇹🇭 🇳🇱 🇹🇷 🇮🇩 🇺🇦 🇨🇿 🇮🇹.
 View these docs in other languages at [electron/i18n](https://github.com/electron/i18n/tree/master/content/).

 The Electron framework lets you write cross-platform desktop applications
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -56,8 +56,6 @@ build_script:
  - cd src
  - ps: $env:BUILD_CONFIG_PATH="//electron/build/args/%GN_CONFIG%.gn"
  - gn gen out/Default "--args=import(\"%BUILD_CONFIG_PATH%\") %GN_EXTRA_ARGS%"
-  - gn check out/Default //electron:electron_lib
-  - gn check out/Default //electron:electron_app
  - ninja -C out/Default electron:electron_app
  - gn gen out/ffmpeg "--args=import(\"//electron/build/args/ffmpeg.gn\") %GN_EXTRA_ARGS%"
  - ninja -C out/ffmpeg electron:electron_ffmpeg_zip
@@ -79,8 +77,6 @@ build_script:
        appveyor PushArtifact out/Default/symbols.zip
      }
 test_script:
-  # Workaround for https://github.com/appveyor/ci/issues/2420
-  - set "PATH=%PATH%;C:\Program Files\Git\mingw64\libexec\git-core"
  - ps: >-
      if ((-Not (Test-Path Env:\ELECTRON_RELEASE)) -And ($env:GN_CONFIG -in "testing", "release")) {
        $env:RUN_TESTS="true"
--- a/atom/app/atom_main_delegate.cc
+++ b/atom/app/atom_main_delegate.cc
@@ -237,6 +237,10 @@ void AtomMainDelegate::PreSandboxStartup() {
  if (!IsBrowserProcess(command_line))
    return;

+  // 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);
+
  // Allow file:// URIs to read other file:// URIs by default.
  command_line->AppendSwitch(::switches::kAllowFileAccessFromFiles);

--- a/atom/app/manifests.cc
+++ b/atom/app/manifests.cc
@@ -1,44 +1,44 @@
-// 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/public/cpp/manifest.h"
-#include "services/service_manager/public/cpp/manifest_builder.h"
-
-#if BUILDFLAG(ENABLE_PRINTING)
-#include "components/services/pdf_compositor/public/cpp/manifest.h"
-#endif
-
-#if BUILDFLAG(ENABLE_PRINT_PREVIEW)
-#include "chrome/services/printing/public/cpp/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)
-      printing::GetPdfCompositorManifest(),
-#endif
-#if BUILDFLAG(ENABLE_PRINT_PREVIEW)
-      GetChromePrintingManifest(),
-#endif
-  }};
-  return *manifests;
-}
+// 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;
+}
--- a/atom/app/manifests.h
+++ b/atom/app/manifests.h
@@ -1,16 +1,16 @@
-// 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_
+// 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_
--- a/atom/app/node_main.cc
+++ b/atom/app/node_main.cc
@@ -11,7 +11,6 @@
 #include "atom/browser/javascript_environment.h"
 #include "atom/browser/node_debugger.h"
 #include "atom/common/api/atom_bindings.h"
-#include "atom/common/atom_version.h"
 #include "atom/common/crash_reporter/crash_reporter.h"
 #include "atom/common/native_mate_converters/string16_converter.h"
 #include "atom/common/node_bindings.h"
@@ -80,11 +79,6 @@ int NodeMain(int argc, char* argv[]) {
    reporter.SetMethod("start", &crash_reporter::CrashReporter::StartInstance);
    process.Set("crashReporter", reporter);

-    mate::Dictionary versions;
-    if (process.Get("versions", &versions)) {
-      versions.SetReadOnly(ATOM_PROJECT_NAME, ATOM_VERSION_STRING);
-    }
-
    node::LoadEnvironment(env);

    bool more;
--- a/atom/browser/api/atom_api_app.cc
+++ b/atom/browser/api/atom_api_app.cc
@@ -34,8 +34,8 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/icon_manager.h"
 #include "chrome/common/chrome_paths.h"
-#include "content/browser/gpu/compositor_util.h"        // nogncheck
-#include "content/browser/gpu/gpu_data_manager_impl.h"  // nogncheck
+#include "content/browser/gpu/compositor_util.h"
+#include "content/browser/gpu/gpu_data_manager_impl.h"
 #include "content/public/browser/browser_accessibility_state.h"
 #include "content/public/browser/browser_child_process_host.h"
 #include "content/public/browser/child_process_data.h"
@@ -533,11 +533,12 @@ int ImportIntoCertStore(CertificateManagerModel* model,
 }
 #endif

-void OnIconDataAvailable(util::Promise promise, gfx::Image* icon) {
+void OnIconDataAvailable(scoped_refptr<util::Promise> promise,
+                         gfx::Image* icon) {
  if (icon && !icon->IsEmpty()) {
-    promise.Resolve(*icon);
+    promise->Resolve(*icon);
  } else {
-    promise.RejectWithErrorMessage("Failed to get file icon.");
+    promise->RejectWithErrorMessage("Failed to get file icon.");
  }
 }

@@ -1125,8 +1126,7 @@ JumpListResult App::SetJumpList(v8::Local<v8::Value> val,

 v8::Local<v8::Promise> App::GetFileIcon(const base::FilePath& path,
                                        mate::Arguments* args) {
-  util::Promise promise(isolate());
-  v8::Local<v8::Promise> handle = promise.GetHandle();
+  scoped_refptr<util::Promise> promise = new util::Promise(isolate());
  base::FilePath normalized_path = path.NormalizePathSeparators();

  IconLoader::IconSize icon_size;
@@ -1143,19 +1143,17 @@ v8::Local<v8::Promise> App::GetFileIcon(const base::FilePath& path,
  gfx::Image* icon =
      icon_manager->LookupIconFromFilepath(normalized_path, icon_size);
  if (icon) {
-    promise.Resolve(*icon);
+    promise->Resolve(*icon);
  } else {
-    icon_manager->LoadIcon(
-        normalized_path, icon_size,
-        base::BindOnce(&OnIconDataAvailable, std::move(promise)),
-        &cancelable_task_tracker_);
+    icon_manager->LoadIcon(normalized_path, icon_size,
+                           base::Bind(&OnIconDataAvailable, promise),
+                           &cancelable_task_tracker_);
  }
-  return handle;
+  return promise->GetHandle();
 }

 std::vector<mate::Dictionary> App::GetAppMetrics(v8::Isolate* isolate) {
  std::vector<mate::Dictionary> result;
-  result.reserve(app_metrics_.size());
  int processor_count = base::SysInfo::NumberOfProcessors();

  for (const auto& process_metric : app_metrics_) {
@@ -1199,30 +1197,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) {
@@ -1260,46 +1258,6 @@ bool App::MoveToApplicationsFolder(mate::Arguments* args) {
 bool App::IsInApplicationsFolder() {
  return ui::cocoa::AtomBundleMover::IsCurrentAppInApplicationsFolder();
 }
-
-int DockBounce(const std::string& type) {
-  int request_id = -1;
-  if (type == "critical")
-    request_id = Browser::Get()->DockBounce(Browser::BOUNCE_CRITICAL);
-  else if (type == "informational")
-    request_id = Browser::Get()->DockBounce(Browser::BOUNCE_INFORMATIONAL);
-  return request_id;
-}
-
-void DockSetMenu(atom::api::Menu* menu) {
-  Browser::Get()->DockSetMenu(menu->model());
-}
-
-v8::Local<v8::Value> App::GetDockAPI(v8::Isolate* isolate) {
-  if (dock_.IsEmpty()) {
-    // Initialize the Dock API, the methods are bound to "dock" which exists
-    // for the lifetime of "app"
-    auto browser = base::Unretained(Browser::Get());
-    mate::Dictionary dock_obj = mate::Dictionary::CreateEmpty(isolate);
-    dock_obj.SetMethod("bounce", &DockBounce);
-    dock_obj.SetMethod("cancelBounce",
-                       base::Bind(&Browser::DockCancelBounce, browser));
-    dock_obj.SetMethod("downloadFinished",
-                       base::Bind(&Browser::DockDownloadFinished, browser));
-    dock_obj.SetMethod("setBadge",
-                       base::Bind(&Browser::DockSetBadgeText, browser));
-    dock_obj.SetMethod("getBadge",
-                       base::Bind(&Browser::DockGetBadgeText, browser));
-    dock_obj.SetMethod("hide", base::Bind(&Browser::DockHide, browser));
-    dock_obj.SetMethod("show", base::Bind(&Browser::DockShow, browser));
-    dock_obj.SetMethod("isVisible",
-                       base::Bind(&Browser::DockIsVisible, browser));
-    dock_obj.SetMethod("setMenu", &DockSetMenu);
-    dock_obj.SetMethod("setIcon", base::Bind(&Browser::DockSetIcon, browser));
-
-    dock_.Reset(isolate, dock_obj.GetHandle());
-  }
-  return v8::Local<v8::Value>::New(isolate, dock_);
-}
 #endif

 // static
@@ -1398,9 +1356,6 @@ void App::BuildPrototype(v8::Isolate* isolate,
 #if defined(MAS_BUILD)
      .SetMethod("startAccessingSecurityScopedResource",
                 &App::StartAccessingSecurityScopedResource)
-#endif
-#if defined(OS_MACOSX)
-      .SetProperty("dock", &App::GetDockAPI)
 #endif
      .SetMethod("enableSandbox", &App::EnableSandbox);
 }
@@ -1411,6 +1366,21 @@ void App::BuildPrototype(v8::Isolate* isolate,

 namespace {

+#if defined(OS_MACOSX)
+int DockBounce(const std::string& type) {
+  int request_id = -1;
+  if (type == "critical")
+    request_id = Browser::Get()->DockBounce(Browser::BOUNCE_CRITICAL);
+  else if (type == "informational")
+    request_id = Browser::Get()->DockBounce(Browser::BOUNCE_INFORMATIONAL);
+  return request_id;
+}
+
+void DockSetMenu(atom::api::Menu* menu) {
+  Browser::Get()->DockSetMenu(menu->model());
+}
+#endif
+
 void Initialize(v8::Local<v8::Object> exports,
                v8::Local<v8::Value> unused,
                v8::Local<v8::Context> context,
@@ -1421,8 +1391,25 @@ void Initialize(v8::Local<v8::Object> exports,
                      ->GetFunction(context)
                      .ToLocalChecked());
  dict.Set("app", atom::api::App::Create(isolate));
+#if defined(OS_MACOSX)
+  auto browser = base::Unretained(Browser::Get());
+  dict.SetMethod("dockBounce", &DockBounce);
+  dict.SetMethod("dockCancelBounce",
+                 base::Bind(&Browser::DockCancelBounce, browser));
+  dict.SetMethod("dockDownloadFinished",
+                 base::Bind(&Browser::DockDownloadFinished, browser));
+  dict.SetMethod("dockSetBadgeText",
+                 base::Bind(&Browser::DockSetBadgeText, browser));
+  dict.SetMethod("dockGetBadgeText",
+                 base::Bind(&Browser::DockGetBadgeText, browser));
+  dict.SetMethod("dockHide", base::Bind(&Browser::DockHide, browser));
+  dict.SetMethod("dockShow", base::Bind(&Browser::DockShow, browser));
+  dict.SetMethod("dockIsVisible", base::Bind(&Browser::DockIsVisible, browser));
+  dict.SetMethod("dockSetMenu", &DockSetMenu);
+  dict.SetMethod("dockSetIcon", base::Bind(&Browser::DockSetIcon, browser));
+#endif
 }

 }  // namespace

-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_app, Initialize)
+NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_browser_app, Initialize)
--- a/atom/browser/api/atom_api_app.h
+++ b/atom/browser/api/atom_api_app.h
@@ -18,7 +18,6 @@
 #include "atom/common/native_mate_converters/callback.h"
 #include "atom/common/promise_util.h"
 #include "base/process/process_iterator.h"
-#include "base/process/process_metrics.h"
 #include "base/task/cancelable_task_tracker.h"
 #include "chrome/browser/icon_manager.h"
 #include "chrome/browser/process_singleton.h"
@@ -211,8 +210,6 @@ class App : public AtomBrowserClient::Delegate,
 #if defined(OS_MACOSX)
  bool MoveToApplicationsFolder(mate::Arguments* args);
  bool IsInApplicationsFolder();
-  v8::Local<v8::Value> GetDockAPI(v8::Isolate* isolate);
-  v8::Global<v8::Value> dock_;
 #endif
 #if defined(MAS_BUILD)
  base::Callback<void()> StartAccessingSecurityScopedResource(
--- a/atom/browser/api/atom_api_auto_updater.cc
+++ b/atom/browser/api/atom_api_auto_updater.cc
@@ -154,4 +154,4 @@ void Initialize(v8::Local<v8::Object> exports,

 }  // namespace

-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_auto_updater, Initialize)
+NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_browser_auto_updater, Initialize)
--- a/atom/browser/api/atom_api_browser_view.cc
+++ b/atom/browser/api/atom_api_browser_view.cc
@@ -37,14 +37,6 @@ struct Converter<atom::AutoResizeFlags> {
    if (params.Get("height", &height) && height) {
      flags |= atom::kAutoResizeHeight;
    }
-    bool horizontal = false;
-    if (params.Get("horizontal", &horizontal) && horizontal) {
-      flags |= atom::kAutoResizeHorizontal;
-    }
-    bool vertical = false;
-    if (params.Get("vertical", &vertical) && vertical) {
-      flags |= atom::kAutoResizeVertical;
-    }

    *auto_resize_flags = static_cast<atom::AutoResizeFlags>(flags);
    return true;
@@ -180,4 +172,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)
--- a/atom/browser/api/atom_api_browser_window.cc
+++ b/atom/browser/api/atom_api_browser_window.cc
@@ -17,8 +17,8 @@
 #include "atom/common/native_mate_converters/value_converter.h"
 #include "atom/common/options_switches.h"
 #include "base/threading/thread_task_runner_handle.h"
-#include "content/browser/renderer_host/render_widget_host_impl.h"  // nogncheck
-#include "content/browser/renderer_host/render_widget_host_owner_delegate.h"  // nogncheck
+#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"
@@ -481,4 +481,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)
--- a/atom/browser/api/atom_api_content_tracing.cc
+++ b/atom/browser/api/atom_api_content_tracing.cc
@@ -66,73 +66,59 @@ scoped_refptr<TracingController::TraceDataEndpoint> GetTraceDataEndpoint(
      result_file_path, base::Bind(callback, result_file_path));
 }

-void OnRecordingStopped(const atom::util::CopyablePromise& promise,
+void OnRecordingStopped(scoped_refptr<atom::util::Promise> promise,
                        const base::FilePath& path) {
-  promise.GetPromise().Resolve(path);
+  promise->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();
+  scoped_refptr<atom::util::Promise> promise = new atom::util::Promise(isolate);

-  // 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;
+  TracingController::GetInstance()->StopTracing(
+      GetTraceDataEndpoint(path, base::Bind(&OnRecordingStopped, promise)));
+
+  return promise->GetHandle();
 }

-void OnCategoriesAvailable(atom::util::Promise promise,
+void OnCategoriesAvailable(scoped_refptr<atom::util::Promise> promise,
                           const std::set<std::string>& categories) {
-  promise.Resolve(categories);
+  promise->Resolve(categories);
 }

 v8::Local<v8::Promise> GetCategories(v8::Isolate* isolate) {
-  atom::util::Promise promise(isolate);
-  v8::Local<v8::Promise> handle = promise.GetHandle();
+  scoped_refptr<atom::util::Promise> promise = new atom::util::Promise(isolate);
+  bool success = TracingController::GetInstance()->GetCategories(
+      base::BindOnce(&OnCategoriesAvailable, promise));

-  // Note: This method always succeeds.
-  TracingController::GetInstance()->GetCategories(
-      base::BindOnce(&OnCategoriesAvailable, std::move(promise)));
-  return handle;
+  if (!success)
+    promise->RejectWithErrorMessage("Could not get categories.");
+
+  return promise->GetHandle();
 }

-void OnTracingStarted(atom::util::Promise promise) {
-  promise.Resolve();
+void OnTracingStarted(scoped_refptr<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();
+  scoped_refptr<atom::util::Promise> promise = new atom::util::Promise(isolate);

-  // Note: This method always succeeds.
-  TracingController::GetInstance()->StartTracing(
-      trace_config, base::BindOnce(&OnTracingStarted, std::move(promise)));
-  return handle;
+  bool success = TracingController::GetInstance()->StartTracing(
+      trace_config, base::BindOnce(&OnTracingStarted, promise));
+
+  if (!success)
+    promise->RejectWithErrorMessage("Could not start tracing");
+
+  return promise->GetHandle();
 }

-void OnTraceBufferUsageAvailable(atom::util::Promise promise,
-                                 float percent_full,
-                                 size_t approximate_count) {
-  mate::Dictionary dict = mate::Dictionary::CreateEmpty(promise.isolate());
-  dict.Set("percentage", percent_full);
-  dict.Set("value", approximate_count);
-
-  promise.Resolve(dict.GetHandle());
-}
-
-v8::Local<v8::Promise> GetTraceBufferUsage(v8::Isolate* isolate) {
-  atom::util::Promise promise(isolate);
-  v8::Local<v8::Promise> handle = promise.GetHandle();
-
-  // Note: This method always succeeds.
-  TracingController::GetInstance()->GetTraceBufferUsage(
-      base::BindOnce(&OnTraceBufferUsageAvailable, std::move(promise)));
-  return handle;
+bool GetTraceBufferUsage(
+    const base::RepeatingCallback<void(float, size_t)>& callback) {
+  return TracingController::GetInstance()->GetTraceBufferUsage(
+      base::BindOnce(callback));
 }

 void Initialize(v8::Local<v8::Object> exports,
@@ -148,4 +134,4 @@ void Initialize(v8::Local<v8::Object> exports,

 }  // namespace

-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_content_tracing, Initialize)
+NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_browser_content_tracing, Initialize)
--- a/atom/browser/api/atom_api_cookies.cc
+++ b/atom/browser/api/atom_api_cookies.cc
@@ -136,11 +136,30 @@ inline net::CookieStore* GetCookieStore(
  return getter->GetURLRequestContext()->cookie_store();
 }

+void ResolvePromiseWithCookies(scoped_refptr<util::Promise> promise,
+                               net::CookieList cookieList) {
+  promise->Resolve(cookieList);
+}
+
+void ResolvePromise(scoped_refptr<util::Promise> promise) {
+  promise->Resolve();
+}
+
+// Resolve |promise| in UI thread.
+void ResolvePromiseInUI(scoped_refptr<util::Promise> promise) {
+  base::PostTaskWithTraits(FROM_HERE, {BrowserThread::UI},
+                           base::BindOnce(ResolvePromise, std::move(promise)));
+}
+
+// Run |callback| on UI thread.
+void RunCallbackInUI(const base::Closure& callback) {
+  base::PostTaskWithTraits(FROM_HERE, {BrowserThread::UI}, 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 net::CookieList& list,
-                   const net::CookieStatusList& excluded_list) {
+                   scoped_refptr<util::Promise> promise,
+                   const net::CookieList& list) {
  net::CookieList result;
  for (const auto& cookie : list) {
    if (MatchesCookie(filter.get(), cookie))
@@ -149,107 +168,71 @@ void FilterCookies(std::unique_ptr<base::DictionaryValue> filter,

  base::PostTaskWithTraits(
      FROM_HERE, {BrowserThread::UI},
-      base::BindOnce(util::Promise::ResolvePromise<net::CookieList>,
-                     std::move(promise), std::move(result)));
+      base::BindOnce(ResolvePromiseWithCookies, std::move(promise), result));
 }

 // Receives cookies matching |filter| in IO thread.
 void GetCookiesOnIO(scoped_refptr<net::URLRequestContextGetter> getter,
                    std::unique_ptr<base::DictionaryValue> filter,
-                    util::Promise promise) {
+                    scoped_refptr<util::Promise> promise) {
  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), std::move(promise));

  // 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) {
-  net::CookieDeletionInfo cookie_info;
-  cookie_info.url = url;
-  cookie_info.name = name;
-  GetCookieStore(getter)->DeleteAllMatchingInfoAsync(
-      std::move(cookie_info),
-      base::BindOnce(
-          [](util::Promise promise, uint32_t num_deleted) {
-            util::Promise::ResolveEmptyPromise(std::move(promise));
-          },
-          std::move(promise)));
+                      scoped_refptr<util::Promise> promise) {
+  GetCookieStore(getter)->DeleteCookieAsync(
+      url, name, base::BindOnce(ResolvePromiseInUI, promise));
+}
+
+// Resolves/rejects the |promise| in UI thread.
+void SettlePromiseInUI(scoped_refptr<util::Promise> promise,
+                       const std::string& errmsg) {
+  if (errmsg.empty()) {
+    promise->Resolve();
+  } else {
+    promise->RejectWithErrorMessage(errmsg);
+  }
 }

 // Callback of SetCookie.
-void OnSetCookie(util::Promise promise,
-                 net::CanonicalCookie::CookieInclusionStatus status) {
-  std::string errmsg;
-  switch (status) {
-    case net::CanonicalCookie::CookieInclusionStatus::EXCLUDE_HTTP_ONLY:
-      errmsg = "Failed to create httponly cookie";
-      break;
-    case net::CanonicalCookie::CookieInclusionStatus::EXCLUDE_SECURE_ONLY:
-      errmsg = "Cannot create a secure cookie from an insecure URL";
-      break;
-    case net::CanonicalCookie::CookieInclusionStatus::EXCLUDE_FAILURE_TO_STORE:
-      errmsg = "Failed to parse cookie";
-      break;
-    case net::CanonicalCookie::CookieInclusionStatus::EXCLUDE_INVALID_DOMAIN:
-      errmsg = "Failed to get cookie domain";
-      break;
-    case net::CanonicalCookie::CookieInclusionStatus::EXCLUDE_INVALID_PREFIX:
-      errmsg = "Failed because the cookie violated prefix rules.";
-      break;
-    case net::CanonicalCookie::CookieInclusionStatus::
-        EXCLUDE_NONCOOKIEABLE_SCHEME:
-      errmsg = "Cannot set cookie for current scheme";
-      break;
-    case net::CanonicalCookie::CookieInclusionStatus::INCLUDE:
-      errmsg = "";
-      break;
-    default:
-      errmsg = "Setting cookie failed";
-      break;
-  }
-  if (errmsg.empty()) {
-    base::PostTaskWithTraits(
-        FROM_HERE, {BrowserThread::UI},
-        base::BindOnce(util::Promise::ResolveEmptyPromise, std::move(promise)));
-  } else {
-    base::PostTaskWithTraits(
-        FROM_HERE, {BrowserThread::UI},
-        base::BindOnce(util::Promise::RejectPromise, std::move(promise),
-                       std::move(errmsg)));
-  }
+void OnSetCookie(scoped_refptr<util::Promise> promise, bool success) {
+  const std::string errmsg = success ? "" : "Setting cookie failed";
+  RunCallbackInUI(base::Bind(SettlePromiseInUI, std::move(promise), errmsg));
 }

 // Flushes cookie store in IO thread.
 void FlushCookieStoreOnIOThread(
    scoped_refptr<net::URLRequestContextGetter> getter,
-    util::Promise promise) {
+    scoped_refptr<util::Promise> promise) {
  GetCookieStore(getter)->FlushStore(
-      base::BindOnce(util::Promise::ResolveEmptyPromise, std::move(promise)));
+      base::BindOnce(ResolvePromiseInUI, promise));
 }

 // Sets cookie with |details| in IO thread.
 void SetCookieOnIO(scoped_refptr<net::URLRequestContextGetter> getter,
                   std::unique_ptr<base::DictionaryValue> details,
-                   util::Promise promise) {
-  std::string url_string, name, value, domain, path;
+                   scoped_refptr<util::Promise> promise) {
+  std::string url, name, value, domain, path;
  bool secure = false;
  bool http_only = false;
  double creation_date;
  double expiration_date;
  double last_access_date;
-  details->GetString("url", &url_string);
+  details->GetString("url", &url);
  details->GetString("name", &name);
  details->GetString("value", &value);
  details->GetString("domain", &domain);
@@ -278,33 +261,26 @@ void SetCookieOnIO(scoped_refptr<net::URLRequestContextGetter> getter,
                           : base::Time::FromDoubleT(last_access_date);
  }

-  GURL url(url_string);
  std::unique_ptr<net::CanonicalCookie> canonical_cookie(
      net::CanonicalCookie::CreateSanitizedCookie(
-          url, name, value, domain, path, creation_time, expiration_time,
+          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));
  if (!canonical_cookie || !canonical_cookie->IsCanonical()) {
-    std::move(completion_callback)
-        .Run(net::CanonicalCookie::CookieInclusionStatus::
-                 EXCLUDE_FAILURE_TO_STORE);
+    std::move(completion_callback).Run(false);
    return;
  }
-  if (url.is_empty()) {
-    std::move(completion_callback)
-        .Run(net::CanonicalCookie::CookieInclusionStatus::
-                 EXCLUDE_INVALID_DOMAIN);
+  if (url.empty()) {
+    std::move(completion_callback).Run(false);
    return;
  }
  if (name.empty()) {
-    std::move(completion_callback)
-        .Run(net::CanonicalCookie::CookieInclusionStatus::
-                 EXCLUDE_FAILURE_TO_STORE);
+    std::move(completion_callback).Run(false);
    return;
  }
  GetCookieStore(getter)->SetCanonicalCookieAsync(
-      std::move(canonical_cookie), url.scheme(), http_only,
+      std::move(canonical_cookie), secure, http_only,
      std::move(completion_callback));
 }

@@ -321,8 +297,7 @@ 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();
+  scoped_refptr<util::Promise> promise = new util::Promise(isolate());

  auto copy = base::DictionaryValue::From(
      base::Value::ToUniquePtrValue(filter.Clone()));
@@ -330,28 +305,26 @@ v8::Local<v8::Promise> Cookies::Get(const base::DictionaryValue& filter) {
  base::PostTaskWithTraits(
      FROM_HERE, {BrowserThread::IO},
      base::BindOnce(GetCookiesOnIO, base::RetainedRef(getter), std::move(copy),
-                     std::move(promise)));
+                     promise));

-  return handle;
+  return promise->GetHandle();
 }

 v8::Local<v8::Promise> Cookies::Remove(const GURL& url,
                                       const std::string& name) {
-  util::Promise promise(isolate());
-  v8::Local<v8::Promise> handle = promise.GetHandle();
+  scoped_refptr<util::Promise> promise = new util::Promise(isolate());

  auto* getter = browser_context_->GetRequestContext();
  base::PostTaskWithTraits(
      FROM_HERE, {BrowserThread::IO},
      base::BindOnce(RemoveCookieOnIO, base::RetainedRef(getter), url, name,
-                     std::move(promise)));
+                     promise));

-  return handle;
+  return promise->GetHandle();
 }

 v8::Local<v8::Promise> Cookies::Set(const base::DictionaryValue& details) {
-  util::Promise promise(isolate());
-  v8::Local<v8::Promise> handle = promise.GetHandle();
+  scoped_refptr<util::Promise> promise = new util::Promise(isolate());

  auto copy = base::DictionaryValue::From(
      base::Value::ToUniquePtrValue(details.Clone()));
@@ -359,22 +332,20 @@ v8::Local<v8::Promise> Cookies::Set(const base::DictionaryValue& details) {
  base::PostTaskWithTraits(
      FROM_HERE, {BrowserThread::IO},
      base::BindOnce(SetCookieOnIO, base::RetainedRef(getter), std::move(copy),
-                     std::move(promise)));
+                     promise));

-  return handle;
+  return promise->GetHandle();
 }

 v8::Local<v8::Promise> Cookies::FlushStore() {
-  util::Promise promise(isolate());
-  v8::Local<v8::Promise> handle = promise.GetHandle();
+  scoped_refptr<util::Promise> promise = new util::Promise(isolate());

  auto* getter = browser_context_->GetRequestContext();
-  base::PostTaskWithTraits(
-      FROM_HERE, {BrowserThread::IO},
-      base::BindOnce(FlushCookieStoreOnIOThread, base::RetainedRef(getter),
-                     std::move(promise)));
+  base::PostTaskWithTraits(FROM_HERE, {BrowserThread::IO},
+                           base::BindOnce(FlushCookieStoreOnIOThread,
+                                          base::RetainedRef(getter), promise));

-  return handle;
+  return promise->GetHandle();
 }

 void Cookies::OnCookieChanged(const CookieDetails* details) {
--- a/atom/browser/api/atom_api_debugger.cc
+++ b/atom/browser/api/atom_api_debugger.cc
@@ -45,8 +45,7 @@ void Debugger::DispatchProtocolMessage(DevToolsAgentHost* agent_host,
  v8::Locker locker(isolate());
  v8::HandleScope handle_scope(isolate());

-  std::unique_ptr<base::Value> parsed_message =
-      base::JSONReader::ReadDeprecated(message);
+  std::unique_ptr<base::Value> parsed_message = base::JSONReader::Read(message);
  if (!parsed_message || !parsed_message->is_dict())
    return;
  base::DictionaryValue* dict =
@@ -66,21 +65,21 @@ void Debugger::DispatchProtocolMessage(DevToolsAgentHost* agent_host,
    if (it == pending_requests_.end())
      return;

-    atom::util::Promise promise = std::move(it->second);
+    scoped_refptr<atom::util::Promise> promise = 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);
+      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);
+      promise->Resolve(result);
    }
  }
 }
@@ -130,18 +129,17 @@ void Debugger::Detach() {
 }

 v8::Local<v8::Promise> Debugger::SendCommand(mate::Arguments* args) {
-  atom::util::Promise promise(isolate());
-  v8::Local<v8::Promise> handle = promise.GetHandle();
+  scoped_refptr<util::Promise> promise = new util::Promise(isolate());

  if (!agent_host_) {
-    promise.RejectWithErrorMessage("No target available");
-    return handle;
+    promise->RejectWithErrorMessage("No target available");
+    return promise->GetHandle();
  }

  std::string method;
  if (!args->GetNext(&method)) {
-    promise.RejectWithErrorMessage("Invalid method");
-    return handle;
+    promise->RejectWithErrorMessage("Invalid method");
+    return promise->GetHandle();
  }

  base::DictionaryValue command_params;
@@ -149,7 +147,7 @@ v8::Local<v8::Promise> Debugger::SendCommand(mate::Arguments* args) {

  base::DictionaryValue request;
  int request_id = ++previous_request_id_;
-  pending_requests_.emplace(request_id, std::move(promise));
+  pending_requests_[request_id] = promise;
  request.SetInteger("id", request_id);
  request.SetString("method", method);
  if (!command_params.empty())
@@ -160,12 +158,12 @@ v8::Local<v8::Promise> Debugger::SendCommand(mate::Arguments* args) {
  base::JSONWriter::Write(request, &json_args);
  agent_host_->DispatchProtocolMessage(this, json_args);

-  return handle;
+  return promise->GetHandle();
 }

 void Debugger::ClearPendingRequests() {
-  for (auto& it : pending_requests_)
-    it.second.RejectWithErrorMessage("target closed while handling command");
+  for (const auto& it : pending_requests_)
+    it.second->RejectWithErrorMessage("target closed while handling command");
 }

 // static
@@ -206,4 +204,4 @@ void Initialize(v8::Local<v8::Object> exports,

 }  // namespace

-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_debugger, Initialize)
+NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_browser_debugger, Initialize);
--- a/atom/browser/api/atom_api_debugger.h
+++ b/atom/browser/api/atom_api_debugger.h
@@ -54,7 +54,7 @@ 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, scoped_refptr<atom::util::Promise>>;

  void Attach(mate::Arguments* args);
  bool IsAttached();
--- a/atom/browser/api/atom_api_desktop_capturer.cc
+++ b/atom/browser/api/atom_api_desktop_capturer.cc
@@ -137,12 +137,11 @@ bool DesktopCapturer::ShouldScheduleNextRefresh(DesktopMediaList* list) {
 }

 void DesktopCapturer::UpdateSourcesList(DesktopMediaList* list) {
+  std::vector<DesktopCapturer::Source> window_sources;
  if (capture_window_ &&
      list->GetMediaListType() == content::DesktopMediaID::TYPE_WINDOW) {
    capture_window_ = false;
    const auto& media_list_sources = list->GetSources();
-    std::vector<DesktopCapturer::Source> window_sources;
-    window_sources.reserve(media_list_sources.size());
    for (const auto& media_list_source : media_list_sources) {
      window_sources.emplace_back(DesktopCapturer::Source{
          media_list_source, std::string(), fetch_window_icons_});
@@ -151,12 +150,11 @@ void DesktopCapturer::UpdateSourcesList(DesktopMediaList* list) {
              std::back_inserter(captured_sources_));
  }

+  std::vector<DesktopCapturer::Source> screen_sources;
  if (capture_screen_ &&
      list->GetMediaListType() == content::DesktopMediaID::TYPE_SCREEN) {
    capture_screen_ = false;
    const auto& media_list_sources = list->GetSources();
-    std::vector<DesktopCapturer::Source> screen_sources;
-    screen_sources.reserve(media_list_sources.size());
    for (const auto& media_list_source : media_list_sources) {
      screen_sources.emplace_back(
          DesktopCapturer::Source{media_list_source, std::string()});
@@ -232,4 +230,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);
--- a/atom/browser/api/atom_api_dialog.cc
+++ b/atom/browser/api/atom_api_dialog.cc
@@ -16,7 +16,6 @@
 #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"
-#include "atom/common/promise_util.h"
 #include "native_mate/dictionary.h"

 #include "atom/common/node_includes.h"
@@ -52,37 +51,32 @@ void ShowMessageBox(int type,
  }
 }

-void ShowOpenDialogSync(const file_dialog::DialogSettings& settings,
-                        mate::Arguments* args) {
-  std::vector<base::FilePath> paths;
-  if (file_dialog::ShowOpenDialogSync(settings, &paths))
-    args->Return(paths);
+void ShowOpenDialog(const file_dialog::DialogSettings& settings,
+                    mate::Arguments* args) {
+  v8::Local<v8::Value> peek = args->PeekNext();
+  file_dialog::OpenDialogCallback callback;
+  if (mate::Converter<file_dialog::OpenDialogCallback>::FromV8(
+          args->isolate(), peek, &callback)) {
+    file_dialog::ShowOpenDialog(settings, callback);
+  } else {
+    std::vector<base::FilePath> paths;
+    if (file_dialog::ShowOpenDialog(settings, &paths))
+      args->Return(paths);
+  }
 }

-v8::Local<v8::Promise> ShowOpenDialog(
-    const file_dialog::DialogSettings& settings,
-    mate::Arguments* args) {
-  atom::util::Promise promise(args->isolate());
-  v8::Local<v8::Promise> handle = promise.GetHandle();
-  file_dialog::ShowOpenDialog(settings, std::move(promise));
-  return handle;
-}
-
-void ShowSaveDialogSync(const file_dialog::DialogSettings& settings,
-                        mate::Arguments* args) {
-  base::FilePath path;
-  if (file_dialog::ShowSaveDialogSync(settings, &path))
-    args->Return(path);
-}
-
-v8::Local<v8::Promise> ShowSaveDialog(
-    const file_dialog::DialogSettings& settings,
-    mate::Arguments* args) {
-  atom::util::Promise promise(args->isolate());
-  v8::Local<v8::Promise> handle = promise.GetHandle();
-
-  file_dialog::ShowSaveDialog(settings, std::move(promise));
-  return handle;
+void ShowSaveDialog(const file_dialog::DialogSettings& settings,
+                    mate::Arguments* args) {
+  v8::Local<v8::Value> peek = args->PeekNext();
+  file_dialog::SaveDialogCallback callback;
+  if (mate::Converter<file_dialog::SaveDialogCallback>::FromV8(
+          args->isolate(), peek, &callback)) {
+    file_dialog::ShowSaveDialog(settings, callback);
+  } else {
+    base::FilePath path;
+    if (file_dialog::ShowSaveDialog(settings, &path))
+      args->Return(path);
+  }
 }

 void Initialize(v8::Local<v8::Object> exports,
@@ -92,9 +86,7 @@ void Initialize(v8::Local<v8::Object> exports,
  mate::Dictionary dict(context->GetIsolate(), exports);
  dict.SetMethod("showMessageBox", &ShowMessageBox);
  dict.SetMethod("showErrorBox", &atom::ShowErrorBox);
-  dict.SetMethod("showOpenDialogSync", &ShowOpenDialogSync);
  dict.SetMethod("showOpenDialog", &ShowOpenDialog);
-  dict.SetMethod("showSaveDialogSync", &ShowSaveDialogSync);
  dict.SetMethod("showSaveDialog", &ShowSaveDialog);
 #if defined(OS_MACOSX) || defined(OS_WIN)
  dict.SetMethod("showCertificateTrustDialog",
@@ -104,4 +96,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)
--- a/atom/browser/api/atom_api_download_item.cc
+++ b/atom/browser/api/atom_api_download_item.cc
@@ -251,4 +251,4 @@ void Initialize(v8::Local<v8::Object> exports,

 }  // namespace

-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_download_item, Initialize)
+NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_browser_download_item, Initialize);
--- a/atom/browser/api/atom_api_event.cc
+++ b/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)
--- a/atom/browser/api/atom_api_global_shortcut.cc
+++ b/atom/browser/api/atom_api_global_shortcut.cc
@@ -166,4 +166,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)
--- a/atom/browser/api/atom_api_in_app_purchase.cc
+++ b/atom/browser/api/atom_api_in_app_purchase.cc
@@ -140,4 +140,4 @@ void Initialize(v8::Local<v8::Object> exports,

 }  // namespace

-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_in_app_purchase, Initialize)
+NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_browser_in_app_purchase, Initialize)
--- a/atom/browser/api/atom_api_menu.cc
+++ b/atom/browser/api/atom_api_menu.cc
@@ -40,7 +40,6 @@ void Menu::AfterInit(v8::Isolate* isolate) {
  delegate.Get("isCommandIdChecked", &is_checked_);
  delegate.Get("isCommandIdEnabled", &is_enabled_);
  delegate.Get("isCommandIdVisible", &is_visible_);
-  delegate.Get("shouldCommandIdWorkWhenHidden", &works_when_hidden_);
  delegate.Get("getAcceleratorForCommandId", &get_accelerator_);
  delegate.Get("shouldRegisterAcceleratorForCommandId",
               &should_register_accelerator_);
@@ -66,12 +65,6 @@ bool Menu::IsCommandIdVisible(int command_id) const {
  return is_visible_.Run(GetWrapper(), command_id);
 }

-bool Menu::ShouldCommandIdWorkWhenHidden(int command_id) const {
-  v8::Locker locker(isolate());
-  v8::HandleScope handle_scope(isolate());
-  return works_when_hidden_.Run(GetWrapper(), command_id);
-}
-
 bool Menu::GetAcceleratorForCommandIdWithParams(
    int command_id,
    bool use_default_accelerator,
@@ -188,10 +181,6 @@ bool Menu::IsVisibleAt(int index) const {
  return model_->IsVisibleAt(index);
 }

-bool Menu::WorksWhenHiddenAt(int index) const {
-  return model_->WorksWhenHiddenAt(index);
-}
-
 void Menu::OnMenuWillClose() {
  Emit("menu-will-close");
 }
@@ -223,7 +212,6 @@ void Menu::BuildPrototype(v8::Isolate* isolate,
      .SetMethod("getAcceleratorTextAt", &Menu::GetAcceleratorTextAt)
      .SetMethod("isItemCheckedAt", &Menu::IsItemCheckedAt)
      .SetMethod("isEnabledAt", &Menu::IsEnabledAt)
-      .SetMethod("worksWhenHiddenAt", &Menu::WorksWhenHiddenAt)
      .SetMethod("isVisibleAt", &Menu::IsVisibleAt)
      .SetMethod("popupAt", &Menu::PopupAt)
      .SetMethod("closePopupAt", &Menu::ClosePopupAt);
@@ -257,4 +245,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)
--- a/atom/browser/api/atom_api_menu.h
+++ b/atom/browser/api/atom_api_menu.h
@@ -47,7 +47,6 @@ class Menu : public mate::TrackableObject<Menu>,
  bool IsCommandIdChecked(int command_id) const override;
  bool IsCommandIdEnabled(int command_id) const override;
  bool IsCommandIdVisible(int command_id) const override;
-  bool ShouldCommandIdWorkWhenHidden(int command_id) const override;
  bool GetAcceleratorForCommandIdWithParams(
      int command_id,
      bool use_default_accelerator,
@@ -97,13 +96,11 @@ class Menu : public mate::TrackableObject<Menu>,
  bool IsItemCheckedAt(int index) const;
  bool IsEnabledAt(int index) const;
  bool IsVisibleAt(int index) const;
-  bool WorksWhenHiddenAt(int index) const;

  // Stored delegate methods.
  base::Callback<bool(v8::Local<v8::Value>, int)> is_checked_;
  base::Callback<bool(v8::Local<v8::Value>, int)> is_enabled_;
  base::Callback<bool(v8::Local<v8::Value>, int)> is_visible_;
-  base::Callback<bool(v8::Local<v8::Value>, int)> works_when_hidden_;
  base::Callback<v8::Local<v8::Value>(v8::Local<v8::Value>, int, bool)>
      get_accelerator_;
  base::Callback<bool(v8::Local<v8::Value>, int)> should_register_accelerator_;
--- a/atom/browser/api/atom_api_net.cc
+++ b/atom/browser/api/atom_api_net.cc
@@ -61,4 +61,4 @@ void Initialize(v8::Local<v8::Object> exports,

 }  // namespace

-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_net, Initialize)
+NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_browser_net, Initialize)
--- a/atom/browser/api/atom_api_net_log.cc
+++ b/atom/browser/api/atom_api_net_log.cc
@@ -20,15 +20,6 @@

 #include "atom/common/node_includes.h"

-namespace {
-
-void OnGetFilePathToCompletedLog(const atom::util::CopyablePromise& promise,
-                                 const base::FilePath& file_path) {
-  promise.GetPromise().Resolve(file_path);
-}
-
-}  // namespace
-
 namespace atom {

 namespace api {
@@ -96,18 +87,19 @@ std::string NetLog::GetCurrentlyLoggingPath() const {
  return std::string();
 }

-v8::Local<v8::Promise> NetLog::StopLogging(mate::Arguments* args) {
-  util::Promise promise(isolate());
-  v8::Local<v8::Promise> handle = promise.GetHandle();
-
-  if (IsCurrentlyLogging()) {
-    stop_callback_queue_.emplace_back(std::move(promise));
-    net_log_writer_->StopNetLog(nullptr);
-  } else {
-    promise.Resolve(base::FilePath());
+void NetLog::StopLogging(mate::Arguments* args) {
+  net_log::NetExportFileWriter::FilePathCallback callback;
+  if (!args->GetNext(&callback)) {
+    args->ThrowError("Invalid callback function");
+    return;
  }

-  return handle;
+  if (IsCurrentlyLogging()) {
+    stop_callback_queue_.emplace_back(callback);
+    net_log_writer_->StopNetLog(nullptr);
+  } else {
+    callback.Run(base::FilePath());
+  }
 }

 void NetLog::OnNewState(const base::DictionaryValue& state) {
@@ -117,11 +109,9 @@ void NetLog::OnNewState(const base::DictionaryValue& state) {
    return;

  if (GetLoggingState() == "NOT_LOGGING") {
-    for (auto& promise : stop_callback_queue_) {
-      // TODO(zcbenz): Remove the use of CopyablePromise when the
-      // GetFilePathToCompletedLog API accepts OnceCallback.
-      net_log_writer_->GetFilePathToCompletedLog(base::Bind(
-          &OnGetFilePathToCompletedLog, util::CopyablePromise(promise)));
+    for (auto& callback : stop_callback_queue_) {
+      if (!callback.is_null())
+        net_log_writer_->GetFilePathToCompletedLog(callback);
    }
    stop_callback_queue_.clear();
  }
--- a/atom/browser/api/atom_api_net_log.h
+++ b/atom/browser/api/atom_api_net_log.h
@@ -10,7 +10,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 "components/net_log/net_export_file_writer.h"
@@ -35,7 +34,7 @@ class NetLog : public mate::TrackableObject<NetLog>,
  std::string GetLoggingState() const;
  bool IsCurrentlyLogging() const;
  std::string GetCurrentlyLoggingPath() const;
-  v8::Local<v8::Promise> StopLogging(mate::Arguments* args);
+  void StopLogging(mate::Arguments* args);

 protected:
  explicit NetLog(v8::Isolate* isolate, AtomBrowserContext* browser_context);
@@ -47,7 +46,8 @@ class NetLog : public mate::TrackableObject<NetLog>,
 private:
  AtomBrowserContext* browser_context_;
  net_log::NetExportFileWriter* net_log_writer_;
-  std::list<atom::util::Promise> stop_callback_queue_;
+  std::list<net_log::NetExportFileWriter::FilePathCallback>
+      stop_callback_queue_;
  std::unique_ptr<base::DictionaryValue> net_log_state_;

  DISALLOW_COPY_AND_ASSIGN(NetLog);
--- a/atom/browser/api/atom_api_notification.cc
+++ b/atom/browser/api/atom_api_notification.cc
@@ -272,4 +272,4 @@ void Initialize(v8::Local<v8::Object> exports,

 }  // namespace

-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_common_notification, Initialize)
+NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_common_notification, Initialize)
--- a/atom/browser/api/atom_api_power_monitor.cc
+++ b/atom/browser/api/atom_api_power_monitor.cc
@@ -84,8 +84,8 @@ void PowerMonitor::OnResume() {
  Emit("resume");
 }

-ui::IdleState PowerMonitor::GetSystemIdleState(v8::Isolate* isolate,
-                                               int idle_threshold) {
+ui::IdleState PowerMonitor::QuerySystemIdleState(v8::Isolate* isolate,
+                                                 int idle_threshold) {
  if (idle_threshold > 0) {
    return ui::CalculateIdleState(idle_threshold);
  } else {
@@ -95,7 +95,7 @@ ui::IdleState PowerMonitor::GetSystemIdleState(v8::Isolate* isolate,
  }
 }

-int PowerMonitor::GetSystemIdleTime() {
+int PowerMonitor::QuerySystemIdleTime() {
  return ui::CalculateIdleTime();
 }

@@ -122,8 +122,8 @@ void PowerMonitor::BuildPrototype(v8::Isolate* isolate,
      .SetMethod("blockShutdown", &PowerMonitor::BlockShutdown)
      .SetMethod("unblockShutdown", &PowerMonitor::UnblockShutdown)
 #endif
-      .SetMethod("getSystemIdleState", &PowerMonitor::GetSystemIdleState)
-      .SetMethod("getSystemIdleTime", &PowerMonitor::GetSystemIdleTime);
+      .SetMethod("_querySystemIdleState", &PowerMonitor::QuerySystemIdleState)
+      .SetMethod("_querySystemIdleTime", &PowerMonitor::QuerySystemIdleTime);
 }

 }  // namespace api
@@ -148,4 +148,4 @@ void Initialize(v8::Local<v8::Object> exports,

 }  // namespace

-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_power_monitor, Initialize)
+NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_browser_power_monitor, Initialize)
--- a/atom/browser/api/atom_api_power_monitor.h
+++ b/atom/browser/api/atom_api_power_monitor.h
@@ -46,8 +46,8 @@ class PowerMonitor : public mate::TrackableObject<PowerMonitor>,
  void OnResume() override;

 private:
-  ui::IdleState GetSystemIdleState(v8::Isolate* isolate, int idle_threshold);
-  int GetSystemIdleTime();
+  ui::IdleState QuerySystemIdleState(v8::Isolate* isolate, int idle_threshold);
+  int QuerySystemIdleTime();

 #if defined(OS_WIN)
  // Static callback invoked when a message comes in to our messaging window.
--- a/atom/browser/api/atom_api_power_save_blocker.cc
+++ b/atom/browser/api/atom_api_power_save_blocker.cc
@@ -151,4 +151,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);
--- a/atom/browser/api/atom_api_protocol.cc
+++ b/atom/browser/api/atom_api_protocol.cc
@@ -177,22 +177,21 @@ bool IsProtocolHandledInIO(
  return is_handled;
 }

-void PromiseCallback(util::Promise promise, bool handled) {
-  promise.Resolve(handled);
+void PromiseCallback(scoped_refptr<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();
+  scoped_refptr<util::Promise> promise = new util::Promise(isolate());
  auto* getter = static_cast<URLRequestContextGetter*>(
      browser_context_->GetRequestContext());

  base::PostTaskWithTraitsAndReplyWithResult(
      FROM_HERE, {content::BrowserThread::IO},
-      base::BindOnce(&IsProtocolHandledInIO, base::RetainedRef(getter), scheme),
-      base::BindOnce(&PromiseCallback, std::move(promise)));
+      base::Bind(&IsProtocolHandledInIO, base::RetainedRef(getter), scheme),
+      base::Bind(&PromiseCallback, promise));

-  return handle;
+  return promise->GetHandle();
 }

 void Protocol::UninterceptProtocol(const std::string& scheme,
@@ -317,4 +316,4 @@ void Initialize(v8::Local<v8::Object> exports,

 }  // namespace

-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_protocol, Initialize)
+NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_browser_protocol, Initialize)
--- a/atom/browser/api/atom_api_render_process_preferences.cc
+++ b/atom/browser/api/atom_api_render_process_preferences.cc
@@ -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)
--- a/atom/browser/api/atom_api_screen.cc
+++ b/atom/browser/api/atom_api_screen.cc
@@ -171,4 +171,4 @@ void Initialize(v8::Local<v8::Object> exports,

 }  // namespace

-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_common_screen, Initialize)
+NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_common_screen, Initialize)
--- a/atom/browser/api/atom_api_session.cc
+++ b/atom/browser/api/atom_api_session.cc
@@ -49,7 +49,7 @@
 #include "native_mate/object_template_builder.h"
 #include "net/base/load_flags.h"
 #include "net/disk_cache/disk_cache.h"
-#include "net/dns/host_cache.h"  // nogncheck
+#include "net/dns/host_cache.h"
 #include "net/http/http_auth_handler_factory.h"
 #include "net/http/http_auth_preferences.h"
 #include "net/http/http_cache.h"
@@ -61,6 +61,7 @@

 #include "atom/common/node_includes.h"

+using atom::api::Cookies;
 using content::BrowserThread;
 using content::StoragePartition;

@@ -210,32 +211,27 @@ const char kPersistPrefix[] = "persist:";
 // Referenced session objects.
 std::map<uint32_t, v8::Global<v8::Object>> g_sessions;

-void ResolveOrRejectPromiseInUI(atom::util::Promise promise, int net_error) {
-  if (net_error != net::OK) {
-    std::string err_msg = net::ErrorToString(net_error);
-    util::Promise::RejectPromise(std::move(promise), std::move(err_msg));
-  } else {
-    util::Promise::ResolveEmptyPromise(std::move(promise));
-  }
+// Runs the callback in UI thread.
+void RunCallbackInUI(const base::Callback<void()>& callback) {
+  base::PostTaskWithTraits(FROM_HERE, {BrowserThread::UI}, callback);
+}
+template <typename... T>
+void RunCallbackInUI(const base::Callback<void(T...)>& callback, T... result) {
+  base::PostTaskWithTraits(FROM_HERE, {BrowserThread::UI},
+                           base::BindOnce(callback, result...));
 }

 // Callback of HttpCache::GetBackend.
 void OnGetBackend(disk_cache::Backend** backend_ptr,
                  Session::CacheAction action,
-                  const atom::util::CopyablePromise& promise,
+                  const net::CompletionCallback& callback,
                  int result) {
  if (result != net::OK) {
-    std::string err_msg =
-        "Failed to retrieve cache backend: " + net::ErrorToString(result);
-    util::Promise::RejectPromise(promise.GetPromise(), std::move(err_msg));
+    RunCallbackInUI(callback, result);
  } else if (backend_ptr && *backend_ptr) {
    if (action == Session::CacheAction::CLEAR) {
-      auto success =
-          (*backend_ptr)
-              ->DoomAllEntries(base::BindOnce(&ResolveOrRejectPromiseInUI,
-                                              promise.GetPromise()));
-      if (success != net::ERR_IO_PENDING)
-        ResolveOrRejectPromiseInUI(promise.GetPromise(), success);
+      (*backend_ptr)
+          ->DoomAllEntries(base::Bind(&RunCallbackInUI<int>, callback));
    } else if (action == Session::CacheAction::STATS) {
      base::StringPairs stats;
      (*backend_ptr)->GetStats(&stats);
@@ -243,35 +239,30 @@ void OnGetBackend(disk_cache::Backend** backend_ptr,
        if (stat.first == "Current size") {
          int current_size;
          base::StringToInt(stat.second, &current_size);
-          util::Promise::ResolvePromise<int>(promise.GetPromise(),
-                                             current_size);
+          RunCallbackInUI(callback, current_size);
          break;
        }
      }
    }
+  } else {
+    RunCallbackInUI<int>(callback, net::ERR_FAILED);
  }
 }

 void DoCacheActionInIO(
    const scoped_refptr<net::URLRequestContextGetter>& context_getter,
    Session::CacheAction action,
-    atom::util::Promise promise) {
+    const net::CompletionCallback& callback) {
  auto* request_context = context_getter->GetURLRequestContext();
-
  auto* http_cache = request_context->http_transaction_factory()->GetCache();
-  if (!http_cache) {
-    std::string err_msg =
-        "Failed to retrieve cache: " + net::ErrorToString(net::ERR_FAILED);
-    util::Promise::RejectPromise(std::move(promise), std::move(err_msg));
-    return;
-  }
+  if (!http_cache)
+    RunCallbackInUI<int>(callback, net::ERR_FAILED);

  // Call GetBackend and make the backend's ptr accessable in OnGetBackend.
  using BackendPtr = disk_cache::Backend*;
  auto** backend_ptr = new BackendPtr(nullptr);
  net::CompletionCallback on_get_backend =
-      base::Bind(&OnGetBackend, base::Owned(backend_ptr), action,
-                 atom::util::CopyablePromise(promise));
+      base::Bind(&OnGetBackend, base::Owned(backend_ptr), action, callback);
  int rv = http_cache->GetBackend(backend_ptr, on_get_backend);
  if (rv != net::ERR_IO_PENDING)
    on_get_backend.Run(net::OK);
@@ -287,22 +278,21 @@ void SetCertVerifyProcInIO(

 void ClearHostResolverCacheInIO(
    const scoped_refptr<net::URLRequestContextGetter>& context_getter,
-    util::Promise promise) {
+    const base::Closure& callback) {
  auto* request_context = context_getter->GetURLRequestContext();
  auto* cache = request_context->host_resolver()->GetHostCache();
  if (cache) {
    cache->clear();
    DCHECK_EQ(0u, cache->size());
-    base::PostTaskWithTraits(
-        FROM_HERE, {BrowserThread::UI},
-        base::BindOnce(util::Promise::ResolveEmptyPromise, std::move(promise)));
+    if (!callback.is_null())
+      RunCallbackInUI(callback);
  }
 }

 void ClearAuthCacheInIO(
    const scoped_refptr<net::URLRequestContextGetter>& context_getter,
    const ClearAuthCacheOptions& options,
-    util::Promise promise) {
+    const base::Closure& callback) {
  auto* request_context = context_getter->GetURLRequestContext();
  auto* network_session =
      request_context->http_transaction_factory()->GetSession();
@@ -322,9 +312,8 @@ void ClearAuthCacheInIO(
    }
    network_session->CloseAllConnections();
  }
-  base::PostTaskWithTraits(
-      FROM_HERE, {BrowserThread::UI},
-      base::BindOnce(util::Promise::ResolveEmptyPromise, std::move(promise)));
+  if (!callback.is_null())
+    RunCallbackInUI(callback);
 }

 void AllowNTLMCredentialsForDomainsInIO(
@@ -340,6 +329,11 @@ void AllowNTLMCredentialsForDomainsInIO(
  }
 }

+void OnClearStorageDataDone(const base::Closure& callback) {
+  if (!callback.is_null())
+    callback.Run();
+}
+
 void DownloadIdCallback(content::DownloadManager* download_manager,
                        const base::FilePath& path,
                        const std::vector<GURL>& url_chain,
@@ -421,44 +415,27 @@ void Session::OnDownloadCreated(content::DownloadManager* manager,
  }
 }

-v8::Local<v8::Promise> Session::ResolveProxy(mate::Arguments* args) {
-  v8::Isolate* isolate = args->isolate();
-  util::Promise promise(isolate);
-  v8::Local<v8::Promise> handle = promise.GetHandle();
-
-  GURL url;
-  args->GetNext(&url);
-
-  browser_context_->GetResolveProxyHelper()->ResolveProxy(
-      url,
-      base::Bind(util::CopyablePromise::ResolveCopyablePromise<std::string>,
-                 atom::util::CopyablePromise(promise)));
-
-  return handle;
+void Session::ResolveProxy(
+    const GURL& url,
+    const ResolveProxyHelper::ResolveProxyCallback& callback) {
+  browser_context_->GetResolveProxyHelper()->ResolveProxy(url, callback);
 }

 template <Session::CacheAction action>
-v8::Local<v8::Promise> Session::DoCacheAction() {
-  v8::Isolate* isolate = v8::Isolate::GetCurrent();
-  util::Promise promise(isolate);
-  v8::Local<v8::Promise> handle = promise.GetHandle();
-
+void Session::DoCacheAction(const net::CompletionCallback& callback) {
  base::PostTaskWithTraits(
      FROM_HERE, {BrowserThread::IO},
      base::BindOnce(&DoCacheActionInIO,
                     WrapRefCounted(browser_context_->GetRequestContext()),
-                     action, std::move(promise)));
-
-  return handle;
+                     action, callback));
 }

-v8::Local<v8::Promise> Session::ClearStorageData(mate::Arguments* args) {
-  v8::Isolate* isolate = args->isolate();
-  util::Promise promise(isolate);
-  v8::Local<v8::Promise> handle = promise.GetHandle();
-
+void Session::ClearStorageData(mate::Arguments* args) {
+  // clearStorageData([options, callback])
  ClearStorageDataOptions options;
+  base::Closure callback;
  args->GetNext(&options);
+  args->GetNext(&callback);

  auto* storage_partition =
      content::BrowserContext::GetStoragePartition(browser_context(), nullptr);
@@ -467,13 +444,9 @@ v8::Local<v8::Promise> Session::ClearStorageData(mate::Arguments* args) {
    // https://w3c.github.io/mediacapture-main/#dom-mediadeviceinfo-deviceid
    MediaDeviceIDSalt::Reset(browser_context()->prefs());
  }
-
-  storage_partition->ClearData(
-      options.storage_types, options.quota_types, options.origin, base::Time(),
-      base::Time::Max(),
-      base::Bind(util::CopyablePromise::ResolveEmptyCopyablePromise,
-                 util::CopyablePromise(promise)));
-  return handle;
+  storage_partition->ClearData(options.storage_types, options.quota_types,
+                               options.origin, base::Time(), base::Time::Max(),
+                               base::Bind(&OnClearStorageDataDone, callback));
 }

 void Session::FlushStorageData() {
@@ -482,17 +455,11 @@ void Session::FlushStorageData() {
  storage_partition->Flush();
 }

-v8::Local<v8::Promise> Session::SetProxy(mate::Arguments* args) {
-  v8::Isolate* isolate = args->isolate();
-  util::Promise promise(isolate);
-  v8::Local<v8::Promise> handle = promise.GetHandle();
-
-  mate::Dictionary options;
-  args->GetNext(&options);
-
+void Session::SetProxy(const mate::Dictionary& options,
+                       const base::Closure& callback) {
  if (!browser_context_->in_memory_pref_store()) {
-    promise.Resolve();
-    return handle;
+    callback.Run();
+    return;
  }

  std::string proxy_rules, bypass_list, pac_url;
@@ -516,11 +483,7 @@ v8::Local<v8::Promise> Session::SetProxy(mate::Arguments* args) {
        WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
  }

-  base::ThreadTaskRunnerHandle::Get()->PostTask(
-      FROM_HERE,
-      base::BindOnce(util::Promise::ResolveEmptyPromise, std::move(promise)));
-
-  return handle;
+  base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, callback);
 }

 void Session::SetDownloadPath(const base::FilePath& path) {
@@ -602,36 +565,31 @@ void Session::SetPermissionCheckHandler(v8::Local<v8::Value> val,
  permission_manager->SetPermissionCheckHandler(handler);
 }

-v8::Local<v8::Promise> Session::ClearHostResolverCache(mate::Arguments* args) {
-  v8::Isolate* isolate = args->isolate();
-  util::Promise promise(isolate);
-  v8::Local<v8::Promise> handle = promise.GetHandle();
+void Session::ClearHostResolverCache(mate::Arguments* args) {
+  base::Closure callback;
+  args->GetNext(&callback);

  base::PostTaskWithTraits(
      FROM_HERE, {BrowserThread::IO},
      base::BindOnce(&ClearHostResolverCacheInIO,
                     WrapRefCounted(browser_context_->GetRequestContext()),
-                     std::move(promise)));
-  return handle;
+                     callback));
 }

-v8::Local<v8::Promise> Session::ClearAuthCache(mate::Arguments* args) {
-  v8::Isolate* isolate = args->isolate();
-  util::Promise promise(isolate);
-  v8::Local<v8::Promise> handle = promise.GetHandle();
-
+void Session::ClearAuthCache(mate::Arguments* args) {
  ClearAuthCacheOptions options;
  if (!args->GetNext(&options)) {
-    promise.RejectWithErrorMessage("Must specify options object");
-    return handle;
+    args->ThrowError("Must specify options object");
+    return;
  }
+  base::Closure callback;
+  args->GetNext(&callback);

  base::PostTaskWithTraits(
      FROM_HERE, {BrowserThread::IO},
      base::BindOnce(&ClearAuthCacheInIO,
                     WrapRefCounted(browser_context_->GetRequestContext()),
-                     options, std::move(promise)));
-  return handle;
+                     options, callback));
 }

 void Session::AllowNTLMCredentialsForDomains(const std::string& domains) {
@@ -827,9 +785,6 @@ void Session::BuildPrototype(v8::Isolate* isolate,

 namespace {

-using atom::api::Cookies;
-using atom::api::NetLog;
-using atom::api::Protocol;
 using atom::api::Session;

 v8::Local<v8::Value> FromPartition(const std::string& partition,
@@ -855,15 +810,9 @@ void Initialize(v8::Local<v8::Object> exports,
  dict.Set(
      "Cookies",
      Cookies::GetConstructor(isolate)->GetFunction(context).ToLocalChecked());
-  dict.Set(
-      "NetLog",
-      NetLog::GetConstructor(isolate)->GetFunction(context).ToLocalChecked());
-  dict.Set(
-      "Protocol",
-      Protocol::GetConstructor(isolate)->GetFunction(context).ToLocalChecked());
  dict.SetMethod("fromPartition", &FromPartition);
 }

 }  // namespace

-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_session, Initialize)
+NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_browser_session, Initialize)
--- a/atom/browser/api/atom_api_session.h
+++ b/atom/browser/api/atom_api_session.h
@@ -11,7 +11,6 @@
 #include "atom/browser/api/trackable_object.h"
 #include "atom/browser/atom_blob_reader.h"
 #include "atom/browser/net/resolve_proxy_helper.h"
-#include "atom/common/promise_util.h"
 #include "base/values.h"
 #include "content/public/browser/download_manager.h"
 #include "native_mate/handle.h"
@@ -63,12 +62,13 @@ class Session : public mate::TrackableObject<Session>,
                             v8::Local<v8::FunctionTemplate> prototype);

  // Methods.
-  v8::Local<v8::Promise> ResolveProxy(mate::Arguments* args);
+  void ResolveProxy(const GURL& url,
+                    const ResolveProxyHelper::ResolveProxyCallback& callback);
  template <CacheAction action>
-  v8::Local<v8::Promise> DoCacheAction();
-  v8::Local<v8::Promise> ClearStorageData(mate::Arguments* args);
+  void DoCacheAction(const net::CompletionCallback& callback);
+  void ClearStorageData(mate::Arguments* args);
  void FlushStorageData();
-  v8::Local<v8::Promise> SetProxy(mate::Arguments* args);
+  void SetProxy(const mate::Dictionary& options, const base::Closure& callback);
  void SetDownloadPath(const base::FilePath& path);
  void EnableNetworkEmulation(const mate::Dictionary& options);
  void DisableNetworkEmulation();
@@ -77,8 +77,8 @@ class Session : public mate::TrackableObject<Session>,
                                   mate::Arguments* args);
  void SetPermissionCheckHandler(v8::Local<v8::Value> val,
                                 mate::Arguments* args);
-  v8::Local<v8::Promise> ClearHostResolverCache(mate::Arguments* args);
-  v8::Local<v8::Promise> ClearAuthCache(mate::Arguments* args);
+  void ClearHostResolverCache(mate::Arguments* args);
+  void ClearAuthCache(mate::Arguments* args);
  void AllowNTLMCredentialsForDomains(const std::string& domains);
  void SetUserAgent(const std::string& user_agent, mate::Arguments* args);
  std::string GetUserAgent();
--- a/atom/browser/api/atom_api_system_preferences.cc
+++ b/atom/browser/api/atom_api_system_preferences.cc
@@ -93,8 +93,6 @@ void SystemPreferences::BuildPrototype(
      .SetMethod("setAppLevelAppearance",
                 &SystemPreferences::SetAppLevelAppearance)
      .SetMethod("getSystemColor", &SystemPreferences::GetSystemColor)
-      .SetMethod("canPromptTouchID", &SystemPreferences::CanPromptTouchID)
-      .SetMethod("promptTouchID", &SystemPreferences::PromptTouchID)
      .SetMethod("isTrustedAccessibilityClient",
                 &SystemPreferences::IsTrustedAccessibilityClient)
      .SetMethod("getMediaAccessStatus",
@@ -130,4 +128,4 @@ void Initialize(v8::Local<v8::Object> exports,

 }  // namespace

-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_system_preferences, Initialize)
+NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_browser_system_preferences, Initialize);
--- a/atom/browser/api/atom_api_system_preferences.h
+++ b/atom/browser/api/atom_api_system_preferences.h
@@ -95,10 +95,6 @@ class SystemPreferences : public mate::EventEmitter<SystemPreferences>

  std::string GetSystemColor(const std::string& color, mate::Arguments* args);

-  bool CanPromptTouchID();
-  v8::Local<v8::Promise> PromptTouchID(v8::Isolate* isolate,
-                                       const std::string& reason);
-
  static bool IsTrustedAccessibilityClient(bool prompt);

  // TODO(codebytere): Write tests for these methods once we
--- a/atom/browser/api/atom_api_system_preferences_mac.mm
+++ b/atom/browser/api/atom_api_system_preferences_mac.mm
@@ -8,19 +8,14 @@

 #import <AVFoundation/AVFoundation.h>
 #import <Cocoa/Cocoa.h>
-#import <LocalAuthentication/LocalAuthentication.h>
-#import <Security/Security.h>

 #include "atom/browser/mac/atom_application.h"
 #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/scoped_cftyperef.h"
 #include "base/mac/sdk_forward_declarations.h"
-#include "base/sequenced_task_runner.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/sys_string_conversions.h"
-#include "base/threading/sequenced_task_runner_handle.h"
 #include "base/values.h"
 #include "native_mate/object_template_builder.h"
 #include "net/base/mac/url_conversions.h"
@@ -410,99 +405,37 @@ std::string SystemPreferences::GetAccentColor() {

 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];
+  if (@available(macOS 10.10, *)) {
+    NSColor* sysColor;
+    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);
  } else {
-    args->ThrowError("Unknown system color: " + color);
+    args->ThrowError(
+        "This api is not available on MacOS version 10.9 or lower.");
    return "";
  }
-
-  return ToRGBHex(sysColor);
-}
-
-bool SystemPreferences::CanPromptTouchID() {
-  if (@available(macOS 10.12.2, *)) {
-    base::scoped_nsobject<LAContext> context([[LAContext alloc] init]);
-    if (![context
-            canEvaluatePolicy:LAPolicyDeviceOwnerAuthenticationWithBiometrics
-                        error:nil])
-      return false;
-    if (@available(macOS 10.13.2, *))
-      return [context biometryType] == LABiometryTypeTouchID;
-    return true;
-  }
-  return false;
-}
-
-void OnTouchIDCompleted(util::Promise promise) {
-  promise.Resolve();
-}
-
-void OnTouchIDFailed(util::Promise promise, const std::string& reason) {
-  promise.RejectWithErrorMessage(reason);
-}
-
-v8::Local<v8::Promise> SystemPreferences::PromptTouchID(
-    v8::Isolate* isolate,
-    const std::string& reason) {
-  util::Promise promise(isolate);
-  v8::Local<v8::Promise> handle = promise.GetHandle();
-
-  if (@available(macOS 10.12.2, *)) {
-    base::scoped_nsobject<LAContext> context([[LAContext alloc] init]);
-    base::ScopedCFTypeRef<SecAccessControlRef> access_control =
-        base::ScopedCFTypeRef<SecAccessControlRef>(
-            SecAccessControlCreateWithFlags(
-                kCFAllocatorDefault,
-                kSecAttrAccessibleWhenUnlockedThisDeviceOnly,
-                kSecAccessControlPrivateKeyUsage |
-                    kSecAccessControlUserPresence,
-                nullptr));
-
-    scoped_refptr<base::SequencedTaskRunner> runner =
-        base::SequencedTaskRunnerHandle::Get();
-
-    __block util::Promise p = std::move(promise);
-    [context
-        evaluateAccessControl:access_control
-                    operation:LAAccessControlOperationUseKeySign
-              localizedReason:[NSString stringWithUTF8String:reason.c_str()]
-                        reply:^(BOOL success, NSError* error) {
-                          if (!success) {
-                            runner->PostTask(
-                                FROM_HERE,
-                                base::BindOnce(
-                                    &OnTouchIDFailed, std::move(p),
-                                    std::string([error.localizedDescription
-                                                     UTF8String])));
-                          } else {
-                            runner->PostTask(FROM_HERE,
-                                             base::BindOnce(&OnTouchIDCompleted,
-                                                            std::move(p)));
-                          }
-                        }];
-  } else {
-    promise.RejectWithErrorMessage(
-        "This API is not available on macOS versions older than 10.12.2");
-  }
-  return handle;
 }

 // static
@@ -536,18 +469,23 @@ std::string SystemPreferences::GetColor(const std::string& color,
  } else if (color == "keyboard-focus-indicator") {
    sysColor = [NSColor keyboardFocusIndicatorColor];
  } else if (color == "label") {
-    sysColor = [NSColor labelColor];
+    if (@available(macOS 10.10, *))
+      sysColor = [NSColor labelColor];
  } else if (color == "link") {
-    sysColor = [NSColor linkColor];
+    if (@available(macOS 10.10, *))
+      sysColor = [NSColor linkColor];
  } else if (color == "placeholder-text") {
-    sysColor = [NSColor placeholderTextColor];
+    if (@available(macOS 10.10, *))
+      sysColor = [NSColor placeholderTextColor];
  } else if (color == "quaternary-label") {
-    sysColor = [NSColor quaternaryLabelColor];
+    if (@available(macOS 10.10, *))
+      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];
+    if (@available(macOS 10.10, *))
+      sysColor = [NSColor secondaryLabelColor];
  } else if (color == "selected-content-background") {
    if (@available(macOS 10.14, *))
      sysColor = [NSColor selectedContentBackgroundColor];
@@ -567,7 +505,8 @@ std::string SystemPreferences::GetColor(const std::string& color,
  } else if (color == "shadow") {
    sysColor = [NSColor shadowColor];
  } else if (color == "tertiary-label") {
-    sysColor = [NSColor tertiaryLabelColor];
+    if (@available(macOS 10.10, *))
+      sysColor = [NSColor tertiaryLabelColor];
  } else if (color == "text-background") {
    sysColor = [NSColor textBackgroundColor];
  } else if (color == "text") {
@@ -615,27 +554,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) {
--- a/atom/browser/api/atom_api_top_level_window.cc
+++ b/atom/browser/api/atom_api_top_level_window.cc
@@ -548,9 +548,11 @@ std::vector<int> TopLevelWindow::GetPosition() {
  return result;
 }

+#if defined(OS_WIN) || defined(OS_MACOSX)
 void TopLevelWindow::MoveTop() {
  window_->MoveTop();
 }
+#endif

 void TopLevelWindow::SetTitle(const std::string& title) {
  window_->SetTitle(title);
@@ -1065,7 +1067,9 @@ void TopLevelWindow::BuildPrototype(v8::Isolate* isolate,
      .SetMethod("setResizable", &TopLevelWindow::SetResizable)
      .SetMethod("isResizable", &TopLevelWindow::IsResizable)
      .SetMethod("setMovable", &TopLevelWindow::SetMovable)
+#if defined(OS_WIN) || defined(OS_MACOSX)
      .SetMethod("moveTop", &TopLevelWindow::MoveTop)
+#endif
      .SetMethod("isMovable", &TopLevelWindow::IsMovable)
      .SetMethod("setMinimizable", &TopLevelWindow::SetMinimizable)
      .SetMethod("isMinimizable", &TopLevelWindow::IsMinimizable)
@@ -1195,4 +1199,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)
--- a/atom/browser/api/atom_api_top_level_window.h
+++ b/atom/browser/api/atom_api_top_level_window.h
@@ -126,7 +126,9 @@ class TopLevelWindow : public mate::TrackableObject<TopLevelWindow>,
  void SetResizable(bool resizable);
  bool IsResizable();
  void SetMovable(bool movable);
+#if defined(OS_WIN) || defined(OS_MACOSX)
  void MoveTop();
+#endif
  bool IsMovable();
  void SetMinimizable(bool minimizable);
  bool IsMinimizable();
--- a/atom/browser/api/atom_api_tray.cc
+++ b/atom/browser/api/atom_api_tray.cc
@@ -261,4 +261,4 @@ void Initialize(v8::Local<v8::Object> exports,

 }  // namespace

-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_tray, Initialize)
+NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_browser_tray, Initialize)
--- a/atom/browser/api/atom_api_view.cc
+++ b/atom/browser/api/atom_api_view.cc
@@ -86,4 +86,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)
--- a/atom/browser/api/atom_api_web_contents.cc
+++ b/atom/browser/api/atom_api_web_contents.cc
@@ -54,10 +54,10 @@
 #include "base/values.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"             // nogncheck
-#include "content/browser/frame_host/render_frame_host_manager.h"   // nogncheck
-#include "content/browser/renderer_host/render_widget_host_impl.h"  // nogncheck
-#include "content/browser/renderer_host/render_widget_host_view_base.h"  // nogncheck
+#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/public/browser/child_process_security_policy.h"
 #include "content/public/browser/download_request_utils.h"
@@ -97,7 +97,7 @@
 #endif

 #if defined(OS_LINUX) || defined(OS_WIN)
-#include "third_party/blink/public/mojom/renderer_preferences.mojom.h"
+#include "content/public/common/renderer_preferences.h"
 #include "ui/gfx/font_render_params.h"
 #endif

@@ -240,10 +240,28 @@ namespace api {

 namespace {

+content::ServiceWorkerContext* GetServiceWorkerContext(
+    content::WebContents* web_contents) {
+  auto* context = web_contents->GetBrowserContext();
+  auto* site_instance = web_contents->GetSiteInstance();
+  if (!context || !site_instance)
+    return nullptr;
+
+  auto* storage_partition =
+      content::BrowserContext::GetStoragePartition(context, site_instance);
+  if (!storage_partition)
+    return nullptr;
+
+  return storage_partition->GetServiceWorkerContext();
+}
+
 // Called when CapturePage is done.
-void OnCapturePageDone(util::Promise promise, const SkBitmap& bitmap) {
+void OnCapturePageDone(scoped_refptr<util::Promise> promise,
+                       const SkBitmap& bitmap) {
  // Hack to enable transparency in captured image
-  promise.Resolve(gfx::Image::CreateFrom1xBitmap(bitmap));
+  // TODO(nitsakh) Remove hack once fixed in chromium
+  const_cast<SkBitmap&>(bitmap).setAlphaType(kPremul_SkAlphaType);
+  promise->Resolve(gfx::Image::CreateFrom1xBitmap(bitmap));
 }

 }  // namespace
@@ -262,12 +280,10 @@ struct WebContents::FrameDispatchHelper {
    api_web_contents->OnGetZoomLevel(rfh, reply_msg);
  }

-  void OnRendererMessageSync(bool internal,
-                             const std::string& channel,
+  void OnRendererMessageSync(const std::string& channel,
                             const base::ListValue& args,
                             IPC::Message* message) {
-    api_web_contents->OnRendererMessageSync(rfh, internal, channel, args,
-                                            message);
+    api_web_contents->OnRendererMessageSync(rfh, channel, args, message);
  }
 };

@@ -583,7 +599,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())
@@ -669,8 +685,7 @@ void WebContents::RendererResponsive(
    observer.OnRendererResponsive();
 }

-bool WebContents::HandleContextMenu(content::RenderFrameHost* render_frame_host,
-                                    const content::ContextMenuParams& params) {
+bool WebContents::HandleContextMenu(const content::ContextMenuParams& params) {
  if (params.custom_context.is_pepper_menu) {
    Emit("pepper-context-menu", std::make_pair(params, web_contents()),
         base::Bind(&content::WebContents::NotifyContextMenuClosed,
@@ -1012,7 +1027,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,
@@ -1054,13 +1069,12 @@ bool WebContents::OnMessageReceived(const IPC::Message& message,
    IPC_MESSAGE_FORWARD_DELAY_REPLY(AtomFrameHostMsg_Message_Sync, &helper,
                                    FrameDispatchHelper::OnRendererMessageSync)
    IPC_MESSAGE_HANDLER(AtomFrameHostMsg_Message_To, OnRendererMessageTo)
-    IPC_MESSAGE_HANDLER(AtomFrameHostMsg_Message_Host, OnRendererMessageHost)
    IPC_MESSAGE_FORWARD_DELAY_REPLY(
        AtomFrameHostMsg_SetTemporaryZoomLevel, &helper,
        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
@@ -1297,15 +1311,11 @@ std::string WebContents::GetUserAgent() {
  return web_contents()->GetUserAgentOverride();
 }

-v8::Local<v8::Promise> WebContents::SavePage(
-    const base::FilePath& full_file_path,
-    const content::SavePageType& save_type) {
-  util::Promise promise(isolate());
-  v8::Local<v8::Promise> ret = promise.GetHandle();
-
-  auto* handler = new SavePageHandler(web_contents(), std::move(promise));
-  handler->Handle(full_file_path, save_type);
-  return ret;
+bool WebContents::SavePage(const base::FilePath& full_file_path,
+                           const content::SavePageType& save_type,
+                           const SavePageHandler::SavePageCallback& callback) {
+  auto* handler = new SavePageHandler(web_contents(), callback);
+  return handler->Handle(full_file_path, save_type);
 }

 void WebContents::OpenDevTools(mate::Arguments* args) {
@@ -1402,23 +1412,6 @@ void WebContents::InspectElement(int x, int y) {
  managed_web_contents()->InspectElement(x, y);
 }

-void WebContents::InspectSharedWorker() {
-  if (type_ == REMOTE)
-    return;
-
-  if (!enable_devtools_)
-    return;
-
-  for (const auto& agent_host : content::DevToolsAgentHost::GetOrCreateAll()) {
-    if (agent_host->GetType() ==
-        content::DevToolsAgentHost::kTypeSharedWorker) {
-      OpenDevTools(nullptr);
-      managed_web_contents()->AttachTo(agent_host);
-      break;
-    }
-  }
-}
-
 void WebContents::InspectServiceWorker() {
  if (type_ == REMOTE)
    return;
@@ -1436,6 +1429,40 @@ void WebContents::InspectServiceWorker() {
  }
 }

+void WebContents::HasServiceWorker(const base::Callback<void(bool)>& callback) {
+  auto* context = GetServiceWorkerContext(web_contents());
+  if (!context)
+    return;
+
+  struct WrappedCallback {
+    base::Callback<void(bool)> callback_;
+    explicit WrappedCallback(const base::Callback<void(bool)>& callback)
+        : callback_(callback) {}
+    void Run(content::ServiceWorkerCapability capability) {
+      callback_.Run(capability !=
+                    content::ServiceWorkerCapability::NO_SERVICE_WORKER);
+      delete this;
+    }
+  };
+
+  auto* wrapped_callback = new WrappedCallback(callback);
+
+  context->CheckHasServiceWorker(
+      web_contents()->GetLastCommittedURL(), GURL::EmptyGURL(),
+      base::BindOnce(&WrappedCallback::Run,
+                     base::Unretained(wrapped_callback)));
+}
+
+void WebContents::UnregisterServiceWorker(
+    const base::Callback<void(bool)>& callback) {
+  auto* context = GetServiceWorkerContext(web_contents());
+  if (!context)
+    return;
+
+  context->UnregisterServiceWorker(web_contents()->GetLastCommittedURL(),
+                                   callback);
+}
+
 void WebContents::SetIgnoreMenuShortcuts(bool ignore) {
  auto* web_preferences = WebContentsPreferences::From(web_contents());
  DCHECK(web_preferences);
@@ -1457,7 +1484,7 @@ bool WebContents::IsCurrentlyAudible() {

 #if BUILDFLAG(ENABLE_PRINTING)
 void WebContents::Print(mate::Arguments* args) {
-  bool silent = false, print_background = false;
+  bool silent, print_background = false;
  base::string16 device_name;
  mate::Dictionary options = mate::Dictionary::CreateEmpty(args->isolate());
  base::DictionaryValue settings;
@@ -1500,13 +1527,11 @@ std::vector<printing::PrinterBasicInfo> WebContents::GetPrinterList() {
  return printers;
 }

-v8::Local<v8::Promise> WebContents::PrintToPDF(
-    const base::DictionaryValue& settings) {
-  util::Promise promise(isolate());
-  v8::Local<v8::Promise> handle = promise.GetHandle();
+void WebContents::PrintToPDF(
+    const base::DictionaryValue& settings,
+    const PrintPreviewMessageHandler::PrintToPDFCallback& callback) {
  PrintPreviewMessageHandler::FromWebContents(web_contents())
-      ->PrintToPDF(settings, std::move(promise));
-  return handle;
+      ->PrintToPDF(settings, callback);
 }
 #endif

@@ -1777,16 +1802,15 @@ void WebContents::StartDrag(const mate::Dictionary& item,

 v8::Local<v8::Promise> WebContents::CapturePage(mate::Arguments* args) {
  gfx::Rect rect;
-  util::Promise promise(isolate());
-  v8::Local<v8::Promise> handle = promise.GetHandle();
+  scoped_refptr<util::Promise> promise = new util::Promise(isolate());

  // get rect arguments if they exist
  args->GetNext(&rect);

  auto* const view = web_contents()->GetRenderWidgetHostView();
  if (!view) {
-    promise.Resolve(gfx::Image());
-    return handle;
+    promise->Resolve(gfx::Image());
+    return promise->GetHandle();
  }

  // Capture full page if user doesn't specify a |rect|.
@@ -1805,8 +1829,8 @@ 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, promise));
+  return promise->GetHandle();
 }

 void WebContents::OnCursorChange(const content::WebCursor& cursor) {
@@ -1963,9 +1987,6 @@ v8::Local<v8::Value> WebContents::GetLastWebPreferences(
 }

 bool WebContents::IsRemoteModuleEnabled() const {
-  if (web_contents()->GetVisibleURL().SchemeIs("chrome-devtools")) {
-    return false;
-  }
  if (auto* web_preferences = WebContentsPreferences::From(web_contents())) {
    return web_preferences->IsRemoteModuleEnabled();
  }
@@ -2148,8 +2169,10 @@ void WebContents::BuildPrototype(v8::Isolate* isolate,
      .SetMethod("getLastWebPreferences", &WebContents::GetLastWebPreferences)
      .SetMethod("_isRemoteModuleEnabled", &WebContents::IsRemoteModuleEnabled)
      .SetMethod("getOwnerBrowserWindow", &WebContents::GetOwnerBrowserWindow)
+      .SetMethod("hasServiceWorker", &WebContents::HasServiceWorker)
+      .SetMethod("unregisterServiceWorker",
+                 &WebContents::UnregisterServiceWorker)
      .SetMethod("inspectServiceWorker", &WebContents::InspectServiceWorker)
-      .SetMethod("inspectSharedWorker", &WebContents::InspectSharedWorker)
 #if BUILDFLAG(ENABLE_PRINTING)
      .SetMethod("_print", &WebContents::Print)
      .SetMethod("_getPrinters", &WebContents::GetPrinterList)
@@ -2182,22 +2205,18 @@ AtomBrowserContext* WebContents::GetBrowserContext() const {
 }

 void WebContents::OnRendererMessage(content::RenderFrameHost* frame_host,
-                                    bool internal,
                                    const std::string& channel,
                                    const base::ListValue& args) {
-  // webContents.emit('-ipc-message', new Event(), internal, channel, args);
-  EmitWithSender("-ipc-message", frame_host, nullptr, internal, channel, args);
+  // webContents.emit(channel, new Event(), args...);
+  EmitWithSender(channel, frame_host, nullptr, args);
 }

 void WebContents::OnRendererMessageSync(content::RenderFrameHost* frame_host,
-                                        bool internal,
                                        const std::string& channel,
                                        const base::ListValue& args,
                                        IPC::Message* message) {
-  // webContents.emit('-ipc-message-sync', new Event(sender, message), internal,
-  // channel, args);
-  EmitWithSender("-ipc-message-sync", frame_host, message, internal, channel,
-                 args);
+  // webContents.emit(channel, new Event(sender, message), args...);
+  EmitWithSender(channel, frame_host, message, args);
 }

 void WebContents::OnRendererMessageTo(content::RenderFrameHost* frame_host,
@@ -2215,13 +2234,6 @@ void WebContents::OnRendererMessageTo(content::RenderFrameHost* frame_host,
  }
 }

-void WebContents::OnRendererMessageHost(content::RenderFrameHost* frame_host,
-                                        const std::string& channel,
-                                        const base::ListValue& args) {
-  // webContents.emit('ipc-message-host', new Event(), channel, args);
-  EmitWithSender("ipc-message-host", frame_host, nullptr, channel, args);
-}
-
 // static
 mate::Handle<WebContents> WebContents::Create(v8::Isolate* isolate,
                                              const mate::Dictionary& options) {
@@ -2284,4 +2296,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)
--- a/atom/browser/api/atom_api_web_contents.h
+++ b/atom/browser/api/atom_api_web_contents.h
@@ -149,8 +149,9 @@ class WebContents : public mate::TrackableObject<WebContents>,
  void SetUserAgent(const std::string& user_agent, mate::Arguments* args);
  std::string GetUserAgent();
  void InsertCSS(const std::string& css);
-  v8::Local<v8::Promise> SavePage(const base::FilePath& full_file_path,
-                                  const content::SavePageType& save_type);
+  bool SavePage(const base::FilePath& full_file_path,
+                const content::SavePageType& save_type,
+                const SavePageHandler::SavePageCallback& callback);
  void OpenDevTools(mate::Arguments* args);
  void CloseDevTools();
  bool IsDevToolsOpened();
@@ -159,8 +160,9 @@ class WebContents : public mate::TrackableObject<WebContents>,
  void EnableDeviceEmulation(const blink::WebDeviceEmulationParams& params);
  void DisableDeviceEmulation();
  void InspectElement(int x, int y);
-  void InspectSharedWorker();
  void InspectServiceWorker();
+  void HasServiceWorker(const base::Callback<void(bool)>&);
+  void UnregisterServiceWorker(const base::Callback<void(bool)>&);
  void SetIgnoreMenuShortcuts(bool ignore);
  void SetAudioMuted(bool muted);
  bool IsAudioMuted();
@@ -173,7 +175,9 @@ class WebContents : public mate::TrackableObject<WebContents>,
  void Print(mate::Arguments* args);
  std::vector<printing::PrinterBasicInfo> GetPrinterList();
  // Print current page as PDF.
-  v8::Local<v8::Promise> PrintToPDF(const base::DictionaryValue& settings);
+  void PrintToPDF(
+      const base::DictionaryValue& settings,
+      const PrintPreviewMessageHandler::PrintToPDFCallback& callback);
 #endif

  // DevTools workspace api.
@@ -377,8 +381,7 @@ class WebContents : public mate::TrackableObject<WebContents>,
  void RendererResponsive(
      content::WebContents* source,
      content::RenderWidgetHost* render_widget_host) override;
-  bool HandleContextMenu(content::RenderFrameHost* render_frame_host,
-                         const content::ContextMenuParams& params) override;
+  bool HandleContextMenu(const content::ContextMenuParams& params) override;
  bool OnGoToEntryOffset(int offset) override;
  void FindReply(content::WebContents* web_contents,
                 int request_id,
@@ -477,13 +480,11 @@ class WebContents : public mate::TrackableObject<WebContents>,

  // Called when received a message from renderer.
  void OnRendererMessage(content::RenderFrameHost* frame_host,
-                         bool internal,
                         const std::string& channel,
                         const base::ListValue& args);

  // Called when received a synchronous message from renderer.
  void OnRendererMessageSync(content::RenderFrameHost* frame_host,
-                             bool internal,
                             const std::string& channel,
                             const base::ListValue& args,
                             IPC::Message* message);
@@ -496,11 +497,6 @@ class WebContents : public mate::TrackableObject<WebContents>,
                           const std::string& channel,
                           const base::ListValue& args);

-  // Called when received a message from renderer to host.
-  void OnRendererMessageHost(content::RenderFrameHost* frame_host,
-                             const std::string& channel,
-                             const base::ListValue& args);
-
  // Called when received a synchronous message from renderer to
  // set temporary zoom level.
  void OnSetTemporaryZoomLevel(content::RenderFrameHost* frame_host,
--- a/atom/browser/api/atom_api_web_contents_impl.cc
+++ b/atom/browser/api/atom_api_web_contents_impl.cc
@@ -4,10 +4,7 @@

 #include "atom/browser/api/atom_api_web_contents.h"

-#include "content/browser/frame_host/frame_tree.h"           // nogncheck
-#include "content/browser/frame_host/frame_tree_node.h"      // nogncheck
-#include "content/browser/web_contents/web_contents_impl.h"  // nogncheck
-#include "content/public/browser/guest_mode.h"
+#include "content/browser/web_contents/web_contents_impl.h"

 #if BUILDFLAG(ENABLE_OSR)
 #include "atom/browser/osr/osr_render_widget_host_view.h"
@@ -24,15 +21,8 @@ namespace api {

 void WebContents::DetachFromOuterFrame() {
  // See detach_webview_frame.patch on how to detach.
-  DCHECK(content::GuestMode::IsCrossProcessFrameGuest(web_contents()));
-  int frame_tree_node_id =
-      static_cast<content::WebContentsImpl*>(web_contents())
-          ->GetOuterDelegateFrameTreeNodeId();
-  if (frame_tree_node_id != content::FrameTreeNode::kFrameTreeNodeInvalidId) {
-    auto* node = content::FrameTreeNode::GloballyFindByID(frame_tree_node_id);
-    DCHECK(node->parent());
-    node->frame_tree()->RemoveFrame(node);
-  }
+  auto* impl = static_cast<content::WebContentsImpl*>(web_contents());
+  impl->GetRenderManagerForTesting()->RemoveOuterDelegateFrame();
 }

 #if BUILDFLAG(ENABLE_OSR)
--- a/atom/browser/api/atom_api_web_contents_view.cc
+++ b/atom/browser/api/atom_api_web_contents_view.cc
@@ -131,4 +131,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)
--- a/atom/browser/api/atom_api_web_view_manager.cc
+++ b/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)
--- a/atom/browser/api/event_emitter.cc
+++ b/atom/browser/api/event_emitter.cc
@@ -79,7 +79,6 @@ v8::Local<v8::Object> CreateEventFromFlags(v8::Isolate* isolate, int flags) {
  obj.Set("ctrlKey", static_cast<bool>(flags & ui::EF_CONTROL_DOWN));
  obj.Set("altKey", static_cast<bool>(flags & ui::EF_ALT_DOWN));
  obj.Set("metaKey", static_cast<bool>(flags & ui::EF_COMMAND_DOWN));
-  obj.Set("triggeredByAccelerator", static_cast<bool>(flags));
  return obj.GetHandle();
 }

--- a/atom/browser/api/event_emitter.h
+++ b/atom/browser/api/event_emitter.h
@@ -103,7 +103,8 @@ class EventEmitter : public Wrappable<T> {
    v8::HandleScope handle_scope(isolate());
    EmitEvent(isolate(), GetWrapper(), name, event, args...);
    return event->Get(StringToV8(isolate(), "defaultPrevented"))
-        ->BooleanValue(isolate());
+        ->BooleanValue(isolate()->GetCurrentContext())
+        .ToChecked();
  }

  DISALLOW_COPY_AND_ASSIGN(EventEmitter);
--- a/atom/browser/api/frame_subscriber.cc
+++ b/atom/browser/api/frame_subscriber.cc
@@ -10,7 +10,6 @@
 #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 "media/capture/mojom/video_capture_types.mojom.h"
 #include "ui/gfx/skbitmap_operations.h"

 #include "atom/common/node_includes.h"
@@ -88,6 +87,7 @@ void FrameSubscriber::RenderViewHostChanged(content::RenderViewHost* old_host,
 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();
--- a/atom/browser/api/frame_subscriber.h
+++ b/atom/browser/api/frame_subscriber.h
@@ -45,6 +45,7 @@ class FrameSubscriber : public content::WebContentsObserver,
  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;
--- a/atom/browser/api/gpu_info_enumerator.cc
+++ b/atom/browser/api/gpu_info_enumerator.cc
@@ -83,19 +83,6 @@ void GPUInfoEnumerator::EndVideoEncodeAcceleratorSupportedProfile() {
  value_stack.pop();
 }

-void GPUInfoEnumerator::BeginImageDecodeAcceleratorSupportedProfile() {
-  value_stack.push(std::move(current));
-  current = std::make_unique<base::DictionaryValue>();
-}
-
-void GPUInfoEnumerator::EndImageDecodeAcceleratorSupportedProfile() {
-  auto& top_value = value_stack.top();
-  top_value->SetDictionary(kImageDecodeAcceleratorSupportedProfileKey,
-                           std::move(current));
-  current = std::move(top_value);
-  value_stack.pop();
-}
-
 void GPUInfoEnumerator::BeginAuxAttributes() {
  value_stack.push(std::move(current));
  current = std::make_unique<base::DictionaryValue>();
--- a/atom/browser/api/gpu_info_enumerator.h
+++ b/atom/browser/api/gpu_info_enumerator.h
@@ -22,8 +22,6 @@ class GPUInfoEnumerator final : public gpu::GPUInfo::Enumerator {
      "videoDecodeAcceleratorSupportedProfile";
  const char* kVideoEncodeAcceleratorSupportedProfileKey =
      "videoEncodeAcceleratorSupportedProfile";
-  const char* kImageDecodeAcceleratorSupportedProfileKey =
-      "imageDecodeAcceleratorSupportedProfile";
  const char* kAuxAttributesKey = "auxAttributes";
  const char* kOverlayCapabilityKey = "overlayCapability";
  const char* kDx12VulkanVersionInfoKey = "dx12VulkanVersionInfo";
@@ -43,8 +41,6 @@ class GPUInfoEnumerator final : public gpu::GPUInfo::Enumerator {
  void EndVideoDecodeAcceleratorSupportedProfile() override;
  void BeginVideoEncodeAcceleratorSupportedProfile() override;
  void EndVideoEncodeAcceleratorSupportedProfile() override;
-  void BeginImageDecodeAcceleratorSupportedProfile() override;
-  void EndImageDecodeAcceleratorSupportedProfile() override;
  void BeginAuxAttributes() override;
  void EndAuxAttributes() override;
  void BeginOverlayCapability() override;
--- a/atom/browser/api/gpuinfo_manager.cc
+++ b/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(
--- a/atom/browser/api/gpuinfo_manager.h
+++ b/atom/browser/api/gpuinfo_manager.h
@@ -11,7 +11,7 @@

 #include "atom/common/native_mate_converters/value_converter.h"
 #include "atom/common/promise_util.h"
-#include "content/browser/gpu/gpu_data_manager_impl.h"  // nogncheck
+#include "content/browser/gpu/gpu_data_manager_impl.h"
 #include "content/public/browser/gpu_data_manager.h"
 #include "content/public/browser/gpu_data_manager_observer.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);
--- a/atom/browser/api/save_page_handler.cc
+++ b/atom/browser/api/save_page_handler.cc
@@ -5,7 +5,6 @@
 #include "atom/browser/api/save_page_handler.h"

 #include <string>
-#include <utility>

 #include "atom/browser/atom_browser_context.h"
 #include "base/callback.h"
@@ -17,8 +16,8 @@ namespace atom {
 namespace api {

 SavePageHandler::SavePageHandler(content::WebContents* web_contents,
-                                 util::Promise promise)
-    : web_contents_(web_contents), promise_(std::move(promise)) {}
+                                 const SavePageCallback& callback)
+    : web_contents_(web_contents), callback_(callback) {}

 SavePageHandler::~SavePageHandler() {}

@@ -44,19 +43,25 @@ bool SavePageHandler::Handle(const base::FilePath& full_path,
  download_manager->RemoveObserver(this);
  // If initialization fails which means fail to create |DownloadItem|, we need
  // to delete the |SavePageHandler| instance to avoid memory-leak.
-  if (!result) {
-    promise_.RejectWithErrorMessage("Failed to save the page");
+  if (!result)
    delete this;
-  }
  return result;
 }

 void SavePageHandler::OnDownloadUpdated(download::DownloadItem* item) {
  if (item->IsDone()) {
-    if (item->GetState() == download::DownloadItem::COMPLETE)
-      promise_.Resolve();
-    else
-      promise_.RejectWithErrorMessage("Failed to save the page.");
+    v8::Isolate* isolate = v8::Isolate::GetCurrent();
+    v8::Locker locker(isolate);
+    v8::HandleScope handle_scope(isolate);
+    if (item->GetState() == download::DownloadItem::COMPLETE) {
+      callback_.Run(v8::Null(isolate));
+    } else {
+      v8::Local<v8::String> error_message =
+          v8::String::NewFromUtf8(isolate, "Fail to save page",
+                                  v8::NewStringType::kNormal)
+              .ToLocalChecked();
+      callback_.Run(v8::Exception::Error(error_message));
+    }
    Destroy(item);
  }
 }
--- a/atom/browser/api/save_page_handler.h
+++ b/atom/browser/api/save_page_handler.h
@@ -7,7 +7,6 @@

 #include <string>

-#include "atom/common/promise_util.h"
 #include "components/download/public/common/download_item.h"
 #include "content/public/browser/download_manager.h"
 #include "content/public/browser/save_page_type.h"
@@ -29,8 +28,10 @@ namespace api {
 class SavePageHandler : public content::DownloadManager::Observer,
                        public download::DownloadItem::Observer {
 public:
+  using SavePageCallback = base::Callback<void(v8::Local<v8::Value>)>;
+
  SavePageHandler(content::WebContents* web_contents,
-                  atom::util::Promise promise);
+                  const SavePageCallback& callback);
  ~SavePageHandler() override;

  bool Handle(const base::FilePath& full_path,
@@ -47,7 +48,7 @@ class SavePageHandler : public content::DownloadManager::Observer,
  void OnDownloadUpdated(download::DownloadItem* item) override;

  content::WebContents* web_contents_;  // weak
-  atom::util::Promise promise_;
+  SavePageCallback callback_;
 };

 }  // namespace api
--- a/atom/browser/api/stream_subscriber.cc
+++ b/atom/browser/api/stream_subscriber.cc
@@ -19,15 +19,12 @@ namespace mate {
 StreamSubscriber::StreamSubscriber(
    v8::Isolate* isolate,
    v8::Local<v8::Object> emitter,
-    base::WeakPtr<atom::URLRequestStreamJob> url_job,
-    scoped_refptr<base::SequencedTaskRunner> ui_task_runner)
-    : base::RefCountedDeleteOnSequence<StreamSubscriber>(ui_task_runner),
-      isolate_(isolate),
+    base::WeakPtr<atom::URLRequestStreamJob> url_job)
+    : isolate_(isolate),
      emitter_(isolate, emitter),
      url_job_(url_job),
      weak_factory_(this) {
-  DCHECK(ui_task_runner->RunsTasksInCurrentSequence());
-
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
  auto weak_self = weak_factory_.GetWeakPtr();
  On("data", base::Bind(&StreamSubscriber::OnData, weak_self));
  On("end", base::Bind(&StreamSubscriber::OnEnd, weak_self));
@@ -35,12 +32,13 @@ StreamSubscriber::StreamSubscriber(
 }

 StreamSubscriber::~StreamSubscriber() {
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
  RemoveAllListeners();
 }

 void StreamSubscriber::On(const std::string& event,
                          EventCallback&& callback) {  // NOLINT
-  DCHECK(owning_task_runner()->RunsTasksInCurrentSequence());
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
  DCHECK(js_handlers_.find(event) == js_handlers_.end());

  v8::Locker locker(isolate_);
@@ -54,7 +52,7 @@ void StreamSubscriber::On(const std::string& event,
 }

 void StreamSubscriber::Off(const std::string& event) {
-  DCHECK(owning_task_runner()->RunsTasksInCurrentSequence());
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
  DCHECK(js_handlers_.find(event) != js_handlers_.end());

  v8::Locker locker(isolate_);
@@ -98,7 +96,6 @@ void StreamSubscriber::OnError(mate::Arguments* args) {
 }

 void StreamSubscriber::RemoveAllListeners() {
-  DCHECK(owning_task_runner()->RunsTasksInCurrentSequence());
  v8::Locker locker(isolate_);
  v8::Isolate::Scope isolate_scope(isolate_);
  v8::HandleScope handle_scope(isolate_);
--- a/atom/browser/api/stream_subscriber.h
+++ b/atom/browser/api/stream_subscriber.h
@@ -11,8 +11,6 @@
 #include <vector>

 #include "base/callback.h"
-#include "base/memory/ref_counted.h"
-#include "base/memory/ref_counted_delete_on_sequence.h"
 #include "base/memory/weak_ptr.h"
 #include "content/public/browser/browser_thread.h"
 #include "v8/include/v8.h"
@@ -25,25 +23,17 @@ namespace mate {

 class Arguments;

-class StreamSubscriber
-    : public base::RefCountedDeleteOnSequence<StreamSubscriber> {
+class StreamSubscriber {
 public:
-  REQUIRE_ADOPTION_FOR_REFCOUNTED_TYPE();
-
  StreamSubscriber(v8::Isolate* isolate,
                   v8::Local<v8::Object> emitter,
-                   base::WeakPtr<atom::URLRequestStreamJob> url_job,
-                   scoped_refptr<base::SequencedTaskRunner> ui_task_runner);
+                   base::WeakPtr<atom::URLRequestStreamJob> url_job);
+  ~StreamSubscriber();

 private:
-  friend class base::DeleteHelper<StreamSubscriber>;
-  friend class base::RefCountedDeleteOnSequence<StreamSubscriber>;
-
  using JSHandlersMap = std::map<std::string, v8::Global<v8::Value>>;
  using EventCallback = base::Callback<void(mate::Arguments* args)>;

-  ~StreamSubscriber();
-
  void On(const std::string& event, EventCallback&& callback);  // NOLINT
  void Off(const std::string& event);

--- a/atom/browser/api/views/atom_api_box_layout.cc
+++ b/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)
--- a/atom/browser/api/views/atom_api_button.cc
+++ b/atom/browser/api/views/atom_api_button.cc
@@ -57,4 +57,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)
--- a/atom/browser/api/views/atom_api_label_button.cc
+++ b/atom/browser/api/views/atom_api_label_button.cc
@@ -77,4 +77,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)
--- a/atom/browser/api/views/atom_api_layout_manager.cc
+++ b/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)
--- a/atom/browser/api/views/atom_api_md_text_button.cc
+++ b/atom/browser/api/views/atom_api_md_text_button.cc
@@ -54,4 +54,4 @@ void Initialize(v8::Local<v8::Object> exports,

 }  // namespace

-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_md_text_button, Initialize)
+NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_browser_md_text_button, Initialize)
--- a/atom/browser/api/views/atom_api_resize_area.cc
+++ b/atom/browser/api/views/atom_api_resize_area.cc
@@ -57,4 +57,4 @@ void Initialize(v8::Local<v8::Object> exports,

 }  // namespace

-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_resize_area, Initialize)
+NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_browser_resize_area, Initialize)
--- a/atom/browser/api/views/atom_api_text_field.cc
+++ b/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)
--- a/atom/browser/atom_blob_reader.cc
+++ b/atom/browser/atom_blob_reader.cc
@@ -7,7 +7,7 @@
 #include <utility>

 #include "base/task/post_task.h"
-#include "content/browser/blob_storage/chrome_blob_storage_context.h"  // nogncheck
+#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"
--- a/atom/browser/atom_browser_client.cc
+++ b/atom/browser/atom_browser_client.cc
@@ -74,6 +74,7 @@
 #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"
@@ -495,8 +496,15 @@ 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(switches::kDisableRemoteModule);
+      command_line->AppendSwitch(service_manager::switches::kNoSandbox);
+      command_line->AppendSwitch(::switches::kNoZygote);
    }
    auto* web_preferences = WebContentsPreferences::From(web_contents);
    if (web_preferences)
--- a/atom/browser/atom_browser_context.cc
+++ b/atom/browser/atom_browser_context.cc
@@ -36,7 +36,7 @@
 #include "components/prefs/value_map_pref_store.h"
 #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"  // nogncheck
+#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 "net/base/escape.h"
--- a/atom/browser/atom_browser_main_parts.cc
+++ b/atom/browser/atom_browser_main_parts.cc
@@ -45,7 +45,6 @@
 #include "electron/buildflags/buildflags.h"
 #include "media/base/localized_strings.h"
 #include "services/device/public/mojom/constants.mojom.h"
-#include "services/network/public/cpp/features.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "ui/base/idle/idle.h"
 #include "ui/base/material_design/material_design_controller.h"
@@ -210,8 +209,7 @@ void AtomBrowserMainParts::InitializeFeatureList() {
  // Can be reenabled when our site instance policy is aligned with chromium
  // when node integration is enabled.
  disable_features +=
-      std::string(",") + features::kSpareRendererForSitePerProcess.name +
-      std::string(",") + network::features::kNetworkService.name;
+      std::string(",") + features::kSpareRendererForSitePerProcess.name;
  auto feature_list = std::make_unique<base::FeatureList>();
  feature_list->InitializeFromCommandLine(enable_features, disable_features);
  base::FeatureList::SetInstance(std::move(feature_list));
@@ -286,7 +284,6 @@ void AtomBrowserMainParts::RegisterDestructionCallback(

 int AtomBrowserMainParts::PreEarlyInitialization() {
  InitializeFeatureList();
-  field_trial_list_ = std::make_unique<base::FieldTrialList>(nullptr);
  OverrideAppLogsPath();
 #if defined(USE_X11)
  views::LinuxUI::SetInstance(BuildGtkUi());
--- a/atom/browser/atom_browser_main_parts.h
+++ b/atom/browser/atom_browser_main_parts.h
@@ -10,7 +10,6 @@
 #include <string>

 #include "base/callback.h"
-#include "base/metrics/field_trial.h"
 #include "base/timer/timer.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_main_parts.h"
@@ -127,7 +126,6 @@ class AtomBrowserMainParts : public content::BrowserMainParts {
  std::unique_ptr<NodeEnvironment> node_env_;
  std::unique_ptr<NodeDebugger> node_debugger_;
  std::unique_ptr<IconManager> icon_manager_;
-  std::unique_ptr<base::FieldTrialList> field_trial_list_;

  base::RepeatingTimer gc_timer_;

--- a/atom/browser/atom_download_manager_delegate.cc
+++ b/atom/browser/atom_download_manager_delegate.cc
@@ -5,14 +5,12 @@
 #include "atom/browser/atom_download_manager_delegate.h"

 #include <string>
-#include <utility>

 #include "atom/browser/api/atom_api_download_item.h"
 #include "atom/browser/atom_browser_context.h"
 #include "atom/browser/native_window.h"
 #include "atom/browser/ui/file_dialog.h"
 #include "atom/browser/web_contents_preferences.h"
-#include "atom/common/native_mate_converters/callback.h"
 #include "atom/common/options_switches.h"
 #include "base/bind.h"
 #include "base/files/file_util.h"
@@ -121,14 +119,10 @@ void AtomDownloadManagerDelegate::OnDownloadPathGenerated(
        !web_preferences || web_preferences->IsEnabled(options::kOffscreen);
    settings.force_detached = offscreen;

-    v8::Isolate* isolate = v8::Isolate::GetCurrent();
-    atom::util::Promise dialog_promise(isolate);
    auto dialog_callback =
        base::Bind(&AtomDownloadManagerDelegate::OnDownloadSaveDialogDone,
                   base::Unretained(this), download_id, callback);
-
-    file_dialog::ShowSaveDialog(settings, std::move(dialog_promise));
-    ignore_result(dialog_promise.Then(dialog_callback));
+    file_dialog::ShowSaveDialog(settings, dialog_callback);
  } else {
    callback.Run(path, download::DownloadItem::TARGET_DISPOSITION_PROMPT,
                 download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS, path,
--- a/atom/browser/atom_resource_dispatcher_host_delegate.cc
+++ b/atom/browser/atom_resource_dispatcher_host_delegate.cc
@@ -80,7 +80,7 @@ bool AtomResourceDispatcherHostDelegate::ShouldInterceptResourceAsStream(
    GURL* origin,
    std::string* payload) {
 #if BUILDFLAG(ENABLE_PDF_VIEWER)
-  content::ResourceRequestInfo* info =
+  const content::ResourceRequestInfo* info =
      content::ResourceRequestInfo::ForRequest(request);

  int render_process_host_id;
--- a/atom/browser/browser.cc
+++ b/atom/browser/browser.cc
@@ -165,14 +165,14 @@ void Browser::DidFinishLaunching(const base::DictionaryValue& launch_info) {
    observer.OnFinishLaunching(launch_info);
 }

-const util::Promise& Browser::WhenReady(v8::Isolate* isolate) {
+util::Promise* Browser::WhenReady(v8::Isolate* isolate) {
  if (!ready_promise_) {
-    ready_promise_.reset(new util::Promise(isolate));
+    ready_promise_ = new util::Promise(isolate);
    if (is_ready()) {
      ready_promise_->Resolve();
    }
  }
-  return *ready_promise_;
+  return ready_promise_;
 }

 void Browser::OnAccessibilitySupportChanged() {
--- a/atom/browser/browser.h
+++ b/atom/browser/browser.h
@@ -171,7 +171,7 @@ class Browser : public WindowListObserver {

  // Hide/Show dock.
  void DockHide();
-  v8::Local<v8::Promise> DockShow(v8::Isolate* isolate);
+  void DockShow();
  bool DockIsVisible();

  // Set docks' menu.
@@ -253,7 +253,7 @@ class Browser : public WindowListObserver {
  bool is_shutting_down() const { return is_shutdown_; }
  bool is_quiting() const { return is_quiting_; }
  bool is_ready() const { return is_ready_; }
-  const util::Promise& WhenReady(v8::Isolate* isolate);
+  util::Promise* WhenReady(v8::Isolate* isolate);

 protected:
  // Returns the version of application bundle or executable file.
@@ -292,7 +292,7 @@ class Browser : public WindowListObserver {

  int badge_count_ = 0;

-  std::unique_ptr<util::Promise> ready_promise_;
+  util::Promise* ready_promise_ = nullptr;

 #if defined(OS_LINUX) || defined(OS_MACOSX)
  base::DictionaryValue about_panel_options_;
--- a/atom/browser/browser_mac.mm
+++ b/atom/browser/browser_mac.mm
@@ -11,11 +11,9 @@
 #include "atom/browser/window_list.h"
 #include "atom/common/application_info.h"
 #include "atom/common/platform_util.h"
-#include "atom/common/promise_util.h"
 #include "base/mac/bundle_locations.h"
 #include "base/mac/foundation_util.h"
 #include "base/mac/mac_util.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/sys_string_conversions.h"
 #include "net/base/mac/url_conversions.h"
@@ -29,7 +27,7 @@ void Browser::SetShutdownHandler(base::Callback<bool()> handler) {
 }

 void Browser::Focus() {
-  [[AtomApplication sharedApplication] activateIgnoringOtherApps:NO];
+  [[AtomApplication sharedApplication] activateIgnoringOtherApps:YES];
 }

 void Browser::Hide() {
@@ -115,16 +113,16 @@ bool Browser::IsDefaultProtocolClient(const std::string& protocol,

  NSString* protocol_ns = [NSString stringWithUTF8String:protocol.c_str()];

-  base::ScopedCFTypeRef<CFStringRef> bundleId(
-      LSCopyDefaultHandlerForURLScheme(base::mac::NSToCFCast(protocol_ns)));
-
+  CFStringRef bundle =
+      LSCopyDefaultHandlerForURLScheme(base::mac::NSToCFCast(protocol_ns));
+  NSString* bundleId =
+      static_cast<NSString*>(base::mac::CFTypeRefToNSObjectAutorelease(bundle));
  if (!bundleId)
    return false;

  // Ensure the comparison is case-insensitive
  // as LS does not persist the case of the bundle id.
-  NSComparisonResult result =
-      [base::mac::CFToNSCast(bundleId) caseInsensitiveCompare:identifier];
+  NSComparisonResult result = [bundleId caseInsensitiveCompare:identifier];
  return result == NSOrderedSame;
 }

@@ -149,9 +147,13 @@ void Browser::SetUserActivity(const std::string& type,
 }

 std::string Browser::GetCurrentActivityType() {
-  NSUserActivity* userActivity =
-      [[AtomApplication sharedApplication] getCurrentActivity];
-  return base::SysNSStringToUTF8(userActivity.activityType);
+  if (@available(macOS 10.10, *)) {
+    NSUserActivity* userActivity =
+        [[AtomApplication sharedApplication] getCurrentActivity];
+    return base::SysNSStringToUTF8(userActivity.activityType);
+  } else {
+    return std::string();
+  }
 }

 void Browser::InvalidateCurrentActivity() {
@@ -338,10 +340,7 @@ bool Browser::DockIsVisible() {
          NSApplicationActivationPolicyRegular);
 }

-v8::Local<v8::Promise> Browser::DockShow(v8::Isolate* isolate) {
-  util::Promise promise(isolate);
-  v8::Local<v8::Promise> handle = promise.GetHandle();
-
+void Browser::DockShow() {
  BOOL active = [[NSRunningApplication currentApplication] isActive];
  ProcessSerialNumber psn = {0, kCurrentProcess};
  if (active) {
@@ -353,7 +352,6 @@ v8::Local<v8::Promise> Browser::DockShow(v8::Isolate* isolate) {
      [app activateWithOptions:NSApplicationActivateIgnoringOtherApps];
      break;
    }
-    __block util::Promise p = std::move(promise);
    dispatch_time_t one_ms = dispatch_time(DISPATCH_TIME_NOW, USEC_PER_SEC);
    dispatch_after(one_ms, dispatch_get_main_queue(), ^{
      TransformProcessType(&psn, kProcessTransformToForegroundApplication);
@@ -361,14 +359,11 @@ v8::Local<v8::Promise> Browser::DockShow(v8::Isolate* isolate) {
      dispatch_after(one_ms, dispatch_get_main_queue(), ^{
        [[NSRunningApplication currentApplication]
            activateWithOptions:NSApplicationActivateIgnoringOtherApps];
-        p.Resolve();
      });
    });
  } else {
    TransformProcessType(&psn, kProcessTransformToForegroundApplication);
-    promise.Resolve();
  }
-  return handle;
 }

 void Browser::DockSetMenu(AtomMenuModel* model) {
--- a/atom/browser/common_web_contents_delegate.cc
+++ b/atom/browser/common_web_contents_delegate.cc
@@ -24,12 +24,13 @@
 #include "base/threading/scoped_blocking_call.h"
 #include "base/threading/sequenced_task_runner_handle.h"
 #include "chrome/browser/ssl/security_state_tab_helper.h"
+#include "chrome/browser/ui/color_chooser.h"
 #include "chrome/common/pref_names.h"
 #include "components/prefs/pref_service.h"
 #include "components/prefs/scoped_user_pref_update.h"
 #include "components/security_state/content/content_utils.h"
 #include "components/security_state/core/security_state.h"
-#include "content/browser/renderer_host/render_widget_host_view_base.h"  // nogncheck
+#include "content/browser/renderer_host/render_widget_host_view_base.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/child_process_security_policy.h"
 #include "content/public/browser/file_select_listener.h"
@@ -41,10 +42,6 @@
 #include "printing/buildflags/buildflags.h"
 #include "storage/browser/fileapi/isolated_context.h"

-#if BUILDFLAG(ENABLE_COLOR_CHOOSER)
-#include "chrome/browser/ui/color_chooser.h"
-#endif
-
 #if BUILDFLAG(ENABLE_OSR)
 #include "atom/browser/osr/osr_web_contents_view.h"
 #endif
@@ -211,7 +208,7 @@ void CommonWebContentsDelegate::SetOwnerWindow(
    NativeWindow* owner_window) {
  if (owner_window) {
    owner_window_ = owner_window->GetWeakPtr();
-#if defined(TOOLKIT_VIEWS)
+#if defined(TOOLKIT_VIEWS) && !defined(OS_MACOSX)
    autofill_popup_.reset(new AutofillPopup());
 #endif
    NativeWindowRelay::CreateForWebContents(web_contents,
@@ -382,7 +379,7 @@ void CommonWebContentsDelegate::DevToolsSaveToFile(const std::string& url,
    settings.force_detached = offscreen_;
    settings.title = url;
    settings.default_path = base::FilePath::FromUTF8Unsafe(url);
-    if (!file_dialog::ShowSaveDialogSync(settings, &path)) {
+    if (!file_dialog::ShowSaveDialog(settings, &path)) {
      base::Value url_value(url);
      web_contents_->CallClientFunction("DevToolsAPI.canceledSaveURL",
                                        &url_value, nullptr, nullptr);
@@ -454,7 +451,7 @@ void CommonWebContentsDelegate::DevToolsAddFileSystem(
    settings.parent_window = owner_window();
    settings.force_detached = offscreen_;
    settings.properties = file_dialog::FILE_DIALOG_OPEN_DIRECTORY;
-    if (!file_dialog::ShowOpenDialogSync(settings, &paths))
+    if (!file_dialog::ShowOpenDialog(settings, &paths))
      return;

    path = paths[0];
@@ -508,7 +505,7 @@ void CommonWebContentsDelegate::DevToolsIndexPath(
    return;
  std::vector<std::string> excluded_folders;
  std::unique_ptr<base::Value> parsed_excluded_folders =
-      base::JSONReader::ReadDeprecated(excluded_folders_message);
+      base::JSONReader::Read(excluded_folders_message);
  if (parsed_excluded_folders && parsed_excluded_folders->is_list()) {
    const std::vector<base::Value>& folder_paths =
        parsed_excluded_folders->GetList();
@@ -619,39 +616,9 @@ void CommonWebContentsDelegate::SetHtmlApiFullscreen(bool enter_fullscreen) {
    return;
  }

-  // Set fullscreen on window if allowed.
-  auto* web_preferences = WebContentsPreferences::From(GetWebContents());
-  bool html_fullscreenable =
-      web_preferences ? !web_preferences->IsEnabled(
-                            options::kDisableHtmlFullscreenWindowResize)
-                      : true;
-
-  if (html_fullscreenable) {
-    owner_window_->SetFullScreen(enter_fullscreen);
-  }
-
+  owner_window_->SetFullScreen(enter_fullscreen);
  html_fullscreen_ = enter_fullscreen;
  native_fullscreen_ = false;
 }

-void CommonWebContentsDelegate::ShowAutofillPopup(
-    content::RenderFrameHost* frame_host,
-    content::RenderFrameHost* embedder_frame_host,
-    bool offscreen,
-    const gfx::RectF& bounds,
-    const std::vector<base::string16>& values,
-    const std::vector<base::string16>& labels) {
-  if (!owner_window())
-    return;
-
-  autofill_popup_->CreateView(frame_host, embedder_frame_host, offscreen,
-                              owner_window()->content_view(), bounds);
-  autofill_popup_->SetItems(values, labels);
-}
-
-void CommonWebContentsDelegate::HideAutofillPopup() {
-  if (autofill_popup_)
-    autofill_popup_->Hide();
-}
-
 }  // namespace atom
--- a/atom/browser/common_web_contents_delegate.h
+++ b/atom/browser/common_web_contents_delegate.h
@@ -18,7 +18,7 @@
 #include "content/public/browser/web_contents_delegate.h"
 #include "electron/buildflags/buildflags.h"

-#if defined(TOOLKIT_VIEWS)
+#if defined(TOOLKIT_VIEWS) && !defined(OS_MACOSX)
 #include "atom/browser/ui/autofill_popup.h"
 #endif

@@ -105,7 +105,7 @@ class CommonWebContentsDelegate : public content::WebContentsDelegate,
      const content::NativeWebKeyboardEvent& event) override;

  // Autofill related events.
-#if defined(TOOLKIT_VIEWS)
+#if defined(TOOLKIT_VIEWS) && !defined(OS_MACOSX)
  void ShowAutofillPopup(content::RenderFrameHost* frame_host,
                         content::RenderFrameHost* embedder_frame_host,
                         bool offscreen,
@@ -175,7 +175,7 @@ class CommonWebContentsDelegate : public content::WebContentsDelegate,
  bool native_fullscreen_ = false;

  // UI related helper classes.
-#if defined(TOOLKIT_VIEWS)
+#if defined(TOOLKIT_VIEWS) && !defined(OS_MACOSX)
  std::unique_ptr<AutofillPopup> autofill_popup_;
 #endif
  std::unique_ptr<WebDialogHelper> web_dialog_helper_;
--- a/atom/browser/common_web_contents_delegate_views.cc
+++ b/atom/browser/common_web_contents_delegate_views.cc
@@ -41,6 +41,27 @@ bool CommonWebContentsDelegate::HandleKeyboardEvent(
  return false;
 }

+void CommonWebContentsDelegate::ShowAutofillPopup(
+    content::RenderFrameHost* frame_host,
+    content::RenderFrameHost* embedder_frame_host,
+    bool offscreen,
+    const gfx::RectF& bounds,
+    const std::vector<base::string16>& values,
+    const std::vector<base::string16>& labels) {
+  if (!owner_window())
+    return;
+
+  auto* window = static_cast<NativeWindowViews*>(owner_window());
+  autofill_popup_->CreateView(frame_host, embedder_frame_host, offscreen,
+                              window->content_view(), bounds);
+  autofill_popup_->SetItems(values, labels);
+}
+
+void CommonWebContentsDelegate::HideAutofillPopup() {
+  if (autofill_popup_)
+    autofill_popup_->Hide();
+}
+
 gfx::ImageSkia CommonWebContentsDelegate::GetDevToolsWindowIcon() {
  if (!owner_window())
    return gfx::ImageSkia();
--- a/atom/browser/loader/layered_resource_handler.h
+++ b/atom/browser/loader/layered_resource_handler.h
@@ -7,7 +7,7 @@

 #include <memory>

-#include "content/browser/loader/layered_resource_handler.h"  // nogncheck
+#include "content/browser/loader/layered_resource_handler.h"
 #include "services/network/public/cpp/resource_response.h"

 namespace atom {
--- a/atom/browser/login_handler.cc
+++ b/atom/browser/login_handler.cc
@@ -20,11 +20,12 @@ using content::BrowserThread;

 namespace atom {

-LoginHandler::LoginHandler(net::URLRequest* request,
-                           const net::AuthChallengeInfo& auth_info,
-                           net::NetworkDelegate::AuthCallback callback,
-                           net::AuthCredentials* credentials,
-                           content::ResourceRequestInfo* resource_request_info)
+LoginHandler::LoginHandler(
+    net::URLRequest* request,
+    const net::AuthChallengeInfo& auth_info,
+    net::NetworkDelegate::AuthCallback callback,
+    net::AuthCredentials* credentials,
+    const content::ResourceRequestInfo* resource_request_info)
    : credentials_(credentials),
      auth_info_(&auth_info),
      auth_callback_(std::move(callback)),
--- a/atom/browser/login_handler.h
+++ b/atom/browser/login_handler.h
@@ -26,7 +26,7 @@ class LoginHandler : public base::RefCountedThreadSafe<LoginHandler> {
               const net::AuthChallengeInfo& auth_info,
               net::NetworkDelegate::AuthCallback callback,
               net::AuthCredentials* credentials,
-               content::ResourceRequestInfo* resource_request_info);
+               const content::ResourceRequestInfo* resource_request_info);

  // The auth is cancelled, must be called on UI thread.
  void CancelAuth();
--- a/atom/browser/mac/atom_application.h
+++ b/atom/browser/mac/atom_application.h
@@ -7,7 +7,6 @@
 #include "base/mac/scoped_sending_event.h"

 #import <AVFoundation/AVFoundation.h>
-#import <LocalAuthentication/LocalAuthentication.h>

 // Forward Declare Appearance APIs
@interface NSApplication (HighSierraSDK)
@@ -30,13 +29,6 @@ typedef NS_ENUM(NSInteger, AVAuthorizationStatusMac) {
  AVAuthorizationStatusAuthorizedMac = 3,
 };

-@interface NSMenuItem (HighSierraSDK)
-@property(atomic, readwrite)
-    BOOL allowsKeyEquivalentWhenHidden API_AVAILABLE(macosx(10.13));
- (void)setAllowsKeyEquivalentWhenHidden:(BOOL)arg1
-    API_AVAILABLE(macosx(10.13));
-@end
-
@interface AVCaptureDevice (MojaveSDK)
 + (void)requestAccessForMediaType:(AVMediaType)mediaType
                completionHandler:(void (^)(BOOL granted))handler
@@ -95,7 +87,8 @@ typedef NS_ENUM(NSInteger, AVAuthorizationStatusMac) {
                                            NSUserActivityDelegate> {
 @private
  BOOL handlingSendEvent_;
-  base::scoped_nsobject<NSUserActivity> currentActivity_;
+  base::scoped_nsobject<NSUserActivity> currentActivity_
+      API_AVAILABLE(macosx(10.10));
  NSCondition* handoffLock_;
  BOOL updateReceived_;
  base::Callback<bool()> shouldShutdown_;
@@ -111,7 +104,7 @@ typedef NS_ENUM(NSInteger, AVAuthorizationStatusMac) {
 // CrAppControlProtocol:
 - (void)setHandlingSendEvent:(BOOL)handlingSendEvent;

- (NSUserActivity*)getCurrentActivity;
+- (NSUserActivity*)getCurrentActivity API_AVAILABLE(macosx(10.10));
 - (void)setCurrentActivity:(NSString*)type
              withUserInfo:(NSDictionary*)userInfo
            withWebpageURL:(NSURL*)webpageURL;
--- a/atom/browser/mac/atom_application.mm
+++ b/atom/browser/mac/atom_application.mm
@@ -69,13 +69,15 @@ inline void dispatch_sync_main(dispatch_block_t block) {
 - (void)setCurrentActivity:(NSString*)type
              withUserInfo:(NSDictionary*)userInfo
            withWebpageURL:(NSURL*)webpageURL {
-  currentActivity_ = base::scoped_nsobject<NSUserActivity>(
-      [[NSUserActivity alloc] initWithActivityType:type]);
-  [currentActivity_ setUserInfo:userInfo];
-  [currentActivity_ setWebpageURL:webpageURL];
-  [currentActivity_ setDelegate:self];
-  [currentActivity_ becomeCurrent];
-  [currentActivity_ setNeedsSave:YES];
+  if (@available(macOS 10.10, *)) {
+    currentActivity_ = base::scoped_nsobject<NSUserActivity>(
+        [[NSUserActivity alloc] initWithActivityType:type]);
+    [currentActivity_ setUserInfo:userInfo];
+    [currentActivity_ setWebpageURL:webpageURL];
+    [currentActivity_ setDelegate:self];
+    [currentActivity_ becomeCurrent];
+    [currentActivity_ setNeedsSave:YES];
+  }
 }

 - (NSUserActivity*)getCurrentActivity {
@@ -101,7 +103,8 @@ inline void dispatch_sync_main(dispatch_block_t block) {
  [handoffLock_ unlock];
 }

- (void)userActivityWillSave:(NSUserActivity*)userActivity {
+- (void)userActivityWillSave:(NSUserActivity*)userActivity
+    API_AVAILABLE(macosx(10.10)) {
  __block BOOL shouldWait = NO;
  dispatch_sync_main(^{
    std::string activity_type(
@@ -129,7 +132,8 @@ inline void dispatch_sync_main(dispatch_block_t block) {
  [userActivity setNeedsSave:YES];
 }

- (void)userActivityWasContinued:(NSUserActivity*)userActivity {
+- (void)userActivityWasContinued:(NSUserActivity*)userActivity
+    API_AVAILABLE(macosx(10.10)) {
  dispatch_async(dispatch_get_main_queue(), ^{
    std::string activity_type(
        base::SysNSStringToUTF8(userActivity.activityType));
--- a/atom/browser/mac/atom_application_delegate.mm
+++ b/atom/browser/mac/atom_application_delegate.mm
@@ -103,7 +103,7 @@ static base::mac::ScopedObjCClassSwizzler* g_swizzle_imk_input_session;
 #else
          (void (^)(NSArray* restorableObjects))
 #endif
-              restorationHandler {
+              restorationHandler API_AVAILABLE(macosx(10.10)) {
  std::string activity_type(base::SysNSStringToUTF8(userActivity.activityType));
  std::unique_ptr<base::DictionaryValue> user_info =
      atom::NSDictionaryToDictionaryValue(userActivity.userInfo);
--- a/Show More
+++ b/Show More