Bump v5.0.1

* fix: ensure the inspector agent is shutdown before cleaning up the node env

* spec: add tests to ensure clean shutdown with connected inspector agent

* Update node_debugger.cc

.circleci/config.yml

@@ -22,12 +22,12 @@ machine-linux-2xlarge: &machine-linux-2xlarge
 
 machine-mac: &machine-mac
   macos:
-    xcode: "9.4.1"
+    xcode: "8.3.3"
 
 machine-mac-large: &machine-mac-large
   resource_class: large
   macos:
-    xcode: "9.4.1"
+    xcode: "8.3.3"
 
 # Build configurations options.
 env-debug-build: &env-debug-build
@@ -176,20 +176,14 @@ step-restore-brew-cache: &step-restore-brew-cache
     keys:
       - v1-brew-cache-{{ arch }}
 
-step-get-more-space-on-mac: &step-get-more-space-on-mac
+step-install-nodejs-on-mac: &step-install-nodejs-on-mac
   run:
-    name: Free up space on MacOS
+    name: Install Node.js 10 on MacOS
     command: |
       if [ "`uname`" == "Darwin" ]; then
-        sudo rm -rf /Library/Developer/CoreSimulator
-      fi
-
-step-delete-git-directories: &step-delete-git-directories
-  run:
-    name: Delete src/.git directory on MacOS to free space
-    command: |
-      if [ "`uname`" == "Darwin" ]; then
-        sudo rm -rf src/.git
+        brew update
+        brew install node@10
+        echo 'export PATH="/usr/local/opt/node@10/bin:$PATH"' >> $BASH_ENV
       fi
 
 # On macOS the npm install command during gclient sync was run on a linux
@@ -220,15 +214,6 @@ step-fix-sync-on-mac: &step-fix-sync-on-mac
         python src/electron/script/update-external-binaries.py
       fi
 
-step-install-signing-cert-on-mac: &step-install-signing-cert-on-mac
-  run:
-    name: Import and trust self-signed codesigning cert on MacOS
-    command: |
-      if [ "`uname`" == "Darwin" ]; then
-        cd src/electron
-        ./script/codesign/import-testing-cert-ci.sh
-      fi
-
 step-install-gnutar-on-mac: &step-install-gnutar-on-mac
   run:
     name: Install gnu-tar on macos
@@ -246,16 +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
-      gn check out/Default //electron:manifests
-      gn check out/Default //electron/atom/common/api:mojo
-
 step-electron-build: &step-electron-build
   run:
     name: Electron build
@@ -456,29 +431,44 @@ step-maybe-zip-symbols: &step-maybe-zip-symbols
       export BUILD_PATH="$PWD/out/Default"
       electron/script/zip-symbols.py -b $BUILD_PATH
 
-step-maybe-cross-arch-snapshot: &step-maybe-cross-arch-snapshot
+step-maybe-native-mksnapshot-gn-gen: &step-maybe-native-mksnapshot-gn-gen
   run:
-    name: Generate cross arch snapshot (arm/arm64)
+    name: Native mksnapshot GN gen (arm/arm64)
     command: |
-      if [ "$TRIGGER_ARM_TEST" == "true" ] && [ -z "$CIRCLE_PR_NUMBER" ]; then
+      if [ "$BUILD_NATIVE_MKSNAPSHOT" == "1" ]; then
         cd src
-        if [ "$TARGET_ARCH" == "arm" ]; then
-          export MKSNAPSHOT_PATH="clang_x86_v8_arm"
-        elif [ "$TARGET_ARCH" == "arm64" ]; then
-          export MKSNAPSHOT_PATH="clang_x64_v8_arm64"
-        fi
-        cp "out/Default/$MKSNAPSHOT_PATH/mksnapshot" out/Default
-        cp "out/Default/$MKSNAPSHOT_PATH/libffmpeg.so" out/Default
-        cp "out/Default/$MKSNAPSHOT_PATH/v8_context_snapshot_generator" out/Default
-        python electron/script/verify-mksnapshot.py --source-root "$PWD" --build-dir out/Default --create-snapshot-only
-        mkdir cross-arch-snapshots
-        cp out/Default-mksnapshot-test/*.bin cross-arch-snapshots
+        gn gen out/native_mksnapshot --args='import("'$GN_CONFIG'") cc_wrapper="'"$SCCACHE_PATH"'" v8_snapshot_toolchain="'"$MKSNAPSHOT_TOOLCHAIN"'"'" $GN_EXTRA_ARGS v8_enable_embedded_builtins = false"
+      else
+        echo 'Skipping native mksnapshot GN gen for non arm build'
       fi
 
-step-maybe-cross-arch-snapshot-store: &step-maybe-cross-arch-snapshot-store
+step-maybe-native-mksnapshot-build: &step-maybe-native-mksnapshot-build
+  run:
+    name: Native mksnapshot build (arm/arm64)
+    no_output_timeout: 30m
+    command: |
+      if [ "$BUILD_NATIVE_MKSNAPSHOT" == "1" ]; then
+        cd src
+        ninja -C out/native_mksnapshot electron:electron_mksnapshot_zip -j $NUMBER_OF_NINJA_PROCESSES
+      else
+        echo 'Skipping native mksnapshot build for non arm build'
+      fi
+
+step-maybe-native-mksnapshot-strip: &step-maybe-native-mksnapshot-strip
+  run:
+    name: Native mksnapshot binary strip (arm/arm64)
+    command: |
+      if [ "$BUILD_NATIVE_MKSNAPSHOT" == "1" ]; then
+        cd src
+        electron/script/strip-binaries.py --file $PWD/out/native_mksnapshot/mksnapshot --target-cpu="$TARGET_ARCH"
+      else
+        echo 'Skipping native mksnapshot binary strip'
+      fi
+
+step-maybe-native-mksnapshot-store: &step-maybe-native-mksnapshot-store
   store_artifacts:
-    path: src/cross-arch-snapshots
-    destination: cross-arch-snapshots
+    path: src/out/native_mksnapshot/mksnapshot.zip
+    destination: native_mksnapshot.zip
 
 step-maybe-trigger-arm-test: &step-maybe-trigger-arm-test
   run:
@@ -501,57 +491,14 @@ step-maybe-generate-typescript-defs: &step-maybe-generate-typescript-defs
         npm run create-typescript-definitions
       fi
 
-step-fix-known-hosts-linux: &step-fix-known-hosts-linux
-  run:
-    name: Fix Known Hosts on Linux
-    command: |
-      if [ "`uname`" == "Linux" ]; then
-        ./src/electron/.circleci/fix-known-hosts.sh
-      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)"
-          gn_version="$(curl -sL "https://chromium.googlesource.com/chromium/src/+/${chromium_revision}/DEPS?format=TEXT" | base64 -d | grep gn_version | head -n1 | cut -d\' -f4)"
-
-          cipd ensure -ensure-file - -root . <<-CIPD
-          \$ServiceURL https://chrome-infra-packages.appspot.com/
-          @Subdir buildtools/linux64
-          gn/gn/linux-amd64 $gn_version
-          CIPD
-
-          echo 'export CHROMIUM_BUILDTOOLS_PATH="'"$PWD"'/buildtools"' >> $BASH_ENV
-    - 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
     - *step-depot-tools-get
     - *step-depot-tools-add-to-path
     - *step-restore-brew-cache
-    - *step-get-more-space-on-mac
+    - *step-install-nodejs-on-mac
     - *step-install-gnutar-on-mac
 
     - restore_cache:
@@ -588,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:
@@ -623,6 +561,7 @@ steps-electron-build-for-tests: &steps-electron-build-for-tests
     - *step-depot-tools-add-to-path
     - *step-setup-env-for-build
     - *step-restore-brew-cache
+    - *step-install-nodejs-on-mac
     - *step-install-npm-deps-on-mac
     - *step-fix-sync-on-mac
     - *step-gn-gen-default
@@ -642,8 +581,12 @@ steps-electron-build-for-tests: &steps-electron-build-for-tests
     # mksnapshot
     - *step-mksnapshot-build
     - *step-mksnapshot-store
-    - *step-maybe-cross-arch-snapshot
-    - *step-maybe-cross-arch-snapshot-store
+
+    # native_mksnapshot
+    - *step-maybe-native-mksnapshot-gn-gen
+    - *step-maybe-native-mksnapshot-build
+    - *step-maybe-native-mksnapshot-strip
+    - *step-maybe-native-mksnapshot-store
 
     # ffmpeg
     - *step-ffmpeg-gn-gen
@@ -668,11 +611,10 @@ steps-electron-build-for-publish: &steps-electron-build-for-publish
     - *step-depot-tools-get
     - *step-depot-tools-add-to-path
     - *step-restore-brew-cache
-    - *step-get-more-space-on-mac
+    - *step-install-nodejs-on-mac
     - *step-gclient-sync
     - *step-setup-env-for-build
     - *step-gn-gen-default
-    - *step-delete-git-directories
 
     # Electron app
     - *step-electron-build
@@ -687,6 +629,12 @@ steps-electron-build-for-publish: &steps-electron-build-for-publish
     - *step-mksnapshot-build
     - *step-mksnapshot-store
 
+    # native_mksnapshot
+    - *step-maybe-native-mksnapshot-gn-gen
+    - *step-maybe-native-mksnapshot-build
+    - *step-maybe-native-mksnapshot-strip
+    - *step-maybe-native-mksnapshot-store
+
     # chromedriver
     - *step-electron-chromedriver-build
     - *step-electron-chromedriver-store
@@ -720,6 +668,18 @@ steps-chromedriver-build: &steps-chromedriver-build
 
     - *step-maybe-notify-slack-failure
 
+steps-native-mksnapshot-build: &steps-native-mksnapshot-build
+  steps:
+    - attach_workspace:
+        at: .
+    - *step-depot-tools-add-to-path
+    - *step-setup-env-for-build
+    - *step-maybe-native-mksnapshot-gn-gen
+    - *step-maybe-native-mksnapshot-build
+    - *step-maybe-native-mksnapshot-store
+
+    - *step-maybe-notify-slack-failure
+
 steps-native-tests: &steps-native-tests
   steps:
     - attach_workspace:
@@ -785,8 +745,7 @@ steps-tests: &steps-tests
     - *step-mksnapshot-unzip
     - *step-setup-linux-for-headless-testing
     - *step-restore-brew-cache
-    - *step-fix-known-hosts-linux
-    - *step-install-signing-cert-on-mac
+    - *step-install-nodejs-on-mac
 
     - run:
         name: Run Electron tests
@@ -802,13 +761,7 @@ steps-tests: &steps-tests
     - run:
         name: Check test results existence
         command: |
-          MOCHA_FILE='src/junit/test-results-remote.xml'
-          # Check if it exists and not empty.
-          if [ ! -s "$MOCHA_FILE" ]; then
-            exit 1
-          fi
-
-          MOCHA_FILE='src/junit/test-results-main.xml'
+          MOCHA_FILE='src/junit/test-results.xml'
           # Check if it exists and not empty.
           if [ ! -s "$MOCHA_FILE" ]; then
             exit 1
@@ -826,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
@@ -871,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:
@@ -886,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:
@@ -1014,6 +946,16 @@ jobs:
       GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_boto=True --custom-var=checkout_requests=True'
     <<: *steps-electron-build-for-publish
 
+  linux-arm-native-mksnapshot:
+    <<: *machine-linux-2xlarge
+    environment:
+      <<: *env-linux-medium
+      <<: *env-arm
+      <<: *env-release-build
+      <<: *env-enable-sccache
+      <<: *env-send-slack-notifications
+    <<: *steps-native-mksnapshot-build
+
   linux-arm64-debug:
     <<: *machine-linux-2xlarge
     environment:
@@ -1023,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:
@@ -1041,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:
@@ -1078,6 +1004,16 @@ jobs:
       GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm64=True --custom-var=checkout_boto=True --custom-var=checkout_requests=True'
     <<: *steps-electron-build-for-publish
 
+  linux-arm64-native-mksnapshot:
+    <<: *machine-linux-2xlarge
+    environment:
+      <<: *env-linux-medium
+      <<: *env-arm64
+      <<: *env-release-build
+      <<: *env-enable-sccache
+      <<: *env-send-slack-notifications
+    <<: *steps-native-mksnapshot-build
+
   osx-testing:
     <<: *machine-mac-large
     environment:
@@ -1086,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:
@@ -1134,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:
@@ -1396,10 +1302,6 @@ jobs:
 
 workflows:
   version: 2
-  lint:
-    jobs:
-      - lint
-
   build-linux:
     jobs:
       - linux-checkout
@@ -1407,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
@@ -1440,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:
@@ -1457,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
@@ -1472,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
@@ -1542,6 +1418,9 @@ workflows:
       - linux-arm-release:
           requires:
             - linux-checkout
+      - linux-arm-native-mksnapshot:
+          requires:
+            - linux-checkout
       - linux-arm-chromedriver:
           requires:
             - linux-checkout
@@ -1549,11 +1428,14 @@ workflows:
           requires:
             - linux-arm-release
             - linux-arm-chromedriver
-
+            - linux-arm-native-mksnapshot
 
       - linux-arm64-release:
           requires:
             - linux-checkout
+      - linux-arm64-native-mksnapshot:
+          requires:
+            - linux-checkout
       - linux-arm64-chromedriver:
           requires:
             - linux-checkout
@@ -1561,6 +1443,7 @@ workflows:
           requires:
             - linux-arm64-release
             - linux-arm64-chromedriver
+            - linux-arm64-native-mksnapshot
 
   nightly-mac-release-test:
     triggers:

.circleci/fix-known-hosts.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-set -e
-
-mkdir -p ~/.ssh
-echo "|1|B3r+7aO0/x90IdefihIjxIoJrrk=|OJddGDfhbuLFc1bUyy84hhIw57M= ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==
-|1|rGlEvW55DtzNZp+pzw9gvyOyKi4=|LLWr+7qlkAlw3YGGVfLHHxB/kR0= ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==" >> ~/.ssh/known_hosts

.eslintrc.json

@@ -1,34 +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"
-    }],
-    "node/no-deprecated-api": 0
-  },
-  "parserOptions": {
-    "ecmaVersion": 6,
-    "sourceType": "module"
-  },
-  "overrides": [
-    {
-      "files": "*.js",
-      "rules": {
-          "@typescript-eslint/no-unused-vars": "off"
-      }
-    }
-  ]
+    }]
+  }
 }

.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

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,38 @@
+<!--
+Thanks for opening an issue! A few things to keep in mind:
+
+- The issue tracker is only for bugs and feature requests.
+- Before reporting a bug, please try reproducing your issue against
+  the latest version of Electron.
+- If you need general advice, join our Slack: http://atom-slack.herokuapp.com
+-->
+
+* Output of `node_modules/.bin/electron --version`:
+* Operating System (Platform and Version):
+
+<!-- If this used to work -->
+* Output of `node_modules/.bin/electron --version` on last known working Electron version (if applicable):
+
+### Expected behavior
+
+<!-- What do you think should happen? -->
+
+### Actual behavior
+
+<!-- What actually happens? -->
+
+### How 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 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.
+
+  $ git clone $YOUR_URL -b $BRANCH
+  $ npm install
+  $ npm start || electron .
+
+-->

.github/ISSUE_TEMPLATE/Bug_report.md

@@ -4,51 +4,29 @@ about: Create a report to help us improve Electron
 
 ---
 
-<!--  As an open source project with a dedicated but small maintainer team, it can sometimes take a long time for issues to be addressed so please be patient and we will get back to you as soon as we can.
--->
+* 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):
 
-### Preflight Checklist
-<!-- Please ensure you've completed the following steps by replacing [ ] with [x]-->
+**Expected Behavior**
+A clear and concise description of what you expected to happen.
 
-* [ ] I have read the [Contributing Guidelines](https://github.com/electron/electron/blob/master/CONTRIBUTING.md) for this project.
-* [ ] I agree to follow the [Code of Conduct](https://github.com/electron/electron/blob/master/CODE_OF_CONDUCT.md) that this project adheres to.
-* [ ] I have searched the issue tracker for an issue that matches the one I want to file, without success.
+**Actual behavior**
+A clear and concise description of what actually happened.
 
-### Issue Details
-
-* **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 -->
-
-### Expected Behavior
-<!-- A clear and concise description of what you expected to happen. -->
-
-### 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.
--->
+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.

.github/ISSUE_TEMPLATE/Feature_request.md

@@ -4,24 +4,14 @@ about: Suggest an idea for Electron
 
 ---
 
-<!--  As an open source project with a dedicated but small maintainer team, it can sometimes take a long time for issues to be addressed so please be patient and we will get back to you as soon as we can.
--->
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is.
 
-### Preflight Checklist
-<!-- Please ensure you've completed the following steps by replacing [ ] with [x]-->
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
 
-* [ ] I have read the [Contributing Guidelines](https://github.com/electron/electron/blob/master/CONTRIBUTING.md) for this project.
-* [ ] I agree to follow the [Code of Conduct](https://github.com/electron/electron/blob/master/CODE_OF_CONDUCT.md) that this project adheres to.
-* [ ] I have searched the issue tracker for a feature request that matches the one I want to file, without success.
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
 
-### Problem Description
-<!-- Is your feature request related to a problem? Please add a clear and concise description of what the problem is. -->
-
-### Proposed Solution
-<!-- Describe the solution you'd like in a clear and concise manner -->
-
-### Alternatives 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.

.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.

.github/ISSUE_TEMPLATE/mac_app_store_private_api_rejection.md

@@ -1,25 +0,0 @@
----
-name: Mac App Store Private API Rejection
-about: Your app was rejected from the Mac App Store for using private API's
-
----
-
-<!--  As an open source project with a dedicated but small maintainer team, it can sometimes take a long time for issues to be addressed so please be patient and we will get back to you as soon as we can.
--->
-
-### Preflight Checklist
-<!-- Please ensure you've completed the following steps by replacing [ ] with [x]-->
-
-* [ ] I have read the [Contributing Guidelines](https://github.com/electron/electron/blob/master/CONTRIBUTING.md) for this project.
-* [ ] I agree to follow the [Code of Conduct](https://github.com/electron/electron/blob/master/CODE_OF_CONDUCT.md) that this project adheres to.
-
-### Issue Details
-
-* **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. -->

.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

.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 -->

.github/config.yml

@@ -1,3 +1,13 @@
+# Configuration for new-issue-welcome - https://github.com/behaviorbot/new-issue-welcome
+
+# Comment to be posted to on first time issues
+newIssueWelcomeComment: |
+  👋 Thanks for opening your first issue here! If you're reporting a 🐞 bug, please make sure you include steps to reproduce it. We get a lot of issues on this repo, so please be patient and we will get back to you as soon as we can.
+
+  To help make it easier for us to investigate your issue, please follow the [contributing guidelines](https://github.com/electron/electron/blob/master/CONTRIBUTING.md).
+
+# Configuration for new-pr-welcome - https://github.com/behaviorbot/new-pr-welcome
+
 # Comment to be posted to on PRs from first time contributors in your repository
 newPRWelcomeComment: |
   💖 Thanks for opening this pull request! 💖
@@ -26,6 +36,11 @@ newPRWelcomeComment: |
 firstPRMergeComment: >
   Congrats on merging your first pull request! 🎉🎉🎉
 
+# Configuration for trop - https://github.com/electron/trop
+
+watchedProject:
+  name: Backports
+
 # Users authorized to run manual trop backports
 authorizedUsers:
   - alexeykuzmin
@@ -35,7 +50,6 @@ authorizedUsers:
   - deepak1556
   - jkleinsc
   - MarshallOfSound
-  - miniak
   - nitsakh
   - nornagon
   - zcbenz

.gitignore

@@ -37,7 +37,7 @@
 /vendor/pyyaml
 node_modules/
 SHASUMS256.txt
-**/package-lock.json
+**/yarn.lock
 compile_commands.json
 .envrc
 
@@ -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

.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

BUILD.gn

@@ -2,7 +2,6 @@ import("//build/config/locales.gni")
 import("//build/config/ui.gni")
 import("//build/config/win/manifest.gni")
 import("//pdf/features.gni")
-import("//printing/buildflags/buildflags.gni")
 import("//third_party/ffmpeg/ffmpeg_options.gni")
 import("//tools/generate_library_loader/generate_library_loader.gni")
 import("//tools/grit/grit_rule.gni")
@@ -12,10 +11,8 @@ import("//v8/snapshot_toolchain.gni")
 import("build/asar.gni")
 import("build/js_wrap.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) {
@@ -56,31 +53,19 @@ 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 + [ "yarn.lock" ]
-
-  outputs = [
-    "$target_gen_dir/tsc/typings/electron.d.ts",
-  ]
-}
-
 npm_action("atom_browserify_sandbox_unwrapped") {
   script = "browserify"
-  deps = [
-    ":build_electron_definitions",
+
+  inputs = [
+    # FIXME(zcbenz): The dependencies of these files are not listed here, so
+    # the generated file will be out-dated when dependencies are modified.
+    # Use a script to generate all dependencies and put them here.
+    "lib/sandboxed_renderer/init.js",
+    "lib/sandboxed_renderer/api/exports/electron.js",
   ]
 
-  inputs = auto_filenames.sandbox_browserify_deps
-
   outputs = [
-    "$target_gen_dir/js2c/sandbox_bundle_unwrapped.js",
+    "$target_gen_dir/js2c/preload_bundle_unwrapped.js",
   ]
 
   args = [
@@ -89,12 +74,6 @@ npm_action("atom_browserify_sandbox_unwrapped") {
     "./lib/sandboxed_renderer/api/exports/electron.js:electron",
     "-t",
     "aliasify",
-    "-p",
-    "[",
-    "tsify",
-    "-p",
-    "tsconfig.electron.json",
-    "]",
     "--standalone",
     "sandboxed_preload",
     "-o",
@@ -104,11 +83,10 @@ npm_action("atom_browserify_sandbox_unwrapped") {
 
 npm_action("atom_browserify_isolated_unwrapped") {
   script = "browserify"
-  deps = [
-    ":build_electron_definitions",
-  ]
 
-  inputs = auto_filenames.isolated_browserify_deps
+  inputs = [
+    "lib/isolated_renderer/init.js",
+  ]
 
   outputs = [
     "$target_gen_dir/js2c/isolated_bundle_unwrapped.js",
@@ -118,12 +96,6 @@ npm_action("atom_browserify_isolated_unwrapped") {
     "lib/isolated_renderer/init.js",
     "-t",
     "aliasify",
-    "-p",
-    "[",
-    "tsify",
-    "-p",
-    "tsconfig.electron.json",
-    "]",
     "--standalone",
     "isolated_preload",
     "-o",
@@ -131,49 +103,6 @@ npm_action("atom_browserify_isolated_unwrapped") {
   ]
 }
 
-npm_action("atom_browserify_content_script_unwrapped") {
-  script = "browserify"
-  deps = [
-    ":build_electron_definitions",
-  ]
-
-  inputs = auto_filenames.context_script_browserify_deps
-
-  outputs = [
-    "$target_gen_dir/js2c/content_script_bundle_unwrapped.js",
-  ]
-
-  args = [
-    "lib/content_script/init.js",
-    "-t",
-    "aliasify",
-    "-p",
-    "[",
-    "tsify",
-    "-p",
-    "tsconfig.electron.json",
-    "]",
-    "--standalone",
-    "content_script_preload",
-    "-o",
-    rebase_path(outputs[0]),
-  ]
-}
-
-js_wrap("atom_browserify_content_script") {
-  deps = [
-    ":atom_browserify_content_script_unwrapped",
-  ]
-
-  inputs = [
-    "$target_gen_dir/js2c/content_script_bundle_unwrapped.js",
-  ]
-
-  outputs = [
-    "$target_gen_dir/js2c/content_script_bundle.js",
-  ]
-}
-
 js_wrap("atom_browserify_isolated") {
   deps = [
     ":atom_browserify_isolated_unwrapped",
@@ -194,11 +123,11 @@ js_wrap("atom_browserify_sandbox") {
   ]
 
   inputs = [
-    "$target_gen_dir/js2c/sandbox_bundle_unwrapped.js",
+    "$target_gen_dir/js2c/preload_bundle_unwrapped.js",
   ]
 
   outputs = [
-    "$target_gen_dir/js2c/sandbox_bundle.js",
+    "$target_gen_dir/js2c/preload_bundle.js",
   ]
 }
 
@@ -214,16 +143,14 @@ copy("atom_js2c_copy") {
 
 action("atom_js2c") {
   deps = [
-    ":atom_browserify_content_script",
     ":atom_browserify_isolated",
     ":atom_browserify_sandbox",
     ":atom_js2c_copy",
   ]
 
   browserify_sources = [
-    "$target_gen_dir/js2c/content_script_bundle.js",
     "$target_gen_dir/js2c/isolated_bundle.js",
-    "$target_gen_dir/js2c/sandbox_bundle.js",
+    "$target_gen_dir/js2c/preload_bundle.js",
   ]
 
   sources = browserify_sources + [
@@ -242,15 +169,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 += [
@@ -269,65 +188,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") {
@@ -385,30 +257,6 @@ if (is_linux) {
   }
 }
 
-source_set("manifests") {
-  sources = [
-    "//electron/atom/app/manifests.cc",
-    "//electron/atom/app/manifests.h",
-  ]
-
-  include_dirs = [ "//electron" ]
-
-  deps = [
-    "//electron/atom/common/api:mojo",
-    "//printing/buildflags",
-    "//services/proxy_resolver/public/cpp:manifest",
-    "//services/service_manager/public/cpp",
-  ]
-
-  if (enable_basic_printing) {
-    deps += [ "//components/services/pdf_compositor/public/cpp:manifest" ]
-  }
-
-  if (enable_print_preview) {
-    deps += [ "//chrome/services/printing/public/cpp:manifest" ]
-  }
-}
-
 static_library("electron_lib") {
   configs += [ "//v8:external_startup_data" ]
   configs += [ "//third_party/electron_node:node_internals" ]
@@ -417,14 +265,13 @@ static_library("electron_lib") {
 
   deps = [
     ":atom_js2c",
-    ":manifests",
-    ":resources",
-    "atom/common/api:mojo",
     "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",
@@ -433,12 +280,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",
@@ -448,9 +293,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",
@@ -463,20 +306,10 @@ static_library("electron_lib") {
     "//third_party/libyuv",
     "//third_party/webrtc_overrides:init_webrtc",
     "//third_party/widevine/cdm:headers",
-    "//ui/base/idle",
     "//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 = [
@@ -547,7 +380,6 @@ static_library("electron_lib") {
     deps += [
       "//third_party/crashpad/crashpad/client",
       "//ui/accelerated_widget_mac",
-      "//ui/views_bridge_mac",
     ]
     sources += [
       "atom/browser/ui/views/autofill_popup_view.cc",
@@ -592,6 +424,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 += [
@@ -603,20 +438,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" ]
   }
 
@@ -806,7 +630,6 @@ if (is_mac) {
     libs = [
       "AVFoundation.framework",
       "Carbon.framework",
-      "LocalAuthentication.framework",
       "QuartzCore.framework",
       "Quartz.framework",
       "Security.framework",
@@ -934,9 +757,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",
@@ -982,13 +805,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",
     ]
 
@@ -1017,7 +839,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 = [
@@ -1068,7 +900,6 @@ template("dist_zip") {
                              "deps",
                              "data_deps",
                              "data",
-                             "testonly",
                            ])
     write_runtime_deps = _runtime_deps_file
   }
@@ -1078,11 +909,7 @@ template("dist_zip") {
     deps = [
       ":$_runtime_deps_target",
     ]
-    forward_variables_from(invoker,
-                           [
-                             "outputs",
-                             "testonly",
-                           ])
+    forward_variables_from(invoker, [ "outputs" ])
     args = rebase_path(outputs + [ _runtime_deps_file ], root_build_dir) + [
              target_cpu,
              target_os,
@@ -1150,7 +977,6 @@ dist_zip("electron_ffmpeg_zip") {
 }
 
 dist_zip("electron_chromedriver_zip") {
-  testonly = true
   data_deps = [
     "//chrome/test/chromedriver",
     ":licenses",

DEPS

@@ -10,7 +10,7 @@ gclient_gn_args = [
 
 vars = {
   'chromium_version':
-    '76.0.3783.1',
+    '73.0.3683.121',
   'node_version':
     'a86a4a160dc520c61a602c949a32a1bc4c0fc633',
 
@@ -24,9 +24,6 @@ vars = {
   'requests_git': 'https://github.com/kennethreitz',
   'yaml_git': 'https://github.com/yaml',
 
-  # KEEP IN SYNC WITH spec-runner FILE
-  'yarn_version': '1.15.2',
-
   # To be able to build clean Chromium from sources.
   'apply_patches': True,
 
@@ -110,7 +107,7 @@ hooks = [
     'action': [
       'python',
       '-c',
-      'import os, subprocess; os.chdir(os.path.join("src", "electron")); subprocess.check_call(["python", "script/lib/npx.py", "yarn@' + (Var("yarn_version")) + '", "install", "--frozen-lockfile"]);',
+      'import os; os.chdir("src"); os.chdir("electron"); os.system("npm install")',
     ],
   },
   {
@@ -120,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");',
     ],
   },
   {
@@ -130,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 = [

ELECTRON_VERSION

@@ -1 +1 @@
-6.0.0-beta.2
+5.0.1

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

appveyor.yml

@@ -25,12 +25,11 @@
 
 version: 1.0.{build}
 build_cloud: libcc-20
-image: libcc-20-vs2017-15.9
+image: libcc-20-vs2017-15.7.4
 environment:
   GIT_CACHE_PATH: C:\Users\electron\libcc_cache
   DISABLE_CRASH_REPORTER_TESTS: true
   ELECTRON_OUT_DIR: Default
-  ELECTRON_ENABLE_STACK_DUMPING: 1
 build_script:
   - ps: >-
       if(($env:APPVEYOR_PULL_REQUEST_HEAD_REPO_NAME -split "/")[0] -eq ($env:APPVEYOR_REPO_NAME -split "/")[0]) {
@@ -39,7 +38,7 @@ build_script:
   - echo "Building $env:GN_CONFIG build"
   - git config --global core.longpaths true
   - cd ..
-  - ps: if (Test-Path src\electron) { Remove-Item src\electron -Recurse }
+  - md src
   - ps: Move-Item $env:APPVEYOR_BUILD_FOLDER -Destination src\electron
   - ps: $env:CHROMIUM_BUILDTOOLS_PATH="$pwd\src\buildtools"
   - ps: $env:SCCACHE_PATH="$pwd\src\electron\external_binaries\sccache.exe"
@@ -53,14 +52,10 @@ build_script:
       --unmanaged
       %GCLIENT_EXTRA_ARGS%
       "https://github.com/electron/electron"
-  - gclient sync --with_branch_heads --with_tags --reset
+  - gclient sync --with_branch_heads --with_tags
   - 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
-  - gn check out/Default //electron:manifests
-  - gn check out/Default //electron/atom/common/api:mojo
   - 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
@@ -82,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"

atom/app/manifests.cc

@@ -1,49 +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 "electron/atom/common/api/api.mojom.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")
-          .ExposeInterfaceFilterCapability_Deprecated(
-              "navigation:frame", "renderer",
-              service_manager::Manifest::InterfaceList<
-                  atom::mojom::ElectronBrowser>())
-          .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;
+}

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_

atom/app/node_main.cc

@@ -10,21 +10,21 @@
 #include "atom/app/uv_task_runner.h"
 #include "atom/browser/javascript_environment.h"
 #include "atom/browser/node_debugger.h"
-#include "atom/common/api/electron_bindings.h"
-#include "atom/common/atom_version.h"
+#include "atom/common/api/atom_bindings.h"
 #include "atom/common/crash_reporter/crash_reporter.h"
 #include "atom/common/native_mate_converters/string16_converter.h"
 #include "atom/common/node_bindings.h"
-#include "atom/common/node_includes.h"
 #include "base/command_line.h"
 #include "base/feature_list.h"
-#include "base/task/thread_pool/thread_pool.h"
+#include "base/task/task_scheduler/task_scheduler.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "gin/array_buffer.h"
 #include "gin/public/isolate_holder.h"
 #include "gin/v8_initializer.h"
 #include "native_mate/dictionary.h"
 
+#include "atom/common/node_includes.h"
+
 namespace atom {
 
 int NodeMain(int argc, char* argv[]) {
@@ -48,7 +48,7 @@ int NodeMain(int argc, char* argv[]) {
     gin::V8Initializer::LoadV8Natives();
 
     // V8 requires a task scheduler apparently
-    base::ThreadPool::CreateAndStartWithDefaultParams("Electron");
+    base::TaskScheduler::CreateAndStartWithDefaultParams("Electron");
 
     // Initialize gin::IsolateHolder.
     JavascriptEnvironment gin_env(loop);
@@ -70,20 +70,15 @@ int NodeMain(int argc, char* argv[]) {
 
     mate::Dictionary process(gin_env.isolate(), env->process_object());
 #if defined(OS_WIN)
-    process.SetMethod("log", &ElectronBindings::Log);
+    process.SetMethod("log", &AtomBindings::Log);
 #endif
-    process.SetMethod("crash", &ElectronBindings::Crash);
+    process.SetMethod("crash", &AtomBindings::Crash);
 
     // Setup process.crashReporter.start in child node processes
     auto reporter = mate::Dictionary::CreateEmpty(gin_env.isolate());
     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;
@@ -113,10 +108,10 @@ int NodeMain(int argc, char* argv[]) {
 
   // According to "src/gin/shell/gin_main.cc":
   //
-  // gin::IsolateHolder waits for tasks running in ThreadPool in its
-  // destructor and thus must be destroyed before ThreadPool starts skipping
+  // gin::IsolateHolder waits for tasks running in TaskScheduler in its
+  // destructor and thus must be destroyed before TaskScheduler starts skipping
   // CONTINUE_ON_SHUTDOWN tasks.
-  base::ThreadPool::GetInstance()->Shutdown();
+  base::TaskScheduler::GetInstance()->Shutdown();
 
   v8::V8::Dispose();
 

atom/browser/api/atom_api_app.cc

@@ -16,7 +16,6 @@
 #include "atom/browser/atom_paths.h"
 #include "atom/browser/login_handler.h"
 #include "atom/browser/relauncher.h"
-#include "atom/common/application_info.h"
 #include "atom/common/atom_command_line.h"
 #include "atom/common/native_mate_converters/callback.h"
 #include "atom/common/native_mate_converters/file_path_converter.h"
@@ -25,7 +24,6 @@
 #include "atom/common/native_mate_converters/net_converter.h"
 #include "atom/common/native_mate_converters/network_converter.h"
 #include "atom/common/native_mate_converters/value_converter.h"
-#include "atom/common/node_includes.h"
 #include "atom/common/options_switches.h"
 #include "base/command_line.h"
 #include "base/environment.h"
@@ -36,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"
@@ -53,6 +51,12 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/image/image.h"
 
+// clang-format off
+// This header should be declared at the end to avoid
+// redefinition errors.
+#include "atom/common/node_includes.h"  // NOLINT(build/include_alpha)
+// clang-format on
+
 #if defined(OS_WIN)
 #include "atom/browser/ui/win/jump_list.h"
 #include "base/strings/utf_string_conversions.h"
@@ -529,9 +533,9 @@ int ImportIntoCertStore(CertificateManagerModel* model,
 }
 #endif
 
-void OnIconDataAvailable(util::Promise promise, gfx::Image icon) {
-  if (!icon.IsEmpty()) {
-    promise.Resolve(icon);
+void OnIconDataAvailable(util::Promise promise, gfx::Image* icon) {
+  if (icon && !icon->IsEmpty()) {
+    promise.Resolve(*icon);
   } else {
     promise.RejectWithErrorMessage("Failed to get file icon.");
   }
@@ -672,7 +676,7 @@ void App::OnLogin(scoped_refptr<LoginHandler> login_handler,
   if (web_contents) {
     prevent_default = Emit(
         "login", WebContents::FromOrCreate(isolate(), web_contents),
-        request_details, *login_handler->auth_info(),
+        request_details, login_handler->auth_info(),
         base::Bind(&PassLoginInformation, base::RetainedRef(login_handler)));
   }
 
@@ -831,26 +835,6 @@ void App::SetAppPath(const base::FilePath& app_path) {
   app_path_ = app_path;
 }
 
-#if !defined(OS_MACOSX)
-void App::SetAppLogsPath(mate::Arguments* args) {
-  base::FilePath custom_path;
-  if (args->GetNext(&custom_path)) {
-    if (!custom_path.IsAbsolute()) {
-      args->ThrowError("Path must be absolute");
-      return;
-    }
-    base::PathService::Override(DIR_APP_LOGS, custom_path);
-  } else {
-    base::FilePath path;
-    if (base::PathService::Get(DIR_USER_DATA, &path)) {
-      path = path.Append(base::FilePath::FromUTF8Unsafe(GetApplicationName()));
-      path = path.Append(base::FilePath::FromUTF8Unsafe("logs"));
-      base::PathService::Override(DIR_APP_LOGS, path);
-    }
-  }
-}
-#endif
-
 base::FilePath App::GetPath(mate::Arguments* args, const std::string& name) {
   bool succeed = false;
   base::FilePath path;
@@ -1056,7 +1040,7 @@ Browser::LoginItemSettings App::GetLoginItemSettings(mate::Arguments* args) {
 
 #if defined(USE_NSS_CERTS)
 void App::ImportCertificate(const base::DictionaryValue& options,
-                            net::CompletionRepeatingCallback callback) {
+                            const net::CompletionCallback& callback) {
   auto browser_context = AtomBrowserContext::From("", false);
   if (!certificate_manager_model_) {
     auto copy = base::DictionaryValue::From(
@@ -1069,17 +1053,17 @@ void App::ImportCertificate(const base::DictionaryValue& options,
   }
 
   int rv = ImportIntoCertStore(certificate_manager_model_.get(), options);
-  std::move(callback).Run(rv);
+  callback.Run(rv);
 }
 
 void App::OnCertificateManagerModelCreated(
     std::unique_ptr<base::DictionaryValue> options,
-    net::CompletionOnceCallback callback,
+    const net::CompletionCallback& callback,
     std::unique_ptr<CertificateManagerModel> model) {
   certificate_manager_model_ = std::move(model);
   int rv =
       ImportIntoCertStore(certificate_manager_model_.get(), *(options.get()));
-  std::move(callback).Run(rv);
+  callback.Run(rv);
 }
 #endif
 
@@ -1171,7 +1155,6 @@ v8::Local<v8::Promise> App::GetFileIcon(const base::FilePath& path,
 
 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_) {
@@ -1276,46 +1259,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
@@ -1355,8 +1298,6 @@ void App::BuildPrototype(v8::Isolate* isolate,
       .SetMethod("getLoginItemSettings", &App::GetLoginItemSettings)
       .SetMethod("setLoginItemSettings",
                  base::Bind(&Browser::SetLoginItemSettings, browser))
-      .SetMethod("isEmojiPanelSupported",
-                 base::Bind(&Browser::IsEmojiPanelSupported, browser))
 #if defined(OS_MACOSX)
       .SetMethod("hide", base::Bind(&Browser::Hide, browser))
       .SetMethod("show", base::Bind(&Browser::Show, browser))
@@ -1378,13 +1319,6 @@ void App::BuildPrototype(v8::Isolate* isolate,
       .SetMethod("showAboutPanel",
                  base::Bind(&Browser::ShowAboutPanel, browser))
 #endif
-#if defined(OS_MACOSX) || defined(OS_WIN)
-      .SetMethod("showEmojiPanel",
-                 base::Bind(&Browser::ShowEmojiPanel, browser))
-      .SetProperty("accessibilitySupportEnabled",
-                   &App::IsAccessibilitySupportEnabled,
-                   &App::SetAccessibilitySupportEnabled)
-#endif
 #if defined(OS_WIN)
       .SetMethod("setUserTasks", base::Bind(&Browser::SetUserTasks, browser))
       .SetMethod("getJumpListSettings", &App::GetJumpListSettings)
@@ -1398,7 +1332,6 @@ void App::BuildPrototype(v8::Isolate* isolate,
       .SetMethod("getAppPath", &App::GetAppPath)
       .SetMethod("setPath", &App::SetPath)
       .SetMethod("getPath", &App::GetPath)
-      .SetMethod("setAppLogsPath", &App::SetAppLogsPath)
       .SetMethod("setDesktopName", &App::SetDesktopName)
       .SetMethod("getLocale", &App::GetLocale)
       .SetMethod("getLocaleCountryCode", &App::GetLocaleCountryCode)
@@ -1409,9 +1342,9 @@ void App::BuildPrototype(v8::Isolate* isolate,
       .SetMethod("requestSingleInstanceLock", &App::RequestSingleInstanceLock)
       .SetMethod("releaseSingleInstanceLock", &App::ReleaseSingleInstanceLock)
       .SetMethod("relaunch", &App::Relaunch)
-      .SetMethod("_isAccessibilitySupportEnabled",
+      .SetMethod("isAccessibilitySupportEnabled",
                  &App::IsAccessibilitySupportEnabled)
-      .SetMethod("_setAccessibilitySupportEnabled",
+      .SetMethod("setAccessibilitySupportEnabled",
                  &App::SetAccessibilitySupportEnabled)
       .SetMethod("disableHardwareAcceleration",
                  &App::DisableHardwareAcceleration)
@@ -1424,9 +1357,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);
 }
@@ -1437,6 +1367,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,
@@ -1447,6 +1392,23 @@ 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

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"
@@ -27,8 +26,7 @@
 #include "content/public/browser/render_process_host.h"
 #include "native_mate/dictionary.h"
 #include "native_mate/handle.h"
-#include "net/base/completion_once_callback.h"
-#include "net/base/completion_repeating_callback.h"
+#include "net/base/completion_callback.h"
 #include "net/ssl/client_cert_identity.h"
 
 #if defined(USE_NSS_CERTS)
@@ -79,7 +77,7 @@ class App : public AtomBrowserClient::Delegate,
 #if defined(USE_NSS_CERTS)
   void OnCertificateManagerModelCreated(
       std::unique_ptr<base::DictionaryValue> options,
-      net::CompletionOnceCallback callback,
+      const net::CompletionCallback& callback,
       std::unique_ptr<CertificateManagerModel> model);
 #endif
 
@@ -176,8 +174,6 @@ class App : public AtomBrowserClient::Delegate,
   void ChildProcessLaunched(int process_type, base::ProcessHandle handle);
   void ChildProcessDisconnected(base::ProcessId pid);
 
-  void SetAppLogsPath(mate::Arguments* args);
-
   // Get/Set the pre-defined path in PathService.
   base::FilePath GetPath(mate::Arguments* args, const std::string& name);
   void SetPath(mate::Arguments* args,
@@ -200,7 +196,7 @@ class App : public AtomBrowserClient::Delegate,
   Browser::LoginItemSettings GetLoginItemSettings(mate::Arguments* args);
 #if defined(USE_NSS_CERTS)
   void ImportCertificate(const base::DictionaryValue& options,
-                         net::CompletionRepeatingCallback callback);
+                         const net::CompletionCallback& callback);
 #endif
   v8::Local<v8::Promise> GetFileIcon(const base::FilePath& path,
                                      mate::Arguments* args);
@@ -214,10 +210,7 @@ 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(
       mate::Arguments* args);

atom/browser/api/atom_api_app_mac.mm

@@ -1,38 +0,0 @@
-// Copyright (c) 2019 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#include "atom/browser/api/atom_api_app.h"
-#include "atom/browser/atom_paths.h"
-#include "atom/common/native_mate_converters/file_path_converter.h"
-#include "base/path_service.h"
-
-#import <Cocoa/Cocoa.h>
-
-namespace atom {
-
-namespace api {
-
-void App::SetAppLogsPath(mate::Arguments* args) {
-  base::FilePath custom_path;
-  if (args->GetNext(&custom_path)) {
-    if (!custom_path.IsAbsolute()) {
-      args->ThrowError("Path must be absolute");
-      return;
-    }
-    base::PathService::Override(DIR_APP_LOGS, custom_path);
-  } else {
-    NSString* bundle_name =
-        [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleName"];
-    NSString* logs_path =
-        [NSString stringWithFormat:@"Library/Logs/%@", bundle_name];
-    NSString* library_path =
-        [NSHomeDirectory() stringByAppendingPathComponent:logs_path];
-    base::PathService::Override(DIR_APP_LOGS,
-                                base::FilePath([library_path UTF8String]));
-  }
-}
-
-}  // namespace atom
-
-}  // namespace api

atom/browser/api/atom_api_auto_updater.cc

@@ -64,17 +64,11 @@ void AutoUpdater::OnError(const std::string& message,
   auto errorObject =
       error->ToObject(isolate()->GetCurrentContext()).ToLocalChecked();
 
-  auto context = isolate()->GetCurrentContext();
-
   // add two new params for better error handling
-  errorObject
-      ->Set(context, mate::StringToV8(isolate(), "code"),
-            v8::Integer::New(isolate(), code))
-      .Check();
-  errorObject
-      ->Set(context, mate::StringToV8(isolate(), "domain"),
-            mate::StringToV8(isolate(), domain))
-      .Check();
+  errorObject->Set(mate::StringToV8(isolate(), "code"),
+                   v8::Integer::New(isolate(), code));
+  errorObject->Set(mate::StringToV8(isolate(), "domain"),
+                   mate::StringToV8(isolate(), domain));
 
   mate::EmitEvent(isolate(), GetWrapper(), "error", errorObject, message);
 }

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;

atom/browser/api/atom_api_browser_window.cc

@@ -15,17 +15,18 @@
 #include "atom/common/color_util.h"
 #include "atom/common/native_mate_converters/callback.h"
 #include "atom/common/native_mate_converters/value_converter.h"
-#include "atom/common/node_includes.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"
 #include "native_mate/dictionary.h"
 #include "ui/gl/gpu_switching_manager.h"
 
+#include "atom/common/node_includes.h"
+
 namespace atom {
 
 namespace api {

atom/browser/api/atom_api_content_tracing.cc

@@ -8,7 +8,6 @@
 #include "atom/common/native_mate_converters/callback.h"
 #include "atom/common/native_mate_converters/file_path_converter.h"
 #include "atom/common/native_mate_converters/value_converter.h"
-#include "atom/common/node_includes.h"
 #include "atom/common/promise_util.h"
 #include "base/bind.h"
 #include "base/files/file_util.h"
@@ -16,6 +15,8 @@
 #include "content/public/browser/tracing_controller.h"
 #include "native_mate/dictionary.h"
 
+#include "atom/common/node_includes.h"
+
 using content::TracingController;
 
 namespace mate {
@@ -71,6 +72,11 @@ scoped_refptr<TracingController::TraceDataEndpoint> GetTraceDataEndpoint(
       result_file_path, base::Bind(callback, result_file_path));
 }
 
+void OnRecordingStopped(const atom::util::CopyablePromise& promise,
+                        const base::FilePath& path) {
+  promise.GetPromise().Resolve(path);
+}
+
 v8::Local<v8::Promise> StopRecording(v8::Isolate* isolate,
                                      const base::FilePath& path) {
   atom::util::Promise promise(isolate);
@@ -79,24 +85,30 @@ v8::Local<v8::Promise> StopRecording(v8::Isolate* isolate,
   // TODO(zcbenz): Remove the use of CopyablePromise when the
   // CreateFileEndpoint API accepts OnceCallback.
   TracingController::GetInstance()->StopTracing(GetTraceDataEndpoint(
-      path, base::Bind(atom::util::CopyablePromise::ResolveCopyablePromise<
-                           const base::FilePath&>,
-                       atom::util::CopyablePromise(promise))));
+      path,
+      base::Bind(&OnRecordingStopped, atom::util::CopyablePromise(promise))));
   return handle;
 }
 
+void OnCategoriesAvailable(atom::util::Promise promise,
+                           const std::set<std::string>& categories) {
+  promise.Resolve(categories);
+}
+
 v8::Local<v8::Promise> GetCategories(v8::Isolate* isolate) {
   atom::util::Promise promise(isolate);
   v8::Local<v8::Promise> handle = promise.GetHandle();
 
   // Note: This method always succeeds.
-  TracingController::GetInstance()->GetCategories(base::BindOnce(
-      atom::util::Promise::ResolvePromise<const std::set<std::string>&>,
-      std::move(promise)));
-
+  TracingController::GetInstance()->GetCategories(
+      base::BindOnce(&OnCategoriesAvailable, std::move(promise)));
   return handle;
 }
 
+void OnTracingStarted(atom::util::Promise promise) {
+  promise.Resolve();
+}
+
 v8::Local<v8::Promise> StartTracing(
     v8::Isolate* isolate,
     const base::trace_event::TraceConfig& trace_config) {
@@ -105,29 +117,14 @@ v8::Local<v8::Promise> StartTracing(
 
   // Note: This method always succeeds.
   TracingController::GetInstance()->StartTracing(
-      trace_config, base::BindOnce(atom::util::Promise::ResolveEmptyPromise,
-                                   std::move(promise)));
+      trace_config, base::BindOnce(&OnTracingStarted, std::move(promise)));
   return handle;
 }
 
-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,

atom/browser/api/atom_api_cookies.cc

@@ -136,11 +136,30 @@ inline net::CookieStore* GetCookieStore(
   return getter->GetURLRequestContext()->cookie_store();
 }
 
+void ResolvePromiseWithCookies(util::Promise promise,
+                               const net::CookieList& cookie_list) {
+  promise.Resolve(cookie_list);
+}
+
+void ResolvePromise(util::Promise promise) {
+  promise.Resolve();
+}
+
+// Resolve |promise| in UI thread.
+void ResolvePromiseInUI(util::Promise promise) {
+  base::PostTaskWithTraits(FROM_HERE, {BrowserThread::UI},
+                           base::BindOnce(ResolvePromise, std::move(promise)));
+}
+
+// Run |callback| on UI thread.
+void RunCallbackInUI(base::OnceClosure callback) {
+  base::PostTaskWithTraits(FROM_HERE, {BrowserThread::UI}, std::move(callback));
+}
+
 // 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) {
+                   const net::CookieList& list) {
   net::CookieList result;
   for (const auto& cookie : list) {
     if (MatchesCookie(filter.get(), cookie))
@@ -149,8 +168,7 @@ void FilterCookies(std::unique_ptr<base::DictionaryValue> filter,
 
   base::PostTaskWithTraits(
       FROM_HERE, {BrowserThread::UI},
-      base::BindOnce(util::Promise::ResolvePromise<const net::CookieList&>,
-                     std::move(promise), std::move(result)));
+      base::BindOnce(ResolvePromiseWithCookies, std::move(promise), result));
 }
 
 // Receives cookies matching |filter| in IO thread.
@@ -176,59 +194,24 @@ 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)));
+  GetCookieStore(getter)->DeleteCookieAsync(
+      url, name, base::BindOnce(ResolvePromiseInUI, std::move(promise)));
+}
+
+// Resolves/rejects the |promise| in UI thread.
+void SettlePromiseInUI(util::Promise promise, const std::string& errmsg) {
+  if (errmsg.empty()) {
+    promise.Resolve();
+  } else {
+    promise.RejectWithErrorMessage(errmsg);
+  }
 }
 
 // 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(util::Promise promise, bool success) {
+  const std::string errmsg = success ? "" : "Setting cookie failed";
+  RunCallbackInUI(
+      base::BindOnce(SettlePromiseInUI, std::move(promise), errmsg));
 }
 
 // Flushes cookie store in IO thread.
@@ -236,20 +219,20 @@ void FlushCookieStoreOnIOThread(
     scoped_refptr<net::URLRequestContextGetter> getter,
     util::Promise promise) {
   GetCookieStore(getter)->FlushStore(
-      base::BindOnce(util::Promise::ResolveEmptyPromise, std::move(promise)));
+      base::BindOnce(ResolvePromiseInUI, std::move(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;
+  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,37 +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::NO_RESTRICTION, net::COOKIE_PRIORITY_DEFAULT));
+          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;
   }
-  net::CookieOptions options;
-  if (http_only) {
-    options.set_include_httponly();
-  }
   GetCookieStore(getter)->SetCanonicalCookieAsync(
-      std::move(canonical_cookie), url.scheme(), options,
+      std::move(canonical_cookie), secure, http_only,
       std::move(completion_callback));
 }
 

atom/browser/api/atom_api_debugger.cc

@@ -10,13 +10,14 @@
 
 #include "atom/common/native_mate_converters/callback.h"
 #include "atom/common/native_mate_converters/value_converter.h"
-#include "atom/common/node_includes.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "content/public/browser/devtools_agent_host.h"
 #include "content/public/browser/web_contents.h"
 #include "native_mate/dictionary.h"
 
+#include "atom/common/node_includes.h"
+
 using content::DevToolsAgentHost;
 
 namespace atom {
@@ -44,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 =
@@ -205,4 +205,4 @@ void Initialize(v8::Local<v8::Object> exports,
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_debugger, Initialize)
+NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_debugger, Initialize);

atom/browser/api/atom_api_desktop_capturer.cc

@@ -10,7 +10,6 @@
 
 #include "atom/common/api/atom_api_native_image.h"
 #include "atom/common/native_mate_converters/gfx_converter.h"
-#include "atom/common/node_includes.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_restrictions.h"
@@ -27,6 +26,8 @@
 #include "ui/display/win/display_info.h"
 #endif  // defined(OS_WIN)
 
+#include "atom/common/node_includes.h"
+
 namespace mate {
 
 template <>
@@ -132,12 +133,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_});
@@ -146,12 +146,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()});
@@ -165,12 +164,8 @@ void DesktopCapturer::UpdateSourcesList(DesktopMediaList* list) {
       std::vector<std::string> device_names;
       // Crucially, this list of device names will be in the same order as
       // |media_list_sources|.
-      if (!webrtc::DxgiDuplicatorController::Instance()->GetDeviceNames(
-              &device_names)) {
-        Emit("error", "Failed to get sources.");
-        return;
-      }
-
+      webrtc::DxgiDuplicatorController::Instance()->GetDeviceNames(
+          &device_names);
       int device_name_index = 0;
       for (auto& source : screen_sources) {
         const auto& device_name = device_names[device_name_index++];
@@ -180,13 +175,13 @@ void DesktopCapturer::UpdateSourcesList(DesktopMediaList* list) {
         const int64_t device_id =
             display::win::DisplayInfo::DeviceIdFromDeviceName(
                 wide_device_name.c_str());
-        source.display_id = base::NumberToString(device_id);
+        source.display_id = base::Int64ToString(device_id);
       }
     }
 #elif defined(OS_MACOSX)
     // On Mac, the IDs across the APIs match.
     for (auto& source : screen_sources) {
-      source.display_id = base::NumberToString(source.media_list_source.id.id);
+      source.display_id = base::Int64ToString(source.media_list_source.id.id);
     }
 #endif  // defined(OS_WIN)
     // TODO(ajmacd): Add Linux support. The IDs across APIs differ but Chrome
@@ -226,9 +221,9 @@ void Initialize(v8::Local<v8::Object> exports,
                 void* priv) {
   v8::Isolate* isolate = context->GetIsolate();
   mate::Dictionary dict(isolate, exports);
-  dict.SetMethod("createDesktopCapturer", &atom::api::DesktopCapturer::Create);
+  dict.Set("desktopCapturer", atom::api::DesktopCapturer::Create(isolate));
 }
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_desktop_capturer, Initialize)
+NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_desktop_capturer, Initialize);

atom/browser/api/atom_api_dialog.cc

@@ -16,97 +16,67 @@
 #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/node_includes.h"
-#include "atom/common/promise_util.h"
 #include "native_mate/dictionary.h"
 
+#include "atom/common/node_includes.h"
+
 namespace {
 
-int ShowMessageBoxSync(int type,
-                       const std::vector<std::string>& buttons,
-                       int default_id,
-                       int cancel_id,
-                       int options,
-                       const std::string& title,
-                       const std::string& message,
-                       const std::string& detail,
-                       const std::string& checkbox_label,
-                       bool checkbox_checked,
-                       const gfx::ImageSkia& icon,
-                       atom::NativeWindow* window) {
-  return atom::ShowMessageBoxSync(
-      window, static_cast<atom::MessageBoxType>(type), buttons, default_id,
-      cancel_id, options, title, message, detail, icon);
+void ShowMessageBox(int type,
+                    const std::vector<std::string>& buttons,
+                    int default_id,
+                    int cancel_id,
+                    int options,
+                    const std::string& title,
+                    const std::string& message,
+                    const std::string& detail,
+                    const std::string& checkbox_label,
+                    bool checkbox_checked,
+                    const gfx::ImageSkia& icon,
+                    atom::NativeWindow* window,
+                    mate::Arguments* args) {
+  v8::Local<v8::Value> peek = args->PeekNext();
+  atom::MessageBoxCallback callback;
+  if (mate::Converter<atom::MessageBoxCallback>::FromV8(args->isolate(), peek,
+                                                        &callback)) {
+    atom::ShowMessageBox(window, static_cast<atom::MessageBoxType>(type),
+                         buttons, default_id, cancel_id, options, title,
+                         message, detail, checkbox_label, checkbox_checked,
+                         icon, callback);
+  } else {
+    int chosen = atom::ShowMessageBox(
+        window, static_cast<atom::MessageBoxType>(type), buttons, default_id,
+        cancel_id, options, title, message, detail, icon);
+    args->Return(chosen);
+  }
 }
 
-void ResolvePromiseObject(atom::util::Promise promise,
-                          int result,
-                          bool checkbox_checked) {
-  mate::Dictionary dict = mate::Dictionary::CreateEmpty(promise.isolate());
-
-  dict.Set("response", result);
-  dict.Set("checkboxChecked", checkbox_checked);
-
-  promise.Resolve(dict.GetHandle());
+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> ShowMessageBox(int type,
-                                      const std::vector<std::string>& buttons,
-                                      int default_id,
-                                      int cancel_id,
-                                      int options,
-                                      const std::string& title,
-                                      const std::string& message,
-                                      const std::string& detail,
-                                      const std::string& checkbox_label,
-                                      bool checkbox_checked,
-                                      const gfx::ImageSkia& icon,
-                                      atom::NativeWindow* window,
-                                      mate::Arguments* args) {
-  v8::Isolate* isolate = args->isolate();
-  atom::util::Promise promise(isolate);
-  v8::Local<v8::Promise> handle = promise.GetHandle();
-
-  atom::ShowMessageBox(
-      window, static_cast<atom::MessageBoxType>(type), buttons, default_id,
-      cancel_id, options, title, message, detail, checkbox_label,
-      checkbox_checked, icon,
-      base::BindOnce(&ResolvePromiseObject, std::move(promise)));
-
-  return handle;
-}
-
-void ShowOpenDialogSync(const file_dialog::DialogSettings& settings,
-                        mate::Arguments* args) {
-  std::vector<base::FilePath> paths;
-  if (file_dialog::ShowOpenDialogSync(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,
@@ -114,12 +84,9 @@ void Initialize(v8::Local<v8::Object> exports,
                 v8::Local<v8::Context> context,
                 void* priv) {
   mate::Dictionary dict(context->GetIsolate(), exports);
-  dict.SetMethod("showMessageBoxSync", &ShowMessageBoxSync);
   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",

atom/browser/api/atom_api_download_item.cc

@@ -11,12 +11,13 @@
 #include "atom/common/native_mate_converters/file_dialog_converter.h"
 #include "atom/common/native_mate_converters/file_path_converter.h"
 #include "atom/common/native_mate_converters/gurl_converter.h"
-#include "atom/common/node_includes.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "native_mate/dictionary.h"
 #include "net/base/filename_util.h"
 
+#include "atom/common/node_includes.h"
+
 namespace mate {
 
 template <>
@@ -250,4 +251,4 @@ void Initialize(v8::Local<v8::Object> exports,
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_download_item, Initialize)
+NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_download_item, Initialize);

atom/browser/api/atom_api_event.cc

@@ -10,7 +10,7 @@ namespace {
 
 v8::Local<v8::Object> CreateWithSender(v8::Isolate* isolate,
                                        v8::Local<v8::Object> sender) {
-  return mate::internal::CreateJSEvent(isolate, sender, nullptr, base::nullopt);
+  return mate::internal::CreateJSEvent(isolate, sender, nullptr, nullptr);
 }
 
 void Initialize(v8::Local<v8::Object> exports,

atom/browser/api/atom_api_global_shortcut.cc

@@ -10,11 +10,12 @@
 #include "atom/browser/api/atom_api_system_preferences.h"
 #include "atom/common/native_mate_converters/accelerator_converter.h"
 #include "atom/common/native_mate_converters/callback.h"
-#include "atom/common/node_includes.h"
 #include "base/stl_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "native_mate/dictionary.h"
 
+#include "atom/common/node_includes.h"
+
 #if defined(OS_MACOSX)
 #include "base/mac/mac_util.h"
 #endif

atom/browser/api/atom_api_in_app_purchase.cc

@@ -9,9 +9,10 @@
 #include <vector>
 
 #include "atom/common/native_mate_converters/callback.h"
-#include "atom/common/node_includes.h"
 #include "native_mate/dictionary.h"
 
+#include "atom/common/node_includes.h"
+
 namespace mate {
 
 template <>
@@ -91,7 +92,7 @@ void InAppPurchase::BuildPrototype(v8::Isolate* isolate,
                  &in_app_purchase::FinishAllTransactions)
       .SetMethod("finishTransactionByDate",
                  &in_app_purchase::FinishTransactionByDate)
-      .SetMethod("getProducts", &InAppPurchase::GetProducts);
+      .SetMethod("getProducts", &in_app_purchase::GetProducts);
 }
 
 InAppPurchase::InAppPurchase(v8::Isolate* isolate) {
@@ -100,37 +101,13 @@ InAppPurchase::InAppPurchase(v8::Isolate* isolate) {
 
 InAppPurchase::~InAppPurchase() {}
 
-v8::Local<v8::Promise> InAppPurchase::PurchaseProduct(
-    const std::string& product_id,
-    mate::Arguments* args) {
-  v8::Isolate* isolate = args->isolate();
-  atom::util::Promise promise(isolate);
-  v8::Local<v8::Promise> handle = promise.GetHandle();
-
+void InAppPurchase::PurchaseProduct(const std::string& product_id,
+                                    mate::Arguments* args) {
   int quantity = 1;
+  in_app_purchase::InAppPurchaseCallback callback;
   args->GetNext(&quantity);
-
-  in_app_purchase::PurchaseProduct(
-      product_id, quantity,
-      base::BindOnce(atom::util::Promise::ResolvePromise<bool>,
-                     std::move(promise)));
-
-  return handle;
-}
-
-v8::Local<v8::Promise> InAppPurchase::GetProducts(
-    const std::vector<std::string>& productIDs,
-    mate::Arguments* args) {
-  v8::Isolate* isolate = args->isolate();
-  atom::util::Promise promise(isolate);
-  v8::Local<v8::Promise> handle = promise.GetHandle();
-
-  in_app_purchase::GetProducts(
-      productIDs, base::BindOnce(atom::util::Promise::ResolvePromise<
-                                     std::vector<in_app_purchase::Product>>,
-                                 std::move(promise)));
-
-  return handle;
+  args->GetNext(&callback);
+  in_app_purchase::PurchaseProduct(product_id, quantity, callback);
 }
 
 void InAppPurchase::OnTransactionsUpdated(

atom/browser/api/atom_api_in_app_purchase.h

@@ -12,7 +12,6 @@
 #include "atom/browser/mac/in_app_purchase.h"
 #include "atom/browser/mac/in_app_purchase_observer.h"
 #include "atom/browser/mac/in_app_purchase_product.h"
-#include "atom/common/promise_util.h"
 #include "native_mate/handle.h"
 
 namespace atom {
@@ -31,11 +30,7 @@ class InAppPurchase : public mate::EventEmitter<InAppPurchase>,
   explicit InAppPurchase(v8::Isolate* isolate);
   ~InAppPurchase() override;
 
-  v8::Local<v8::Promise> PurchaseProduct(const std::string& product_id,
-                                         mate::Arguments* args);
-
-  v8::Local<v8::Promise> GetProducts(const std::vector<std::string>& productIDs,
-                                     mate::Arguments* args);
+  void PurchaseProduct(const std::string& product_id, mate::Arguments* args);
 
   // TransactionObserver:
   void OnTransactionsUpdated(

atom/browser/api/atom_api_menu.cc

@@ -9,11 +9,12 @@
 #include "atom/common/native_mate_converters/callback.h"
 #include "atom/common/native_mate_converters/image_converter.h"
 #include "atom/common/native_mate_converters/string16_converter.h"
-#include "atom/common/node_includes.h"
 #include "native_mate/constructor.h"
 #include "native_mate/dictionary.h"
 #include "native_mate/object_template_builder.h"
 
+#include "atom/common/node_includes.h"
+
 namespace atom {
 
 namespace api {
@@ -39,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_);
@@ -65,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,
@@ -187,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");
 }
@@ -222,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);

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_;

atom/browser/api/atom_api_menu_mac.mm

@@ -6,7 +6,6 @@
 
 #include "atom/browser/native_window.h"
 #include "atom/browser/unresponsive_suppressor.h"
-#include "atom/common/node_includes.h"
 #include "base/mac/scoped_sending_event.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/sys_string_conversions.h"
@@ -15,6 +14,8 @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
 
+#include "atom/common/node_includes.h"
+
 using content::BrowserThread;
 
 namespace {

atom/browser/api/atom_api_menu_views.cc

@@ -52,7 +52,7 @@ void MenuViews::PopupAt(TopLevelWindow* window,
       std::make_unique<MenuRunner>(model(), flags, close_callback);
   menu_runners_[window_id]->RunMenuAt(
       native_window->widget(), NULL, gfx::Rect(location, gfx::Size()),
-      views::MenuAnchorPosition::kTopLeft, ui::MENU_SOURCE_MOUSE);
+      views::MENU_ANCHOR_TOPLEFT, ui::MENU_SOURCE_MOUSE);
 }
 
 void MenuViews::ClosePopupAt(int32_t window_id) {

atom/browser/api/atom_api_net_log.cc

@@ -10,7 +10,6 @@
 #include "atom/browser/net/system_network_context_manager.h"
 #include "atom/common/native_mate_converters/callback.h"
 #include "atom/common/native_mate_converters/file_path_converter.h"
-#include "atom/common/node_includes.h"
 #include "base/command_line.h"
 #include "chrome/browser/browser_process.h"
 #include "components/net_log/chrome_net_log.h"
@@ -19,6 +18,8 @@
 #include "native_mate/handle.h"
 #include "net/url_request/url_request_context_getter.h"
 
+#include "atom/common/node_includes.h"
+
 namespace atom {
 
 namespace api {
@@ -86,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) {
@@ -107,12 +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(
-          util::CopyablePromise::ResolveCopyablePromise<const base::FilePath&>,
-          util::CopyablePromise(promise)));
+    for (auto& callback : stop_callback_queue_) {
+      if (!callback.is_null())
+        net_log_writer_->GetFilePathToCompletedLog(callback);
     }
     stop_callback_queue_.clear();
   }

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);

atom/browser/api/atom_api_notification.cc

@@ -10,13 +10,15 @@
 #include "atom/common/native_mate_converters/gfx_converter.h"
 #include "atom/common/native_mate_converters/image_converter.h"
 #include "atom/common/native_mate_converters/string16_converter.h"
-#include "atom/common/node_includes.h"
 #include "base/guid.h"
 #include "base/strings/utf_string_conversions.h"
 #include "native_mate/constructor.h"
 #include "native_mate/dictionary.h"
 #include "native_mate/object_template_builder.h"
 #include "url/gurl.h"
+// Must be the last in the includes list.
+// See https://github.com/electron/electron/issues/10363
+#include "atom/common/node_includes.h"
 
 namespace mate {
 template <>

atom/browser/api/atom_api_power_monitor.cc

@@ -6,11 +6,12 @@
 
 #include "atom/browser/browser.h"
 #include "atom/common/native_mate_converters/callback.h"
-#include "atom/common/node_includes.h"
 #include "base/power_monitor/power_monitor.h"
 #include "base/power_monitor/power_monitor_device_source.h"
 #include "native_mate/dictionary.h"
 
+#include "atom/common/node_includes.h"
+
 namespace mate {
 template <>
 struct Converter<ui::IdleState> {
@@ -83,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 {
@@ -94,7 +95,7 @@ ui::IdleState PowerMonitor::GetSystemIdleState(v8::Isolate* isolate,
   }
 }
 
-int PowerMonitor::GetSystemIdleTime() {
+int PowerMonitor::QuerySystemIdleTime() {
   return ui::CalculateIdleTime();
 }
 
@@ -121,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

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.

atom/browser/api/atom_api_power_save_blocker.cc

@@ -6,7 +6,6 @@
 
 #include <string>
 
-#include "atom/common/node_includes.h"
 #include "base/task/post_task.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "content/public/common/service_manager_connection.h"
@@ -15,6 +14,8 @@
 #include "services/device/public/mojom/wake_lock_provider.mojom.h"
 #include "services/service_manager/public/cpp/connector.h"
 
+#include "atom/common/node_includes.h"
+
 namespace mate {
 
 template <>
@@ -150,4 +151,4 @@ void Initialize(v8::Local<v8::Object> exports,
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_power_save_blocker, Initialize)
+NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_power_save_blocker, Initialize);

atom/browser/api/atom_api_protocol.cc

@@ -177,6 +177,10 @@ bool IsProtocolHandledInIO(
   return is_handled;
 }
 
+void PromiseCallback(util::Promise promise, bool handled) {
+  promise.Resolve(handled);
+}
+
 v8::Local<v8::Promise> Protocol::IsProtocolHandled(const std::string& scheme) {
   util::Promise promise(isolate());
   v8::Local<v8::Promise> handle = promise.GetHandle();
@@ -186,7 +190,7 @@ v8::Local<v8::Promise> Protocol::IsProtocolHandled(const std::string& scheme) {
   base::PostTaskWithTraitsAndReplyWithResult(
       FROM_HERE, {content::BrowserThread::IO},
       base::BindOnce(&IsProtocolHandledInIO, base::RetainedRef(getter), scheme),
-      base::BindOnce(util::Promise::ResolvePromise<bool>, std::move(promise)));
+      base::BindOnce(&PromiseCallback, std::move(promise)));
 
   return handle;
 }

atom/browser/api/atom_api_render_process_preferences.cc

@@ -7,11 +7,12 @@
 #include "atom/browser/api/atom_api_web_contents.h"
 #include "atom/browser/atom_browser_client.h"
 #include "atom/common/native_mate_converters/value_converter.h"
-#include "atom/common/node_includes.h"
 #include "content/public/browser/render_process_host.h"
 #include "native_mate/dictionary.h"
 #include "native_mate/object_template_builder.h"
 
+#include "atom/common/node_includes.h"
+
 namespace atom {
 
 namespace api {

atom/browser/api/atom_api_screen.cc

@@ -10,7 +10,6 @@
 #include "atom/browser/api/atom_api_browser_window.h"
 #include "atom/browser/browser.h"
 #include "atom/common/native_mate_converters/gfx_converter.h"
-#include "atom/common/node_includes.h"
 #include "base/bind.h"
 #include "native_mate/dictionary.h"
 #include "native_mate/object_template_builder.h"
@@ -22,6 +21,8 @@
 #include "ui/display/win/screen_win.h"
 #endif
 
+#include "atom/common/node_includes.h"
+
 namespace atom {
 
 namespace api {

atom/browser/api/atom_api_session.cc

@@ -28,7 +28,6 @@
 #include "atom/common/native_mate_converters/gurl_converter.h"
 #include "atom/common/native_mate_converters/net_converter.h"
 #include "atom/common/native_mate_converters/value_converter.h"
-#include "atom/common/node_includes.h"
 #include "base/files/file_path.h"
 #include "base/guid.h"
 #include "base/strings/string_number_conversions.h"
@@ -48,10 +47,9 @@
 #include "content/public/browser/storage_partition.h"
 #include "native_mate/dictionary.h"
 #include "native_mate/object_template_builder.h"
-#include "net/base/completion_repeating_callback.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 +59,8 @@
 #include "net/url_request/url_request_context_getter.h"
 #include "ui/base/l10n/l10n_util.h"
 
+#include "atom/common/node_includes.h"
+
 using content::BrowserThread;
 using content::StoragePartition;
 
@@ -210,32 +210,27 @@ const char kPersistPrefix[] = "persist:";
 // Referenced session objects.
 std::map<uint32_t, v8::Global<v8::Object>> g_sessions;
 
-void ResolveOrRejectPromiseInUI(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 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 +238,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,
-    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::CompletionRepeatingCallback on_get_backend =
-      base::Bind(&OnGetBackend, base::Owned(backend_ptr), action,
-                 util::CopyablePromise(promise));
+  net::CompletionCallback on_get_backend =
+      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 +277,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 +311,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 +328,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,
@@ -366,9 +359,8 @@ void DestroyGlobalHandle(v8::Isolate* isolate,
   v8::HandleScope handle_scope(isolate);
   if (!global_handle.IsEmpty()) {
     v8::Local<v8::Value> local_handle = global_handle.Get(isolate);
-    v8::Local<v8::Object> object;
-    if (local_handle->IsObject() &&
-        local_handle->ToObject(isolate->GetCurrentContext()).ToLocal(&object)) {
+    if (local_handle->IsObject()) {
+      v8::Local<v8::Object> object = local_handle->ToObject(isolate);
       void* ptr = object->GetAlignedPointerFromInternalField(0);
       if (!ptr)
         return;
@@ -422,44 +414,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>,
-                 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);
@@ -468,13 +443,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() {
@@ -483,17 +454,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;
@@ -517,11 +482,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) {
@@ -603,36 +564,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) {
@@ -661,17 +617,16 @@ std::string Session::GetUserAgent() {
   return browser_context_->GetUserAgent();
 }
 
-v8::Local<v8::Promise> Session::GetBlobData(v8::Isolate* isolate,
-                                            const std::string& uuid) {
-  util::Promise promise(isolate);
-  v8::Local<v8::Promise> handle = promise.GetHandle();
+void Session::GetBlobData(const std::string& uuid,
+                          const AtomBlobReader::CompletionCallback& callback) {
+  if (callback.is_null())
+    return;
 
   AtomBlobReader* blob_reader = browser_context()->GetBlobReader();
   base::PostTaskWithTraits(
       FROM_HERE, {BrowserThread::IO},
       base::BindOnce(&AtomBlobReader::StartReading,
-                     base::Unretained(blob_reader), uuid, std::move(promise)));
-  return handle;
+                     base::Unretained(blob_reader), uuid, callback));
 }
 
 void Session::CreateInterruptedDownload(const mate::Dictionary& options) {
@@ -830,7 +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;
 
@@ -857,9 +811,6 @@ 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());

atom/browser/api/atom_api_session.h

@@ -11,10 +11,10 @@
 #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"
+#include "net/base/completion_callback.h"
 
 class GURL;
 
@@ -62,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();
@@ -76,13 +77,13 @@ 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();
-  v8::Local<v8::Promise> GetBlobData(v8::Isolate* isolate,
-                                     const std::string& uuid);
+  void GetBlobData(const std::string& uuid,
+                   const AtomBlobReader::CompletionCallback& callback);
   void CreateInterruptedDownload(const mate::Dictionary& options);
   void SetPreloads(const std::vector<base::FilePath::StringType>& preloads);
   std::vector<base::FilePath::StringType> GetPreloads() const;

atom/browser/api/atom_api_system_preferences.cc

@@ -8,7 +8,6 @@
 #include "atom/common/native_mate_converters/value_converter.h"
 #include "atom/common/node_includes.h"
 #include "native_mate/dictionary.h"
-#include "ui/gfx/animation/animation.h"
 #include "ui/gfx/color_utils.h"
 
 namespace atom {
@@ -44,19 +43,6 @@ bool SystemPreferences::IsHighContrastColorScheme() {
 }
 #endif  // !defined(OS_WIN)
 
-v8::Local<v8::Value> SystemPreferences::GetAnimationSettings(
-    v8::Isolate* isolate) {
-  mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
-  dict.SetHidden("simple", true);
-  dict.Set("shouldRenderRichAnimation",
-           gfx::Animation::ShouldRenderRichAnimation());
-  dict.Set("scrollAnimationsEnabledBySystem",
-           gfx::Animation::ScrollAnimationsEnabledBySystem());
-  dict.Set("prefersReducedMotion", gfx::Animation::PrefersReducedMotion());
-
-  return dict.GetHandle();
-}
-
 // static
 mate::Handle<SystemPreferences> SystemPreferences::Create(
     v8::Isolate* isolate) {
@@ -107,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",
@@ -119,9 +103,7 @@ void SystemPreferences::BuildPrototype(
                  &SystemPreferences::IsInvertedColorScheme)
       .SetMethod("isHighContrastColorScheme",
                  &SystemPreferences::IsHighContrastColorScheme)
-      .SetMethod("isDarkMode", &SystemPreferences::IsDarkMode)
-      .SetMethod("getAnimationSettings",
-                 &SystemPreferences::GetAnimationSettings);
+      .SetMethod("isDarkMode", &SystemPreferences::IsDarkMode);
 }
 
 }  // namespace api
@@ -146,4 +128,4 @@ void Initialize(v8::Local<v8::Object> exports,
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_system_preferences, Initialize)
+NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_system_preferences, Initialize);

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
@@ -117,7 +113,6 @@ class SystemPreferences : public mate::EventEmitter<SystemPreferences>
   bool IsDarkMode();
   bool IsInvertedColorScheme();
   bool IsHighContrastColorScheme();
-  v8::Local<v8::Value> GetAnimationSettings(v8::Isolate* isolate);
 
  protected:
   explicit SystemPreferences(v8::Isolate* isolate);

atom/browser/api/atom_api_system_preferences_mac.mm

@@ -8,20 +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/browser/ui/cocoa/NSColor+Hex.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"
@@ -112,6 +106,21 @@ std::string ConvertAuthorizationStatus(AVAuthorizationStatusMac status) {
   }
 }
 
+// Convert color to RGBA value like "aabbccdd"
+std::string ToRGBA(NSColor* color) {
+  return base::StringPrintf(
+      "%02X%02X%02X%02X", (int)(color.redComponent * 0xFF),
+      (int)(color.greenComponent * 0xFF), (int)(color.blueComponent * 0xFF),
+      (int)(color.alphaComponent * 0xFF));
+}
+
+// Convert color to RGB hex value like "#ABCDEF"
+std::string ToRGBHex(NSColor* color) {
+  return base::StringPrintf("#%02X%02X%02X", (int)(color.redComponent * 0xFF),
+                            (int)(color.greenComponent * 0xFF),
+                            (int)(color.blueComponent * 0xFF));
+}
+
 }  // namespace
 
 void SystemPreferences::PostNotification(const std::string& name,
@@ -391,7 +400,7 @@ std::string SystemPreferences::GetAccentColor() {
   if (@available(macOS 10.14, *))
     sysColor = [NSColor controlAccentColor];
 
-  return base::SysNSStringToUTF8([sysColor RGBAValue]);
+  return ToRGBA(sysColor);
 }
 
 std::string SystemPreferences::GetSystemColor(const std::string& color,
@@ -420,70 +429,7 @@ std::string SystemPreferences::GetSystemColor(const std::string& color,
     return "";
   }
 
-  return base::SysNSStringToUTF8([sysColor hexadecimalValue]);
-}
-
-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;
-}
-
-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) {
-                            std::string err_msg = std::string(
-                                [error.localizedDescription UTF8String]);
-                            runner->PostTask(
-                                FROM_HERE,
-                                base::BindOnce(util::Promise::RejectPromise,
-                                               std::move(p),
-                                               std::move(err_msg)));
-                          } else {
-                            runner->PostTask(
-                                FROM_HERE,
-                                base::BindOnce(
-                                    util::Promise::ResolveEmptyPromise,
-                                    std::move(p)));
-                          }
-                        }];
-  } else {
-    promise.RejectWithErrorMessage(
-        "This API is not available on macOS versions older than 10.12.2");
-  }
-  return handle;
+  return ToRGBHex(sysColor);
 }
 
 // static
@@ -573,7 +519,7 @@ std::string SystemPreferences::GetColor(const std::string& color,
     return "";
   }
 
-  return base::SysNSStringToUTF8([sysColor hexadecimalValue]);
+  return ToRGBHex(sysColor);
 }
 
 std::string SystemPreferences::GetMediaAccessStatus(

atom/browser/api/atom_api_top_level_window.cc

@@ -18,7 +18,6 @@
 #include "atom/common/native_mate_converters/image_converter.h"
 #include "atom/common/native_mate_converters/string16_converter.h"
 #include "atom/common/native_mate_converters/value_converter.h"
-#include "atom/common/node_includes.h"
 #include "atom/common/options_switches.h"
 #include "electron/buildflags/buildflags.h"
 #include "gin/converter.h"
@@ -34,6 +33,8 @@
 #include "ui/base/win/shell.h"
 #endif
 
+#include "atom/common/node_includes.h"
+
 #if defined(OS_WIN)
 namespace mate {
 
@@ -547,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);
@@ -567,14 +570,6 @@ void TopLevelWindow::SetSkipTaskbar(bool skip) {
   window_->SetSkipTaskbar(skip);
 }
 
-void TopLevelWindow::SetExcludedFromShownWindowsMenu(bool excluded) {
-  window_->SetExcludedFromShownWindowsMenu(excluded);
-}
-
-bool TopLevelWindow::IsExcludedFromShownWindowsMenu() {
-  return window_->IsExcludedFromShownWindowsMenu();
-}
-
 void TopLevelWindow::SetSimpleFullScreen(bool simple_fullscreen) {
   window_->SetSimpleFullScreen(simple_fullscreen);
 }
@@ -648,11 +643,10 @@ void TopLevelWindow::SetFocusable(bool focusable) {
 }
 
 void TopLevelWindow::SetMenu(v8::Isolate* isolate, v8::Local<v8::Value> value) {
-  auto context = isolate->GetCurrentContext();
   mate::Handle<Menu> menu;
-  v8::Local<v8::Object> object;
-  if (value->IsObject() && value->ToObject(context).ToLocal(&object) &&
-      gin::V8ToString(isolate, object->GetConstructorName()) == "Menu" &&
+  if (value->IsObject() &&
+      gin::V8ToString(
+          isolate, value->ToObject(isolate)->GetConstructorName()) == "Menu" &&
       mate::ConvertFromV8(isolate, value, &menu) && !menu.IsEmpty()) {
     menu_.Reset(isolate, menu.ToV8());
     window_->SetMenu(menu->model());
@@ -1073,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)
@@ -1142,9 +1138,6 @@ void TopLevelWindow::BuildPrototype(v8::Isolate* isolate,
       .SetMethod("addTabbedWindow", &TopLevelWindow::AddTabbedWindow)
       .SetMethod("setWindowButtonVisibility",
                  &TopLevelWindow::SetWindowButtonVisibility)
-      .SetProperty("excludedFromShownWindowsMenu",
-                   &TopLevelWindow::IsExcludedFromShownWindowsMenu,
-                   &TopLevelWindow::SetExcludedFromShownWindowsMenu)
 #endif
       .SetMethod("setAutoHideMenuBar", &TopLevelWindow::SetAutoHideMenuBar)
       .SetMethod("isMenuBarAutoHide", &TopLevelWindow::IsMenuBarAutoHide)

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();
@@ -145,8 +147,6 @@ class TopLevelWindow : public mate::TrackableObject<TopLevelWindow>,
   std::string GetTitle();
   void FlashFrame(bool flash);
   void SetSkipTaskbar(bool skip);
-  void SetExcludedFromShownWindowsMenu(bool excluded);
-  bool IsExcludedFromShownWindowsMenu();
   void SetSimpleFullScreen(bool simple_fullscreen);
   bool IsSimpleFullScreen();
   void SetKiosk(bool kiosk);

atom/browser/api/atom_api_tray.cc

@@ -159,17 +159,7 @@ void Tray::SetToolTip(const std::string& tool_tip) {
 }
 
 void Tray::SetTitle(const std::string& title) {
-#if defined(OS_MACOSX)
   tray_icon_->SetTitle(title);
-#endif
-}
-
-std::string Tray::GetTitle() {
-#if defined(OS_MACOSX)
-  return tray_icon_->GetTitle();
-#else
-  return "";
-#endif
 }
 
 void Tray::SetHighlightMode(TrayIcon::HighlightMode mode) {
@@ -237,7 +227,6 @@ void Tray::BuildPrototype(v8::Isolate* isolate,
       .SetMethod("setPressedImage", &Tray::SetPressedImage)
       .SetMethod("setToolTip", &Tray::SetToolTip)
       .SetMethod("setTitle", &Tray::SetTitle)
-      .SetMethod("getTitle", &Tray::GetTitle)
       .SetMethod("setHighlightMode", &Tray::SetHighlightMode)
       .SetMethod("setIgnoreDoubleClickEvents",
                  &Tray::SetIgnoreDoubleClickEvents)

atom/browser/api/atom_api_tray.h

@@ -69,7 +69,6 @@ class Tray : public mate::TrackableObject<Tray>, public TrayIconObserver {
   void SetPressedImage(v8::Isolate* isolate, mate::Handle<NativeImage> image);
   void SetToolTip(const std::string& tool_tip);
   void SetTitle(const std::string& title);
-  std::string GetTitle();
   void SetHighlightMode(TrayIcon::HighlightMode mode);
   void SetIgnoreDoubleClickEvents(bool ignore);
   bool GetIgnoreDoubleClickEvents();

atom/browser/api/atom_api_url_request.cc

@@ -354,7 +354,7 @@ void URLRequest::OnReceivedRedirect(
 }
 
 void URLRequest::OnAuthenticationRequired(
-    const net::AuthChallengeInfo& auth_info) {
+    scoped_refptr<const net::AuthChallengeInfo> auth_info) {
   if (request_state_.Canceled() || request_state_.Closed()) {
     return;
   }
@@ -364,7 +364,7 @@ void URLRequest::OnAuthenticationRequired(
     return;
   }
 
-  Emit("login", auth_info,
+  Emit("login", auth_info.get(),
        base::Bind(&AtomURLRequest::PassLoginInformation, atom_request_));
 }
 

atom/browser/api/atom_api_url_request.h

@@ -105,7 +105,8 @@ class URLRequest : public mate::EventEmitter<URLRequest> {
       const std::string& method,
       const GURL& url,
       scoped_refptr<net::HttpResponseHeaders> response_headers);
-  void OnAuthenticationRequired(const net::AuthChallengeInfo& auth_info);
+  void OnAuthenticationRequired(
+      scoped_refptr<const net::AuthChallengeInfo> auth_info);
   void OnResponseStarted(
       scoped_refptr<net::HttpResponseHeaders> response_headers);
   void OnResponseData(scoped_refptr<const net::IOBufferWithSize> data);

atom/browser/api/atom_api_view.cc

@@ -4,9 +4,10 @@
 
 #include "atom/browser/api/atom_api_view.h"
 
-#include "atom/common/node_includes.h"
 #include "native_mate/dictionary.h"
 
+#include "atom/common/node_includes.h"
+
 namespace atom {
 
 namespace api {

atom/browser/api/atom_api_web_contents.cc

@@ -45,7 +45,6 @@
 #include "atom/common/native_mate_converters/network_converter.h"
 #include "atom/common/native_mate_converters/string16_converter.h"
 #include "atom/common/native_mate_converters/value_converter.h"
-#include "atom/common/node_includes.h"
 #include "atom/common/options_switches.h"
 #include "base/message_loop/message_loop.h"
 #include "base/no_destructor.h"
@@ -55,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"
@@ -78,15 +77,11 @@
 #include "content/public/browser/storage_partition.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/context_menu_params.h"
-#include "electron/atom/common/api/api.mojom.h"
-#include "mojo/public/cpp/system/platform_handle.h"
 #include "native_mate/converter.h"
 #include "native_mate/dictionary.h"
 #include "native_mate/object_template_builder.h"
 #include "net/url_request/url_request_context.h"
-#include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h"
 #include "third_party/blink/public/mojom/frame/find_in_page.mojom.h"
-#include "third_party/blink/public/platform/web_cursor_info.h"
 #include "third_party/blink/public/platform/web_input_event.h"
 #include "ui/display/screen.h"
 #include "ui/events/base_event_utils.h"
@@ -101,7 +96,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
 
@@ -110,6 +105,8 @@
 #include "components/printing/common/print_messages.h"
 #endif
 
+#include "atom/common/node_includes.h"
+
 namespace mate {
 
 #if BUILDFLAG(ENABLE_PRINTING)
@@ -242,9 +239,26 @@ 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) {
   // Hack to enable transparency in captured image
+  // TODO(nitsakh) Remove hack once fixed in chromium
+  const_cast<SkBitmap&>(bitmap).setAlphaType(kPremul_SkAlphaType);
   promise.Resolve(gfx::Image::CreateFrom1xBitmap(bitmap));
 }
 
@@ -263,6 +277,12 @@ struct WebContents::FrameDispatchHelper {
   void OnGetZoomLevel(IPC::Message* reply_msg) {
     api_web_contents->OnGetZoomLevel(rfh, reply_msg);
   }
+
+  void OnRendererMessageSync(const std::string& channel,
+                             const base::ListValue& args,
+                             IPC::Message* message) {
+    api_web_contents->OnRendererMessageSync(rfh, channel, args, message);
+  }
 };
 
 WebContents::WebContents(v8::Isolate* isolate,
@@ -273,10 +293,6 @@ WebContents::WebContents(v8::Isolate* isolate,
   Init(isolate);
   AttachAsUserData(web_contents);
   InitZoomController(web_contents, mate::Dictionary::CreateEmpty(isolate));
-  registry_.AddInterface(base::BindRepeating(&WebContents::BindElectronBrowser,
-                                             base::Unretained(this)));
-  bindings_.set_connection_error_handler(base::BindRepeating(
-      &WebContents::OnElectronBrowserConnectionError, base::Unretained(this)));
 }
 
 WebContents::WebContents(v8::Isolate* isolate,
@@ -424,11 +440,6 @@ void WebContents::InitWithSessionAndOptions(
   // Initialize zoom controller.
   InitZoomController(web_contents(), options);
 
-  registry_.AddInterface(base::BindRepeating(&WebContents::BindElectronBrowser,
-                                             base::Unretained(this)));
-  bindings_.set_connection_error_handler(base::BindRepeating(
-      &WebContents::OnElectronBrowserConnectionError, base::Unretained(this)));
-
   web_contents()->SetUserAgentOverride(GetBrowserContext()->GetUserAgent(),
                                        false);
 
@@ -491,14 +502,12 @@ void WebContents::DestroyWebContents(bool async) {
   ResetManagedWebContents(async);
 }
 
-bool WebContents::DidAddMessageToConsole(
-    content::WebContents* source,
-    blink::mojom::ConsoleMessageLevel level,
-    const base::string16& message,
-    int32_t line_no,
-    const base::string16& source_id) {
-  return Emit("console-message", static_cast<int32_t>(level), message, line_no,
-              source_id);
+bool WebContents::DidAddMessageToConsole(content::WebContents* source,
+                                         int32_t level,
+                                         const base::string16& message,
+                                         int32_t line_no,
+                                         const base::string16& source_id) {
+  return Emit("console-message", level, message, line_no, source_id);
 }
 
 void WebContents::OnCreateWindow(
@@ -674,8 +683,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,
@@ -810,32 +818,25 @@ void WebContents::PluginCrashed(const base::FilePath& plugin_path,
 }
 
 void WebContents::MediaStartedPlaying(const MediaPlayerInfo& video_type,
-                                      const content::MediaPlayerId& id) {
+                                      const MediaPlayerId& id) {
   Emit("media-started-playing");
 }
 
 void WebContents::MediaStoppedPlaying(
     const MediaPlayerInfo& video_type,
-    const content::MediaPlayerId& id,
+    const MediaPlayerId& id,
     content::WebContentsObserver::MediaStoppedReason reason) {
   Emit("media-paused");
 }
 
-void WebContents::DidChangeThemeColor(base::Optional<SkColor> theme_color) {
-  if (theme_color) {
-    Emit("did-change-theme-color", atom::ToRGBHex(theme_color.value()));
+void WebContents::DidChangeThemeColor(SkColor theme_color) {
+  if (theme_color != SK_ColorTRANSPARENT) {
+    Emit("did-change-theme-color", atom::ToRGBHex(theme_color));
   } else {
     Emit("did-change-theme-color", nullptr);
   }
 }
 
-void WebContents::OnInterfaceRequestFromFrame(
-    content::RenderFrameHost* render_frame_host,
-    const std::string& interface_name,
-    mojo::ScopedMessagePipeHandle* interface_pipe) {
-  registry_.TryBindInterface(interface_name, interface_pipe, render_frame_host);
-}
-
 void WebContents::DocumentLoadedInFrame(
     content::RenderFrameHost* render_frame_host) {
   if (!render_frame_host->GetParent())
@@ -899,75 +900,6 @@ bool WebContents::EmitNavigationEvent(
               frame_routing_id);
 }
 
-void WebContents::BindElectronBrowser(
-    mojom::ElectronBrowserRequest request,
-    content::RenderFrameHost* render_frame_host) {
-  auto id = bindings_.AddBinding(this, std::move(request), render_frame_host);
-  frame_to_bindings_map_[render_frame_host].push_back(id);
-}
-
-void WebContents::OnElectronBrowserConnectionError() {
-  auto binding_id = bindings_.dispatch_binding();
-  auto* frame_host = bindings_.dispatch_context();
-  base::Erase(frame_to_bindings_map_[frame_host], binding_id);
-}
-
-void WebContents::Message(bool internal,
-                          const std::string& channel,
-                          base::Value arguments) {
-  // webContents.emit('-ipc-message', new Event(), internal, channel,
-  // arguments);
-  EmitWithSender("-ipc-message", bindings_.dispatch_context(), base::nullopt,
-                 internal, channel, std::move(arguments));
-}
-
-void WebContents::MessageSync(bool internal,
-                              const std::string& channel,
-                              base::Value arguments,
-                              MessageSyncCallback callback) {
-  // webContents.emit('-ipc-message-sync', new Event(sender, message), internal,
-  // channel, arguments);
-  EmitWithSender("-ipc-message-sync", bindings_.dispatch_context(),
-                 std::move(callback), internal, channel, std::move(arguments));
-}
-
-void WebContents::MessageTo(bool internal,
-                            bool send_to_all,
-                            int32_t web_contents_id,
-                            const std::string& channel,
-                            base::Value arguments) {
-  auto* web_contents = mate::TrackableObject<WebContents>::FromWeakMapID(
-      isolate(), web_contents_id);
-
-  if (web_contents) {
-    web_contents->SendIPCMessageWithSender(internal, send_to_all, channel,
-                                           base::ListValue(arguments.GetList()),
-                                           ID());
-  }
-}
-
-void WebContents::MessageHost(const std::string& channel,
-                              base::Value arguments) {
-  // webContents.emit('ipc-message-host', new Event(), channel, args);
-  EmitWithSender("ipc-message-host", bindings_.dispatch_context(),
-                 base::nullopt, channel, std::move(arguments));
-}
-
-void WebContents::RenderFrameDeleted(
-    content::RenderFrameHost* render_frame_host) {
-  // A RenderFrameHost can be destroyed before the related Mojo binding is
-  // closed, which can result in Mojo calls being sent for RenderFrameHosts
-  // that no longer exist. To prevent this from happening, when a
-  // RenderFrameHost goes away, we close all the bindings related to that
-  // frame.
-  auto it = frame_to_bindings_map_.find(render_frame_host);
-  if (it == frame_to_bindings_map_.end())
-    return;
-  for (auto id : it->second)
-    bindings_.RemoveBinding(id);
-  frame_to_bindings_map_.erase(it);
-}
-
 void WebContents::DidStartNavigation(
     content::NavigationHandle* navigation_handle) {
   EmitNavigationEvent("did-start-navigation", navigation_handle);
@@ -1131,6 +1063,10 @@ bool WebContents::OnMessageReceived(const IPC::Message& message,
   bool handled = true;
   FrameDispatchHelper helper = {this, frame_host};
   IPC_BEGIN_MESSAGE_MAP_WITH_PARAM(WebContents, message, frame_host)
+    IPC_MESSAGE_HANDLER(AtomFrameHostMsg_Message, OnRendererMessage)
+    IPC_MESSAGE_FORWARD_DELAY_REPLY(AtomFrameHostMsg_Message_Sync, &helper,
+                                    FrameDispatchHelper::OnRendererMessageSync)
+    IPC_MESSAGE_HANDLER(AtomFrameHostMsg_Message_To, OnRendererMessageTo)
     IPC_MESSAGE_FORWARD_DELAY_REPLY(
         AtomFrameHostMsg_SetTemporaryZoomLevel, &helper,
         FrameDispatchHelper::OnSetTemporaryZoomLevel)
@@ -1195,7 +1131,7 @@ void WebContents::SetBackgroundThrottling(bool allowed) {
     return;
   }
 
-  auto* render_view_host = contents->GetRenderViewHost();
+  const auto* render_view_host = contents->GetRenderViewHost();
   if (!render_view_host) {
     return;
   }
@@ -1376,16 +1312,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> handle = promise.GetHandle();
-
-  auto* handler = new SavePageHandler(web_contents(), std::move(promise));
-  handler->Handle(full_file_path, save_type);
-
-  return handle;
+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) {
@@ -1482,23 +1413,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;
@@ -1516,6 +1430,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);
@@ -1580,13 +1528,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
 
@@ -1736,13 +1682,14 @@ bool WebContents::SendIPCMessageWithSender(bool internal,
     target_hosts = web_contents()->GetAllFrames();
   }
 
+  bool handled = false;
   for (auto* frame_host : target_hosts) {
-    mojom::ElectronRendererAssociatedPtr electron_ptr;
-    frame_host->GetRemoteAssociatedInterfaces()->GetInterface(
-        mojo::MakeRequest(&electron_ptr));
-    electron_ptr->Message(internal, false, channel, args.Clone(), sender_id);
+    handled = frame_host->Send(
+                  new AtomFrameMsg_Message(frame_host->GetRoutingID(), internal,
+                                           false, channel, args, sender_id)) ||
+              handled;
   }
-  return true;
+  return handled;
 }
 
 bool WebContents::SendIPCMessageToFrame(bool internal,
@@ -1758,13 +1705,8 @@ bool WebContents::SendIPCMessageToFrame(bool internal,
     return false;
   if (!(*iter)->IsRenderFrameLive())
     return false;
-
-  mojom::ElectronRendererAssociatedPtr electron_ptr;
-  (*iter)->GetRemoteAssociatedInterfaces()->GetInterface(
-      mojo::MakeRequest(&electron_ptr));
-  electron_ptr->Message(internal, send_to_all, channel, args.Clone(),
-                        0 /* sender_id */);
-  return true;
+  return (*iter)->Send(new AtomFrameMsg_Message(
+      frame_id, internal, send_to_all, channel, args, 0 /* sender_id */));
 }
 
 void WebContents::SendInputEvent(v8::Isolate* isolate,
@@ -1806,19 +1748,6 @@ void WebContents::SendInputEvent(v8::Isolate* isolate,
             mouse_wheel_event);
 #endif
       } else {
-        // Chromium expects phase info in wheel events (and applies a
-        // DCHECK to verify it). See: https://crbug.com/756524.
-        mouse_wheel_event.phase = blink::WebMouseWheelEvent::kPhaseBegan;
-        mouse_wheel_event.dispatch_type = blink::WebInputEvent::kBlocking;
-        rwh->ForwardWheelEvent(mouse_wheel_event);
-
-        // Send a synthetic wheel event with phaseEnded to finish scrolling.
-        mouse_wheel_event.has_synthetic_phase = true;
-        mouse_wheel_event.delta_x = 0;
-        mouse_wheel_event.delta_y = 0;
-        mouse_wheel_event.phase = blink::WebMouseWheelEvent::kPhaseEnded;
-        mouse_wheel_event.dispatch_type =
-            blink::WebInputEvent::kEventNonBlocking;
         rwh->ForwardWheelEvent(mouse_wheel_event);
       }
       return;
@@ -1840,7 +1769,7 @@ void WebContents::BeginFrameSubscription(mate::Arguments* args) {
   }
 
   frame_subscriber_.reset(
-      new FrameSubscriber(web_contents(), callback, only_dirty));
+      new FrameSubscriber(isolate(), web_contents(), callback, only_dirty));
 }
 
 void WebContents::EndFrameSubscription() {
@@ -1918,9 +1847,10 @@ v8::Local<v8::Promise> WebContents::CapturePage(mate::Arguments* args) {
 }
 
 void WebContents::OnCursorChange(const content::WebCursor& cursor) {
-  const content::CursorInfo& info = cursor.info();
+  content::CursorInfo info;
+  cursor.GetCursorInfo(&info);
 
-  if (info.type == blink::WebCursorInfo::kTypeCustom) {
+  if (cursor.IsCustom()) {
     Emit("cursor-changed", CursorTypeToString(info),
          gfx::Image::CreateFrom1xBitmap(info.custom_image),
          info.image_scale_factor,
@@ -2070,9 +2000,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();
   }
@@ -2155,36 +2082,22 @@ void WebContents::GrantOriginAccess(const GURL& url) {
       url::Origin::Create(url));
 }
 
-void WebContents::TakeHeapSnapshot(const base::FilePath& file_path,
-                                   base::Callback<void(bool)> callback) {
+bool WebContents::TakeHeapSnapshot(const base::FilePath& file_path,
+                                   const std::string& channel) {
   base::ThreadRestrictions::ScopedAllowIO allow_io;
 
   base::File file(file_path,
                   base::File::FLAG_CREATE_ALWAYS | base::File::FLAG_WRITE);
-  if (!file.IsValid()) {
-    std::move(callback).Run(false);
-    return;
-  }
+  if (!file.IsValid())
+    return false;
 
   auto* frame_host = web_contents()->GetMainFrame();
-  if (!frame_host) {
-    std::move(callback).Run(false);
-    return;
-  }
+  if (!frame_host)
+    return false;
 
-  // This dance with `base::Owned` is to ensure that the interface stays alive
-  // until the callback is called. Otherwise it would be closed at the end of
-  // this function.
-  auto electron_ptr = std::make_unique<mojom::ElectronRendererAssociatedPtr>();
-  frame_host->GetRemoteAssociatedInterfaces()->GetInterface(
-      mojo::MakeRequest(electron_ptr.get()));
-  auto* raw_ptr = electron_ptr.get();
-  (*raw_ptr)->TakeHeapSnapshot(
-      mojo::WrapPlatformFile(file.TakePlatformFile()),
-      base::BindOnce([](mojom::ElectronRendererAssociatedPtr* ep,
-                        base::Callback<void(bool)> callback,
-                        bool success) { callback.Run(success); },
-                     base::Owned(std::move(electron_ptr)), callback));
+  return frame_host->Send(new AtomFrameMsg_TakeHeapSnapshot(
+      frame_host->GetRoutingID(),
+      IPC::TakePlatformFileForTransit(std::move(file)), channel));
 }
 
 // static
@@ -2269,8 +2182,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)
@@ -2302,6 +2217,36 @@ AtomBrowserContext* WebContents::GetBrowserContext() const {
   return static_cast<AtomBrowserContext*>(web_contents()->GetBrowserContext());
 }
 
+void WebContents::OnRendererMessage(content::RenderFrameHost* frame_host,
+                                    const std::string& channel,
+                                    const base::ListValue& args) {
+  // webContents.emit(channel, new Event(), args...);
+  EmitWithSender(channel, frame_host, nullptr, args);
+}
+
+void WebContents::OnRendererMessageSync(content::RenderFrameHost* frame_host,
+                                        const std::string& channel,
+                                        const base::ListValue& args,
+                                        IPC::Message* message) {
+  // webContents.emit(channel, new Event(sender, message), args...);
+  EmitWithSender(channel, frame_host, message, args);
+}
+
+void WebContents::OnRendererMessageTo(content::RenderFrameHost* frame_host,
+                                      bool internal,
+                                      bool send_to_all,
+                                      int32_t web_contents_id,
+                                      const std::string& channel,
+                                      const base::ListValue& args) {
+  auto* web_contents = mate::TrackableObject<WebContents>::FromWeakMapID(
+      isolate(), web_contents_id);
+
+  if (web_contents) {
+    web_contents->SendIPCMessageWithSender(internal, send_to_all, channel, args,
+                                           ID());
+  }
+}
+
 // static
 mate::Handle<WebContents> WebContents::Create(v8::Isolate* isolate,
                                               const mate::Dictionary& options) {

atom/browser/api/atom_api_web_contents.h

@@ -5,7 +5,6 @@
 #ifndef ATOM_BROWSER_API_ATOM_API_WEB_CONTENTS_H_
 #define ATOM_BROWSER_API_ATOM_API_WEB_CONTENTS_H_
 
-#include <map>
 #include <memory>
 #include <string>
 #include <vector>
@@ -20,14 +19,11 @@
 #include "content/common/cursors/webcursor.h"
 #include "content/public/browser/keyboard_event_processing_result.h"
 #include "content/public/browser/web_contents.h"
-#include "content/public/browser/web_contents_binding_set.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/common/favicon_url.h"
-#include "electron/atom/common/api/api.mojom.h"
 #include "electron/buildflags/buildflags.h"
 #include "native_mate/handle.h"
 #include "printing/buildflags/buildflags.h"
-#include "services/service_manager/public/cpp/binder_registry.h"
 #include "ui/gfx/image/image.h"
 
 #if BUILDFLAG(ENABLE_PRINTING)
@@ -77,8 +73,7 @@ class ExtendedWebContentsObserver : public base::CheckedObserver {
 // Wrapper around the content::WebContents.
 class WebContents : public mate::TrackableObject<WebContents>,
                     public CommonWebContentsDelegate,
-                    public content::WebContentsObserver,
-                    public mojom::ElectronBrowser {
+                    public content::WebContentsObserver {
  public:
   enum Type {
     BACKGROUND_PAGE,  // A DevTools extension background page.
@@ -154,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();
@@ -164,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();
@@ -178,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.
@@ -294,8 +293,8 @@ class WebContents : public mate::TrackableObject<WebContents>,
   // the specified URL.
   void GrantOriginAccess(const GURL& url);
 
-  void TakeHeapSnapshot(const base::FilePath& file_path,
-                        base::Callback<void(bool)>);
+  bool TakeHeapSnapshot(const base::FilePath& file_path,
+                        const std::string& channel);
 
   // Properties.
   int32_t ID() const;
@@ -337,7 +336,7 @@ class WebContents : public mate::TrackableObject<WebContents>,
 
   // content::WebContentsDelegate:
   bool DidAddMessageToConsole(content::WebContents* source,
-                              blink::mojom::ConsoleMessageLevel level,
+                              int32_t level,
                               const base::string16& message,
                               int32_t line_no,
                               const base::string16& source_id) override;
@@ -382,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,
@@ -416,7 +414,6 @@ class WebContents : public mate::TrackableObject<WebContents>,
                              content::RenderViewHost* new_host) override;
   void RenderViewDeleted(content::RenderViewHost*) override;
   void RenderProcessGone(base::TerminationStatus status) override;
-  void RenderFrameDeleted(content::RenderFrameHost* render_frame_host) override;
   void DocumentLoadedInFrame(
       content::RenderFrameHost* render_frame_host) override;
   void DidFinishLoad(content::RenderFrameHost* render_frame_host,
@@ -445,16 +442,12 @@ class WebContents : public mate::TrackableObject<WebContents>,
   void PluginCrashed(const base::FilePath& plugin_path,
                      base::ProcessId plugin_pid) override;
   void MediaStartedPlaying(const MediaPlayerInfo& video_type,
-                           const content::MediaPlayerId& id) override;
+                           const MediaPlayerId& id) override;
   void MediaStoppedPlaying(
       const MediaPlayerInfo& video_type,
-      const content::MediaPlayerId& id,
+      const MediaPlayerId& id,
       content::WebContentsObserver::MediaStoppedReason reason) override;
-  void DidChangeThemeColor(base::Optional<SkColor> theme_color) override;
-  void OnInterfaceRequestFromFrame(
-      content::RenderFrameHost* render_frame_host,
-      const std::string& interface_name,
-      mojo::ScopedMessagePipeHandle* interface_pipe) override;
+  void DidChangeThemeColor(SkColor theme_color) override;
 
   // InspectableWebContentsDelegate:
   void DevToolsReloadPage() override;
@@ -475,12 +468,6 @@ class WebContents : public mate::TrackableObject<WebContents>,
   struct FrameDispatchHelper;
   AtomBrowserContext* GetBrowserContext() const;
 
-  // Binds the given request for the ElectronBrowser API. When the
-  // RenderFrameHost is destroyed, all related bindings will be removed.
-  void BindElectronBrowser(mojom::ElectronBrowserRequest request,
-                           content::RenderFrameHost* render_frame_host);
-  void OnElectronBrowserConnectionError();
-
   uint32_t GetNextRequestId() { return ++request_id_; }
 
 #if BUILDFLAG(ENABLE_OSR)
@@ -488,24 +475,28 @@ class WebContents : public mate::TrackableObject<WebContents>,
   OffScreenRenderWidgetHostView* GetOffScreenRenderWidgetHostView() const;
 #endif
 
-  // mojom::ElectronBrowser
-  void Message(bool internal,
-               const std::string& channel,
-               base::Value arguments) override;
-  void MessageSync(bool internal,
-                   const std::string& channel,
-                   base::Value arguments,
-                   MessageSyncCallback callback) override;
-  void MessageTo(bool internal,
-                 bool send_to_all,
-                 int32_t web_contents_id,
-                 const std::string& channel,
-                 base::Value arguments) override;
-  void MessageHost(const std::string& channel, base::Value arguments) override;
-
   // Called when we receive a CursorChange message from chromium.
   void OnCursorChange(const content::WebCursor& cursor);
 
+  // Called when received a message from renderer.
+  void OnRendererMessage(content::RenderFrameHost* frame_host,
+                         const std::string& channel,
+                         const base::ListValue& args);
+
+  // Called when received a synchronous message from renderer.
+  void OnRendererMessageSync(content::RenderFrameHost* frame_host,
+                             const std::string& channel,
+                             const base::ListValue& args,
+                             IPC::Message* message);
+
+  // Called when received a message from renderer to be forwarded.
+  void OnRendererMessageTo(content::RenderFrameHost* frame_host,
+                           bool internal,
+                           bool send_to_all,
+                           int32_t web_contents_id,
+                           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,
@@ -553,11 +544,6 @@ class WebContents : public mate::TrackableObject<WebContents>,
   // -1 means no speculative RVH has been committed yet.
   int currently_committed_process_id_ = -1;
 
-  service_manager::BinderRegistryWithArgs<content::RenderFrameHost*> registry_;
-  mojo::BindingSet<mojom::ElectronBrowser, content::RenderFrameHost*> bindings_;
-  std::map<content::RenderFrameHost*, std::vector<mojo::BindingId>>
-      frame_to_bindings_map_;
-
   DISALLOW_COPY_AND_ASSIGN(WebContents);
 };
 

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)

atom/browser/api/atom_api_web_contents_view.cc

@@ -8,7 +8,6 @@
 #include "atom/browser/browser.h"
 #include "atom/browser/ui/inspectable_web_contents_view.h"
 #include "atom/common/api/constructor.h"
-#include "atom/common/node_includes.h"
 #include "content/public/browser/web_contents_user_data.h"
 #include "native_mate/dictionary.h"
 
@@ -16,6 +15,8 @@
 #include "atom/browser/ui/cocoa/delayed_native_view_host.h"
 #endif
 
+#include "atom/common/node_includes.h"
+
 namespace {
 
 // Used to indicate whether a WebContents already has a view.

atom/browser/api/atom_api_web_view_manager.cc

@@ -7,11 +7,14 @@
 #include "atom/browser/web_view_manager.h"
 #include "atom/common/native_mate_converters/content_converter.h"
 #include "atom/common/native_mate_converters/value_converter.h"
-#include "atom/common/node_includes.h"
 #include "atom/common/options_switches.h"
 #include "content/public/browser/browser_context.h"
 #include "native_mate/dictionary.h"
 
+// Must be the last in the includes list.
+// See https://github.com/electron/electron/issues/10363
+#include "atom/common/node_includes.h"
+
 using atom::WebContentsPreferences;
 
 namespace {

atom/browser/api/event.cc

@@ -4,8 +4,6 @@
 
 #include "atom/browser/api/event.h"
 
-#include <utility>
-
 #include "atom/common/api/api_messages.h"
 #include "atom/common/native_mate_converters/string16_converter.h"
 #include "atom/common/native_mate_converters/value_converter.h"
@@ -22,11 +20,11 @@ Event::Event(v8::Isolate* isolate) {
 Event::~Event() {}
 
 void Event::SetSenderAndMessage(content::RenderFrameHost* sender,
-                                base::Optional<MessageSyncCallback> callback) {
+                                IPC::Message* message) {
   DCHECK(!sender_);
-  DCHECK(!callback_);
+  DCHECK(!message_);
   sender_ = sender;
-  callback_ = std::move(callback);
+  message_ = message;
 
   Observe(content::WebContents::FromRenderFrameHost(sender));
 }
@@ -35,7 +33,7 @@ void Event::RenderFrameDeleted(content::RenderFrameHost* rfh) {
   if (sender_ != rfh)
     return;
   sender_ = nullptr;
-  callback_.reset();
+  message_ = nullptr;
 }
 
 void Event::RenderFrameHostChanged(content::RenderFrameHost* old_rfh,
@@ -48,23 +46,22 @@ void Event::FrameDeleted(content::RenderFrameHost* rfh) {
   if (sender_ != rfh)
     return;
   sender_ = nullptr;
-  callback_.reset();
+  message_ = nullptr;
 }
 
 void Event::PreventDefault(v8::Isolate* isolate) {
-  GetWrapper()
-      ->Set(isolate->GetCurrentContext(),
-            StringToV8(isolate, "defaultPrevented"), v8::True(isolate))
-      .Check();
+  GetWrapper()->Set(StringToV8(isolate, "defaultPrevented"), v8::True(isolate));
 }
 
 bool Event::SendReply(const base::ListValue& result) {
-  if (!callback_ || sender_ == nullptr)
+  if (message_ == nullptr || sender_ == nullptr)
     return false;
 
-  std::move(*callback_).Run(result.Clone());
-  callback_.reset();
-  return true;
+  AtomFrameHostMsg_Message_Sync::WriteReplyParams(message_, result);
+  bool success = sender_->Send(message_);
+  message_ = nullptr;
+  sender_ = nullptr;
+  return success;
 }
 
 // static

atom/browser/api/event.h

@@ -5,9 +5,7 @@
 #ifndef ATOM_BROWSER_API_EVENT_H_
 #define ATOM_BROWSER_API_EVENT_H_
 
-#include "base/optional.h"
 #include "content/public/browser/web_contents_observer.h"
-#include "electron/atom/common/api/api.mojom.h"
 #include "native_mate/handle.h"
 #include "native_mate/wrappable.h"
 
@@ -19,7 +17,6 @@ namespace mate {
 
 class Event : public Wrappable<Event>, public content::WebContentsObserver {
  public:
-  using MessageSyncCallback = atom::mojom::ElectronBrowser::MessageSyncCallback;
   static Handle<Event> Create(v8::Isolate* isolate);
 
   static void BuildPrototype(v8::Isolate* isolate,
@@ -27,7 +24,7 @@ class Event : public Wrappable<Event>, public content::WebContentsObserver {
 
   // Pass the sender and message to be replied.
   void SetSenderAndMessage(content::RenderFrameHost* sender,
-                           base::Optional<MessageSyncCallback> callback);
+                           IPC::Message* message);
 
   // event.PreventDefault().
   void PreventDefault(v8::Isolate* isolate);
@@ -48,7 +45,7 @@ class Event : public Wrappable<Event>, public content::WebContentsObserver {
  private:
   // Replyer for the synchronous messages.
   content::RenderFrameHost* sender_ = nullptr;
-  base::Optional<MessageSyncCallback> callback_;
+  IPC::Message* message_ = nullptr;
 
   DISALLOW_COPY_AND_ASSIGN(Event);
 };

atom/browser/api/event_emitter.cc

@@ -4,16 +4,15 @@
 
 #include "atom/browser/api/event_emitter.h"
 
-#include <utility>
-
 #include "atom/browser/api/event.h"
-#include "atom/common/node_includes.h"
 #include "content/public/browser/render_frame_host.h"
 #include "native_mate/arguments.h"
 #include "native_mate/dictionary.h"
 #include "native_mate/object_template_builder.h"
 #include "ui/events/event_constants.h"
 
+#include "atom/common/node_includes.h"
+
 namespace mate {
 
 namespace {
@@ -44,18 +43,16 @@ v8::Local<v8::Object> CreateEventObject(v8::Isolate* isolate) {
 
 namespace internal {
 
-v8::Local<v8::Object> CreateJSEvent(
-    v8::Isolate* isolate,
-    v8::Local<v8::Object> object,
-    content::RenderFrameHost* sender,
-    base::Optional<atom::mojom::ElectronBrowser::MessageSyncCallback>
-        callback) {
+v8::Local<v8::Object> CreateJSEvent(v8::Isolate* isolate,
+                                    v8::Local<v8::Object> object,
+                                    content::RenderFrameHost* sender,
+                                    IPC::Message* message) {
   v8::Local<v8::Object> event;
-  bool use_native_event = sender && callback;
+  bool use_native_event = sender && message;
 
   if (use_native_event) {
     mate::Handle<mate::Event> native_event = mate::Event::Create(isolate);
-    native_event->SetSenderAndMessage(sender, std::move(callback));
+    native_event->SetSenderAndMessage(sender, message);
     event = v8::Local<v8::Object>::Cast(native_event.ToV8());
   } else {
     event = CreateEventObject(isolate);
@@ -82,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();
 }
 

atom/browser/api/event_emitter.h

@@ -5,28 +5,28 @@
 #ifndef ATOM_BROWSER_API_EVENT_EMITTER_H_
 #define ATOM_BROWSER_API_EVENT_EMITTER_H_
 
-#include <utility>
 #include <vector>
 
 #include "atom/common/api/event_emitter_caller.h"
-#include "base/optional.h"
 #include "content/public/browser/browser_thread.h"
-#include "electron/atom/common/api/api.mojom.h"
 #include "native_mate/wrappable.h"
 
 namespace content {
 class RenderFrameHost;
 }
 
+namespace IPC {
+class Message;
+}
+
 namespace mate {
 
 namespace internal {
 
-v8::Local<v8::Object> CreateJSEvent(
-    v8::Isolate* isolate,
-    v8::Local<v8::Object> object,
-    content::RenderFrameHost* sender,
-    base::Optional<atom::mojom::ElectronBrowser::MessageSyncCallback> callback);
+v8::Local<v8::Object> CreateJSEvent(v8::Isolate* isolate,
+                                    v8::Local<v8::Object> object,
+                                    content::RenderFrameHost* sender,
+                                    IPC::Message* message);
 v8::Local<v8::Object> CreateCustomEvent(v8::Isolate* isolate,
                                         v8::Local<v8::Object> object,
                                         v8::Local<v8::Object> event);
@@ -69,25 +69,23 @@ class EventEmitter : public Wrappable<T> {
   // this.emit(name, new Event(), args...);
   template <typename... Args>
   bool Emit(const base::StringPiece& name, const Args&... args) {
-    return EmitWithSender(name, nullptr, base::nullopt, args...);
+    return EmitWithSender(name, nullptr, nullptr, args...);
   }
 
   // this.emit(name, new Event(sender, message), args...);
   template <typename... Args>
-  bool EmitWithSender(
-      const base::StringPiece& name,
-      content::RenderFrameHost* sender,
-      base::Optional<atom::mojom::ElectronBrowser::MessageSyncCallback>
-          callback,
-      const Args&... args) {
+  bool EmitWithSender(const base::StringPiece& name,
+                      content::RenderFrameHost* sender,
+                      IPC::Message* message,
+                      const Args&... args) {
     v8::Locker locker(isolate());
     v8::HandleScope handle_scope(isolate());
     v8::Local<v8::Object> wrapper = GetWrapper();
     if (wrapper.IsEmpty()) {
       return false;
     }
-    v8::Local<v8::Object> event = internal::CreateJSEvent(
-        isolate(), wrapper, sender, std::move(callback));
+    v8::Local<v8::Object> event =
+        internal::CreateJSEvent(isolate(), wrapper, sender, message);
     return EmitWithEvent(name, event, args...);
   }
 
@@ -104,13 +102,9 @@ class EventEmitter : public Wrappable<T> {
     v8::Locker locker(isolate());
     v8::HandleScope handle_scope(isolate());
     EmitEvent(isolate(), GetWrapper(), name, event, args...);
-    auto context = isolate()->GetCurrentContext();
-    v8::Local<v8::Value> defaultPrevented;
-    if (event->Get(context, StringToV8(isolate(), "defaultPrevented"))
-            .ToLocal(&defaultPrevented)) {
-      return defaultPrevented->BooleanValue(isolate());
-    }
-    return false;
+    return event->Get(StringToV8(isolate(), "defaultPrevented"))
+        ->BooleanValue(isolate()->GetCurrentContext())
+        .ToChecked();
   }
 
   DISALLOW_COPY_AND_ASSIGN(EventEmitter);

atom/browser/api/frame_subscriber.cc

@@ -10,21 +10,22 @@
 #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/geometry/size_conversions.h"
-#include "ui/gfx/image/image.h"
 #include "ui/gfx/skbitmap_operations.h"
 
+#include "atom/common/node_includes.h"
+
 namespace atom {
 
 namespace api {
 
 constexpr static int kMaxFrameRate = 30;
 
-FrameSubscriber::FrameSubscriber(content::WebContents* web_contents,
+FrameSubscriber::FrameSubscriber(v8::Isolate* isolate,
+                                 content::WebContents* web_contents,
                                  const FrameCaptureCallback& callback,
                                  bool only_dirty)
     : content::WebContentsObserver(web_contents),
+      isolate_(isolate),
       callback_(callback),
       only_dirty_(only_dirty),
       weak_ptr_factory_(this) {
@@ -44,9 +45,10 @@ void FrameSubscriber::AttachToHost(content::RenderWidgetHost* host) {
     return;
 
   // Create and configure the video capturer.
-  gfx::Size size = GetRenderViewSize();
   video_capturer_ = host_->GetView()->CreateVideoCapturer();
-  video_capturer_->SetResolutionConstraints(size, size, true);
+  video_capturer_->SetResolutionConstraints(
+      host_->GetView()->GetViewBounds().size(),
+      host_->GetView()->GetViewBounds().size(), true);
   video_capturer_->SetAutoThrottlingEnabled(false);
   video_capturer_->SetMinSizeChangePeriod(base::TimeDelta());
   video_capturer_->SetFormat(media::PIXEL_FORMAT_ARGB,
@@ -85,11 +87,12 @@ 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 size = GetRenderViewSize();
-  if (size != content_rect.size()) {
-    video_capturer_->SetResolutionConstraints(size, size, true);
+  gfx::Size view_size = host_->GetView()->GetViewBounds().size();
+  if (view_size != content_rect.size()) {
+    video_capturer_->SetResolutionConstraints(view_size, view_size, true);
     video_capturer_->RequestRefreshFrame();
     return;
   }
@@ -146,30 +149,26 @@ void FrameSubscriber::Done(const gfx::Rect& damage, const SkBitmap& frame) {
   if (frame.drawsNothing())
     return;
 
+  v8::Locker locker(isolate_);
+  v8::HandleScope handle_scope(isolate_);
+
+  const_cast<SkBitmap&>(frame).setAlphaType(kPremul_SkAlphaType);
   const SkBitmap& bitmap = only_dirty_ ? SkBitmapOperations::CreateTiledBitmap(
                                              frame, damage.x(), damage.y(),
                                              damage.width(), damage.height())
                                        : frame;
 
-  // Copying SkBitmap does not copy the internal pixels, we have to manually
-  // allocate and write pixels otherwise crash may happen when the original
-  // frame is modified.
-  SkBitmap copy;
-  copy.allocPixels(SkImageInfo::Make(bitmap.width(), bitmap.height(),
-                                     kRGBA_8888_SkColorType,
-                                     kPremul_SkAlphaType));
-  SkPixmap pixmap;
-  bool success = bitmap.peekPixels(&pixmap) && copy.writePixels(pixmap, 0, 0);
-  CHECK(success);
+  size_t rgb_row_size = bitmap.width() * bitmap.bytesPerPixel();
+  auto* source = static_cast<const char*>(bitmap.getPixels());
 
-  callback_.Run(gfx::Image::CreateFrom1xBitmap(copy), damage);
-}
+  v8::MaybeLocal<v8::Object> buffer =
+      node::Buffer::Copy(isolate_, source, rgb_row_size * bitmap.height());
+  auto local_buffer = buffer.ToLocalChecked();
 
-gfx::Size FrameSubscriber::GetRenderViewSize() const {
-  content::RenderWidgetHostView* view = host_->GetView();
-  gfx::Size size = view->GetViewBounds().size();
-  return gfx::ToRoundedSize(
-      gfx::ScaleSize(gfx::SizeF(size), view->GetDeviceScaleFactor()));
+  v8::Local<v8::Value> damage_rect =
+      mate::Converter<gfx::Rect>::ToV8(isolate_, damage);
+
+  callback_.Run(local_buffer, damage_rect);
 }
 
 }  // namespace api

atom/browser/api/frame_subscriber.h

@@ -14,10 +14,6 @@
 #include "content/public/browser/web_contents_observer.h"
 #include "v8/include/v8.h"
 
-namespace gfx {
-class Image;
-}
-
 namespace atom {
 
 namespace api {
@@ -28,9 +24,10 @@ class FrameSubscriber : public content::WebContentsObserver,
                         public viz::mojom::FrameSinkVideoConsumer {
  public:
   using FrameCaptureCallback =
-      base::Callback<void(const gfx::Image&, const gfx::Rect&)>;
+      base::Callback<void(v8::Local<v8::Value>, v8::Local<v8::Value>)>;
 
-  FrameSubscriber(content::WebContents* web_contents,
+  FrameSubscriber(v8::Isolate* isolate,
+                  content::WebContents* web_contents,
                   const FrameCaptureCallback& callback,
                   bool only_dirty);
   ~FrameSubscriber() override;
@@ -48,15 +45,14 @@ 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;
 
   void Done(const gfx::Rect& damage, const SkBitmap& frame);
 
-  // Get the pixel size of render view.
-  gfx::Size GetRenderViewSize() const;
-
+  v8::Isolate* isolate_;
   FrameCaptureCallback callback_;
   bool only_dirty_;
 

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>();

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;

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"
 

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);
   }
 }

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

atom/browser/api/stream_subscriber.cc

@@ -9,10 +9,11 @@
 #include "atom/browser/net/url_request_stream_job.h"
 #include "atom/common/api/event_emitter_caller.h"
 #include "atom/common/native_mate_converters/callback.h"
-#include "atom/common/node_includes.h"
 #include "base/task/post_task.h"
 #include "content/public/browser/browser_task_traits.h"
 
+#include "atom/common/node_includes.h"
+
 namespace mate {
 
 StreamSubscriber::StreamSubscriber(

atom/browser/api/views/atom_api_box_layout.cc

@@ -8,9 +8,10 @@
 
 #include "atom/browser/api/atom_api_view.h"
 #include "atom/common/api/constructor.h"
-#include "atom/common/node_includes.h"
 #include "native_mate/dictionary.h"
 
+#include "atom/common/node_includes.h"
+
 namespace mate {
 
 template <>

atom/browser/api/views/atom_api_button.cc

@@ -5,9 +5,10 @@
 #include "atom/browser/api/views/atom_api_button.h"
 
 #include "atom/common/api/constructor.h"
-#include "atom/common/node_includes.h"
 #include "native_mate/dictionary.h"
 
+#include "atom/common/node_includes.h"
+
 namespace atom {
 
 namespace api {

atom/browser/api/views/atom_api_label_button.cc

@@ -5,10 +5,11 @@
 #include "atom/browser/api/views/atom_api_label_button.h"
 
 #include "atom/common/api/constructor.h"
-#include "atom/common/node_includes.h"
 #include "base/strings/utf_string_conversions.h"
 #include "native_mate/dictionary.h"
 
+#include "atom/common/node_includes.h"
+
 namespace atom {
 
 namespace api {

atom/browser/api/views/atom_api_layout_manager.cc

@@ -5,9 +5,10 @@
 #include "atom/browser/api/views/atom_api_layout_manager.h"
 
 #include "atom/common/api/constructor.h"
-#include "atom/common/node_includes.h"
 #include "native_mate/dictionary.h"
 
+#include "atom/common/node_includes.h"
+
 namespace atom {
 
 namespace api {

atom/browser/api/views/atom_api_md_text_button.cc

@@ -5,10 +5,11 @@
 #include "atom/browser/api/views/atom_api_md_text_button.h"
 
 #include "atom/common/api/constructor.h"
-#include "atom/common/node_includes.h"
 #include "base/strings/utf_string_conversions.h"
 #include "native_mate/dictionary.h"
 
+#include "atom/common/node_includes.h"
+
 namespace atom {
 
 namespace api {

atom/browser/api/views/atom_api_resize_area.cc

@@ -5,9 +5,10 @@
 #include "atom/browser/api/views/atom_api_resize_area.h"
 
 #include "atom/common/api/constructor.h"
-#include "atom/common/node_includes.h"
 #include "native_mate/dictionary.h"
 
+#include "atom/common/node_includes.h"
+
 namespace atom {
 
 namespace api {

atom/browser/api/views/atom_api_text_field.cc

@@ -5,9 +5,10 @@
 #include "atom/browser/api/views/atom_api_text_field.h"
 
 #include "atom/common/api/constructor.h"
-#include "atom/common/node_includes.h"
 #include "native_mate/dictionary.h"
 
+#include "atom/common/node_includes.h"
+
 namespace atom {
 
 namespace api {

atom/browser/atom_blob_reader.cc

@@ -6,9 +6,8 @@
 
 #include <utility>
 
-#include "atom/common/node_includes.h"
 #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"
@@ -17,6 +16,8 @@
 #include "storage/browser/blob/blob_reader.h"
 #include "storage/browser/blob/blob_storage_context.h"
 
+#include "atom/common/node_includes.h"
+
 using content::BrowserThread;
 
 namespace atom {
@@ -27,10 +28,12 @@ void FreeNodeBufferData(char* data, void* hint) {
   delete[] data;
 }
 
-void RunPromiseInUI(util::Promise promise, char* blob_data, int size) {
+void RunCallbackInUI(const AtomBlobReader::CompletionCallback& callback,
+                     char* blob_data,
+                     int size) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  v8::Isolate* isolate = promise.isolate();
 
+  v8::Isolate* isolate = v8::Isolate::GetCurrent();
   v8::Locker locker(isolate);
   v8::HandleScope handle_scope(isolate);
   if (blob_data) {
@@ -38,9 +41,9 @@ void RunPromiseInUI(util::Promise promise, char* blob_data, int size) {
         node::Buffer::New(isolate, blob_data, static_cast<size_t>(size),
                           &FreeNodeBufferData, nullptr)
             .ToLocalChecked();
-    promise.Resolve(buffer);
+    callback.Run(buffer);
   } else {
-    promise.RejectWithErrorMessage("Could not get blob data");
+    callback.Run(v8::Null(isolate));
   }
 }
 
@@ -51,29 +54,29 @@ AtomBlobReader::AtomBlobReader(content::ChromeBlobStorageContext* blob_context)
 
 AtomBlobReader::~AtomBlobReader() {}
 
-void AtomBlobReader::StartReading(const std::string& uuid,
-                                  util::Promise promise) {
+void AtomBlobReader::StartReading(
+    const std::string& uuid,
+    const AtomBlobReader::CompletionCallback& completion_callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   auto blob_data_handle = blob_context_->context()->GetBlobDataFromUUID(uuid);
+  auto callback = base::Bind(&RunCallbackInUI, completion_callback);
   if (!blob_data_handle) {
-    util::Promise::RejectPromise(std::move(promise),
-                                 "Could not get blob data handle");
+    base::PostTaskWithTraits(FROM_HERE, {BrowserThread::UI},
+                             base::BindOnce(callback, nullptr, 0));
     return;
   }
 
   auto blob_reader = blob_data_handle->CreateReader();
   BlobReadHelper* blob_read_helper =
-      new BlobReadHelper(std::move(blob_reader),
-                         base::BindOnce(&RunPromiseInUI, std::move(promise)));
+      new BlobReadHelper(std::move(blob_reader), callback);
   blob_read_helper->Read();
 }
 
 AtomBlobReader::BlobReadHelper::BlobReadHelper(
     std::unique_ptr<storage::BlobReader> blob_reader,
-    BlobReadHelper::CompletionCallback callback)
-    : blob_reader_(std::move(blob_reader)),
-      completion_callback_(std::move(callback)) {}
+    const BlobReadHelper::CompletionCallback& callback)
+    : blob_reader_(std::move(blob_reader)), completion_callback_(callback) {}
 
 AtomBlobReader::BlobReadHelper::~BlobReadHelper() {}
 
@@ -115,9 +118,8 @@ void AtomBlobReader::BlobReadHelper::DidReadBlobData(
 
   char* data = new char[size];
   memcpy(data, blob_data->data(), size);
-  base::PostTaskWithTraits(
-      FROM_HERE, {BrowserThread::UI},
-      base::BindOnce(std::move(completion_callback_), data, size));
+  base::PostTaskWithTraits(FROM_HERE, {BrowserThread::UI},
+                           base::BindOnce(completion_callback_, data, size));
   delete this;
 }
 

atom/browser/atom_blob_reader.h

@@ -8,7 +8,6 @@
 #include <memory>
 #include <string>
 
-#include "atom/common/promise_util.h"
 #include "base/callback.h"
 
 namespace content {
@@ -36,20 +35,23 @@ namespace atom {
 // except Ctor are expected to be called on IO thread.
 class AtomBlobReader {
  public:
+  using CompletionCallback = base::Callback<void(v8::Local<v8::Value>)>;
+
   explicit AtomBlobReader(content::ChromeBlobStorageContext* blob_context);
   ~AtomBlobReader();
 
-  void StartReading(const std::string& uuid, atom::util::Promise promise);
+  void StartReading(const std::string& uuid,
+                    const AtomBlobReader::CompletionCallback& callback);
 
  private:
   // A self-destroyed helper class to read the blob data.
   // Must be accessed on IO thread.
   class BlobReadHelper {
    public:
-    using CompletionCallback = base::OnceCallback<void(char*, int)>;
+    using CompletionCallback = base::Callback<void(char*, int)>;
 
     BlobReadHelper(std::unique_ptr<storage::BlobReader> blob_reader,
-                   BlobReadHelper::CompletionCallback callback);
+                   const BlobReadHelper::CompletionCallback& callback);
     ~BlobReadHelper();
 
     void Read();

atom/browser/atom_browser_client.cc

@@ -26,8 +26,6 @@
 #include "atom/browser/io_thread.h"
 #include "atom/browser/media/media_capture_devices_dispatcher.h"
 #include "atom/browser/native_window.h"
-#include "atom/browser/net/network_context_service.h"
-#include "atom/browser/net/network_context_service_factory.h"
 #include "atom/browser/notifications/notification_presenter.h"
 #include "atom/browser/notifications/platform_notification_service.h"
 #include "atom/browser/session_preferences.h"
@@ -74,9 +72,9 @@
 #include "ppapi/host/ppapi_host.h"
 #include "printing/buildflags/buildflags.h"
 #include "services/device/public/cpp/geolocation/location_provider.h"
-#include "services/network/public/cpp/features.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"
@@ -498,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)
@@ -534,7 +539,7 @@ std::string AtomBrowserClient::GetGeolocationApiKey() {
   return api_key;
 }
 
-scoped_refptr<content::QuotaPermissionContext>
+content::QuotaPermissionContext*
 AtomBrowserClient::CreateQuotaPermissionContext() {
   return new AtomQuotaPermissionContext;
 }
@@ -689,20 +694,7 @@ network::mojom::NetworkContextPtr AtomBrowserClient::CreateNetworkContext(
     const base::FilePath& /*relative_partition_path*/) {
   if (!browser_context)
     return nullptr;
-
-  if (base::FeatureList::IsEnabled(network::features::kNetworkService)) {
-    return NetworkContextServiceFactory::GetForContext(browser_context)
-        ->CreateNetworkContext();
-  } else {
-    return static_cast<AtomBrowserContext*>(browser_context)
-        ->GetNetworkContext();
-  }
-}
-
-network::mojom::NetworkContext* AtomBrowserClient::GetSystemNetworkContext() {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  DCHECK(g_browser_process->system_network_context_manager());
-  return g_browser_process->system_network_context_manager()->GetContext();
+  return static_cast<AtomBrowserContext*>(browser_context)->GetNetworkContext();
 }
 
 void AtomBrowserClient::RegisterOutOfProcessServices(
@@ -830,11 +822,7 @@ bool AtomBrowserClient::HandleExternalProtocol(
     ui::PageTransition page_transition,
     bool has_user_gesture,
     const std::string& method,
-    const net::HttpRequestHeaders& headers,
-    network::mojom::URLLoaderFactoryRequest* factory_request,
-    // clang-format off
-    network::mojom::URLLoaderFactory*& out_factory) {  // NOLINT
-  // clang-format on
+    const net::HttpRequestHeaders& headers) {
   base::PostTaskWithTraits(
       FROM_HERE, {BrowserThread::UI},
       base::BindOnce(&HandleExternalProtocolInUI, url, web_contents_getter,
@@ -867,8 +855,7 @@ NotificationPresenter* AtomBrowserClient::GetNotificationPresenter() {
 }
 
 content::PlatformNotificationService*
-AtomBrowserClient::GetPlatformNotificationService(
-    content::BrowserContext* browser_context) {
+AtomBrowserClient::GetPlatformNotificationService() {
   if (!notification_service_) {
     notification_service_.reset(new PlatformNotificationService(this));
   }
@@ -893,10 +880,8 @@ AtomBrowserClient::GetSystemSharedURLLoaderFactory() {
 
 void AtomBrowserClient::OnNetworkServiceCreated(
     network::mojom::NetworkService* network_service) {
-  if (!g_browser_process ||
-      !base::FeatureList::IsEnabled(network::features::kNetworkService))
+  if (!g_browser_process)
     return;
-
   g_browser_process->system_network_context_manager()->OnNetworkServiceCreated(
       network_service);
 }

atom/browser/atom_browser_client.h

@@ -90,8 +90,7 @@ class AtomBrowserClient : public content::ContentBrowserClient,
       base::CommandLine* command_line) override;
   void DidCreatePpapiPlugin(content::BrowserPpapiHost* browser_host) override;
   std::string GetGeolocationApiKey() override;
-  scoped_refptr<content::QuotaPermissionContext> CreateQuotaPermissionContext()
-      override;
+  content::QuotaPermissionContext* CreateQuotaPermissionContext() override;
   content::GeneratedCodeCacheSettings GetGeneratedCodeCacheSettings(
       content::BrowserContext* context) override;
   void AllowCertificateError(
@@ -138,15 +137,14 @@ class AtomBrowserClient : public content::ContentBrowserClient,
       content::BrowserContext* browser_context,
       bool in_memory,
       const base::FilePath& relative_partition_path) override;
-  network::mojom::NetworkContext* GetSystemNetworkContext() override;
   void RegisterOutOfProcessServices(OutOfProcessServiceMap* services) override;
   base::Optional<service_manager::Manifest> GetServiceManifestOverlay(
       base::StringPiece name) override;
   net::NetLog* GetNetLog() override;
   content::MediaObserver* GetMediaObserver() override;
   content::DevToolsManagerDelegate* GetDevToolsManagerDelegate() override;
-  content::PlatformNotificationService* GetPlatformNotificationService(
-      content::BrowserContext* browser_context) override;
+  content::PlatformNotificationService* GetPlatformNotificationService()
+      override;
   content::BrowserMainParts* CreateBrowserMainParts(
       const content::MainFunctionParams&) override;
   base::FilePath GetDefaultDownloadDirectory() override;
@@ -173,12 +171,7 @@ class AtomBrowserClient : public content::ContentBrowserClient,
       ui::PageTransition page_transition,
       bool has_user_gesture,
       const std::string& method,
-      const net::HttpRequestHeaders& headers,
-      network::mojom::URLLoaderFactoryRequest* factory_request,
-      // clang-format off
-      network::mojom::URLLoaderFactory*& out_factory)  // NOLINT
-      // clang-format on
-      override;
+      const net::HttpRequestHeaders& headers) override;
 
  private:
   struct ProcessPreferences {

atom/browser/atom_browser_context.cc

@@ -36,11 +36,10 @@
 #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"
-#include "services/network/public/cpp/features.h"
 
 using content::BrowserThread;
 
@@ -93,12 +92,8 @@ AtomBrowserContext::AtomBrowserContext(const std::string& partition,
   // Initialize Pref Registry.
   InitPrefs();
 
-  if (!base::FeatureList::IsEnabled(network::features::kNetworkService)) {
-    proxy_config_monitor_ = std::make_unique<ProxyConfigMonitor>(prefs_.get());
-    io_handle_ =
-        new URLRequestContextGetter::Handle(weak_factory_.GetWeakPtr());
-  }
-
+  proxy_config_monitor_ = std::make_unique<ProxyConfigMonitor>(prefs_.get());
+  io_handle_ = new URLRequestContextGetter::Handle(weak_factory_.GetWeakPtr());
   cookie_change_notifier_ = std::make_unique<CookieChangeNotifier>(this);
 
   BrowserContextDependencyManager::GetInstance()->MarkBrowserContextLive(this);
@@ -108,13 +103,7 @@ AtomBrowserContext::~AtomBrowserContext() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   NotifyWillBeDestroyed(this);
   ShutdownStoragePartitions();
-
-  BrowserThread::DeleteSoon(BrowserThread::IO, FROM_HERE,
-                            std::move(resource_context_));
-
-  if (!base::FeatureList::IsEnabled(network::features::kNetworkService))
-    io_handle_->ShutdownOnUIThread();
-
+  io_handle_->ShutdownOnUIThread();
   // Notify any keyed services of browser context destruction.
   BrowserContextDependencyManager::GetInstance()->DestroyBrowserContextServices(
       this);
@@ -156,42 +145,22 @@ void AtomBrowserContext::SetUserAgent(const std::string& user_agent) {
 net::URLRequestContextGetter* AtomBrowserContext::CreateRequestContext(
     content::ProtocolHandlerMap* protocol_handlers,
     content::URLRequestInterceptorScopedVector protocol_interceptors) {
-  if (!base::FeatureList::IsEnabled(network::features::kNetworkService)) {
-    return io_handle_
-        ->CreateMainRequestContextGetter(protocol_handlers,
-                                         std::move(protocol_interceptors))
-        .get();
-  } else {
-    NOTREACHED();
-    return nullptr;
-  }
+  return io_handle_
+      ->CreateMainRequestContextGetter(protocol_handlers,
+                                       std::move(protocol_interceptors))
+      .get();
 }
 
 net::URLRequestContextGetter* AtomBrowserContext::CreateMediaRequestContext() {
-  if (!base::FeatureList::IsEnabled(network::features::kNetworkService)) {
-    return io_handle_->GetMainRequestContextGetter().get();
-  } else {
-    NOTREACHED();
-    return nullptr;
-  }
+  return io_handle_->GetMainRequestContextGetter().get();
 }
 
 net::URLRequestContextGetter* AtomBrowserContext::GetRequestContext() {
-  if (!base::FeatureList::IsEnabled(network::features::kNetworkService)) {
-    return GetDefaultStoragePartition(this)->GetURLRequestContext();
-  } else {
-    NOTREACHED();
-    return nullptr;
-  }
+  return GetDefaultStoragePartition(this)->GetURLRequestContext();
 }
 
 network::mojom::NetworkContextPtr AtomBrowserContext::GetNetworkContext() {
-  if (!base::FeatureList::IsEnabled(network::features::kNetworkService)) {
-    return io_handle_->GetNetworkContext();
-  } else {
-    NOTREACHED();
-    return nullptr;
-  }
+  return io_handle_->GetNetworkContext();
 }
 
 base::FilePath AtomBrowserContext::GetPath() const {
@@ -211,13 +180,7 @@ int AtomBrowserContext::GetMaxCacheSize() const {
 }
 
 content::ResourceContext* AtomBrowserContext::GetResourceContext() {
-  if (!base::FeatureList::IsEnabled(network::features::kNetworkService)) {
-    return io_handle_->GetResourceContext();
-  } else {
-    if (!resource_context_)
-      resource_context_.reset(new content::ResourceContext);
-    return resource_context_.get();
-  }
+  return io_handle_->GetResourceContext();
 }
 
 std::string AtomBrowserContext::GetMediaDeviceIDSalt() {

atom/browser/atom_browser_context.h

@@ -16,7 +16,6 @@
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/net/proxy_config_monitor.h"
 #include "content/public/browser/browser_context.h"
-#include "content/public/browser/resource_context.h"
 
 class PrefRegistrySimple;
 class PrefService;
@@ -149,7 +148,6 @@ class AtomBrowserContext
   URLRequestContextGetter::Handle* io_handle_;
   ValueMapPrefStore* in_memory_pref_store_;
 
-  std::unique_ptr<content::ResourceContext> resource_context_;
   std::unique_ptr<CookieChangeNotifier> cookie_change_notifier_;
   std::unique_ptr<PrefService> prefs_;
   std::unique_ptr<AtomDownloadManagerDelegate> download_manager_delegate_;

atom/browser/atom_browser_main_parts.cc

@@ -23,11 +23,10 @@
 #include "atom/browser/media/media_capture_devices_dispatcher.h"
 #include "atom/browser/node_debugger.h"
 #include "atom/browser/ui/devtools_manager_delegate.h"
-#include "atom/common/api/electron_bindings.h"
+#include "atom/common/api/atom_bindings.h"
 #include "atom/common/application_info.h"
 #include "atom/common/asar/asar_util.h"
 #include "atom/common/node_bindings.h"
-#include "atom/common/node_includes.h"
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/feature_list.h"
@@ -46,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"
@@ -76,7 +74,7 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_win.h"
 #include "ui/display/win/dpi.h"
-#include "ui/gfx/system_fonts_win.h"
+#include "ui/gfx/platform_font_win.h"
 #include "ui/strings/grit/app_locale_settings.h"
 #endif
 
@@ -91,6 +89,9 @@
 #include "device/bluetooth/dbus/dbus_bluez_manager_wrapper_linux.h"
 #endif
 
+// Must be included after all other headers.
+#include "atom/common/node_includes.h"
+
 namespace atom {
 
 namespace {
@@ -102,7 +103,7 @@ void Erase(T* container, typename T::iterator iter) {
 
 #if defined(OS_WIN)
 // gfx::Font callbacks
-void AdjustUIFont(gfx::win::FontAdjustment* font_adjustment) {
+void AdjustUIFont(gfx::PlatformFontWin::FontAdjustment* font_adjustment) {
   l10n_util::NeedOverrideDefaultUIFont(&font_adjustment->font_family_override,
                                        &font_adjustment->font_scale);
   font_adjustment->font_scale *= display::win::GetAccessibilityFontScale();
@@ -214,6 +215,17 @@ void AtomBrowserMainParts::InitializeFeatureList() {
   base::FeatureList::SetInstance(std::move(feature_list));
 }
 
+#if !defined(OS_MACOSX)
+void AtomBrowserMainParts::OverrideAppLogsPath() {
+  base::FilePath path;
+  if (base::PathService::Get(DIR_APP_DATA, &path)) {
+    path = path.Append(base::FilePath::FromUTF8Unsafe(GetApplicationName()));
+    path = path.Append(base::FilePath::FromUTF8Unsafe("logs"));
+    base::PathService::Override(DIR_APP_LOGS, path);
+  }
+}
+#endif
+
 // static
 AtomBrowserMainParts* AtomBrowserMainParts::self_ = nullptr;
 
@@ -222,7 +234,7 @@ AtomBrowserMainParts::AtomBrowserMainParts(
     : fake_browser_process_(new BrowserProcessImpl),
       browser_(new Browser),
       node_bindings_(NodeBindings::Create(NodeBindings::BROWSER)),
-      electron_bindings_(new ElectronBindings(uv_default_loop())),
+      atom_bindings_(new AtomBindings(uv_default_loop())),
       main_function_params_(params) {
   DCHECK(!self_) << "Cannot have two AtomBrowserMainParts";
   self_ = this;
@@ -272,7 +284,7 @@ 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());
   OverrideLinuxAppDataPath();
@@ -310,7 +322,7 @@ void AtomBrowserMainParts::PostEarlyInitialization() {
   node_debugger_->Start();
 
   // Add Electron extended APIs.
-  electron_bindings_->BindTo(js_env_->isolate(), env->process_object());
+  atom_bindings_->BindTo(js_env_->isolate(), env->process_object());
 
   // Load everything.
   node_bindings_->LoadEnvironment(env);
@@ -380,8 +392,8 @@ void AtomBrowserMainParts::ToolkitInitialized() {
 #endif
 
 #if defined(OS_WIN)
-  gfx::win::SetAdjustFontCallback(&AdjustUIFont);
-  gfx::win::SetGetMinimumFontSizeCallback(&GetMinimumFontSize);
+  gfx::PlatformFontWin::SetAdjustFontCallback(&AdjustUIFont);
+  gfx::PlatformFontWin::SetGetMinimumFontSizeCallback(&GetMinimumFontSize);
 
   wchar_t module_name[MAX_PATH] = {0};
   if (GetModuleFileName(NULL, module_name, MAX_PATH))

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"
@@ -29,7 +28,7 @@ class WMState;
 
 namespace atom {
 
-class ElectronBindings;
+class AtomBindings;
 class Browser;
 class JavascriptEnvironment;
 class NodeBindings;
@@ -88,6 +87,7 @@ class AtomBrowserMainParts : public content::BrowserMainParts {
 
  private:
   void InitializeFeatureList();
+  void OverrideAppLogsPath();
   void PreMainMessageLoopStartCommon();
 
 #if defined(OS_POSIX)
@@ -122,11 +122,10 @@ class AtomBrowserMainParts : public content::BrowserMainParts {
   std::unique_ptr<Browser> browser_;
   std::unique_ptr<JavascriptEnvironment> js_env_;
   std::unique_ptr<NodeBindings> node_bindings_;
-  std::unique_ptr<ElectronBindings> electron_bindings_;
+  std::unique_ptr<AtomBindings> atom_bindings_;
   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_;
 

atom/browser/atom_browser_main_parts_mac.mm

@@ -32,6 +32,19 @@ void AtomBrowserMainParts::FreeAppDelegate() {
   [NSApp setDelegate:nil];
 }
 
+void AtomBrowserMainParts::OverrideAppLogsPath() {
+  base::FilePath path;
+  NSString* bundleName =
+      [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleName"];
+  NSString* logsPath =
+      [NSString stringWithFormat:@"Library/Logs/%@", bundleName];
+  NSString* libraryPath =
+      [NSHomeDirectory() stringByAppendingPathComponent:logsPath];
+
+  base::PathService::Override(DIR_APP_LOGS,
+                              base::FilePath([libraryPath UTF8String]));
+}
+
 // Replicates NSApplicationMain, but doesn't start a run loop.
 void AtomBrowserMainParts::InitializeMainNib() {
   auto infoDictionary = base::mac::OuterBundle().infoDictionary;

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,

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;

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.
@@ -187,10 +187,6 @@ class Browser : public WindowListObserver {
   void SetAboutPanelOptions(const base::DictionaryValue& options);
 #endif
 
-#if defined(OS_MACOSX) || defined(OS_WIN)
-  void ShowEmojiPanel();
-#endif
-
 #if defined(OS_WIN)
   struct UserTask {
     base::FilePath program;
@@ -234,8 +230,6 @@ class Browser : public WindowListObserver {
   // windows.
   void Activate(bool has_visible_windows);
 
-  bool IsEmojiPanelSupported();
-
   // Tell the application the loading has been done.
   void WillFinishLaunching();
   void DidFinishLaunching(const base::DictionaryValue& launch_info);

atom/browser/browser_linux.cc

@@ -142,10 +142,6 @@ bool Browser::IsUnityRunning() {
   return unity::IsRunning();
 }
 
-bool Browser::IsEmojiPanelSupported() {
-  return false;
-}
-
 void Browser::ShowAboutPanel() {
   std::string app_name, version, copyright, icon_path, website;