Bump v5.0.6

* fix: sanitize invalid custom protocol headers (#18854)

* lint fix

* wild guess

.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
@@ -35,7 +35,6 @@ env-debug-build: &env-debug-build
 
 env-testing-build: &env-testing-build
   GN_CONFIG: //electron/build/args/testing.gn
-  CHECK_DIST_MANIFEST: '1'
 
 env-release-build: &env-release-build
   GN_CONFIG: //electron/build/args/release.gn
@@ -144,16 +143,13 @@ step-gclient-sync: &step-gclient-sync
   run:
     name: Gclient sync
     command: |
-      # If we did not restore a complete sync then we need to sync for realz
-      if [ ! -s "src/electron/.circle-sync-done" ]; then
-        gclient config \
-          --name "src/electron" \
-          --unmanaged \
-          $GCLIENT_EXTRA_ARGS \
-          "$CIRCLE_REPOSITORY_URL"
+      gclient config \
+        --name "src/electron" \
+        --unmanaged \
+        $GCLIENT_EXTRA_ARGS \
+        "$CIRCLE_REPOSITORY_URL"
 
-        gclient sync --with_branch_heads --with_tags
-      fi
+      gclient sync --with_branch_heads --with_tags
 
 step-setup-env-for-build: &step-setup-env-for-build
   run:
@@ -180,33 +176,27 @@ 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
+        brew update
+        brew install node@10
+        echo 'export PATH="/usr/local/opt/node@10/bin:$PATH"' >> $BASH_ENV
       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
-      fi
-
-# On macOS the yarn install command during gclient sync was run on a linux
+# On macOS the npm install command during gclient sync was run on a linux
 # machine and therefore installed a slightly different set of dependencies
-# Notably "fsevents" is a macOS only dependency, we rerun yarn install once
+# Notably "fsevents" is a macOS only dependency, we rerun npm install once
 # we are on a macOS machine to get the correct state
 step-install-npm-deps-on-mac: &step-install-npm-deps-on-mac
   run:
-    name: Install node_modules on MacOS
+    name: Install NPM Dependencies on MacOS
     command: |
       if [ "`uname`" == "Darwin" ]; then
         cd src/electron
-        node script/yarn install
+        npm install
       fi
 
 # This step handles the differences between the linux "gclient sync"
@@ -224,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
@@ -250,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
@@ -283,28 +254,6 @@ step-electron-dist-build: &step-electron-dist-build
     command: |
       cd src
       ninja -C out/Default electron:electron_dist_zip
-      if [ "$CHECK_DIST_MANIFEST" == "1" ]; then
-        if [ "`uname`" == "Darwin" ]; then
-          target_os=mac
-          target_cpu=x64
-          if [ x"$MAS_BUILD" == x"true" ]; then
-            target_os=mac_mas
-          fi
-        elif [ "`uname`" == "Linux" ]; then
-          target_os=linux
-          if [ x"$TARGET_ARCH" == x ]; then
-            target_cpu=x64
-          elif [ "$TARGET_ARCH" == "ia32" ]; then
-            target_cpu=x86
-          else
-            target_cpu="$TARGET_ARCH"
-          fi
-        else
-          echo "Unknown system: `uname`"
-          exit 1
-        fi
-        electron/script/check-zip-manifest.py out/Default/dist.zip electron/script/dist_zip.$target_os.$target_cpu.manifest
-      fi
 
 step-electron-dist-store: &step-electron-dist-store
   store_artifacts:
@@ -482,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:
@@ -524,153 +488,53 @@ step-maybe-generate-typescript-defs: &step-maybe-generate-typescript-defs
     command: |
       if [ "`uname`" == "Darwin" ]; then
         cd src/electron
-        node script/yarn 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
+        npm run create-typescript-definitions
       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
-          node script/yarn install
-          node script/yarn 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
 
-    - run:
-        name: Generate DEPS Hash
-        command: node src/electron/script/generate-deps-hash.js
-    - run:
-        name: Touch Sync Done
-        command: touch src/electron/.circle-sync-done
-    # Restore exact src cache based on the hash of DEPS and patches/*
-    # If no cache is matched EXACTLY then the .circle-sync-done file is empty
-    # If a cache is matched EXACTLY then the .circle-sync-done file contains "done"
-    - restore_cache:
-        paths:
-          - ./src
-        keys:
-          - v5-src-cache-{{ arch }}-{{ checksum "src/electron/.depshash" }}
-        name: Restoring src cache
-    # Restore exact or closest git cache based on the hash of DEPS and .circle-sync-done
-    # If the src cache was restored above then this will match an empty cache
-    # If the src cache was not restored above then this will match a close git cache
     - restore_cache:
         paths:
           - ~/.gclient-cache
         keys:
-          - v2-gclient-cache-{{ arch }}-{{ checksum "src/electron/.circle-sync-done" }}-{{ checksum "src/electron/DEPS" }}
-          - v2-gclient-cache-{{ arch }}-{{ checksum "src/electron/.circle-sync-done" }}
-        name: Conditionally restoring git cache
+          - v1-gclient-cache-{{ arch }}-{{ checksum "src/electron/DEPS" }}
+          - v1-gclient-cache-{{ arch }}-
     - run:
         name: Set GIT_CACHE_PATH to make gclient to use the cache
         command: |
           # CircleCI does not support interpolation when setting environment variables.
           # https://circleci.com/docs/2.0/env-vars/#setting-an-environment-variable-in-a-shell-command
           echo 'export GIT_CACHE_PATH="$HOME/.gclient-cache"' >> $BASH_ENV
-    # This sync call only runs if .circle-sync-done is an EMPTY file
     - *step-gclient-sync
-    # Persist the git cache based on the hash of DEPS and .circle-sync-done
-    # If the src cache was restored above then this will persist an empty cache
     - save_cache:
         paths:
           - ~/.gclient-cache
-        key: v2-gclient-cache-{{ arch }}-{{ checksum "src/electron/.circle-sync-done" }}-{{ checksum "src/electron/DEPS" }}
-        name: Persisting git cache
-    # These next few steps reset Electron to the correct commit regardless of which cache was restored
-    - run:
-        name: Wipe Electron
-        command: rm -rf src/electron
-    - *step-checkout-electron
-    - run:
-        name: Run Electron Only Hooks
-        command: gclient runhooks --spec="solutions=[{'name':'src/electron','url':None,'deps_file':'DEPS','custom_vars':{'process_deps':False},'managed':False}]"
-    - run:
-        name: Generate DEPS Hash
-        command: (cd src/electron && git checkout .) && node src/electron/script/generate-deps-hash.js
-    # Mark the sync as done for future cache saving
-    - run:
-        name: Mark Sync Done
-        command: echo DONE > src/electron/.circle-sync-done
-    # Minimize the size of the cache
-    - run:
-        name: Remove some unused data to avoid storing it in the workspace/cache
-        command: |
-          rm -rf src/android_webview
-          rm -rf src/ios
-          rm -rf src/third_party/blink/web_tests
-          rm -rf src/third_party/blink/perf_tests
-          rm -rf src/third_party/hunspell_dictionaries
-          rm -rf src/third_party/WebKit/LayoutTests
-    # Save the src cache based on the deps hash
-    - save_cache:
-        paths:
-          - ./src
-        key: v5-src-cache-{{ arch }}-{{ checksum "src/electron/.depshash" }}
-        name: Persisting src cache
+        key: v1-gclient-cache-{{ arch }}-{{ checksum "src/electron/DEPS" }}
     - save_cache:
         paths:
           - /usr/local/Homebrew
         key: v1-brew-cache-{{ arch }}
-        name: Persisting brew cache
+
+    - run:
+        name: Remove some unused data to avoid storing it in the workspace
+        command: |
+          rm -rf src/android_webview
+          rm -rf src/ios
+          rm -rf src/third_party/WebKit/LayoutTests
     - persist_to_workspace:
         root: .
         paths:
           - 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:
@@ -697,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
@@ -716,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
@@ -742,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
@@ -761,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
@@ -794,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:
@@ -859,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
@@ -872,17 +757,11 @@ steps-tests: &steps-tests
         command: |
           cd src
           export ELECTRON_OUT_DIR=Default
-          (cd electron && node script/yarn test -- --ci --enable-logging)
+          (cd electron && npm run test -- --ci --enable-logging)
     - 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
@@ -894,34 +773,12 @@ steps-tests: &steps-tests
 
     - *step-maybe-notify-slack-failure
 
-steps-test-nan: &steps-test-nan
-  steps:
-    - attach_workspace:
-          at: .
-    - *step-depot-tools-add-to-path
-    - *step-electron-dist-unzip
-    - *step-setup-linux-for-headless-testing
-    - *step-fix-known-hosts-linux
-    - run:
-        name: Run Nan Tests
-        command: |
-          cd src
-          export ELECTRON_OUT_DIR=Default
-          node electron/script/nan-spec-runner.js
-
 chromium-upgrade-branches: &chromium-upgrade-branches
   /chromium\-upgrade\/[0-9]+/
 
 # 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
@@ -960,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:
@@ -975,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:
@@ -1103,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:
@@ -1112,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:
@@ -1130,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:
@@ -1167,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:
@@ -1175,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:
@@ -1223,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:
@@ -1314,14 +1131,6 @@ jobs:
       <<: *env-stack-dumping
     <<: *steps-tests
 
-  linux-x64-testing-nan:
-    <<: *machine-linux-medium
-    environment:
-      <<: *env-linux-medium
-      <<: *env-headless-testing
-      <<: *env-stack-dumping
-    <<: *steps-test-nan
-
   linux-x64-release-tests:
     <<: *machine-linux-medium
     environment:
@@ -1355,15 +1164,6 @@ jobs:
       <<: *env-stack-dumping
     <<: *steps-tests
 
-  linux-ia32-testing-nan:
-    <<: *machine-linux-medium
-    environment:
-      <<: *env-linux-medium
-      <<: *env-ia32
-      <<: *env-headless-testing
-      <<: *env-stack-dumping
-    <<: *steps-test-nan
-
   linux-ia32-release-tests:
     <<: *machine-linux-medium
     environment:
@@ -1502,10 +1302,6 @@ jobs:
 
 workflows:
   version: 2
-  lint:
-    jobs:
-      - lint
-
   build-linux:
     jobs:
       - linux-checkout
@@ -1513,21 +1309,12 @@ 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
-      - linux-x64-testing-nan:
-          requires:
-            - linux-x64-testing
 
       - linux-ia32-debug:
           requires:
@@ -1538,9 +1325,6 @@ workflows:
       - linux-ia32-testing-tests:
           requires:
             - linux-ia32-testing
-      - linux-ia32-testing-nan:
-          requires:
-            - linux-ia32-testing
 
       - linux-arm-debug:
           requires:
@@ -1552,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:
@@ -1569,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
@@ -1584,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
@@ -1654,6 +1418,9 @@ workflows:
       - linux-arm-release:
           requires:
             - linux-checkout
+      - linux-arm-native-mksnapshot:
+          requires:
+            - linux-checkout
       - linux-arm-chromedriver:
           requires:
             - linux-checkout
@@ -1661,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
@@ -1673,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

@@ -12,10 +12,6 @@
 # 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
 /script/release-notes                   @electron/wg-releases

.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

.github/main.workflow

@@ -1,10 +0,0 @@
-workflow "Clerk" {
-  #TODO(codebytere): make this work properly on pull_request
-  on = "repository_dispatch"
-  resolves = "Check release notes"
-}
-
-action "Check release notes" {
-  uses = "electron/clerk@master"
-  secrets = [ "GITHUB_TOKEN" ]
-}

.gitignore

@@ -37,7 +37,7 @@
 /vendor/pyyaml
 node_modules/
 SHASUMS256.txt
-**/package-lock.json
+**/yarn.lock
 compile_commands.json
 .envrc
 
@@ -59,9 +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
-
-# Used to accelerate CI builds
-.depshash

.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,20 +2,17 @@ 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")
 import("//tools/grit/repack.gni")
 import("//tools/v8_context_snapshot/v8_context_snapshot.gni")
-import("//v8/gni/snapshot_toolchain.gni")
+import("//v8/snapshot_toolchain.gni")
 import("build/asar.gni")
+import("build/js_wrap.gni")
 import("build/npm.gni")
-import("build/tsc.gni")
-import("build/webpack/webpack.gni")
 import("buildflags/buildflags.gni")
 import("electron_paks.gni")
-import("filenames.auto.gni")
 import("filenames.gni")
 
 if (is_mac) {
@@ -56,85 +53,82 @@ 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" ]
+npm_action("atom_browserify_sandbox_unwrapped") {
+  script = "browserify"
+
+  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",
+  ]
 
   outputs = [
-    "$target_gen_dir/tsc/typings/electron.d.ts",
+    "$target_gen_dir/js2c/preload_bundle_unwrapped.js",
+  ]
+
+  args = [
+    "lib/sandboxed_renderer/init.js",
+    "-r",
+    "./lib/sandboxed_renderer/api/exports/electron.js:electron",
+    "-t",
+    "aliasify",
+    "--standalone",
+    "sandboxed_preload",
+    "-o",
+    rebase_path(outputs[0]),
   ]
 }
 
-webpack_build("electron_browser_bundle") {
-  deps = [
-    ":build_electron_definitions",
+npm_action("atom_browserify_isolated_unwrapped") {
+  script = "browserify"
+
+  inputs = [
+    "lib/isolated_renderer/init.js",
   ]
 
-  inputs = auto_filenames.browser_bundle_deps
+  outputs = [
+    "$target_gen_dir/js2c/isolated_bundle_unwrapped.js",
+  ]
 
-  config_file = "//electron/build/webpack/webpack.config.browser.js"
-  out_file = "$target_gen_dir/js2c/browser_init.js"
+  args = [
+    "lib/isolated_renderer/init.js",
+    "-t",
+    "aliasify",
+    "--standalone",
+    "isolated_preload",
+    "-o",
+    rebase_path(outputs[0]),
+  ]
 }
 
-webpack_build("electron_renderer_bundle") {
+js_wrap("atom_browserify_isolated") {
   deps = [
-    ":build_electron_definitions",
+    ":atom_browserify_isolated_unwrapped",
   ]
 
-  inputs = auto_filenames.renderer_bundle_deps
+  inputs = [
+    "$target_gen_dir/js2c/isolated_bundle_unwrapped.js",
+  ]
 
-  config_file = "//electron/build/webpack/webpack.config.renderer.js"
-  out_file = "$target_gen_dir/js2c/renderer_init.js"
+  outputs = [
+    "$target_gen_dir/js2c/isolated_bundle.js",
+  ]
 }
 
-webpack_build("electron_worker_bundle") {
+js_wrap("atom_browserify_sandbox") {
   deps = [
-    ":build_electron_definitions",
+    ":atom_browserify_sandbox_unwrapped",
   ]
 
-  inputs = auto_filenames.worker_bundle_deps
-
-  config_file = "//electron/build/webpack/webpack.config.worker.js"
-  out_file = "$target_gen_dir/js2c/worker_init.js"
-}
-
-webpack_build("electron_sandboxed_renderer_bundle") {
-  deps = [
-    ":build_electron_definitions",
+  inputs = [
+    "$target_gen_dir/js2c/preload_bundle_unwrapped.js",
   ]
 
-  inputs = auto_filenames.sandbox_bundle_deps
-
-  config_file = "//electron/build/webpack/webpack.config.sandboxed_renderer.js"
-  out_file = "$target_gen_dir/js2c/sandbox_bundle.js"
-}
-
-webpack_build("electron_isolated_renderer_bundle") {
-  deps = [
-    ":build_electron_definitions",
+  outputs = [
+    "$target_gen_dir/js2c/preload_bundle.js",
   ]
-
-  inputs = auto_filenames.isolated_bundle_deps
-
-  config_file = "//electron/build/webpack/webpack.config.isolated_renderer.js"
-  out_file = "$target_gen_dir/js2c/isolated_bundle.js"
-}
-
-webpack_build("electron_content_script_bundle") {
-  deps = [
-    ":build_electron_definitions",
-  ]
-
-  inputs = auto_filenames.content_script_bundle_deps
-
-  config_file = "//electron/build/webpack/webpack.config.content_script.js"
-  out_file = "$target_gen_dir/js2c/content_script_bundle.js"
 }
 
 copy("atom_js2c_copy") {
@@ -149,25 +143,17 @@ copy("atom_js2c_copy") {
 
 action("atom_js2c") {
   deps = [
+    ":atom_browserify_isolated",
+    ":atom_browserify_sandbox",
     ":atom_js2c_copy",
-    ":electron_browser_bundle",
-    ":electron_content_script_bundle",
-    ":electron_isolated_renderer_bundle",
-    ":electron_renderer_bundle",
-    ":electron_sandboxed_renderer_bundle",
-    ":electron_worker_bundle",
   ]
 
-  webpack_sources = [
-    "$target_gen_dir/js2c/browser_init.js",
-    "$target_gen_dir/js2c/renderer_init.js",
-    "$target_gen_dir/js2c/worker_init.js",
-    "$target_gen_dir/js2c/content_script_bundle.js",
+  browserify_sources = [
     "$target_gen_dir/js2c/isolated_bundle.js",
-    "$target_gen_dir/js2c/sandbox_bundle.js",
+    "$target_gen_dir/js2c/preload_bundle.js",
   ]
 
-  sources = webpack_sources + [
+  sources = browserify_sources + [
               "$target_gen_dir/js2c/asar.js",
               "$target_gen_dir/js2c/asar_init.js",
             ]
@@ -183,49 +169,37 @@ action("atom_js2c") {
          rebase_path(sources, root_build_dir)
 }
 
-target_gen_default_app_js = "$target_gen_dir/js/default_app"
-
-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
+asar("js2asar") {
+  sources = filenames.js_sources
+  if (enable_desktop_capturer) {
+    sources += [
+      "lib/browser/desktop-capturer.js",
+      "lib/renderer/api/desktop-capturer.js",
+    ]
+  }
+  if (enable_view_api) {
+    sources += [
+      "lib/browser/api/views/box-layout.js",
+      "lib/browser/api/views/button.js",
+      "lib/browser/api/views/label-button.js",
+      "lib/browser/api/views/layout-manager.js",
+      "lib/browser/api/views/md-text-button.js",
+      "lib/browser/api/views/resize-area.js",
+      "lib/browser/api/views/text-field.js",
+    ]
+  }
   outputs = [
-    "$target_gen_default_app_js/{{source}}",
+    "$root_out_dir/resources/electron.asar",
   ]
+  root = "lib"
 }
 
-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") {
@@ -283,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" ]
@@ -315,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",
@@ -331,13 +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/gpu",
-    "//content/public/renderer",
-    "//content/public/utility",
-    "//device/bluetooth",
     "//gin",
     "//media/capture/mojom:video_capture",
     "//media/mojo/interfaces",
@@ -347,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",
@@ -362,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 = [
@@ -444,7 +378,6 @@ static_library("electron_lib") {
 
   if (is_mac) {
     deps += [
-      "//components/remote_cocoa/app_shim",
       "//third_party/crashpad/crashpad/client",
       "//ui/accelerated_widget_mac",
     ]
@@ -491,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 += [
@@ -502,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" ]
   }
 
@@ -612,6 +537,12 @@ if (is_mac) {
   electron_login_helper_name = "$electron_product_name Login Helper"
   electron_framework_version = "A"
 
+  mac_xib_bundle_data("electron_xibs") {
+    sources = [
+      "atom/common/resources/mac/MainMenu.xib",
+    ]
+  }
+
   bundle_data("electron_framework_resources") {
     public_deps = [
       ":packed_resources",
@@ -680,6 +611,7 @@ if (is_mac) {
     deps = [
       ":electron_framework_libraries",
       ":electron_framework_resources",
+      ":electron_xibs",
     ]
     if (!is_mas_build) {
       deps += [ ":electron_crashpad_helper" ]
@@ -698,7 +630,6 @@ if (is_mac) {
     libs = [
       "AVFoundation.framework",
       "Carbon.framework",
-      "LocalAuthentication.framework",
       "QuartzCore.framework",
       "Quartz.framework",
       "Security.framework",
@@ -826,11 +757,13 @@ if (is_mac) {
 
   bundle_data("electron_app_resources") {
     public_deps = [
-      ":default_app_asar",
+      ":app2asar",
       ":electron_app_strings_bundle_data",
+      ":js2asar",
     ]
     sources = [
       "$root_out_dir/resources/default_app.asar",
+      "$root_out_dir/resources/electron.asar",
       "atom/browser/resources/mac/electron.icns",
     ]
     outputs = [
@@ -872,12 +805,12 @@ if (is_mac) {
     sources = filenames.app_sources
     include_dirs = [ "." ]
     deps = [
-      ":default_app_asar",
+      ":app2asar",
       ":electron_app_manifest",
       ":electron_lib",
+      ":js2asar",
       ":packed_resources",
       "//content:sandbox_helper_win",
-      "//electron/buildflags",
       "//ui/strings",
     ]
 
@@ -894,6 +827,7 @@ if (is_mac) {
 
     if (!is_mac) {
       data += [ "$root_out_dir/resources/default_app.asar" ]
+      data += [ "$root_out_dir/resources/electron.asar" ]
     }
 
     public_deps = [
@@ -905,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 = [
@@ -956,7 +900,6 @@ template("dist_zip") {
                              "deps",
                              "data_deps",
                              "data",
-                             "testonly",
                            ])
     write_runtime_deps = _runtime_deps_file
   }
@@ -966,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,
@@ -1038,7 +977,6 @@ dist_zip("electron_ffmpeg_zip") {
 }
 
 dist_zip("electron_chromedriver_zip") {
-  testonly = true
   data_deps = [
     "//chrome/test/chromedriver",
     ":licenses",

DEPS

@@ -10,11 +10,9 @@ gclient_gn_args = [
 
 vars = {
   'chromium_version':
-    'f200986dfaabd6aad6a4b37dad7aae42fec349e9',
+    '73.0.3683.121',
   'node_version':
-    'b823596192bb790f9ea2a61022b55bf50e6daa83',
-  'nan_version':
-    '960dd6c70fc9eb136efdf37b4bef18fadbc3436f',
+    '0a300f60bce0c8f0cb3d846fcb0e1f55f26013ee',
 
   'boto_version': 'f7574aa6cc2c819430c1f05e9a1a1a666ef8169b',
   'pyyaml_version': '3.12',
@@ -23,14 +21,9 @@ vars = {
   'boto_git': 'https://github.com/boto',
   'chromium_git': 'https://chromium.googlesource.com',
   'electron_git': 'https://github.com/electron',
-  # FIXME: Once https://github.com/nodejs/nan/pull/857 lands this should point at nodejs/nan
-  'nodejs_git': 'https://github.com/marshallofsound',
   'requests_git': 'https://github.com/kennethreitz',
   'yaml_git': 'https://github.com/yaml',
 
-  # KEEP IN SYNC WITH utils.js FILE
-  'yarn_version': '1.15.2',
-
   # To be able to build clean Chromium from sources.
   'apply_patches': True,
 
@@ -40,7 +33,6 @@ vars = {
   # To allow in-house builds to checkout those manually.
   'checkout_chromium': True,
   'checkout_node': True,
-  'checkout_nan': True,
 
   # It's only needed to parse the native tests configurations.
   'checkout_pyyaml': False,
@@ -48,9 +40,6 @@ vars = {
   # Python "requests" module is used for releases only.
   'checkout_requests': False,
 
-  # To allow running hooks without parsing the DEPS tree
-  'process_deps': True,
-
   # It is always needed for normal Electron builds,
   # but might be impossible for custom in-house builds.
   'download_external_binaries': True,
@@ -72,39 +61,35 @@ vars = {
 deps = {
   'src': {
     'url': (Var("chromium_git")) + '/chromium/src.git@' + (Var("chromium_version")),
-    'condition': 'checkout_chromium and process_deps',
-  },
-  'src/third_party/nan': {
-    'url': (Var("nodejs_git")) + '/nan.git@' + (Var("nan_version")),
-    'condition': 'checkout_nan and process_deps',
+    'condition': 'checkout_chromium',
   },
   'src/third_party/electron_node': {
     'url': (Var("electron_git")) + '/node.git@' + (Var("node_version")),
-    'condition': 'checkout_node and process_deps',
+    'condition': 'checkout_node',
   },
   'src/electron/vendor/pyyaml': {
     'url': (Var("yaml_git")) + '/pyyaml.git@' + (Var("pyyaml_version")),
-    'condition': 'checkout_pyyaml and process_deps',
+    'condition': 'checkout_pyyaml',
   },
   'src/electron/vendor/boto': {
     'url': Var('boto_git') + '/boto.git' + '@' +  Var('boto_version'),
-    'condition': 'checkout_boto and process_deps',
+    'condition': 'checkout_boto',
   },
   'src/electron/vendor/requests': {
     'url': Var('requests_git') + '/requests.git' + '@' +  Var('requests_version'),
-    'condition': 'checkout_requests and process_deps',
+    'condition': 'checkout_requests',
   },
 }
 
 hooks = [
   {
     'name': 'patch_chromium',
-    'condition': '(checkout_chromium and apply_patches) and process_deps',
+    'condition': 'checkout_chromium and apply_patches',
     'pattern': 'src/electron',
     'action': [
       'python',
       'src/electron/script/apply_all_patches.py',
-      'src/electron/patches/config.json',
+      'src/electron/patches/common/config.json',
     ],
   },
   {
@@ -122,29 +107,29 @@ 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")',
     ],
   },
   {
     'name': 'setup_boto',
     'pattern': 'src/electron',
-    'condition': 'checkout_boto and process_deps',
+    'condition': 'checkout_boto',
     '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");',
     ],
   },
   {
     'name': 'setup_requests',
     'pattern': 'src/electron',
-    'condition': 'checkout_requests and process_deps',
+    'condition': 'checkout_requests',
     '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 @@
-7.0.0-nightly.20190612
+5.0.6

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
@@ -93,10 +93,6 @@ const child = proc.spawn(electron)
 
 Find documentation translations in [electron/i18n](https://github.com/electron/i18n).
 
-## Contributing
-
-If you are interested in reporting/fixing issues and contributing directly to the code base, please see [CONTRIBUTING.md](CONTRIBUTING.md) for more information on what we're looking for and how to get started.
-
 ## Community
 
 Info on reporting bugs, getting help, finding third-party tools and sample apps,

appveyor.yml

@@ -23,28 +23,13 @@
 # https://www.appveyor.com/docs/build-configuration/#secure-variables
 # https://www.appveyor.com/docs/build-configuration/#custom-environment-variables
 
-# Uncomment these lines to enable RDP
-#on_finish:
-#  - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
-
 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
-notifications:
-  - provider: Webhook
-    url: https://electron-mission-control.herokuapp.com/rest/appveyor-hook
-    method: POST
-    headers:
-      x-mission-control-secret:
-        secure: 90BLVPcqhJPG7d24v0q/RRray6W3wDQ8uVQlQjOHaBWkw1i8FoA1lsjr2C/v1dVok+tS2Pi6KxDctPUkwIb4T27u4RhvmcPzQhVpfwVJAG9oNtq+yKN7vzHfg7k/pojEzVdJpQLzeJGcSrZu7VY39Q==
-    on_build_success: false
-    on_build_failure: true
-    on_build_status_changed: false
 build_script:
   - ps: >-
       if(($env:APPVEYOR_PULL_REQUEST_HEAD_REPO_NAME -split "/")[0] -eq ($env:APPVEYOR_REPO_NAME -split "/")[0]) {
@@ -53,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"
@@ -67,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
@@ -95,10 +76,7 @@ build_script:
         python electron\script\zip-symbols.py
         appveyor PushArtifact out/Default/symbols.zip
       }
-  - python electron/script/check-zip-manifest.py out/Default/dist.zip electron/script/dist_zip.win.%TARGET_ARCH%.manifest
 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"
@@ -111,7 +89,7 @@ test_script:
         echo "Skipping tests for $env:GN_CONFIG build"
       }
   - cd electron
-  - if "%RUN_TESTS%"=="true" ( echo Running test suite & node script/yarn test -- --ci --enable-logging)
+  - if "%RUN_TESTS%"=="true" ( echo Running test suite & npm run test -- --ci --enable-logging)
   - cd ..
   - if "%RUN_TESTS%"=="true" ( echo Verifying non proprietary ffmpeg & python electron\script\verify-ffmpeg.py --build-dir out\Default --source-root %cd% --ffmpeg-path out\ffmpeg )
   - echo "About to verify mksnapshot"

atom/app/atom_content_client.cc

@@ -268,8 +268,4 @@ void AtomContentClient::AddContentDecryptionModules(
   }
 }
 
-bool AtomContentClient::IsDataResourceGzipped(int resource_id) const {
-  return ui::ResourceBundle::GetSharedInstance().IsGzipped(resource_id);
-}
-
 }  // namespace atom

atom/app/atom_content_client.h

@@ -31,7 +31,6 @@ class AtomContentClient : public content::ContentClient {
   void AddContentDecryptionModules(
       std::vector<content::CdmInfo>* cdms,
       std::vector<media::CdmHostFilePath>* cdm_host_file_paths) override;
-  bool IsDataResourceGzipped(int resource_id) const override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AtomContentClient);

atom/app/atom_login_helper.mm

@@ -1,7 +1,3 @@
-// Copyright (c) 2017 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
 #import <Cocoa/Cocoa.h>
 
 int main(int argc, char* argv[]) {

atom/app/atom_main_delegate.cc

@@ -14,8 +14,6 @@
 
 #include "atom/app/atom_content_client.h"
 #include "atom/browser/atom_browser_client.h"
-#include "atom/browser/atom_gpu_client.h"
-#include "atom/browser/feature_list.h"
 #include "atom/browser/relauncher.h"
 #include "atom/common/options_switches.h"
 #include "atom/renderer/atom_renderer_client.h"
@@ -49,10 +47,6 @@
 #include "atom/app/atom_main_delegate_mac.h"
 #endif
 
-#if defined(OS_WIN)
-#include "base/win/win_util.h"
-#endif
-
 namespace atom {
 
 namespace {
@@ -142,19 +136,14 @@ bool AtomMainDelegate::BasicStartupComplete(int* exit_code) {
 #if defined(DEBUG)
   // Print logging to debug.log on Windows
   settings.logging_dest = logging::LOG_TO_ALL;
-  base::FilePath log_filename;
-  base::PathService::Get(base::DIR_EXE, &log_filename);
-  log_filename = log_filename.AppendASCII("debug.log");
-  settings.log_file = log_filename.value().c_str();
+  settings.log_file = L"debug.log";
   settings.lock_log = logging::LOCK_LOG_FILE;
   settings.delete_old = logging::DELETE_OLD_LOG_FILE;
 #else
-  settings.logging_dest =
-      logging::LOG_TO_SYSTEM_DEBUG_LOG | logging::LOG_TO_STDERR;
+  settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG;
 #endif  // defined(DEBUG)
 #else   // defined(OS_WIN)
-  settings.logging_dest =
-      logging::LOG_TO_SYSTEM_DEBUG_LOG | logging::LOG_TO_STDERR;
+  settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG;
 #endif  // !defined(OS_WIN)
 
   // Only enable logging when --enable-logging is specified.
@@ -192,9 +181,6 @@ bool AtomMainDelegate::BasicStartupComplete(int* exit_code) {
   // Disable the ActiveVerifier, which is used by Chrome to track possible
   // bugs, but no use in Electron.
   base::win::DisableHandleVerifier();
-
-  if (IsBrowserProcess(command_line))
-    base::win::PinUser32();
 #endif
 
   content_client_ = std::make_unique<AtomContentClient>();
@@ -261,10 +247,6 @@ void AtomMainDelegate::PreSandboxStartup() {
 }
 
 void AtomMainDelegate::PreCreateMainMessageLoop() {
-  // This is initialized early because the service manager reads some feature
-  // flags and we need to make sure the feature list is initialized before the
-  // service manager reads the features.
-  InitializeFeatureList();
 #if defined(OS_MACOSX)
   RegisterAtomCrApp();
 #endif
@@ -275,11 +257,6 @@ content::ContentBrowserClient* AtomMainDelegate::CreateContentBrowserClient() {
   return browser_client_.get();
 }
 
-content::ContentGpuClient* AtomMainDelegate::CreateContentGpuClient() {
-  gpu_client_.reset(new AtomGpuClient);
-  return gpu_client_.get();
-}
-
 content::ContentRendererClient*
 AtomMainDelegate::CreateContentRendererClient() {
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(

atom/app/atom_main_delegate.h

@@ -27,7 +27,6 @@ class AtomMainDelegate : public content::ContentMainDelegate {
   void PreCreateMainMessageLoop() override;
   void PostEarlyInitialization(bool is_running_tests) override;
   content::ContentBrowserClient* CreateContentBrowserClient() override;
-  content::ContentGpuClient* CreateContentGpuClient() override;
   content::ContentRendererClient* CreateContentRendererClient() override;
   content::ContentUtilityClient* CreateContentUtilityClient() override;
   int RunProcess(
@@ -49,7 +48,6 @@ class AtomMainDelegate : public content::ContentMainDelegate {
 
   std::unique_ptr<content::ContentBrowserClient> browser_client_;
   std::unique_ptr<content::ContentClient> content_client_;
-  std::unique_ptr<content::ContentGpuClient> gpu_client_;
   std::unique_ptr<content::ContentRendererClient> renderer_client_;
   std::unique_ptr<content::ContentUtilityClient> utility_client_;
 

atom/app/atom_main_delegate_mac.mm

@@ -4,8 +4,6 @@
 
 #include "atom/app/atom_main_delegate.h"
 
-#include <string>
-
 #include "atom/browser/mac/atom_application.h"
 #include "atom/common/application_info.h"
 #include "atom/common/mac/main_application_bundle.h"

atom/app/manifests.cc

@@ -1,65 +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
-
-namespace {
-
-// TODO(https://crbug.com/781334): Remove these helpers and just update the
-// manifest definitions to be marked out-of-process. This is here only to avoid
-// extra churn when transitioning away from content_packaged_services.
-service_manager::Manifest MakeOutOfProcess(
-    const service_manager::Manifest& manifest) {
-  // cpplint.py emits a false positive [build/include_what_you_use]
-  service_manager::Manifest copy(manifest);  // NOLINT
-  copy.options.execution_mode =
-      service_manager::Manifest::ExecutionMode::kOutOfProcessBuiltin;
-  return copy;
-}
-
-}  // namespace
-
-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>&
-GetElectronBuiltinServiceManifests() {
-  static base::NoDestructor<std::vector<service_manager::Manifest>> manifests{{
-      MakeOutOfProcess(proxy_resolver::GetManifest()),
-#if BUILDFLAG(ENABLE_PRINTING)
-      MakeOutOfProcess(printing::GetPdfCompositorManifest()),
-#endif
-#if BUILDFLAG(ENABLE_PRINT_PREVIEW)
-      MakeOutOfProcess(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>&
-GetElectronBuiltinServiceManifests();
-
-#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::ThreadPoolInstance::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::ThreadPoolInstance::Get()->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"
@@ -24,9 +23,7 @@
 #include "atom/common/native_mate_converters/image_converter.h"
 #include "atom/common/native_mate_converters/net_converter.h"
 #include "atom/common/native_mate_converters/network_converter.h"
-#include "atom/common/native_mate_converters/once_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/command_line.h"
 #include "base/environment.h"
@@ -37,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"
@@ -54,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"
@@ -85,7 +88,6 @@ struct Converter<Browser::UserTask> {
       return false;
     dict.Get("arguments", &(out->arguments));
     dict.Get("description", &(out->description));
-    dict.Get("workingDirectory", &(out->working_dir));
     return true;
   }
 };
@@ -159,7 +161,6 @@ struct Converter<JumpListItem> {
 
         dict.Get("args", &(out->arguments));
         dict.Get("description", &(out->description));
-        dict.Get("workingDirectory", &(out->working_dir));
         return true;
 
       case JumpListItem::Type::SEPARATOR:
@@ -186,7 +187,6 @@ struct Converter<JumpListItem> {
         dict.Set("iconPath", val.icon_path);
         dict.Set("iconIndex", val.icon_index);
         dict.Set("description", val.description);
-        dict.Set("workingDirectory", val.working_dir);
         break;
 
       case JumpListItem::Type::SEPARATOR:
@@ -430,7 +430,7 @@ int GetPathConstant(const std::string& name) {
 }
 
 bool NotificationCallbackWrapper(
-    const base::RepeatingCallback<
+    const base::Callback<
         void(const base::CommandLine::StringVector& command_line,
              const base::FilePath& current_directory)>& callback,
     const base::CommandLine::StringVector& cmd,
@@ -489,7 +489,7 @@ void OnClientCertificateSelected(
       if (cert->EqualsExcludingChain((*identities)[i]->certificate())) {
         net::ClientCertIdentity::SelfOwningAcquirePrivateKey(
             std::move((*identities)[i]),
-            base::BindRepeating(&GotPrivateKey, delegate, std::move(cert)));
+            base::Bind(&GotPrivateKey, delegate, std::move(cert)));
         break;
       }
     }
@@ -533,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.");
   }
@@ -674,11 +674,10 @@ void App::OnLogin(scoped_refptr<LoginHandler> login_handler,
   bool prevent_default = false;
   content::WebContents* web_contents = login_handler->GetWebContents();
   if (web_contents) {
-    prevent_default =
-        Emit("login", WebContents::FromOrCreate(isolate(), web_contents),
-             request_details, *login_handler->auth_info(),
-             base::BindOnce(&PassLoginInformation,
-                            base::RetainedRef(login_handler)));
+    prevent_default = Emit(
+        "login", WebContents::FromOrCreate(isolate(), web_contents),
+        request_details, login_handler->auth_info(),
+        base::Bind(&PassLoginInformation, base::RetainedRef(login_handler)));
   }
 
   // Default behavior is to always cancel the auth.
@@ -723,10 +722,10 @@ void App::AllowCertificateError(
     int cert_error,
     const net::SSLInfo& ssl_info,
     const GURL& request_url,
-    bool is_main_frame_request,
+    content::ResourceType resource_type,
     bool strict_enforcement,
     bool expired_previous_decision,
-    const base::RepeatingCallback<void(content::CertificateRequestResultType)>&
+    const base::Callback<void(content::CertificateRequestResultType)>&
         callback) {
   v8::Locker locker(isolate());
   v8::HandleScope handle_scope(isolate());
@@ -760,8 +759,8 @@ void App::SelectClientCertificate(
       Emit("select-client-certificate",
            WebContents::FromOrCreate(isolate(), web_contents),
            cert_request_info->host_and_port.ToString(), std::move(client_certs),
-           base::BindOnce(&OnClientCertificateSelected, isolate(),
-                          shared_delegate, shared_identities));
+           base::Bind(&OnClientCertificateSelected, isolate(), shared_delegate,
+                      shared_identities));
 
   // Default to first certificate from the platform store.
   if (!prevent_default) {
@@ -769,14 +768,10 @@ void App::SelectClientCertificate(
         (*shared_identities)[0]->certificate();
     net::ClientCertIdentity::SelfOwningAcquirePrivateKey(
         std::move((*shared_identities)[0]),
-        base::BindRepeating(&GotPrivateKey, shared_delegate, std::move(cert)));
+        base::Bind(&GotPrivateKey, shared_delegate, std::move(cert)));
   }
 }
 
-void App::OnGpuInfoUpdate() {
-  Emit("gpu-info-update");
-}
-
 void App::OnGpuProcessCrashed(base::TerminationStatus status) {
   Emit("gpu-process-crashed",
        status == base::TERMINATION_STATUS_PROCESS_WAS_KILLED);
@@ -807,14 +802,6 @@ void App::BrowserChildProcessKilled(
 void App::RenderProcessReady(content::RenderProcessHost* host) {
   ChildProcessLaunched(content::PROCESS_TYPE_RENDERER,
                        host->GetProcess().Handle());
-
-  // TODO(jeremy): this isn't really the right place to be creating
-  // `WebContents` instances, but this was implicitly happening before in
-  // `RenderProcessPreferences`, so this is at least more explicit...
-  content::WebContents* web_contents =
-      AtomBrowserClient::Get()->GetWebContentsFromProcessID(host->GetID());
-  if (web_contents)
-    WebContents::FromOrCreate(v8::Isolate::GetCurrent(), web_contents);
 }
 
 void App::RenderProcessDisconnected(base::ProcessId host_pid) {
@@ -848,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;
@@ -964,10 +931,10 @@ bool App::RequestSingleInstanceLock() {
   base::FilePath user_dir;
   base::PathService::Get(DIR_USER_DATA, &user_dir);
 
-  auto cb = base::BindRepeating(&App::OnSecondInstance, base::Unretained(this));
+  auto cb = base::Bind(&App::OnSecondInstance, base::Unretained(this));
 
   process_singleton_.reset(new ProcessSingleton(
-      user_dir, base::BindRepeating(NotificationCallbackWrapper, cb)));
+      user_dir, base::Bind(NotificationCallbackWrapper, cb)));
 
   switch (process_singleton_->NotifyOtherProcessOrCreate()) {
     case ProcessSingleton::NotifyResult::LOCK_ERROR:
@@ -1073,31 +1040,30 @@ 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(
         base::Value::ToUniquePtrValue(options.Clone()));
     CertificateManagerModel::Create(
         browser_context.get(),
-        base::BindRepeating(&App::OnCertificateManagerModelCreated,
-                            base::Unretained(this), base::Passed(&copy),
-                            callback));
+        base::Bind(&App::OnCertificateManagerModelCreated,
+                   base::Unretained(this), base::Passed(&copy), callback));
     return;
   }
 
   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
 
@@ -1189,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_) {
@@ -1286,21 +1251,6 @@ void App::EnableSandbox(mate::Arguments* args) {
   command_line->AppendSwitch(switches::kEnableSandbox);
 }
 
-void App::SetUserAgentFallback(const std::string& user_agent) {
-  AtomBrowserClient::Get()->SetUserAgent(user_agent);
-}
-
-std::string App::GetUserAgentFallback() {
-  return AtomBrowserClient::Get()->GetUserAgent();
-}
-
-void App::SetBrowserClientCanUseCustomSiteInstance(bool should_disable) {
-  AtomBrowserClient::Get()->SetCanUseCustomSiteInstance(should_disable);
-}
-bool App::CanBrowserClientUseCustomSiteInstance() {
-  return AtomBrowserClient::Get()->CanUseCustomSiteInstance();
-}
-
 #if defined(OS_MACOSX)
 bool App::MoveToApplicationsFolder(mate::Arguments* args) {
   return ui::cocoa::AtomBundleMover::Move(args);
@@ -1309,51 +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::BounceType::CRITICAL);
-  else if (type == "informational")
-    request_id = Browser::Get()->DockBounce(Browser::BounceType::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::BindRepeating(&Browser::DockCancelBounce, browser));
-    dock_obj.SetMethod(
-        "downloadFinished",
-        base::BindRepeating(&Browser::DockDownloadFinished, browser));
-    dock_obj.SetMethod(
-        "setBadge", base::BindRepeating(&Browser::DockSetBadgeText, browser));
-    dock_obj.SetMethod(
-        "getBadge", base::BindRepeating(&Browser::DockGetBadgeText, browser));
-    dock_obj.SetMethod("hide",
-                       base::BindRepeating(&Browser::DockHide, browser));
-    dock_obj.SetMethod("show",
-                       base::BindRepeating(&Browser::DockShow, browser));
-    dock_obj.SetMethod("isVisible",
-                       base::BindRepeating(&Browser::DockIsVisible, browser));
-    dock_obj.SetMethod("setMenu", &DockSetMenu);
-    dock_obj.SetMethod("setIcon",
-                       base::BindRepeating(&Browser::DockSetIcon, browser));
-
-    dock_.Reset(isolate, dock_obj.GetHandle());
-  }
-  return v8::Local<v8::Value>::New(isolate, dock_);
-}
 #endif
 
 // static
@@ -1367,92 +1272,66 @@ void App::BuildPrototype(v8::Isolate* isolate,
   prototype->SetClassName(mate::StringToV8(isolate, "App"));
   auto browser = base::Unretained(Browser::Get());
   mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate())
-      .SetMethod("quit", base::BindRepeating(&Browser::Quit, browser))
-      .SetMethod("exit", base::BindRepeating(&Browser::Exit, browser))
-      .SetMethod("focus", base::BindRepeating(&Browser::Focus, browser))
-      .SetMethod("getVersion",
-                 base::BindRepeating(&Browser::GetVersion, browser))
-      .SetMethod("setVersion",
-                 base::BindRepeating(&Browser::SetVersion, browser))
-      .SetMethod("_getName", base::BindRepeating(&Browser::GetName, browser))
-      .SetMethod("_setName", base::BindRepeating(&Browser::SetName, browser))
-      .SetMethod("isReady", base::BindRepeating(&Browser::is_ready, browser))
-      .SetMethod("whenReady", base::BindRepeating(&Browser::WhenReady, browser))
+      .SetMethod("quit", base::Bind(&Browser::Quit, browser))
+      .SetMethod("exit", base::Bind(&Browser::Exit, browser))
+      .SetMethod("focus", base::Bind(&Browser::Focus, browser))
+      .SetMethod("getVersion", base::Bind(&Browser::GetVersion, browser))
+      .SetMethod("setVersion", base::Bind(&Browser::SetVersion, browser))
+      .SetMethod("getName", base::Bind(&Browser::GetName, browser))
+      .SetMethod("setName", base::Bind(&Browser::SetName, browser))
+      .SetMethod("isReady", base::Bind(&Browser::is_ready, browser))
+      .SetMethod("whenReady", base::Bind(&Browser::WhenReady, browser))
       .SetMethod("addRecentDocument",
-                 base::BindRepeating(&Browser::AddRecentDocument, browser))
+                 base::Bind(&Browser::AddRecentDocument, browser))
       .SetMethod("clearRecentDocuments",
-                 base::BindRepeating(&Browser::ClearRecentDocuments, browser))
+                 base::Bind(&Browser::ClearRecentDocuments, browser))
       .SetMethod("setAppUserModelId",
-                 base::BindRepeating(&Browser::SetAppUserModelID, browser))
-      .SetMethod(
-          "isDefaultProtocolClient",
-          base::BindRepeating(&Browser::IsDefaultProtocolClient, browser))
-      .SetMethod(
-          "setAsDefaultProtocolClient",
-          base::BindRepeating(&Browser::SetAsDefaultProtocolClient, browser))
-      .SetMethod(
-          "removeAsDefaultProtocolClient",
-          base::BindRepeating(&Browser::RemoveAsDefaultProtocolClient, browser))
-      .SetMethod("_setBadgeCount",
-                 base::BindRepeating(&Browser::SetBadgeCount, browser))
-      .SetMethod("_getBadgeCount",
-                 base::BindRepeating(&Browser::GetBadgeCount, browser))
+                 base::Bind(&Browser::SetAppUserModelID, browser))
+      .SetMethod("isDefaultProtocolClient",
+                 base::Bind(&Browser::IsDefaultProtocolClient, browser))
+      .SetMethod("setAsDefaultProtocolClient",
+                 base::Bind(&Browser::SetAsDefaultProtocolClient, browser))
+      .SetMethod("removeAsDefaultProtocolClient",
+                 base::Bind(&Browser::RemoveAsDefaultProtocolClient, browser))
+      .SetMethod("setBadgeCount", base::Bind(&Browser::SetBadgeCount, browser))
+      .SetMethod("getBadgeCount", base::Bind(&Browser::GetBadgeCount, browser))
       .SetMethod("getLoginItemSettings", &App::GetLoginItemSettings)
       .SetMethod("setLoginItemSettings",
-                 base::BindRepeating(&Browser::SetLoginItemSettings, browser))
-      .SetMethod("isEmojiPanelSupported",
-                 base::BindRepeating(&Browser::IsEmojiPanelSupported, browser))
-      .SetProperty("badgeCount",
-                   base::BindRepeating(&Browser::GetBadgeCount, browser),
-                   base::BindRepeating(&Browser::SetBadgeCount, browser))
-      .SetProperty("name", base::BindRepeating(&Browser::GetName, browser),
-                   base::BindRepeating(&Browser::SetName, browser))
+                 base::Bind(&Browser::SetLoginItemSettings, browser))
 #if defined(OS_MACOSX)
-      .SetMethod("hide", base::BindRepeating(&Browser::Hide, browser))
-      .SetMethod("show", base::BindRepeating(&Browser::Show, browser))
+      .SetMethod("hide", base::Bind(&Browser::Hide, browser))
+      .SetMethod("show", base::Bind(&Browser::Show, browser))
       .SetMethod("setUserActivity",
-                 base::BindRepeating(&Browser::SetUserActivity, browser))
+                 base::Bind(&Browser::SetUserActivity, browser))
       .SetMethod("getCurrentActivityType",
-                 base::BindRepeating(&Browser::GetCurrentActivityType, browser))
-      .SetMethod(
-          "invalidateCurrentActivity",
-          base::BindRepeating(&Browser::InvalidateCurrentActivity, browser))
-      .SetMethod("resignCurrentActivity",
-                 base::BindRepeating(&Browser::ResignCurrentActivity, browser))
+                 base::Bind(&Browser::GetCurrentActivityType, browser))
+      .SetMethod("invalidateCurrentActivity",
+                 base::Bind(&Browser::InvalidateCurrentActivity, browser))
       .SetMethod("updateCurrentActivity",
-                 base::BindRepeating(&Browser::UpdateCurrentActivity, browser))
+                 base::Bind(&Browser::UpdateCurrentActivity, browser))
       // TODO(juturu): Remove in 2.0, deprecate before then with warnings
       .SetMethod("moveToApplicationsFolder", &App::MoveToApplicationsFolder)
       .SetMethod("isInApplicationsFolder", &App::IsInApplicationsFolder)
 #endif
 #if defined(OS_MACOSX) || defined(OS_LINUX)
       .SetMethod("setAboutPanelOptions",
-                 base::BindRepeating(&Browser::SetAboutPanelOptions, browser))
+                 base::Bind(&Browser::SetAboutPanelOptions, browser))
       .SetMethod("showAboutPanel",
-                 base::BindRepeating(&Browser::ShowAboutPanel, browser))
-#endif
-#if defined(OS_MACOSX) || defined(OS_WIN)
-      .SetMethod("showEmojiPanel",
-                 base::BindRepeating(&Browser::ShowEmojiPanel, browser))
-      .SetProperty("accessibilitySupportEnabled",
-                   &App::IsAccessibilitySupportEnabled,
-                   &App::SetAccessibilitySupportEnabled)
+                 base::Bind(&Browser::ShowAboutPanel, browser))
 #endif
 #if defined(OS_WIN)
-      .SetMethod("setUserTasks",
-                 base::BindRepeating(&Browser::SetUserTasks, browser))
+      .SetMethod("setUserTasks", base::Bind(&Browser::SetUserTasks, browser))
       .SetMethod("getJumpListSettings", &App::GetJumpListSettings)
       .SetMethod("setJumpList", &App::SetJumpList)
 #endif
 #if defined(OS_LINUX)
       .SetMethod("isUnityRunning",
-                 base::BindRepeating(&Browser::IsUnityRunning, browser))
+                 base::Bind(&Browser::IsUnityRunning, browser))
 #endif
       .SetMethod("setAppPath", &App::SetAppPath)
       .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)
@@ -1463,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)
@@ -1479,15 +1358,7 @@ void App::BuildPrototype(v8::Isolate* isolate,
       .SetMethod("startAccessingSecurityScopedResource",
                  &App::StartAccessingSecurityScopedResource)
 #endif
-#if defined(OS_MACOSX)
-      .SetProperty("dock", &App::GetDockAPI)
-#endif
-      .SetProperty("userAgentFallback", &App::GetUserAgentFallback,
-                   &App::SetUserAgentFallback)
-      .SetMethod("enableSandbox", &App::EnableSandbox)
-      .SetProperty("allowRendererProcessReuse",
-                   &App::CanBrowserClientUseCustomSiteInstance,
-                   &App::SetBrowserClientCanUseCustomSiteInstance);
+      .SetMethod("enableSandbox", &App::EnableSandbox);
 }
 
 }  // namespace api
@@ -1496,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,
@@ -1506,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)
@@ -69,7 +67,7 @@ class App : public AtomBrowserClient::Delegate,
             public content::BrowserChildProcessObserver {
  public:
   using FileIconCallback =
-      base::RepeatingCallback<void(v8::Local<v8::Value>, const gfx::Image&)>;
+      base::Callback<void(v8::Local<v8::Value>, const gfx::Image&)>;
 
   static mate::Handle<App> Create(v8::Isolate* isolate);
 
@@ -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
 
@@ -130,11 +128,11 @@ class App : public AtomBrowserClient::Delegate,
       int cert_error,
       const net::SSLInfo& ssl_info,
       const GURL& request_url,
-      bool is_main_frame_request,
+      content::ResourceType resource_type,
       bool strict_enforcement,
       bool expired_previous_decision,
-      const base::RepeatingCallback<
-          void(content::CertificateRequestResultType)>& callback) override;
+      const base::Callback<void(content::CertificateRequestResultType)>&
+          callback) override;
   void SelectClientCertificate(
       content::WebContents* web_contents,
       net::SSLCertRequestInfo* cert_request_info,
@@ -157,7 +155,6 @@ class App : public AtomBrowserClient::Delegate,
                        bool* no_javascript_access) override;
 
   // content::GpuDataManagerObserver:
-  void OnGpuInfoUpdate() override;
   void OnGpuProcessCrashed(base::TerminationStatus status) override;
 
   // content::BrowserChildProcessObserver:
@@ -177,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,
@@ -201,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);
@@ -211,20 +206,13 @@ class App : public AtomBrowserClient::Delegate,
   v8::Local<v8::Promise> GetGPUInfo(v8::Isolate* isolate,
                                     const std::string& info_type);
   void EnableSandbox(mate::Arguments* args);
-  void SetUserAgentFallback(const std::string& user_agent);
-  std::string GetUserAgentFallback();
-  void SetBrowserClientCanUseCustomSiteInstance(bool should_disable);
-  bool CanBrowserClientUseCustomSiteInstance();
 
 #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::RepeatingCallback<void()> StartAccessingSecurityScopedResource(
+  base::Callback<void()> StartAccessingSecurityScopedResource(
       mate::Arguments* args);
 #endif
 

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 api
-
-}  // namespace atom

atom/browser/api/atom_api_app_mas.mm

@@ -4,8 +4,6 @@
 
 #include "atom/browser/api/atom_api_app.h"
 
-#include <string>
-
 #import <Cocoa/Cocoa.h>
 
 #include "base/strings/sys_string_conversions.h"
@@ -21,13 +19,13 @@ void OnStopAccessingSecurityScopedResource(NSURL* bookmarkUrl) {
 }
 
 // Get base64 encoded NSData, create a bookmark for it and start accessing it.
-base::RepeatingCallback<void()> App::StartAccessingSecurityScopedResource(
+base::Callback<void()> App::StartAccessingSecurityScopedResource(
     mate::Arguments* args) {
   std::string data;
   args->GetNext(&data);
   NSString* base64str = base::SysUTF8ToNSString(data);
-  NSData* bookmarkData = [[NSData alloc] initWithBase64EncodedString:base64str
-                                                             options:0];
+  NSData* bookmarkData =
+      [[NSData alloc] initWithBase64EncodedString:base64str options:0];
 
   // Create bookmarkUrl from NSData.
   BOOL isStale = false;
@@ -57,10 +55,9 @@ base::RepeatingCallback<void()> App::StartAccessingSecurityScopedResource(
   [bookmarkUrl retain];
 
   // Return a js callback which will close the bookmark.
-  return base::BindRepeating(&OnStopAccessingSecurityScopedResource,
-                             bookmarkUrl);
+  return base::Bind(&OnStopAccessingSecurityScopedResource, bookmarkUrl);
 }
 
-}  // namespace api
-
 }  // 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);
 }
@@ -97,8 +91,7 @@ void AutoUpdater::OnUpdateDownloaded(const std::string& release_notes,
                                      const std::string& url) {
   Emit("update-downloaded", release_notes, release_name, release_date, url,
        // Keep compatibility with old APIs.
-       base::BindRepeating(&AutoUpdater::QuitAndInstall,
-                           base::Unretained(this)));
+       base::Bind(&AutoUpdater::QuitAndInstall, base::Unretained(this)));
 }
 
 void AutoUpdater::OnWindowAllClosed() {

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;
@@ -68,7 +60,7 @@ void BrowserView::Init(v8::Isolate* isolate,
                        const mate::Dictionary& options) {
   mate::Dictionary web_preferences = mate::Dictionary::CreateEmpty(isolate);
   options.Get(options::kWebPreferences, &web_preferences);
-  web_preferences.Set("type", "browserView");
+  web_preferences.Set("isBrowserView", true);
   mate::Handle<class WebContents> web_contents =
       WebContents::Create(isolate, web_preferences);
 
@@ -165,7 +157,7 @@ void Initialize(v8::Local<v8::Object> exports,
                 v8::Local<v8::Context> context,
                 void* priv) {
   v8::Isolate* isolate = context->GetIsolate();
-  BrowserView::SetConstructor(isolate, base::BindRepeating(&BrowserView::New));
+  BrowserView::SetConstructor(isolate, base::Bind(&BrowserView::New));
 
   mate::Dictionary browser_view(isolate, BrowserView::GetConstructor(isolate)
                                              ->GetFunction(context)

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 {
@@ -67,7 +68,7 @@ BrowserWindow::BrowserWindow(v8::Isolate* isolate,
   }
 
   web_contents_.Reset(isolate, web_contents.ToV8());
-  api_web_contents_ = web_contents.get();
+  api_web_contents_ = web_contents->GetWeakPtr();
   api_web_contents_->AddObserver(this);
   Observe(api_web_contents_->web_contents());
 
@@ -94,7 +95,9 @@ BrowserWindow::BrowserWindow(v8::Isolate* isolate,
 }
 
 BrowserWindow::~BrowserWindow() {
-  api_web_contents_->RemoveObserver(this);
+  // FIXME This is a hack rather than a proper fix preventing shutdown crashes.
+  if (api_web_contents_)
+    api_web_contents_->RemoveObserver(this);
   // Note that the OnWindowClosed will not be called after the destructor runs,
   // since the window object is managed by the TopLevelWindow class.
   if (web_contents())
@@ -170,6 +173,17 @@ void BrowserWindow::OnRendererUnresponsive(content::RenderProcessHost*) {
   ScheduleUnresponsiveEvent(50);
 }
 
+bool BrowserWindow::OnMessageReceived(const IPC::Message& message,
+                                      content::RenderFrameHost* rfh) {
+  bool handled = true;
+  IPC_BEGIN_MESSAGE_MAP_WITH_PARAM(BrowserWindow, message, rfh)
+    IPC_MESSAGE_HANDLER(AtomFrameHostMsg_UpdateDraggableRegions,
+                        UpdateDraggableRegions)
+    IPC_MESSAGE_UNHANDLED(handled = false)
+  IPC_END_MESSAGE_MAP()
+  return handled;
+}
+
 void BrowserWindow::OnCloseContents() {
   // On some machines it may happen that the window gets destroyed for twice,
   // checking web_contents() can effectively guard against that.
@@ -205,11 +219,6 @@ void BrowserWindow::OnRendererResponsive() {
   Emit("responsive");
 }
 
-void BrowserWindow::OnDraggableRegionsUpdated(
-    const std::vector<mojom::DraggableRegionPtr>& regions) {
-  UpdateDraggableRegions(regions);
-}
-
 void BrowserWindow::RequestPreferredWidth(int* width) {
   *width = web_contents()->GetPreferredSize().width();
 }
@@ -270,7 +279,7 @@ void BrowserWindow::OnWindowFocus() {
 void BrowserWindow::OnWindowResize() {
 #if defined(OS_MACOSX)
   if (!draggable_regions_.empty())
-    UpdateDraggableRegions(draggable_regions_);
+    UpdateDraggableRegions(nullptr, draggable_regions_);
 #endif
   TopLevelWindow::OnWindowResize();
 }
@@ -308,28 +317,28 @@ void BrowserWindow::SetBrowserView(v8::Local<v8::Value> value) {
   TopLevelWindow::ResetBrowserViews();
   TopLevelWindow::AddBrowserView(value);
 #if defined(OS_MACOSX)
-  UpdateDraggableRegions(draggable_regions_);
+  UpdateDraggableRegions(nullptr, draggable_regions_);
 #endif
 }
 
 void BrowserWindow::AddBrowserView(v8::Local<v8::Value> value) {
   TopLevelWindow::AddBrowserView(value);
 #if defined(OS_MACOSX)
-  UpdateDraggableRegions(draggable_regions_);
+  UpdateDraggableRegions(nullptr, draggable_regions_);
 #endif
 }
 
 void BrowserWindow::RemoveBrowserView(v8::Local<v8::Value> value) {
   TopLevelWindow::RemoveBrowserView(value);
 #if defined(OS_MACOSX)
-  UpdateDraggableRegions(draggable_regions_);
+  UpdateDraggableRegions(nullptr, draggable_regions_);
 #endif
 }
 
 void BrowserWindow::ResetBrowserViews() {
   TopLevelWindow::ResetBrowserViews();
 #if defined(OS_MACOSX)
-  UpdateDraggableRegions(draggable_regions_);
+  UpdateDraggableRegions(nullptr, draggable_regions_);
 #endif
 }
 
@@ -371,13 +380,13 @@ v8::Local<v8::Value> BrowserWindow::GetWebContents(v8::Isolate* isolate) {
 
 // Convert draggable regions in raw format to SkRegion format.
 std::unique_ptr<SkRegion> BrowserWindow::DraggableRegionsToSkRegion(
-    const std::vector<mojom::DraggableRegionPtr>& regions) {
+    const std::vector<DraggableRegion>& regions) {
   auto sk_region = std::make_unique<SkRegion>();
-  for (const auto& region : regions) {
+  for (const DraggableRegion& region : regions) {
     sk_region->op(
-        region->bounds.x(), region->bounds.y(), region->bounds.right(),
-        region->bounds.bottom(),
-        region->draggable ? SkRegion::kUnion_Op : SkRegion::kDifference_Op);
+        region.bounds.x(), region.bounds.y(), region.bounds.right(),
+        region.bounds.bottom(),
+        region.draggable ? SkRegion::kUnion_Op : SkRegion::kDifference_Op);
   }
   return sk_region;
 }
@@ -386,8 +395,8 @@ void BrowserWindow::ScheduleUnresponsiveEvent(int ms) {
   if (!window_unresponsive_closure_.IsCancelled())
     return;
 
-  window_unresponsive_closure_.Reset(base::BindRepeating(
-      &BrowserWindow::NotifyWindowUnresponsive, GetWeakPtr()));
+  window_unresponsive_closure_.Reset(
+      base::Bind(&BrowserWindow::NotifyWindowUnresponsive, GetWeakPtr()));
   base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
       FROM_HERE, window_unresponsive_closure_.callback(),
       base::TimeDelta::FromMilliseconds(ms));
@@ -468,9 +477,8 @@ void Initialize(v8::Local<v8::Object> exports,
                 void* priv) {
   v8::Isolate* isolate = context->GetIsolate();
   mate::Dictionary dict(isolate, exports);
-  dict.Set("BrowserWindow",
-           mate::CreateConstructor<BrowserWindow>(
-               isolate, base::BindRepeating(&BrowserWindow::New)));
+  dict.Set("BrowserWindow", mate::CreateConstructor<BrowserWindow>(
+                                isolate, base::Bind(&BrowserWindow::New)));
 }
 
 }  // namespace

atom/browser/api/atom_api_browser_window.h

@@ -51,12 +51,12 @@ class BrowserWindow : public TopLevelWindow,
   void DidFirstVisuallyNonEmptyPaint() override;
   void BeforeUnloadDialogCancelled() override;
   void OnRendererUnresponsive(content::RenderProcessHost*) override;
+  bool OnMessageReceived(const IPC::Message& message,
+                         content::RenderFrameHost* rfh) override;
 
   // ExtendedWebContentsObserver:
   void OnCloseContents() override;
   void OnRendererResponsive() override;
-  void OnDraggableRegionsUpdated(
-      const std::vector<mojom::DraggableRegionPtr>& regions) override;
 
   // NativeWindowObserver:
   void RequestPreferredWidth(int* width) override;
@@ -91,12 +91,12 @@ class BrowserWindow : public TopLevelWindow,
   // Helpers.
 
   // Called when the window needs to update its draggable region.
-  void UpdateDraggableRegions(
-      const std::vector<mojom::DraggableRegionPtr>& regions);
+  void UpdateDraggableRegions(content::RenderFrameHost* rfh,
+                              const std::vector<DraggableRegion>& regions);
 
   // Convert draggable regions in raw format to SkRegion format.
   std::unique_ptr<SkRegion> DraggableRegionsToSkRegion(
-      const std::vector<mojom::DraggableRegionPtr>& regions);
+      const std::vector<DraggableRegion>& regions);
 
   // Schedule a notification unresponsive event.
   void ScheduleUnresponsiveEvent(int ms);
@@ -112,11 +112,11 @@ class BrowserWindow : public TopLevelWindow,
   base::CancelableClosure window_unresponsive_closure_;
 
 #if defined(OS_MACOSX)
-  std::vector<mojom::DraggableRegionPtr> draggable_regions_;
+  std::vector<DraggableRegion> draggable_regions_;
 #endif
 
   v8::Global<v8::Value> web_contents_;
-  api::WebContents* api_web_contents_;
+  base::WeakPtr<api::WebContents> api_web_contents_;
 
   base::WeakPtrFactory<BrowserWindow> weak_factory_;
 

atom/browser/api/atom_api_browser_window_mac.mm

@@ -4,14 +4,12 @@
 
 #include "atom/browser/api/atom_api_browser_window.h"
 
-#include <memory>
-#include <vector>
-
 #import <Cocoa/Cocoa.h>
 
 #include "atom/browser/native_browser_view.h"
 #include "atom/browser/native_window_mac.h"
 #include "atom/browser/ui/inspectable_web_contents_view.h"
+#include "atom/common/draggable_region.h"
 #include "base/mac/scoped_nsobject.h"
 
 @interface NSView (WebContentsView)
@@ -75,7 +73,8 @@ void BrowserWindow::OverrideNSWindowContentView(InspectableWebContents* iwc) {
 }
 
 void BrowserWindow::UpdateDraggableRegions(
-    const std::vector<mojom::DraggableRegionPtr>& regions) {
+    content::RenderFrameHost* rfh,
+    const std::vector<DraggableRegion>& regions) {
   if (window_->has_frame())
     return;
 
@@ -101,9 +100,7 @@ void BrowserWindow::UpdateDraggableRegions(
 
   // Draggable regions is implemented by having the whole web view draggable
   // (mouseDownCanMoveWindow) and overlaying regions that are not draggable.
-  draggable_regions_.clear();
-  for (const auto& r : regions)
-    draggable_regions_.push_back(r.Clone());
+  draggable_regions_ = regions;
   std::vector<gfx::Rect> drag_exclude_rects;
   if (regions.empty()) {
     drag_exclude_rects.push_back(gfx::Rect(0, 0, webViewWidth, webViewHeight));
@@ -114,7 +111,7 @@ void BrowserWindow::UpdateDraggableRegions(
 
   auto browser_views = window_->browser_views();
   for (NativeBrowserView* view : browser_views) {
-    view->UpdateDraggableRegions(drag_exclude_rects);
+    (view)->UpdateDraggableRegions(drag_exclude_rects);
   }
 
   // Create and add a ControlRegionView for each region that needs to be

atom/browser/api/atom_api_browser_window_views.cc

@@ -11,7 +11,8 @@ namespace atom {
 namespace api {
 
 void BrowserWindow::UpdateDraggableRegions(
-    const std::vector<mojom::DraggableRegionPtr>& regions) {
+    content::RenderFrameHost* rfh,
+    const std::vector<DraggableRegion>& regions) {
   if (window_->has_frame())
     return;
   static_cast<NativeWindowViews*>(window_.get())

atom/browser/api/atom_api_content_tracing.cc

@@ -4,20 +4,19 @@
 
 #include <set>
 #include <string>
-#include <utility>
 
 #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"
-#include "base/optional.h"
 #include "base/threading/thread_restrictions.h"
 #include "content/public/browser/tracing_controller.h"
 #include "native_mate/dictionary.h"
 
+#include "atom/common/node_includes.h"
+
 using content::TracingController;
 
 namespace mate {
@@ -55,97 +54,79 @@ struct Converter<base::trace_event::TraceConfig> {
 
 namespace {
 
-using CompletionCallback = base::OnceCallback<void(const base::FilePath&)>;
+using CompletionCallback = base::Callback<void(const base::FilePath&)>;
 
-base::Optional<base::FilePath> CreateTemporaryFileOnIO() {
-  base::FilePath temp_file_path;
-  if (!base::CreateTemporaryFile(&temp_file_path))
-    return base::nullopt;
-  return base::make_optional(std::move(temp_file_path));
+scoped_refptr<TracingController::TraceDataEndpoint> GetTraceDataEndpoint(
+    const base::FilePath& path,
+    const CompletionCallback& callback) {
+  base::FilePath result_file_path = path;
+
+  // base::CreateTemporaryFile prevents blocking so we need to allow it
+  // for now since offloading this to a different sequence would require
+  // changing the api shape
+  base::ThreadRestrictions::ScopedAllowIO allow_io;
+  if (result_file_path.empty() && !base::CreateTemporaryFile(&result_file_path))
+    LOG(ERROR) << "Creating temporary file failed";
+
+  return TracingController::CreateFileEndpoint(
+      result_file_path, base::Bind(callback, result_file_path));
 }
 
-void StopTracing(atom::util::Promise promise,
-                 base::Optional<base::FilePath> file_path) {
-  if (file_path) {
-    auto endpoint = TracingController::CreateFileEndpoint(
-        *file_path, base::AdaptCallbackForRepeating(base::BindOnce(
-                        &atom::util::Promise::ResolvePromise<base::FilePath>,
-                        std::move(promise), *file_path)));
-    TracingController::GetInstance()->StopTracing(endpoint);
-  } else {
-    promise.RejectWithErrorMessage(
-        "Failed to create temporary file for trace data");
-  }
+void OnRecordingStopped(const atom::util::CopyablePromise& promise,
+                        const base::FilePath& path) {
+  promise.GetPromise().Resolve(path);
 }
 
-v8::Local<v8::Promise> StopRecording(mate::Arguments* args) {
-  atom::util::Promise promise(args->isolate());
+v8::Local<v8::Promise> StopRecording(v8::Isolate* isolate,
+                                     const base::FilePath& path) {
+  atom::util::Promise promise(isolate);
   v8::Local<v8::Promise> handle = promise.GetHandle();
 
-  base::FilePath path;
-  if (args->GetNext(&path) && !path.empty()) {
-    StopTracing(std::move(promise), base::make_optional(path));
-  } else {
-    // use a temporary file.
-    base::PostTaskWithTraitsAndReplyWithResult(
-        FROM_HERE, {base::MayBlock(), base::TaskPriority::USER_VISIBLE},
-        base::BindOnce(CreateTemporaryFileOnIO),
-        base::BindOnce(StopTracing, std::move(promise)));
-  }
-
+  // TODO(zcbenz): Remove the use of CopyablePromise when the
+  // CreateFileEndpoint API accepts OnceCallback.
+  TracingController::GetInstance()->StopTracing(GetTraceDataEndpoint(
+      path,
+      base::Bind(&OnRecordingStopped, atom::util::CopyablePromise(promise))));
   return handle;
 }
 
+void OnCategoriesAvailable(atom::util::Promise promise,
+                           const std::set<std::string>& categories) {
+  promise.Resolve(categories);
+}
+
 v8::Local<v8::Promise> GetCategories(v8::Isolate* isolate) {
   atom::util::Promise promise(isolate);
   v8::Local<v8::Promise> handle = promise.GetHandle();
 
   // Note: This method always succeeds.
-  TracingController::GetInstance()->GetCategories(base::BindOnce(
-      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) {
   atom::util::Promise promise(isolate);
   v8::Local<v8::Promise> handle = promise.GetHandle();
 
-  if (!TracingController::GetInstance()->StartTracing(
-          trace_config, base::BindOnce(atom::util::Promise::ResolveEmptyPromise,
-                                       std::move(promise)))) {
-    // If StartTracing returns false, that means it didn't invoke its callback.
-    // Return an already-resolved promise and abandon the previous promise (it
-    // was std::move()d into the StartTracing callback and has been deleted by
-    // this point).
-    return atom::util::Promise::ResolvedPromise(isolate);
-  }
-  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)));
+  TracingController::GetInstance()->StartTracing(
+      trace_config, base::BindOnce(&OnTracingStarted, std::move(promise)));
   return handle;
 }
 
+bool GetTraceBufferUsage(
+    const base::RepeatingCallback<void(float, size_t)>& callback) {
+  return TracingController::GetInstance()->GetTraceBufferUsage(
+      base::BindOnce(callback));
+}
+
 void Initialize(v8::Local<v8::Object> exports,
                 v8::Local<v8::Value> unused,
                 v8::Local<v8::Context> context,

atom/browser/api/atom_api_cookies.cc

@@ -12,14 +12,14 @@
 #include "atom/common/native_mate_converters/callback.h"
 #include "atom/common/native_mate_converters/gurl_converter.h"
 #include "atom/common/native_mate_converters/value_converter.h"
+#include "base/task/post_task.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
-#include "content/public/browser/storage_partition.h"
-#include "gin/dictionary.h"
-#include "gin/object_template_builder.h"
+#include "native_mate/dictionary.h"
+#include "native_mate/object_template_builder.h"
 #include "net/cookies/canonical_cookie.h"
 #include "net/cookies/cookie_store.h"
 #include "net/cookies/cookie_util.h"
@@ -28,13 +28,24 @@
 
 using content::BrowserThread;
 
-namespace gin {
+namespace mate {
+
+template <>
+struct Converter<atom::api::Cookies::Error> {
+  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
+                                   atom::api::Cookies::Error val) {
+    if (val == atom::api::Cookies::SUCCESS)
+      return v8::Null(isolate);
+    else
+      return v8::Exception::Error(StringToV8(isolate, "Setting cookie failed"));
+  }
+};
 
 template <>
 struct Converter<net::CanonicalCookie> {
   static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
                                    const net::CanonicalCookie& val) {
-    gin::Dictionary dict(isolate, v8::Object::New(isolate));
+    mate::Dictionary dict(isolate, v8::Object::New(isolate));
     dict.Set("name", val.Name());
     dict.Set("value", val.Value());
     dict.Set("domain", val.Domain());
@@ -45,7 +56,7 @@ struct Converter<net::CanonicalCookie> {
     dict.Set("session", !val.IsPersistent());
     if (val.IsPersistent())
       dict.Set("expirationDate", val.ExpiryDate().ToDoubleT());
-    return ConvertToV8(isolate, dict).As<v8::Object>();
+    return dict.GetHandle();
   }
 };
 
@@ -57,22 +68,22 @@ struct Converter<network::mojom::CookieChangeCause> {
     switch (val) {
       case network::mojom::CookieChangeCause::INSERTED:
       case network::mojom::CookieChangeCause::EXPLICIT:
-        return gin::StringToV8(isolate, "explicit");
+        return mate::StringToV8(isolate, "explicit");
       case network::mojom::CookieChangeCause::OVERWRITE:
-        return gin::StringToV8(isolate, "overwrite");
+        return mate::StringToV8(isolate, "overwrite");
       case network::mojom::CookieChangeCause::EXPIRED:
-        return gin::StringToV8(isolate, "expired");
+        return mate::StringToV8(isolate, "expired");
       case network::mojom::CookieChangeCause::EVICTED:
-        return gin::StringToV8(isolate, "evicted");
+        return mate::StringToV8(isolate, "evicted");
       case network::mojom::CookieChangeCause::EXPIRED_OVERWRITE:
-        return gin::StringToV8(isolate, "expired-overwrite");
+        return mate::StringToV8(isolate, "expired-overwrite");
       default:
-        return gin::StringToV8(isolate, "unknown");
+        return mate::StringToV8(isolate, "unknown");
     }
   }
 };
 
-}  // namespace gin
+}  // namespace mate
 
 namespace atom {
 
@@ -102,62 +113,180 @@ bool MatchesDomain(std::string filter, const std::string& domain) {
 }
 
 // Returns whether |cookie| matches |filter|.
-bool MatchesCookie(const base::Value& filter,
+bool MatchesCookie(const base::DictionaryValue* filter,
                    const net::CanonicalCookie& cookie) {
-  const std::string* str;
-  if ((str = filter.FindStringKey("name")) && *str != cookie.Name())
+  std::string str;
+  bool b;
+  if (filter->GetString("name", &str) && str != cookie.Name())
     return false;
-  if ((str = filter.FindStringKey("path")) && *str != cookie.Path())
+  if (filter->GetString("path", &str) && str != cookie.Path())
     return false;
-  if ((str = filter.FindStringKey("domain")) &&
-      !MatchesDomain(*str, cookie.Domain()))
+  if (filter->GetString("domain", &str) && !MatchesDomain(str, cookie.Domain()))
     return false;
-  base::Optional<bool> secure_filter = filter.FindBoolKey("secure");
-  if (secure_filter && *secure_filter == cookie.IsSecure())
+  if (filter->GetBoolean("secure", &b) && b != cookie.IsSecure())
     return false;
-  base::Optional<bool> session_filter = filter.FindBoolKey("session");
-  if (session_filter && *session_filter != !cookie.IsPersistent())
+  if (filter->GetBoolean("session", &b) && b != !cookie.IsPersistent())
     return false;
   return true;
 }
 
+// Helper to returns the CookieStore.
+inline net::CookieStore* GetCookieStore(
+    scoped_refptr<net::URLRequestContextGetter> getter) {
+  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(const base::Value& filter,
+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, cookie))
+    if (MatchesCookie(filter.get(), cookie))
       result.push_back(cookie);
   }
 
-  promise.Resolve(gin::ConvertToV8(promise.isolate(), result));
+  base::PostTaskWithTraits(
+      FROM_HERE, {BrowserThread::UI},
+      base::BindOnce(ResolvePromiseWithCookies, std::move(promise), result));
 }
 
-std::string InclusionStatusToString(
-    net::CanonicalCookie::CookieInclusionStatus status) {
-  switch (status) {
-    case net::CanonicalCookie::CookieInclusionStatus::EXCLUDE_HTTP_ONLY:
-      return "Failed to create httponly cookie";
-    case net::CanonicalCookie::CookieInclusionStatus::EXCLUDE_SECURE_ONLY:
-      return "Cannot create a secure cookie from an insecure URL";
-    case net::CanonicalCookie::CookieInclusionStatus::EXCLUDE_FAILURE_TO_STORE:
-      return "Failed to parse cookie";
-    case net::CanonicalCookie::CookieInclusionStatus::EXCLUDE_INVALID_DOMAIN:
-      return "Failed to get cookie domain";
-    case net::CanonicalCookie::CookieInclusionStatus::EXCLUDE_INVALID_PREFIX:
-      return "Failed because the cookie violated prefix rules.";
-    case net::CanonicalCookie::CookieInclusionStatus::
-        EXCLUDE_NONCOOKIEABLE_SCHEME:
-      return "Cannot set cookie for current scheme";
-    case net::CanonicalCookie::CookieInclusionStatus::INCLUDE:
-      return "";
-    default:
-      return "Setting cookie failed";
+// Receives cookies matching |filter| in IO thread.
+void GetCookiesOnIO(scoped_refptr<net::URLRequestContextGetter> getter,
+                    std::unique_ptr<base::DictionaryValue> filter,
+                    util::Promise promise) {
+  std::string url;
+  filter->GetString("url", &url);
+
+  auto filtered_callback =
+      base::BindOnce(FilterCookies, std::move(filter), std::move(promise));
+
+  // Empty url will match all url cookies.
+  if (url.empty())
+    GetCookieStore(getter)->GetAllCookiesAsync(std::move(filtered_callback));
+  else
+    GetCookieStore(getter)->GetAllCookiesForURLAsync(
+        GURL(url), std::move(filtered_callback));
+}
+
+// Removes cookie with |url| and |name| in IO thread.
+void RemoveCookieOnIO(scoped_refptr<net::URLRequestContextGetter> getter,
+                      const GURL& url,
+                      const std::string& name,
+                      util::Promise promise) {
+  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, bool success) {
+  const std::string errmsg = success ? "" : "Setting cookie failed";
+  RunCallbackInUI(
+      base::BindOnce(SettlePromiseInUI, std::move(promise), errmsg));
+}
+
+// Flushes cookie store in IO thread.
+void FlushCookieStoreOnIOThread(
+    scoped_refptr<net::URLRequestContextGetter> getter,
+    util::Promise promise) {
+  GetCookieStore(getter)->FlushStore(
+      base::BindOnce(ResolvePromiseInUI, std::move(promise)));
+}
+
+// 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;
+  bool secure = false;
+  bool http_only = false;
+  double creation_date;
+  double expiration_date;
+  double last_access_date;
+  details->GetString("url", &url_string);
+  details->GetString("name", &name);
+  details->GetString("value", &value);
+  details->GetString("domain", &domain);
+  details->GetString("path", &path);
+  details->GetBoolean("secure", &secure);
+  details->GetBoolean("httpOnly", &http_only);
+
+  base::Time creation_time;
+  if (details->GetDouble("creationDate", &creation_date)) {
+    creation_time = (creation_date == 0)
+                        ? base::Time::UnixEpoch()
+                        : base::Time::FromDoubleT(creation_date);
+  }
+
+  base::Time expiration_time;
+  if (details->GetDouble("expirationDate", &expiration_date)) {
+    expiration_time = (expiration_date == 0)
+                          ? base::Time::UnixEpoch()
+                          : base::Time::FromDoubleT(expiration_date);
+  }
+
+  base::Time last_access_time;
+  if (details->GetDouble("lastAccessDate", &last_access_date)) {
+    last_access_time = (last_access_date == 0)
+                           ? base::Time::UnixEpoch()
+                           : base::Time::FromDoubleT(last_access_date);
+  }
+
+  auto completion_callback = base::BindOnce(OnSetCookie, std::move(promise));
+  GURL url(url_string);
+  if (!url.is_valid()) {
+    std::move(completion_callback).Run(false);
+    return;
+  }
+
+  if (name.empty()) {
+    std::move(completion_callback).Run(false);
+    return;
+  }
+
+  std::unique_ptr<net::CanonicalCookie> canonical_cookie(
+      net::CanonicalCookie::CreateSanitizedCookie(
+          url, name, value, domain, path, creation_time, expiration_time,
+          last_access_time, secure, http_only,
+          net::CookieSameSite::DEFAULT_MODE, net::COOKIE_PRIORITY_DEFAULT));
+  if (!canonical_cookie || !canonical_cookie->IsCanonical()) {
+    std::move(completion_callback).Run(false);
+    return;
+  }
+  GetCookieStore(getter)->SetCanonicalCookieAsync(
+      std::move(canonical_cookie), secure, http_only,
+      std::move(completion_callback));
+}
+
 }  // namespace
 
 Cookies::Cookies(v8::Isolate* isolate, AtomBrowserContext* browser_context)
@@ -165,8 +294,7 @@ Cookies::Cookies(v8::Isolate* isolate, AtomBrowserContext* browser_context)
   Init(isolate);
   cookie_change_subscription_ =
       browser_context_->cookie_change_notifier()->RegisterCookieChangeCallback(
-          base::BindRepeating(&Cookies::OnCookieChanged,
-                              base::Unretained(this)));
+          base::Bind(&Cookies::OnCookieChanged, base::Unretained(this)));
 }
 
 Cookies::~Cookies() {}
@@ -175,33 +303,13 @@ v8::Local<v8::Promise> Cookies::Get(const base::DictionaryValue& filter) {
   util::Promise promise(isolate());
   v8::Local<v8::Promise> handle = promise.GetHandle();
 
-  std::string url_string;
-  filter.GetString("url", &url_string);
-  GURL url(url_string);
-
-  auto callback =
-      base::BindOnce(FilterCookies, filter.Clone(), std::move(promise));
-
-  auto* storage_partition = content::BrowserContext::GetDefaultStoragePartition(
-      browser_context_.get());
-  auto* manager = storage_partition->GetCookieManagerForBrowserProcess();
-
-  if (url.is_empty()) {
-    // GetAllCookies has a different callback signature than GetCookieList, but
-    // can be treated as the same, just returning no excluded cookies.
-    // |AddCookieStatusList| takes a |GetCookieListCallback| and returns a
-    // callback that calls the input callback with an empty excluded list.
-    manager->GetAllCookies(
-        net::cookie_util::AddCookieStatusList(std::move(callback)));
-  } else {
-    net::CookieOptions options;
-    options.set_include_httponly();
-    options.set_same_site_cookie_context(
-        net::CookieOptions::SameSiteCookieContext::SAME_SITE_STRICT);
-    options.set_do_not_update_access_time();
-
-    manager->GetCookieList(url, options, std::move(callback));
-  }
+  auto copy = base::DictionaryValue::From(
+      base::Value::ToUniquePtrValue(filter.Clone()));
+  auto* getter = browser_context_->GetRequestContext();
+  base::PostTaskWithTraits(
+      FROM_HERE, {BrowserThread::IO},
+      base::BindOnce(GetCookiesOnIO, base::RetainedRef(getter), std::move(copy),
+                     std::move(promise)));
 
   return handle;
 }
@@ -211,21 +319,11 @@ v8::Local<v8::Promise> Cookies::Remove(const GURL& url,
   util::Promise promise(isolate());
   v8::Local<v8::Promise> handle = promise.GetHandle();
 
-  auto cookie_deletion_filter = network::mojom::CookieDeletionFilter::New();
-  cookie_deletion_filter->url = url;
-  cookie_deletion_filter->cookie_name = name;
-
-  auto* storage_partition = content::BrowserContext::GetDefaultStoragePartition(
-      browser_context_.get());
-  auto* manager = storage_partition->GetCookieManagerForBrowserProcess();
-
-  manager->DeleteCookies(
-      std::move(cookie_deletion_filter),
-      base::BindOnce(
-          [](util::Promise promise, uint32_t num_deleted) {
-            util::Promise::ResolveEmptyPromise(std::move(promise));
-          },
-          std::move(promise)));
+  auto* getter = browser_context_->GetRequestContext();
+  base::PostTaskWithTraits(
+      FROM_HERE, {BrowserThread::IO},
+      base::BindOnce(RemoveCookieOnIO, base::RetainedRef(getter), url, name,
+                     std::move(promise)));
 
   return handle;
 }
@@ -234,72 +332,13 @@ v8::Local<v8::Promise> Cookies::Set(const base::DictionaryValue& details) {
   util::Promise promise(isolate());
   v8::Local<v8::Promise> handle = promise.GetHandle();
 
-  const std::string* url_string = details.FindStringKey("url");
-  const std::string* name = details.FindStringKey("name");
-  const std::string* value = details.FindStringKey("value");
-  const std::string* domain = details.FindStringKey("domain");
-  const std::string* path = details.FindStringKey("path");
-  bool secure = details.FindBoolKey("secure").value_or(false);
-  bool http_only = details.FindBoolKey("httpOnly").value_or(false);
-  base::Optional<double> creation_date = details.FindDoubleKey("creationDate");
-  base::Optional<double> expiration_date =
-      details.FindDoubleKey("expirationDate");
-  base::Optional<double> last_access_date =
-      details.FindDoubleKey("lastAccessDate");
-
-  base::Time creation_time = creation_date
-                                 ? base::Time::FromDoubleT(*creation_date)
-                                 : base::Time::UnixEpoch();
-  base::Time expiration_time = expiration_date
-                                   ? base::Time::FromDoubleT(*expiration_date)
-                                   : base::Time::UnixEpoch();
-  base::Time last_access_time = last_access_date
-                                    ? base::Time::FromDoubleT(*last_access_date)
-                                    : base::Time::UnixEpoch();
-
-  GURL url(url_string ? *url_string : "");
-  if (url.is_empty()) {
-    promise.RejectWithErrorMessage(InclusionStatusToString(
-        net::CanonicalCookie::CookieInclusionStatus::EXCLUDE_INVALID_DOMAIN));
-    return handle;
-  }
-
-  if (!name || name->empty()) {
-    promise.RejectWithErrorMessage(InclusionStatusToString(
-        net::CanonicalCookie::CookieInclusionStatus::EXCLUDE_FAILURE_TO_STORE));
-    return handle;
-  }
-
-  auto canonical_cookie = net::CanonicalCookie::CreateSanitizedCookie(
-      url, *name, value ? *value : "", domain ? *domain : "", path ? *path : "",
-      creation_time, expiration_time, last_access_time, secure, http_only,
-      net::CookieSameSite::NO_RESTRICTION, net::COOKIE_PRIORITY_DEFAULT);
-  if (!canonical_cookie || !canonical_cookie->IsCanonical()) {
-    promise.RejectWithErrorMessage(InclusionStatusToString(
-        net::CanonicalCookie::CookieInclusionStatus::EXCLUDE_FAILURE_TO_STORE));
-    return handle;
-  }
-  net::CookieOptions options;
-  if (http_only) {
-    options.set_include_httponly();
-  }
-
-  auto* storage_partition = content::BrowserContext::GetDefaultStoragePartition(
-      browser_context_.get());
-  auto* manager = storage_partition->GetCookieManagerForBrowserProcess();
-  manager->SetCanonicalCookie(
-      *canonical_cookie, url.scheme(), options,
-      base::BindOnce(
-          [](util::Promise promise,
-             net::CanonicalCookie::CookieInclusionStatus status) {
-            auto errmsg = InclusionStatusToString(status);
-            if (errmsg.empty()) {
-              promise.Resolve();
-            } else {
-              promise.RejectWithErrorMessage(errmsg);
-            }
-          },
-          std::move(promise)));
+  auto copy = base::DictionaryValue::From(
+      base::Value::ToUniquePtrValue(details.Clone()));
+  auto* getter = browser_context_->GetRequestContext();
+  base::PostTaskWithTraits(
+      FROM_HERE, {BrowserThread::IO},
+      base::BindOnce(SetCookieOnIO, base::RetainedRef(getter), std::move(copy),
+                     std::move(promise)));
 
   return handle;
 }
@@ -308,32 +347,29 @@ v8::Local<v8::Promise> Cookies::FlushStore() {
   util::Promise promise(isolate());
   v8::Local<v8::Promise> handle = promise.GetHandle();
 
-  auto* storage_partition = content::BrowserContext::GetDefaultStoragePartition(
-      browser_context_.get());
-  auto* manager = storage_partition->GetCookieManagerForBrowserProcess();
-
-  manager->FlushCookieStore(
-      base::BindOnce(util::Promise::ResolveEmptyPromise, std::move(promise)));
+  auto* getter = browser_context_->GetRequestContext();
+  base::PostTaskWithTraits(
+      FROM_HERE, {BrowserThread::IO},
+      base::BindOnce(FlushCookieStoreOnIOThread, base::RetainedRef(getter),
+                     std::move(promise)));
 
   return handle;
 }
 
 void Cookies::OnCookieChanged(const CookieDetails* details) {
-  Emit("changed", gin::ConvertToV8(isolate(), *(details->cookie)),
-       gin::ConvertToV8(isolate(), details->cause),
-       gin::ConvertToV8(isolate(), details->removed));
+  Emit("changed", *(details->cookie), details->cause, details->removed);
 }
 
 // static
-gin::Handle<Cookies> Cookies::Create(v8::Isolate* isolate,
-                                     AtomBrowserContext* browser_context) {
-  return gin::CreateHandle(isolate, new Cookies(isolate, browser_context));
+mate::Handle<Cookies> Cookies::Create(v8::Isolate* isolate,
+                                      AtomBrowserContext* browser_context) {
+  return mate::CreateHandle(isolate, new Cookies(isolate, browser_context));
 }
 
 // static
 void Cookies::BuildPrototype(v8::Isolate* isolate,
                              v8::Local<v8::FunctionTemplate> prototype) {
-  prototype->SetClassName(gin::StringToV8(isolate, "Cookies"));
+  prototype->SetClassName(mate::StringToV8(isolate, "Cookies"));
   mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate())
       .SetMethod("get", &Cookies::Get)
       .SetMethod("remove", &Cookies::Remove)

atom/browser/api/atom_api_cookies.h

@@ -12,7 +12,7 @@
 #include "atom/browser/net/cookie_details.h"
 #include "atom/common/promise_util.h"
 #include "base/callback_list.h"
-#include "gin/handle.h"
+#include "native_mate/handle.h"
 #include "net/cookies/canonical_cookie.h"
 
 namespace base {
@@ -31,8 +31,13 @@ namespace api {
 
 class Cookies : public mate::TrackableObject<Cookies> {
  public:
-  static gin::Handle<Cookies> Create(v8::Isolate* isolate,
-                                     AtomBrowserContext* browser_context);
+  enum Error {
+    SUCCESS,
+    FAILED,
+  };
+
+  static mate::Handle<Cookies> Create(v8::Isolate* isolate,
+                                      AtomBrowserContext* browser_context);
 
   // mate::TrackableObject:
   static void BuildPrototype(v8::Isolate* isolate,

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 <>
@@ -61,7 +62,7 @@ struct Converter<in_app_purchase::Product> {
     dict.Set("formattedPrice", val.formattedPrice);
 
     // Downloadable Content Information
-    dict.Set("isDownloadable", val.downloadable);
+    dict.Set("isDownloadable", val.isDownloadable);
 
     return dict.GetHandle();
   }
@@ -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);
@@ -241,7 +230,7 @@ void Initialize(v8::Local<v8::Object> exports,
                 v8::Local<v8::Context> context,
                 void* priv) {
   v8::Isolate* isolate = context->GetIsolate();
-  Menu::SetConstructor(isolate, base::BindRepeating(&Menu::New));
+  Menu::SetConstructor(isolate, base::Bind(&Menu::New));
 
   mate::Dictionary dict(isolate, exports);
   dict.Set(

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,20 +96,17 @@ 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::RepeatingCallback<bool(v8::Local<v8::Value>, int)> is_checked_;
-  base::RepeatingCallback<bool(v8::Local<v8::Value>, int)> is_enabled_;
-  base::RepeatingCallback<bool(v8::Local<v8::Value>, int)> is_visible_;
-  base::RepeatingCallback<bool(v8::Local<v8::Value>, int)> works_when_hidden_;
-  base::RepeatingCallback<v8::Local<v8::Value>(v8::Local<v8::Value>, int, bool)>
+  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<v8::Local<v8::Value>(v8::Local<v8::Value>, int, bool)>
       get_accelerator_;
-  base::RepeatingCallback<bool(v8::Local<v8::Value>, int)>
-      should_register_accelerator_;
-  base::RepeatingCallback<void(v8::Local<v8::Value>, v8::Local<v8::Value>, int)>
+  base::Callback<bool(v8::Local<v8::Value>, int)> should_register_accelerator_;
+  base::Callback<void(v8::Local<v8::Value>, v8::Local<v8::Value>, int)>
       execute_command_;
-  base::RepeatingCallback<void(v8::Local<v8::Value>)> menu_will_show_;
+  base::Callback<void(v8::Local<v8::Value>)> menu_will_show_;
 
   DISALLOW_COPY_AND_ASSIGN(Menu);
 };

atom/browser/api/atom_api_menu_mac.mm

@@ -4,12 +4,8 @@
 
 #import "atom/browser/api/atom_api_menu_mac.h"
 
-#include <string>
-#include <utility>
-
 #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"
@@ -18,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 {
@@ -44,11 +42,10 @@ void MenuMac::PopupAt(TopLevelWindow* window,
   if (!native_window)
     return;
 
-  auto popup =
-      base::BindOnce(&MenuMac::PopupOnUI, weak_factory_.GetWeakPtr(),
-                     native_window->GetWeakPtr(), window->weak_map_id(), x, y,
-                     positioning_item, callback);
-  base::PostTaskWithTraits(FROM_HERE, {BrowserThread::UI}, std::move(popup));
+  auto popup = base::Bind(&MenuMac::PopupOnUI, weak_factory_.GetWeakPtr(),
+                          native_window->GetWeakPtr(), window->weak_map_id(), x,
+                          y, positioning_item, callback);
+  base::PostTaskWithTraits(FROM_HERE, {BrowserThread::UI}, popup);
 }
 
 void MenuMac::PopupOnUI(const base::WeakPtr<NativeWindow>& native_window,
@@ -61,11 +58,11 @@ void MenuMac::PopupOnUI(const base::WeakPtr<NativeWindow>& native_window,
     return;
   NSWindow* nswindow = native_window->GetNativeWindow().GetNativeNSWindow();
 
-  auto close_callback = base::BindRepeating(
+  auto close_callback = base::Bind(
       &MenuMac::OnClosed, weak_factory_.GetWeakPtr(), window_id, callback);
-  popup_controllers_[window_id] = base::scoped_nsobject<AtomMenuController>(
-      [[AtomMenuController alloc] initWithModel:model()
-                          useDefaultAccelerator:NO]);
+  popup_controllers_[window_id] = base::scoped_nsobject<AtomMenuController>([
+      [AtomMenuController alloc] initWithModel:model()
+                         useDefaultAccelerator:NO]);
   NSMenu* menu = [popup_controllers_[window_id] menu];
   NSView* view = [nswindow contentView];
 
@@ -139,9 +136,9 @@ void MenuMac::OnClosed(int32_t window_id, base::Closure callback) {
 // static
 void Menu::SetApplicationMenu(Menu* base_menu) {
   MenuMac* menu = static_cast<MenuMac*>(base_menu);
-  base::scoped_nsobject<AtomMenuController> menu_controller(
-      [[AtomMenuController alloc] initWithModel:menu->model_.get()
-                          useDefaultAccelerator:YES]);
+  base::scoped_nsobject<AtomMenuController> menu_controller([
+      [AtomMenuController alloc] initWithModel:menu->model_.get()
+                         useDefaultAccelerator:YES]);
 
   NSRunLoop* currentRunLoop = [NSRunLoop currentRunLoop];
   [currentRunLoop cancelPerformSelector:@selector(setMainMenu:)

atom/browser/api/atom_api_menu_views.cc

@@ -46,13 +46,13 @@ void MenuViews::PopupAt(TopLevelWindow* window,
 
   // Show the menu.
   int32_t window_id = window->weak_map_id();
-  auto close_callback = base::BindRepeating(
+  auto close_callback = base::Bind(
       &MenuViews::OnClosed, weak_factory_.GetWeakPtr(), window_id, callback);
   menu_runners_[window_id] =
       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.cc

@@ -51,7 +51,7 @@ void Initialize(v8::Local<v8::Object> exports,
                 void* priv) {
   v8::Isolate* isolate = context->GetIsolate();
 
-  URLRequest::SetConstructor(isolate, base::BindRepeating(URLRequest::New));
+  URLRequest::SetConstructor(isolate, base::Bind(URLRequest::New));
 
   mate::Dictionary dict(isolate, exports);
   dict.Set("net", Net::Create(isolate));

atom/browser/api/atom_api_net_log.cc

@@ -8,10 +8,8 @@
 
 #include "atom/browser/atom_browser_context.h"
 #include "atom/browser/net/system_network_context_manager.h"
-#include "atom/common/atom_version.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"
@@ -20,153 +18,103 @@
 #include "native_mate/handle.h"
 #include "net/url_request/url_request_context_getter.h"
 
+#include "atom/common/node_includes.h"
+
 namespace atom {
 
-namespace {
-
-scoped_refptr<base::SequencedTaskRunner> CreateFileTaskRunner() {
-  // The tasks posted to this sequenced task runner do synchronous File I/O for
-  // checking paths and setting permissions on files.
-  //
-  // These operations can be skipped on shutdown since FileNetLogObserver's API
-  // doesn't require things to have completed until notified of completion.
-  return base::CreateSequencedTaskRunnerWithTraits(
-      {base::MayBlock(), base::TaskPriority::USER_VISIBLE,
-       base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN});
-}
-
-base::File OpenFileForWriting(base::FilePath path) {
-  return base::File(path,
-                    base::File::FLAG_CREATE_ALWAYS | base::File::FLAG_WRITE);
-}
-
-void ResolvePromiseWithNetError(util::Promise promise, int32_t error) {
-  if (error == net::OK) {
-    promise.Resolve();
-  } else {
-    promise.RejectWithErrorMessage(net::ErrorToString(error));
-  }
-}
-
-}  // namespace
-
 namespace api {
 
 NetLog::NetLog(v8::Isolate* isolate, AtomBrowserContext* browser_context)
-    : browser_context_(browser_context), weak_ptr_factory_(this) {
+    : browser_context_(browser_context) {
   Init(isolate);
-  file_task_runner_ = CreateFileTaskRunner();
+
+  net_log_writer_ = g_browser_process->system_network_context_manager()
+                        ->GetNetExportFileWriter();
+  net_log_writer_->AddObserver(this);
 }
 
-NetLog::~NetLog() = default;
+NetLog::~NetLog() {
+  net_log_writer_->RemoveObserver(this);
+}
 
-v8::Local<v8::Promise> NetLog::StartLogging(mate::Arguments* args) {
+void NetLog::StartLogging(mate::Arguments* args) {
   base::FilePath log_path;
   if (!args->GetNext(&log_path) || log_path.empty()) {
     args->ThrowError("The first parameter must be a valid string");
-    return v8::Local<v8::Promise>();
+    return;
   }
 
-  if (net_log_exporter_) {
-    args->ThrowError("There is already a net log running");
-    return v8::Local<v8::Promise>();
-  }
-
-  pending_start_promise_ = base::make_optional<util::Promise>(isolate());
-  v8::Local<v8::Promise> handle = pending_start_promise_->GetHandle();
-
-  auto command_line_string =
-      base::CommandLine::ForCurrentProcess()->GetCommandLineString();
-  auto channel_string = std::string("Electron " ATOM_VERSION);
-  base::Value custom_constants = base::Value::FromUniquePtrValue(
-      net_log::ChromeNetLog::GetPlatformConstants(command_line_string,
-                                                  channel_string));
-
   auto* network_context =
       content::BrowserContext::GetDefaultStoragePartition(browser_context_)
           ->GetNetworkContext();
 
-  network_context->CreateNetLogExporter(mojo::MakeRequest(&net_log_exporter_));
-  net_log_exporter_.set_connection_error_handler(
-      base::BindOnce(&NetLog::OnConnectionError, base::Unretained(this)));
-
   // TODO(deepak1556): Provide more flexibility to this module
   // by allowing customizations on the capturing options.
-  auto capture_mode = net::NetLogCaptureMode::Default();
-  auto max_file_size = network::mojom::NetLogExporter::kUnlimitedFileSize;
-
-  base::PostTaskAndReplyWithResult(
-      file_task_runner_.get(), FROM_HERE,
-      base::BindOnce(OpenFileForWriting, log_path),
-      base::BindOnce(&NetLog::StartNetLogAfterCreateFile,
-                     weak_ptr_factory_.GetWeakPtr(), capture_mode,
-                     max_file_size, std::move(custom_constants)));
-
-  return handle;
+  net_log_writer_->StartNetLog(
+      log_path, net::NetLogCaptureMode::Default(),
+      net_log::NetExportFileWriter::kNoLimit /* file size limit */,
+      base::CommandLine::ForCurrentProcess()->GetCommandLineString(),
+      std::string(), network_context);
 }
 
-void NetLog::StartNetLogAfterCreateFile(net::NetLogCaptureMode capture_mode,
-                                        uint64_t max_file_size,
-                                        base::Value custom_constants,
-                                        base::File output_file) {
-  if (!net_log_exporter_) {
-    // Theoretically the mojo pipe could have been closed by the time we get
-    // here via the connection error handler. If so, the promise has already
-    // been resolved.
-    return;
-  }
-  DCHECK(pending_start_promise_);
-  if (!output_file.IsValid()) {
-    std::move(*pending_start_promise_)
-        .RejectWithErrorMessage(
-            base::File::ErrorToString(output_file.error_details()));
-    net_log_exporter_.reset();
-    return;
-  }
-  net_log_exporter_->Start(
-      std::move(output_file), std::move(custom_constants), capture_mode,
-      max_file_size,
-      base::BindOnce(&NetLog::NetLogStarted, base::Unretained(this)));
-}
-
-void NetLog::NetLogStarted(int32_t error) {
-  DCHECK(pending_start_promise_);
-  ResolvePromiseWithNetError(std::move(*pending_start_promise_), error);
-}
-
-void NetLog::OnConnectionError() {
-  net_log_exporter_.reset();
-  if (pending_start_promise_) {
-    std::move(*pending_start_promise_)
-        .RejectWithErrorMessage("Failed to start net log exporter");
-  }
+std::string NetLog::GetLoggingState() const {
+  if (!net_log_state_)
+    return std::string();
+  const base::Value* current_log_state =
+      net_log_state_->FindKeyOfType("state", base::Value::Type::STRING);
+  if (!current_log_state)
+    return std::string();
+  return current_log_state->GetString();
 }
 
 bool NetLog::IsCurrentlyLogging() const {
-  return !!net_log_exporter_;
+  const std::string log_state = GetLoggingState();
+  return (log_state == "STARTING_LOG") || (log_state == "LOGGING");
 }
 
-v8::Local<v8::Promise> NetLog::StopLogging(mate::Arguments* args) {
-  util::Promise promise(isolate());
-  v8::Local<v8::Promise> handle = promise.GetHandle();
-
-  if (net_log_exporter_) {
-    // Move the net_log_exporter_ into the callback to ensure that the mojo
-    // pointer lives long enough to resolve the promise. Moving it into the
-    // callback will cause the instance variable to become empty.
-    net_log_exporter_->Stop(
-        base::Value(base::Value::Type::DICTIONARY),
-        base::BindOnce(
-            [](network::mojom::NetLogExporterPtr, util::Promise promise,
-               int32_t error) {
-              ResolvePromiseWithNetError(std::move(promise), error);
-            },
-            std::move(net_log_exporter_), std::move(promise)));
-  } else {
-    promise.RejectWithErrorMessage("No net log in progress");
+std::string NetLog::GetCurrentlyLoggingPath() const {
+  // Net log exporter has a default path which will be used
+  // when no log path is provided, but since we don't allow
+  // net log capture without user provided file path, this
+  // check is completely safe.
+  if (IsCurrentlyLogging()) {
+    const base::Value* current_log_path =
+        net_log_state_->FindKeyOfType("file", base::Value::Type::STRING);
+    if (current_log_path)
+      return current_log_path->GetString();
   }
 
-  return handle;
+  return std::string();
+}
+
+void NetLog::StopLogging(mate::Arguments* args) {
+  net_log::NetExportFileWriter::FilePathCallback callback;
+  if (!args->GetNext(&callback)) {
+    args->ThrowError("Invalid callback function");
+    return;
+  }
+
+  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) {
+  net_log_state_ = state.CreateDeepCopy();
+
+  if (stop_callback_queue_.empty())
+    return;
+
+  if (GetLoggingState() == "NOT_LOGGING") {
+    for (auto& callback : stop_callback_queue_) {
+      if (!callback.is_null())
+        net_log_writer_->GetFilePathToCompletedLog(callback);
+    }
+    stop_callback_queue_.clear();
+  }
 }
 
 // static
@@ -181,6 +129,7 @@ void NetLog::BuildPrototype(v8::Isolate* isolate,
   prototype->SetClassName(mate::StringToV8(isolate, "NetLog"));
   mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate())
       .SetProperty("currentlyLogging", &NetLog::IsCurrentlyLogging)
+      .SetProperty("currentlyLoggingPath", &NetLog::GetCurrentlyLoggingPath)
       .SetMethod("startLogging", &NetLog::StartLogging)
       .SetMethod("stopLogging", &NetLog::StopLogging);
 }

atom/browser/api/atom_api_net_log.h

@@ -10,12 +10,10 @@
 #include <string>
 
 #include "atom/browser/api/trackable_object.h"
-#include "atom/common/promise_util.h"
 #include "base/callback.h"
-#include "base/optional.h"
 #include "base/values.h"
+#include "components/net_log/net_export_file_writer.h"
 #include "native_mate/handle.h"
-#include "services/network/public/mojom/net_log.mojom.h"
 
 namespace atom {
 
@@ -23,7 +21,8 @@ class AtomBrowserContext;
 
 namespace api {
 
-class NetLog : public mate::TrackableObject<NetLog> {
+class NetLog : public mate::TrackableObject<NetLog>,
+               public net_log::NetExportFileWriter::StateObserver {
  public:
   static mate::Handle<NetLog> Create(v8::Isolate* isolate,
                                      AtomBrowserContext* browser_context);
@@ -31,32 +30,25 @@ class NetLog : public mate::TrackableObject<NetLog> {
   static void BuildPrototype(v8::Isolate* isolate,
                              v8::Local<v8::FunctionTemplate> prototype);
 
-  v8::Local<v8::Promise> StartLogging(mate::Arguments* args);
-  v8::Local<v8::Promise> StopLogging(mate::Arguments* args);
+  void StartLogging(mate::Arguments* args);
+  std::string GetLoggingState() const;
   bool IsCurrentlyLogging() const;
+  std::string GetCurrentlyLoggingPath() const;
+  void StopLogging(mate::Arguments* args);
 
  protected:
   explicit NetLog(v8::Isolate* isolate, AtomBrowserContext* browser_context);
   ~NetLog() override;
 
-  void OnConnectionError();
-
-  void StartNetLogAfterCreateFile(net::NetLogCaptureMode capture_mode,
-                                  uint64_t max_file_size,
-                                  base::Value custom_constants,
-                                  base::File output_file);
-  void NetLogStarted(int32_t error);
+  // net_log::NetExportFileWriter::StateObserver implementation
+  void OnNewState(const base::DictionaryValue& state) override;
 
  private:
   AtomBrowserContext* browser_context_;
-
-  network::mojom::NetLogExporterPtr net_log_exporter_;
-
-  base::Optional<util::Promise> pending_start_promise_;
-
-  scoped_refptr<base::TaskRunner> file_task_runner_;
-
-  base::WeakPtrFactory<NetLog> weak_ptr_factory_;
+  net_log::NetExportFileWriter* net_log_writer_;
+  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 <>
@@ -258,8 +260,7 @@ void Initialize(v8::Local<v8::Object> exports,
                 v8::Local<v8::Context> context,
                 void* priv) {
   v8::Isolate* isolate = context->GetIsolate();
-  Notification::SetConstructor(isolate,
-                               base::BindRepeating(&Notification::New));
+  Notification::SetConstructor(isolate, base::Bind(&Notification::New));
 
   mate::Dictionary dict(isolate, exports);
   dict.Set("Notification", Notification::GetConstructor(isolate)

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> {
@@ -37,11 +38,11 @@ namespace api {
 
 PowerMonitor::PowerMonitor(v8::Isolate* isolate) {
 #if defined(OS_LINUX)
-  SetShutdownHandler(base::BindRepeating(&PowerMonitor::ShouldShutdown,
-                                         base::Unretained(this)));
+  SetShutdownHandler(
+      base::Bind(&PowerMonitor::ShouldShutdown, base::Unretained(this)));
 #elif defined(OS_MACOSX)
-  Browser::Get()->SetShutdownHandler(base::BindRepeating(
-      &PowerMonitor::ShouldShutdown, base::Unretained(this)));
+  Browser::Get()->SetShutdownHandler(
+      base::Bind(&PowerMonitor::ShouldShutdown, base::Unretained(this)));
 #endif
   base::PowerMonitor::Get()->AddObserver(this);
   Init(isolate);
@@ -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,17 +95,16 @@ ui::IdleState PowerMonitor::GetSystemIdleState(v8::Isolate* isolate,
   }
 }
 
-int PowerMonitor::GetSystemIdleTime() {
+int PowerMonitor::QuerySystemIdleTime() {
   return ui::CalculateIdleTime();
 }
 
 // static
 v8::Local<v8::Value> PowerMonitor::Create(v8::Isolate* isolate) {
   if (!Browser::Get()->is_ready()) {
-    isolate->ThrowException(v8::Exception::Error(
-        mate::StringToV8(isolate,
-                         "The 'powerMonitor' module can't be used before the "
-                         "app 'ready' event")));
+    isolate->ThrowException(v8::Exception::Error(mate::StringToV8(
+        isolate,
+        "Cannot require \"powerMonitor\" module before app is ready")));
     return v8::Null(isolate);
   }
 
@@ -122,8 +122,8 @@ void PowerMonitor::BuildPrototype(v8::Isolate* isolate,
       .SetMethod("blockShutdown", &PowerMonitor::BlockShutdown)
       .SetMethod("unblockShutdown", &PowerMonitor::UnblockShutdown)
 #endif
-      .SetMethod("getSystemIdleState", &PowerMonitor::GetSystemIdleState)
-      .SetMethod("getSystemIdleTime", &PowerMonitor::GetSystemIdleTime);
+      .SetMethod("_querySystemIdleState", &PowerMonitor::QuerySystemIdleState)
+      .SetMethod("_querySystemIdleTime", &PowerMonitor::QuerySystemIdleTime);
 }
 
 }  // namespace api
@@ -140,8 +140,7 @@ void Initialize(v8::Local<v8::Object> exports,
                 void* priv) {
   v8::Isolate* isolate = context->GetIsolate();
   mate::Dictionary dict(isolate, exports);
-  dict.Set("createPowerMonitor",
-           base::BindRepeating(&PowerMonitor::Create, isolate));
+  dict.Set("powerMonitor", PowerMonitor::Create(isolate));
   dict.Set("PowerMonitor", PowerMonitor::GetConstructor(isolate)
                                ->GetFunction(context)
                                .ToLocalChecked());

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

@@ -4,9 +4,7 @@
 
 #include "atom/browser/api/atom_api_power_monitor.h"
 
-#include <vector>
-
-#import <ApplicationServices/ApplicationServices.h>
+#include <ApplicationServices/ApplicationServices.h>
 #import <Cocoa/Cocoa.h>
 
 @interface MacLockMonitor : NSObject {

atom/browser/api/atom_api_power_save_blocker.cc

@@ -6,18 +6,17 @@
 
 #include <string>
 
-#include "atom/common/node_includes.h"
-#include "base/bind_helpers.h"
 #include "base/task/post_task.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "content/public/common/service_manager_connection.h"
-#include "gin/dictionary.h"
-#include "gin/function_template.h"
+#include "native_mate/dictionary.h"
 #include "services/device/public/mojom/constants.mojom.h"
 #include "services/device/public/mojom/wake_lock_provider.mojom.h"
 #include "services/service_manager/public/cpp/connector.h"
 
-namespace gin {
+#include "atom/common/node_includes.h"
+
+namespace mate {
 
 template <>
 struct Converter<device::mojom::WakeLockType> {
@@ -37,17 +36,17 @@ struct Converter<device::mojom::WakeLockType> {
   }
 };
 
-}  // namespace gin
+}  // namespace mate
 
 namespace atom {
 
 namespace api {
 
-gin::WrapperInfo PowerSaveBlocker::kWrapperInfo = {gin::kEmbedderNativeGin};
-
 PowerSaveBlocker::PowerSaveBlocker(v8::Isolate* isolate)
     : current_lock_type_(device::mojom::WakeLockType::kPreventAppSuspension),
-      is_wake_lock_active_(false) {}
+      is_wake_lock_active_(false) {
+  Init(isolate);
+}
 
 PowerSaveBlocker::~PowerSaveBlocker() {}
 
@@ -120,13 +119,16 @@ bool PowerSaveBlocker::IsStarted(int id) {
 }
 
 // static
-gin::Handle<PowerSaveBlocker> PowerSaveBlocker::Create(v8::Isolate* isolate) {
-  return gin::CreateHandle(isolate, new PowerSaveBlocker(isolate));
+mate::Handle<PowerSaveBlocker> PowerSaveBlocker::Create(v8::Isolate* isolate) {
+  return mate::CreateHandle(isolate, new PowerSaveBlocker(isolate));
 }
 
-gin::ObjectTemplateBuilder PowerSaveBlocker::GetObjectTemplateBuilder(
-    v8::Isolate* isolate) {
-  return gin::Wrappable<PowerSaveBlocker>::GetObjectTemplateBuilder(isolate)
+// static
+void PowerSaveBlocker::BuildPrototype(
+    v8::Isolate* isolate,
+    v8::Local<v8::FunctionTemplate> prototype) {
+  prototype->SetClassName(mate::StringToV8(isolate, "PowerSaveBlocker"));
+  mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate())
       .SetMethod("start", &PowerSaveBlocker::Start)
       .SetMethod("stop", &PowerSaveBlocker::Stop)
       .SetMethod("isStarted", &PowerSaveBlocker::IsStarted);
@@ -143,10 +145,10 @@ void Initialize(v8::Local<v8::Object> exports,
                 v8::Local<v8::Context> context,
                 void* priv) {
   v8::Isolate* isolate = context->GetIsolate();
-  gin::Dictionary dict(isolate, exports);
+  mate::Dictionary dict(isolate, exports);
   dict.Set("powerSaveBlocker", atom::api::PowerSaveBlocker::Create(isolate));
 }
 
 }  // 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_power_save_blocker.h

@@ -8,24 +8,24 @@
 #include <map>
 #include <memory>
 
-#include "gin/handle.h"
-#include "gin/object_template_builder.h"
-#include "gin/wrappable.h"
+#include "atom/browser/api/trackable_object.h"
+#include "native_mate/handle.h"
 #include "services/device/public/mojom/wake_lock.mojom.h"
 
+namespace mate {
+class Dictionary;
+}
+
 namespace atom {
 
 namespace api {
 
-class PowerSaveBlocker : public gin::Wrappable<PowerSaveBlocker> {
+class PowerSaveBlocker : public mate::TrackableObject<PowerSaveBlocker> {
  public:
-  static gin::Handle<PowerSaveBlocker> Create(v8::Isolate* isolate);
+  static mate::Handle<PowerSaveBlocker> Create(v8::Isolate* isolate);
 
-  // gin::Wrappable
-  gin::ObjectTemplateBuilder GetObjectTemplateBuilder(
-      v8::Isolate* isolate) override;
-
-  static gin::WrapperInfo kWrapperInfo;
+  static void BuildPrototype(v8::Isolate* isolate,
+                             v8::Local<v8::FunctionTemplate> prototype);
 
  protected:
   explicit PowerSaveBlocker(v8::Isolate* isolate);

atom/browser/api/atom_api_protocol.cc

@@ -164,9 +164,9 @@ Protocol::ProtocolError Protocol::UnregisterProtocolInIO(
     const std::string& scheme) {
   auto* job_factory = request_context_getter->job_factory();
   if (!job_factory->HasProtocolHandler(scheme))
-    return ProtocolError::NOT_REGISTERED;
+    return PROTOCOL_NOT_REGISTERED;
   job_factory->SetProtocolHandler(scheme, nullptr);
-  return ProtocolError::OK;
+  return PROTOCOL_OK;
 }
 
 bool IsProtocolHandledInIO(
@@ -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;
 }
@@ -209,8 +213,8 @@ Protocol::ProtocolError Protocol::UninterceptProtocolInIO(
     scoped_refptr<URLRequestContextGetter> request_context_getter,
     const std::string& scheme) {
   return request_context_getter->job_factory()->UninterceptProtocol(scheme)
-             ? ProtocolError::OK
-             : ProtocolError::NOT_INTERCEPTED;
+             ? PROTOCOL_OK
+             : PROTOCOL_NOT_INTERCEPTED;
 }
 
 void Protocol::OnIOCompleted(const CompletionCallback& callback,
@@ -222,7 +226,7 @@ void Protocol::OnIOCompleted(const CompletionCallback& callback,
   v8::Locker locker(isolate());
   v8::HandleScope handle_scope(isolate());
 
-  if (error == ProtocolError::OK) {
+  if (error == PROTOCOL_OK) {
     callback.Run(v8::Null(isolate()));
   } else {
     std::string str = ErrorCodeToString(error);
@@ -232,15 +236,15 @@ void Protocol::OnIOCompleted(const CompletionCallback& callback,
 
 std::string Protocol::ErrorCodeToString(ProtocolError error) {
   switch (error) {
-    case ProtocolError::FAIL:
+    case PROTOCOL_FAIL:
       return "Failed to manipulate protocol factory";
-    case ProtocolError::REGISTERED:
+    case PROTOCOL_REGISTERED:
       return "The scheme has been registered";
-    case ProtocolError::NOT_REGISTERED:
+    case PROTOCOL_NOT_REGISTERED:
       return "The scheme has not been registered";
-    case ProtocolError::INTERCEPTED:
+    case PROTOCOL_INTERCEPTED:
       return "The scheme has been intercepted";
-    case ProtocolError::NOT_INTERCEPTED:
+    case PROTOCOL_NOT_INTERCEPTED:
       return "The scheme has not been intercepted";
     default:
       return "Unexpected error";

atom/browser/api/atom_api_protocol.h

@@ -40,10 +40,9 @@ void RegisterSchemesAsPrivileged(v8::Local<v8::Value> val,
 
 class Protocol : public mate::TrackableObject<Protocol> {
  public:
-  using Handler = base::RepeatingCallback<void(const base::DictionaryValue&,
-                                               v8::Local<v8::Value>)>;
-  using CompletionCallback =
-      base::RepeatingCallback<void(v8::Local<v8::Value>)>;
+  using Handler =
+      base::Callback<void(const base::DictionaryValue&, v8::Local<v8::Value>)>;
+  using CompletionCallback = base::Callback<void(v8::Local<v8::Value>)>;
 
   static mate::Handle<Protocol> Create(v8::Isolate* isolate,
                                        AtomBrowserContext* browser_context);
@@ -57,13 +56,13 @@ class Protocol : public mate::TrackableObject<Protocol> {
 
  private:
   // Possible errors.
-  enum class ProtocolError {
-    OK,    // no error
-    FAIL,  // operation failed, should never occur
-    REGISTERED,
-    NOT_REGISTERED,
-    INTERCEPTED,
-    NOT_INTERCEPTED,
+  enum ProtocolError {
+    PROTOCOL_OK,    // no error
+    PROTOCOL_FAIL,  // operation failed, should never occur
+    PROTOCOL_REGISTERED,
+    PROTOCOL_NOT_REGISTERED,
+    PROTOCOL_INTERCEPTED,
+    PROTOCOL_NOT_INTERCEPTED,
   };
 
   // The protocol handler that will create a protocol handler for certain
@@ -119,13 +118,13 @@ class Protocol : public mate::TrackableObject<Protocol> {
       const Handler& handler) {
     auto* job_factory = request_context_getter->job_factory();
     if (job_factory->IsHandledProtocol(scheme))
-      return ProtocolError::REGISTERED;
+      return PROTOCOL_REGISTERED;
     auto protocol_handler = std::make_unique<CustomProtocolHandler<RequestJob>>(
         isolate, request_context_getter.get(), handler);
     if (job_factory->SetProtocolHandler(scheme, std::move(protocol_handler)))
-      return ProtocolError::OK;
+      return PROTOCOL_OK;
     else
-      return ProtocolError::FAIL;
+      return PROTOCOL_FAIL;
   }
 
   // Unregister the protocol handler that handles |scheme|.
@@ -160,15 +159,15 @@ class Protocol : public mate::TrackableObject<Protocol> {
       const Handler& handler) {
     auto* job_factory = request_context_getter->job_factory();
     if (!job_factory->IsHandledProtocol(scheme))
-      return ProtocolError::NOT_REGISTERED;
+      return PROTOCOL_NOT_REGISTERED;
     // It is possible a protocol is handled but can not be intercepted.
     if (!job_factory->HasProtocolHandler(scheme))
-      return ProtocolError::FAIL;
+      return PROTOCOL_FAIL;
     auto protocol_handler = std::make_unique<CustomProtocolHandler<RequestJob>>(
         isolate, request_context_getter.get(), handler);
     if (!job_factory->InterceptProtocol(scheme, std::move(protocol_handler)))
-      return ProtocolError::INTERCEPTED;
-    return ProtocolError::OK;
+      return PROTOCOL_INTERCEPTED;
+    return PROTOCOL_OK;
   }
 
   // Restore the |scheme| to its original protocol handler.

atom/browser/api/atom_api_protocol_ns.cc

@@ -1,181 +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_protocol_ns.h"
-
-#include <memory>
-#include <utility>
-
-#include "atom/browser/atom_browser_context.h"
-#include "atom/common/native_mate_converters/net_converter.h"
-#include "atom/common/native_mate_converters/once_callback.h"
-#include "atom/common/promise_util.h"
-#include "base/stl_util.h"
-
-namespace atom {
-namespace api {
-
-namespace {
-
-const char* kBuiltinSchemes[] = {
-    "about", "file", "http", "https", "data", "filesystem",
-};
-
-// Convert error code to string.
-std::string ErrorCodeToString(ProtocolError error) {
-  switch (error) {
-    case ProtocolError::REGISTERED:
-      return "The scheme has been registered";
-    case ProtocolError::NOT_REGISTERED:
-      return "The scheme has not been registered";
-    case ProtocolError::INTERCEPTED:
-      return "The scheme has been intercepted";
-    case ProtocolError::NOT_INTERCEPTED:
-      return "The scheme has not been intercepted";
-    default:
-      return "Unexpected error";
-  }
-}
-
-}  // namespace
-
-ProtocolNS::ProtocolNS(v8::Isolate* isolate,
-                       AtomBrowserContext* browser_context) {
-  Init(isolate);
-  AttachAsUserData(browser_context);
-}
-
-ProtocolNS::~ProtocolNS() = default;
-
-void ProtocolNS::RegisterURLLoaderFactories(
-    content::ContentBrowserClient::NonNetworkURLLoaderFactoryMap* factories) {
-  for (const auto& it : handlers_) {
-    factories->emplace(it.first, std::make_unique<AtomURLLoaderFactory>(
-                                     it.second.first, it.second.second));
-  }
-}
-
-ProtocolError ProtocolNS::RegisterProtocol(ProtocolType type,
-                                           const std::string& scheme,
-                                           const ProtocolHandler& handler) {
-  ProtocolError error = ProtocolError::OK;
-  if (!base::ContainsKey(handlers_, scheme))
-    handlers_[scheme] = std::make_pair(type, handler);
-  else
-    error = ProtocolError::REGISTERED;
-  return error;
-}
-
-void ProtocolNS::UnregisterProtocol(const std::string& scheme,
-                                    mate::Arguments* args) {
-  ProtocolError error = ProtocolError::OK;
-  if (base::ContainsKey(handlers_, scheme))
-    handlers_.erase(scheme);
-  else
-    error = ProtocolError::NOT_REGISTERED;
-  HandleOptionalCallback(args, error);
-}
-
-bool ProtocolNS::IsProtocolRegistered(const std::string& scheme) {
-  return base::ContainsKey(handlers_, scheme);
-}
-
-ProtocolError ProtocolNS::InterceptProtocol(ProtocolType type,
-                                            const std::string& scheme,
-                                            const ProtocolHandler& handler) {
-  ProtocolError error = ProtocolError::OK;
-  if (!base::ContainsKey(intercept_handlers_, scheme))
-    intercept_handlers_[scheme] = std::make_pair(type, handler);
-  else
-    error = ProtocolError::INTERCEPTED;
-  return error;
-}
-
-void ProtocolNS::UninterceptProtocol(const std::string& scheme,
-                                     mate::Arguments* args) {
-  ProtocolError error = ProtocolError::OK;
-  if (base::ContainsKey(intercept_handlers_, scheme))
-    intercept_handlers_.erase(scheme);
-  else
-    error = ProtocolError::NOT_INTERCEPTED;
-  HandleOptionalCallback(args, error);
-}
-
-bool ProtocolNS::IsProtocolIntercepted(const std::string& scheme) {
-  return base::ContainsKey(intercept_handlers_, scheme);
-}
-
-v8::Local<v8::Promise> ProtocolNS::IsProtocolHandled(
-    const std::string& scheme) {
-  util::Promise promise(isolate());
-  promise.Resolve(IsProtocolRegistered(scheme) ||
-                  IsProtocolIntercepted(scheme) ||
-                  // The |isProtocolHandled| should return true for builtin
-                  // schemes, however with NetworkService it is impossible to
-                  // know which schemes are registered until a real network
-                  // request is sent.
-                  // So we have to test against a hard-coded builtin schemes
-                  // list make it work with old code. We should deprecate this
-                  // API with the new |isProtocolRegistered| API.
-                  base::ContainsValue(kBuiltinSchemes, scheme));
-  return promise.GetHandle();
-}
-
-void ProtocolNS::HandleOptionalCallback(mate::Arguments* args,
-                                        ProtocolError error) {
-  CompletionCallback callback;
-  if (args->GetNext(&callback)) {
-    if (error == ProtocolError::OK)
-      callback.Run(v8::Null(args->isolate()));
-    else
-      callback.Run(v8::Exception::Error(
-          mate::StringToV8(isolate(), ErrorCodeToString(error))));
-  }
-}
-
-// static
-mate::Handle<ProtocolNS> ProtocolNS::Create(
-    v8::Isolate* isolate,
-    AtomBrowserContext* browser_context) {
-  return mate::CreateHandle(isolate, new ProtocolNS(isolate, browser_context));
-}
-
-// static
-void ProtocolNS::BuildPrototype(v8::Isolate* isolate,
-                                v8::Local<v8::FunctionTemplate> prototype) {
-  prototype->SetClassName(mate::StringToV8(isolate, "Protocol"));
-  mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate())
-      .SetMethod("registerStringProtocol",
-                 &ProtocolNS::RegisterProtocolFor<ProtocolType::kString>)
-      .SetMethod("registerBufferProtocol",
-                 &ProtocolNS::RegisterProtocolFor<ProtocolType::kBuffer>)
-      .SetMethod("registerFileProtocol",
-                 &ProtocolNS::RegisterProtocolFor<ProtocolType::kFile>)
-      .SetMethod("registerHttpProtocol",
-                 &ProtocolNS::RegisterProtocolFor<ProtocolType::kHttp>)
-      .SetMethod("registerStreamProtocol",
-                 &ProtocolNS::RegisterProtocolFor<ProtocolType::kStream>)
-      .SetMethod("registerProtocol",
-                 &ProtocolNS::RegisterProtocolFor<ProtocolType::kFree>)
-      .SetMethod("unregisterProtocol", &ProtocolNS::UnregisterProtocol)
-      .SetMethod("isProtocolRegistered", &ProtocolNS::IsProtocolRegistered)
-      .SetMethod("isProtocolHandled", &ProtocolNS::IsProtocolHandled)
-      .SetMethod("interceptStringProtocol",
-                 &ProtocolNS::InterceptProtocolFor<ProtocolType::kString>)
-      .SetMethod("interceptBufferProtocol",
-                 &ProtocolNS::InterceptProtocolFor<ProtocolType::kBuffer>)
-      .SetMethod("interceptFileProtocol",
-                 &ProtocolNS::InterceptProtocolFor<ProtocolType::kFile>)
-      .SetMethod("interceptHttpProtocol",
-                 &ProtocolNS::InterceptProtocolFor<ProtocolType::kHttp>)
-      .SetMethod("interceptStreamProtocol",
-                 &ProtocolNS::InterceptProtocolFor<ProtocolType::kStream>)
-      .SetMethod("interceptProtocol",
-                 &ProtocolNS::InterceptProtocolFor<ProtocolType::kFree>)
-      .SetMethod("uninterceptProtocol", &ProtocolNS::UninterceptProtocol)
-      .SetMethod("isProtocolIntercepted", &ProtocolNS::IsProtocolIntercepted);
-}
-
-}  // namespace api
-}  // namespace atom

atom/browser/api/atom_api_protocol_ns.h

@@ -1,95 +0,0 @@
-// Copyright (c) 2019 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#ifndef ATOM_BROWSER_API_ATOM_API_PROTOCOL_NS_H_
-#define ATOM_BROWSER_API_ATOM_API_PROTOCOL_NS_H_
-
-#include <string>
-
-#include "atom/browser/api/trackable_object.h"
-#include "atom/browser/net/atom_url_loader_factory.h"
-#include "content/public/browser/content_browser_client.h"
-#include "native_mate/dictionary.h"
-#include "native_mate/handle.h"
-
-namespace atom {
-
-class AtomBrowserContext;
-
-namespace api {
-
-// Possible errors.
-enum class ProtocolError {
-  OK,  // no error
-  REGISTERED,
-  NOT_REGISTERED,
-  INTERCEPTED,
-  NOT_INTERCEPTED,
-};
-
-// Protocol implementation based on network services.
-class ProtocolNS : public mate::TrackableObject<ProtocolNS> {
- public:
-  static mate::Handle<ProtocolNS> Create(v8::Isolate* isolate,
-                                         AtomBrowserContext* browser_context);
-
-  static void BuildPrototype(v8::Isolate* isolate,
-                             v8::Local<v8::FunctionTemplate> prototype);
-
-  // Used by AtomBrowserClient for creating URLLoaderFactory.
-  void RegisterURLLoaderFactories(
-      content::ContentBrowserClient::NonNetworkURLLoaderFactoryMap* factories);
-
-  const HandlersMap& intercept_handlers() const { return intercept_handlers_; }
-
- private:
-  ProtocolNS(v8::Isolate* isolate, AtomBrowserContext* browser_context);
-  ~ProtocolNS() override;
-
-  // Callback types.
-  using CompletionCallback =
-      base::RepeatingCallback<void(v8::Local<v8::Value>)>;
-
-  // JS APIs.
-  ProtocolError RegisterProtocol(ProtocolType type,
-                                 const std::string& scheme,
-                                 const ProtocolHandler& handler);
-  void UnregisterProtocol(const std::string& scheme, mate::Arguments* args);
-  bool IsProtocolRegistered(const std::string& scheme);
-
-  ProtocolError InterceptProtocol(ProtocolType type,
-                                  const std::string& scheme,
-                                  const ProtocolHandler& handler);
-  void UninterceptProtocol(const std::string& scheme, mate::Arguments* args);
-  bool IsProtocolIntercepted(const std::string& scheme);
-
-  // Old async version of IsProtocolRegistered.
-  v8::Local<v8::Promise> IsProtocolHandled(const std::string& scheme);
-
-  // Helper for converting old registration APIs to new RegisterProtocol API.
-  template <ProtocolType type>
-  void RegisterProtocolFor(const std::string& scheme,
-                           const ProtocolHandler& handler,
-                           mate::Arguments* args) {
-    HandleOptionalCallback(args, RegisterProtocol(type, scheme, handler));
-  }
-  template <ProtocolType type>
-  void InterceptProtocolFor(const std::string& scheme,
-                            const ProtocolHandler& handler,
-                            mate::Arguments* args) {
-    HandleOptionalCallback(args, InterceptProtocol(type, scheme, handler));
-  }
-
-  // Be compatible with old interface, which accepts optional callback.
-  void HandleOptionalCallback(mate::Arguments* args, ProtocolError error);
-
-  HandlersMap handlers_;
-  HandlersMap intercept_handlers_;
-};
-
-}  // namespace api
-
-}  // namespace atom
-
-#endif  // ATOM_BROWSER_API_ATOM_API_PROTOCOL_NS_H_

atom/browser/api/atom_api_render_process_preferences.cc

@@ -0,0 +1,91 @@
+// Copyright (c) 2016 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_render_process_preferences.h"
+
+#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 "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 {
+
+namespace {
+
+bool IsWebContents(v8::Isolate* isolate, content::RenderProcessHost* process) {
+  content::WebContents* web_contents =
+      static_cast<AtomBrowserClient*>(AtomBrowserClient::Get())
+          ->GetWebContentsFromProcessID(process->GetID());
+  if (!web_contents)
+    return false;
+
+  auto api_web_contents = WebContents::FromOrCreate(isolate, web_contents);
+  auto type = api_web_contents->GetType();
+  return type == WebContents::Type::BROWSER_WINDOW ||
+         type == WebContents::Type::WEB_VIEW;
+}
+
+}  // namespace
+
+RenderProcessPreferences::RenderProcessPreferences(
+    v8::Isolate* isolate,
+    const atom::RenderProcessPreferences::Predicate& predicate)
+    : preferences_(predicate) {
+  Init(isolate);
+}
+
+RenderProcessPreferences::~RenderProcessPreferences() {}
+
+int RenderProcessPreferences::AddEntry(const base::DictionaryValue& entry) {
+  return preferences_.AddEntry(entry);
+}
+
+void RenderProcessPreferences::RemoveEntry(int id) {
+  preferences_.RemoveEntry(id);
+}
+
+// static
+void RenderProcessPreferences::BuildPrototype(
+    v8::Isolate* isolate,
+    v8::Local<v8::FunctionTemplate> prototype) {
+  prototype->SetClassName(
+      mate::StringToV8(isolate, "RenderProcessPreferences"));
+  mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate())
+      .SetMethod("addEntry", &RenderProcessPreferences::AddEntry)
+      .SetMethod("removeEntry", &RenderProcessPreferences::RemoveEntry);
+}
+
+// static
+mate::Handle<RenderProcessPreferences>
+RenderProcessPreferences::ForAllWebContents(v8::Isolate* isolate) {
+  return mate::CreateHandle(isolate,
+                            new RenderProcessPreferences(
+                                isolate, base::Bind(&IsWebContents, isolate)));
+}
+
+}  // namespace api
+
+}  // namespace atom
+
+namespace {
+
+void Initialize(v8::Local<v8::Object> exports,
+                v8::Local<v8::Value> unused,
+                v8::Local<v8::Context> context,
+                void* priv) {
+  mate::Dictionary dict(context->GetIsolate(), exports);
+  dict.SetMethod("forAllWebContents",
+                 &atom::api::RenderProcessPreferences::ForAllWebContents);
+}
+
+}  // namespace
+
+NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_render_process_preferences,
+                                 Initialize)

atom/browser/api/atom_api_render_process_preferences.h

@@ -0,0 +1,44 @@
+// Copyright (c) 2016 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
+// found in the LICENSE file.
+
+#ifndef ATOM_BROWSER_API_ATOM_API_RENDER_PROCESS_PREFERENCES_H_
+#define ATOM_BROWSER_API_ATOM_API_RENDER_PROCESS_PREFERENCES_H_
+
+#include "atom/browser/render_process_preferences.h"
+#include "native_mate/handle.h"
+#include "native_mate/wrappable.h"
+
+namespace atom {
+
+namespace api {
+
+class RenderProcessPreferences
+    : public mate::Wrappable<RenderProcessPreferences> {
+ public:
+  static mate::Handle<RenderProcessPreferences> ForAllWebContents(
+      v8::Isolate* isolate);
+
+  static void BuildPrototype(v8::Isolate* isolate,
+                             v8::Local<v8::FunctionTemplate> prototype);
+
+  int AddEntry(const base::DictionaryValue& entry);
+  void RemoveEntry(int id);
+
+ protected:
+  RenderProcessPreferences(
+      v8::Isolate* isolate,
+      const atom::RenderProcessPreferences::Predicate& predicate);
+  ~RenderProcessPreferences() override;
+
+ private:
+  atom::RenderProcessPreferences preferences_;
+
+  DISALLOW_COPY_AND_ASSIGN(RenderProcessPreferences);
+};
+
+}  // namespace api
+
+}  // namespace atom
+
+#endif  // ATOM_BROWSER_API_ATOM_API_RENDER_PROCESS_PREFERENCES_H_

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 {
@@ -116,8 +117,7 @@ void Screen::OnDisplayMetricsChanged(const display::Display& display,
 v8::Local<v8::Value> Screen::Create(v8::Isolate* isolate) {
   if (!Browser::Get()->is_ready()) {
     isolate->ThrowException(v8::Exception::Error(mate::StringToV8(
-        isolate,
-        "The 'screen' module can't be used before the app 'ready' event")));
+        isolate, "Cannot require \"screen\" module before app is ready")));
     return v8::Null(isolate);
   }
 
@@ -163,7 +163,7 @@ void Initialize(v8::Local<v8::Object> exports,
                 void* priv) {
   v8::Isolate* isolate = context->GetIsolate();
   mate::Dictionary dict(isolate, exports);
-  dict.Set("createScreen", base::BindRepeating(&Screen::Create, isolate));
+  dict.Set("screen", Screen::Create(isolate));
   dict.Set(
       "Screen",
       Screen::GetConstructor(isolate)->GetFunction(context).ToLocalChecked());

atom/browser/api/atom_api_session.cc

@@ -14,7 +14,6 @@
 #include "atom/browser/api/atom_api_download_item.h"
 #include "atom/browser/api/atom_api_net_log.h"
 #include "atom/browser/api/atom_api_protocol.h"
-#include "atom/browser/api/atom_api_protocol_ns.h"
 #include "atom/browser/api/atom_api_web_request.h"
 #include "atom/browser/atom_browser_context.h"
 #include "atom/browser/atom_browser_main_parts.h"
@@ -22,7 +21,6 @@
 #include "atom/browser/browser.h"
 #include "atom/browser/media/media_device_id_salt.h"
 #include "atom/browser/net/atom_cert_verifier.h"
-#include "atom/browser/net/system_network_context_manager.h"
 #include "atom/browser/session_preferences.h"
 #include "atom/common/native_mate_converters/callback.h"
 #include "atom/common/native_mate_converters/content_converter.h"
@@ -30,8 +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 "atom/common/options_switches.h"
 #include "base/files/file_path.h"
 #include "base/guid.h"
 #include "base/strings/string_number_conversions.h"
@@ -48,12 +44,12 @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/download_item_utils.h"
 #include "content/public/browser/download_manager_delegate.h"
-#include "content/public/browser/network_service_instance.h"
 #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"
 #include "net/http/http_auth_handler_factory.h"
 #include "net/http/http_auth_preferences.h"
 #include "net/http/http_cache.h"
@@ -61,9 +57,10 @@
 #include "net/url_request/static_http_user_agent_settings.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
-#include "services/network/public/cpp/features.h"
 #include "ui/base/l10n/l10n_util.h"
 
+#include "atom/common/node_includes.h"
+
 using content::BrowserThread;
 using content::StoragePartition;
 
@@ -75,6 +72,15 @@ struct ClearStorageDataOptions {
   uint32_t quota_types = StoragePartition::QUOTA_MANAGED_STORAGE_MASK_ALL;
 };
 
+struct ClearAuthCacheOptions {
+  std::string type;
+  GURL origin;
+  std::string realm;
+  base::string16 username;
+  base::string16 password;
+  net::HttpAuth::Scheme auth_scheme;
+};
+
 uint32_t GetStorageMask(const std::vector<std::string>& storage_types) {
   uint32_t storage_mask = 0;
   for (const auto& it : storage_types) {
@@ -115,6 +121,18 @@ uint32_t GetQuotaMask(const std::vector<std::string>& quota_types) {
   return quota_mask;
 }
 
+net::HttpAuth::Scheme GetAuthSchemeFromString(const std::string& scheme) {
+  if (scheme == "basic")
+    return net::HttpAuth::AUTH_SCHEME_BASIC;
+  if (scheme == "digest")
+    return net::HttpAuth::AUTH_SCHEME_DIGEST;
+  if (scheme == "ntlm")
+    return net::HttpAuth::AUTH_SCHEME_NTLM;
+  if (scheme == "negotiate")
+    return net::HttpAuth::AUTH_SCHEME_NEGOTIATE;
+  return net::HttpAuth::AUTH_SCHEME_MAX;
+}
+
 void SetUserAgentInIO(scoped_refptr<net::URLRequestContextGetter> getter,
                       const std::string& accept_lang,
                       const std::string& user_agent) {
@@ -146,6 +164,26 @@ struct Converter<ClearStorageDataOptions> {
   }
 };
 
+template <>
+struct Converter<ClearAuthCacheOptions> {
+  static bool FromV8(v8::Isolate* isolate,
+                     v8::Local<v8::Value> val,
+                     ClearAuthCacheOptions* out) {
+    mate::Dictionary options;
+    if (!ConvertFromV8(isolate, val, &options))
+      return false;
+    options.Get("type", &out->type);
+    options.Get("origin", &out->origin);
+    options.Get("realm", &out->realm);
+    options.Get("username", &out->username);
+    options.Get("password", &out->password);
+    std::string scheme;
+    if (options.Get("scheme", &scheme))
+      out->auth_scheme = GetAuthSchemeFromString(scheme);
+    return true;
+  }
+};
+
 template <>
 struct Converter<atom::VerifyRequestParams> {
   static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
@@ -172,6 +210,63 @@ const char kPersistPrefix[] = "persist:";
 // Referenced session objects.
 std::map<uint32_t, v8::Global<v8::Object>> g_sessions;
 
+// Runs the callback in UI thread.
+void RunCallbackInUI(const base::Callback<void()>& callback) {
+  base::PostTaskWithTraits(FROM_HERE, {BrowserThread::UI}, callback);
+}
+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 net::CompletionCallback& callback,
+                  int result) {
+  if (result != net::OK) {
+    RunCallbackInUI(callback, result);
+  } else if (backend_ptr && *backend_ptr) {
+    if (action == Session::CacheAction::CLEAR) {
+      (*backend_ptr)
+          ->DoomAllEntries(base::Bind(&RunCallbackInUI<int>, callback));
+    } else if (action == Session::CacheAction::STATS) {
+      base::StringPairs stats;
+      (*backend_ptr)->GetStats(&stats);
+      for (const auto& stat : stats) {
+        if (stat.first == "Current size") {
+          int current_size;
+          base::StringToInt(stat.second, &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,
+    const net::CompletionCallback& callback) {
+  auto* request_context = context_getter->GetURLRequestContext();
+  auto* http_cache = request_context->http_transaction_factory()->GetCache();
+  if (!http_cache)
+    RunCallbackInUI<int>(callback, net::ERR_FAILED);
+
+  // Call GetBackend and make the backend's ptr accessable in OnGetBackend.
+  using BackendPtr = disk_cache::Backend*;
+  auto** backend_ptr = new BackendPtr(nullptr);
+  net::CompletionCallback on_get_backend =
+      base::Bind(&OnGetBackend, base::Owned(backend_ptr), action, callback);
+  int rv = http_cache->GetBackend(backend_ptr, on_get_backend);
+  if (rv != net::ERR_IO_PENDING)
+    on_get_backend.Run(net::OK);
+}
+
 void SetCertVerifyProcInIO(
     const scoped_refptr<net::URLRequestContextGetter>& context_getter,
     const AtomCertVerifier::VerifyProc& proc) {
@@ -180,6 +275,64 @@ void SetCertVerifyProcInIO(
       ->SetVerifyProc(proc);
 }
 
+void ClearHostResolverCacheInIO(
+    const scoped_refptr<net::URLRequestContextGetter>& context_getter,
+    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());
+    if (!callback.is_null())
+      RunCallbackInUI(callback);
+  }
+}
+
+void ClearAuthCacheInIO(
+    const scoped_refptr<net::URLRequestContextGetter>& context_getter,
+    const ClearAuthCacheOptions& options,
+    const base::Closure& callback) {
+  auto* request_context = context_getter->GetURLRequestContext();
+  auto* network_session =
+      request_context->http_transaction_factory()->GetSession();
+  if (network_session) {
+    if (options.type == "password") {
+      auto* auth_cache = network_session->http_auth_cache();
+      if (!options.origin.is_empty()) {
+        auth_cache->Remove(
+            options.origin, options.realm, options.auth_scheme,
+            net::AuthCredentials(options.username, options.password));
+      } else {
+        auth_cache->ClearAllEntries();
+      }
+    } else if (options.type == "clientCertificate") {
+      auto* client_auth_cache = network_session->ssl_client_auth_cache();
+      client_auth_cache->Remove(net::HostPortPair::FromURL(options.origin));
+    }
+    network_session->CloseAllConnections();
+  }
+  if (!callback.is_null())
+    RunCallbackInUI(callback);
+}
+
+void AllowNTLMCredentialsForDomainsInIO(
+    const scoped_refptr<net::URLRequestContextGetter>& context_getter,
+    const std::string& domains) {
+  auto* request_context = context_getter->GetURLRequestContext();
+  auto* auth_handler = request_context->http_auth_handler_factory();
+  if (auth_handler) {
+    auto* auth_preferences = const_cast<net::HttpAuthPreferences*>(
+        auth_handler->http_auth_preferences());
+    if (auth_preferences)
+      auth_preferences->SetServerWhitelist(domains);
+  }
+}
+
+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,
@@ -192,8 +345,8 @@ void DownloadIdCallback(content::DownloadManager* download_manager,
                         uint32_t id) {
   download_manager->CreateDownloadItem(
       base::GenerateGUID(), id, path, path, url_chain, GURL(), GURL(), GURL(),
-      GURL(), base::nullopt, mime_type, mime_type, start_time, base::Time(),
-      etag, last_modified, offset, length, std::string(),
+      GURL(), mime_type, mime_type, start_time, base::Time(), etag,
+      last_modified, offset, length, std::string(),
       download::DownloadItem::INTERRUPTED,
       download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
       download::DOWNLOAD_INTERRUPT_REASON_NETWORK_TIMEOUT, false, base::Time(),
@@ -206,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;
@@ -262,65 +414,38 @@ 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::BindOnce(util::Promise::ResolvePromise<std::string>,
-                          std::move(promise)));
-
-  return handle;
+void Session::ResolveProxy(
+    const GURL& url,
+    const ResolveProxyHelper::ResolveProxyCallback& callback) {
+  browser_context_->GetResolveProxyHelper()->ResolveProxy(url, callback);
 }
 
-v8::Local<v8::Promise> Session::GetCacheSize() {
-  auto* isolate = v8::Isolate::GetCurrent();
-  auto promise = util::Promise(isolate);
-  auto handle = promise.GetHandle();
-
+void Session::GetCacheSize(const net::CompletionCallback& callback) {
   content::BrowserContext::GetDefaultStoragePartition(browser_context_.get())
       ->GetNetworkContext()
-      ->ComputeHttpCacheSize(base::Time(), base::Time::Max(),
-                             base::BindOnce(
-                                 [](util::Promise promise, bool is_upper_bound,
-                                    int64_t size_or_error) {
-                                   if (size_or_error < 0) {
-                                     promise.RejectWithErrorMessage(
-                                         net::ErrorToString(size_or_error));
-                                   } else {
-                                     promise.Resolve(size_or_error);
-                                   }
-                                 },
-                                 std::move(promise)));
-
-  return handle;
+      ->ComputeHttpCacheSize(
+          base::Time(), base::Time::Max(),
+          base::BindOnce(
+              [](const net::CompletionCallback& cb, bool is_upper_bound,
+                 int64_t size_or_error) { cb.Run(size_or_error); },
+              callback));
 }
 
-v8::Local<v8::Promise> Session::ClearCache() {
-  auto* isolate = v8::Isolate::GetCurrent();
-  auto promise = util::Promise(isolate);
-  auto handle = promise.GetHandle();
-
-  content::BrowserContext::GetDefaultStoragePartition(browser_context_.get())
-      ->GetNetworkContext()
-      ->ClearHttpCache(base::Time(), base::Time::Max(), nullptr,
-                       base::BindOnce(util::Promise::ResolveEmptyPromise,
-                                      std::move(promise)));
-
-  return handle;
+template <Session::CacheAction action>
+void Session::DoCacheAction(const net::CompletionCallback& callback) {
+  base::PostTaskWithTraits(
+      FROM_HERE, {BrowserThread::IO},
+      base::BindOnce(&DoCacheActionInIO,
+                     WrapRefCounted(browser_context_->GetRequestContext()),
+                     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);
@@ -329,12 +454,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::BindOnce(util::Promise::ResolveEmptyPromise, std::move(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() {
@@ -343,17 +465,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;
@@ -377,11 +493,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) {
@@ -415,18 +527,17 @@ void Session::DisableNetworkEmulation() {
       network_emulation_token_, network::mojom::NetworkConditions::New());
 }
 
-void WrapVerifyProc(
-    base::RepeatingCallback<void(const VerifyRequestParams& request,
-                                 base::RepeatingCallback<void(int)>)> proc,
-    const VerifyRequestParams& request,
-    base::OnceCallback<void(int)> cb) {
+void WrapVerifyProc(base::Callback<void(const VerifyRequestParams& request,
+                                        base::Callback<void(int)>)> proc,
+                    const VerifyRequestParams& request,
+                    base::OnceCallback<void(int)> cb) {
   proc.Run(request, base::AdaptCallbackForRepeating(std::move(cb)));
 }
 
 void Session::SetCertVerifyProc(v8::Local<v8::Value> val,
                                 mate::Arguments* args) {
-  base::RepeatingCallback<void(const VerifyRequestParams& request,
-                               base::RepeatingCallback<void(int)>)>
+  base::Callback<void(const VerifyRequestParams& request,
+                      base::Callback<void(int)>)>
       proc;
   if (!(val->IsNull() || mate::ConvertFromV8(args->isolate(), val, &proc))) {
     args->ThrowError("Must pass null or function");
@@ -437,38 +548,19 @@ void Session::SetCertVerifyProc(v8::Local<v8::Value> val,
       FROM_HERE, {BrowserThread::IO},
       base::BindOnce(&SetCertVerifyProcInIO,
                      WrapRefCounted(browser_context_->GetRequestContext()),
-                     base::BindRepeating(&WrapVerifyProc, proc)));
+                     base::Bind(&WrapVerifyProc, proc)));
 }
 
 void Session::SetPermissionRequestHandler(v8::Local<v8::Value> val,
                                           mate::Arguments* args) {
-  using StatusCallback =
-      base::RepeatingCallback<void(blink::mojom::PermissionStatus)>;
-  using RequestHandler =
-      base::Callback<void(content::WebContents*, content::PermissionType,
-                          StatusCallback, const base::DictionaryValue&)>;
-  auto* permission_manager = static_cast<AtomPermissionManager*>(
-      browser_context()->GetPermissionControllerDelegate());
-  if (val->IsNull()) {
-    permission_manager->SetPermissionRequestHandler(
-        AtomPermissionManager::RequestHandler());
-    return;
-  }
-  auto handler = std::make_unique<RequestHandler>();
-  if (!mate::ConvertFromV8(args->isolate(), val, handler.get())) {
+  AtomPermissionManager::RequestHandler handler;
+  if (!(val->IsNull() || mate::ConvertFromV8(args->isolate(), val, &handler))) {
     args->ThrowError("Must pass null or function");
     return;
   }
-  permission_manager->SetPermissionRequestHandler(base::BindRepeating(
-      [](RequestHandler* handler, content::WebContents* web_contents,
-         content::PermissionType permission_type,
-         AtomPermissionManager::StatusCallback callback,
-         const base::DictionaryValue& details) {
-        handler->Run(web_contents, permission_type,
-                     base::AdaptCallbackForRepeating(std::move(callback)),
-                     details);
-      },
-      base::Owned(std::move(handler))));
+  auto* permission_manager = static_cast<AtomPermissionManager*>(
+      browser_context()->GetPermissionControllerDelegate());
+  permission_manager->SetPermissionRequestHandler(handler);
 }
 
 void Session::SetPermissionCheckHandler(v8::Local<v8::Value> val,
@@ -483,38 +575,39 @@ 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);
 
-  content::BrowserContext::GetDefaultStoragePartition(browser_context_.get())
-      ->GetNetworkContext()
-      ->ClearHostCache(nullptr,
-                       base::BindOnce(util::Promise::ResolveEmptyPromise,
-                                      std::move(promise)));
-
-  return handle;
+  base::PostTaskWithTraits(
+      FROM_HERE, {BrowserThread::IO},
+      base::BindOnce(&ClearHostResolverCacheInIO,
+                     WrapRefCounted(browser_context_->GetRequestContext()),
+                     callback));
 }
 
-v8::Local<v8::Promise> Session::ClearAuthCache() {
-  auto* isolate = v8::Isolate::GetCurrent();
-  util::Promise promise(isolate);
-  v8::Local<v8::Promise> handle = promise.GetHandle();
+void Session::ClearAuthCache(mate::Arguments* args) {
+  ClearAuthCacheOptions options;
+  if (!args->GetNext(&options)) {
+    args->ThrowError("Must specify options object");
+    return;
+  }
+  base::Closure callback;
+  args->GetNext(&callback);
 
-  content::BrowserContext::GetDefaultStoragePartition(browser_context_.get())
-      ->GetNetworkContext()
-      ->ClearHttpAuthCache(base::Time(),
-                           base::BindOnce(util::Promise::ResolveEmptyPromise,
-                                          std::move(promise)));
-
-  return handle;
+  base::PostTaskWithTraits(
+      FROM_HERE, {BrowserThread::IO},
+      base::BindOnce(&ClearAuthCacheInIO,
+                     WrapRefCounted(browser_context_->GetRequestContext()),
+                     options, callback));
 }
 
 void Session::AllowNTLMCredentialsForDomains(const std::string& domains) {
-  auto auth_params = CreateHttpAuthDynamicParams();
-  auth_params->server_whitelist = domains;
-  content::GetNetworkService()->ConfigureHttpAuthPrefs(std::move(auth_params));
+  base::PostTaskWithTraits(
+      FROM_HERE, {BrowserThread::IO},
+      base::BindOnce(&AllowNTLMCredentialsForDomainsInIO,
+                     WrapRefCounted(browser_context_->GetRequestContext()),
+                     domains));
 }
 
 void Session::SetUserAgent(const std::string& user_agent,
@@ -535,17 +628,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) {
@@ -574,7 +666,7 @@ void Session::CreateInterruptedDownload(const mate::Dictionary& options) {
   }
   auto* download_manager =
       content::BrowserContext::GetDownloadManager(browser_context());
-  download_manager->GetDelegate()->GetNextId(base::BindRepeating(
+  download_manager->GetDelegate()->GetNextId(base::Bind(
       &DownloadIdCallback, download_manager, path, url_chain, mime_type, offset,
       length, last_modified, etag, base::Time::FromDoubleT(start_time)));
 }
@@ -602,12 +694,8 @@ v8::Local<v8::Value> Session::Cookies(v8::Isolate* isolate) {
 
 v8::Local<v8::Value> Session::Protocol(v8::Isolate* isolate) {
   if (protocol_.IsEmpty()) {
-    v8::Local<v8::Value> handle;
-    if (base::FeatureList::IsEnabled(network::features::kNetworkService))
-      handle = ProtocolNS::Create(isolate, browser_context()).ToV8();
-    else
-      handle = Protocol::Create(isolate, browser_context()).ToV8();
-    protocol_.Reset(isolate, handle);
+    auto handle = atom::api::Protocol::Create(isolate, browser_context());
+    protocol_.Reset(isolate, handle.ToV8());
   }
   return v8::Local<v8::Value>::New(isolate, protocol_);
 }
@@ -672,7 +760,7 @@ void Session::BuildPrototype(v8::Isolate* isolate,
       .MakeDestroyable()
       .SetMethod("resolveProxy", &Session::ResolveProxy)
       .SetMethod("getCacheSize", &Session::GetCacheSize)
-      .SetMethod("clearCache", &Session::ClearCache)
+      .SetMethod("clearCache", &Session::DoCacheAction<CacheAction::CLEAR>)
       .SetMethod("clearStorageData", &Session::ClearStorageData)
       .SetMethod("flushStorageData", &Session::FlushStorageData)
       .SetMethod("setProxy", &Session::SetProxy)
@@ -708,7 +796,6 @@ void Session::BuildPrototype(v8::Isolate* isolate,
 namespace {
 
 using atom::api::Cookies;
-using atom::api::NetLog;
 using atom::api::Protocol;
 using atom::api::Session;
 
@@ -735,9 +822,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,14 @@ class Session : public mate::TrackableObject<Session>,
                              v8::Local<v8::FunctionTemplate> prototype);
 
   // Methods.
-  v8::Local<v8::Promise> ResolveProxy(mate::Arguments* args);
-  v8::Local<v8::Promise> GetCacheSize();
-  v8::Local<v8::Promise> ClearCache();
-  v8::Local<v8::Promise> ClearStorageData(mate::Arguments* args);
+  void ResolveProxy(const GURL& url,
+                    const ResolveProxyHelper::ResolveProxyCallback& callback);
+  template <CacheAction action>
+  void DoCacheAction(const net::CompletionCallback& callback);
+  void GetCacheSize(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 +78,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();
+  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) {
@@ -102,16 +88,11 @@ void SystemPreferences::BuildPrototype(
                  &SystemPreferences::IsSwipeTrackingFromScrollEventsEnabled)
       .SetMethod("getEffectiveAppearance",
                  &SystemPreferences::GetEffectiveAppearance)
-      .SetMethod("_getAppLevelAppearance",
+      .SetMethod("getAppLevelAppearance",
                  &SystemPreferences::GetAppLevelAppearance)
-      .SetMethod("_setAppLevelAppearance",
+      .SetMethod("setAppLevelAppearance",
                  &SystemPreferences::SetAppLevelAppearance)
-      .SetProperty("appLevelAppearance",
-                   &SystemPreferences::GetAppLevelAppearance,
-                   &SystemPreferences::SetAppLevelAppearance)
       .SetMethod("getSystemColor", &SystemPreferences::GetSystemColor)
-      .SetMethod("canPromptTouchID", &SystemPreferences::CanPromptTouchID)
-      .SetMethod("promptTouchID", &SystemPreferences::PromptTouchID)
       .SetMethod("isTrustedAccessibilityClient",
                  &SystemPreferences::IsTrustedAccessibilityClient)
       .SetMethod("getMediaAccessStatus",
@@ -122,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
@@ -149,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

@@ -66,8 +66,7 @@ class SystemPreferences : public mate::EventEmitter<SystemPreferences>
 
 #elif defined(OS_MACOSX)
   using NotificationCallback =
-      base::RepeatingCallback<void(const std::string&,
-                                   const base::DictionaryValue&)>;
+      base::Callback<void(const std::string&, const base::DictionaryValue&)>;
 
   void PostNotification(const std::string& name,
                         const base::DictionaryValue& user_info,
@@ -96,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
@@ -118,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

@@ -5,26 +5,18 @@
 #include "atom/browser/api/atom_api_system_preferences.h"
 
 #include <map>
-#include <memory>
-#include <string>
-#include <utility>
 
 #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"
@@ -426,69 +418,6 @@ std::string SystemPreferences::GetSystemColor(const std::string& color,
   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;
-}
-
 // static
 bool SystemPreferences::IsTrustedAccessibilityClient(bool prompt) {
   NSDictionary* options = @{(id)kAXTrustedCheckOptionPrompt : @(prompt)};
@@ -628,6 +557,10 @@ void SystemPreferences::RemoveUserDefault(const std::string& name) {
 }
 
 bool SystemPreferences::IsDarkMode() {
+  if (@available(macOS 10.14, *)) {
+    return [[NSApplication sharedApplication].effectiveAppearance.name
+        isEqualToString:NSAppearanceNameDarkAqua];
+  }
   NSString* mode = [[NSUserDefaults standardUserDefaults]
       stringForKey:@"AppleInterfaceStyle"];
   return [mode isEqualToString:@"Dark"];

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());
@@ -737,15 +731,15 @@ void TopLevelWindow::SetProgressBar(double progress, mate::Arguments* args) {
   std::string mode;
   args->GetNext(&options) && options.Get("mode", &mode);
 
-  NativeWindow::ProgressState state = NativeWindow::ProgressState::kNormal;
+  NativeWindow::ProgressState state = NativeWindow::PROGRESS_NORMAL;
   if (mode == "error")
-    state = NativeWindow::ProgressState::kError;
+    state = NativeWindow::PROGRESS_ERROR;
   else if (mode == "paused")
-    state = NativeWindow::ProgressState::kPaused;
+    state = NativeWindow::PROGRESS_PAUSED;
   else if (mode == "indeterminate")
-    state = NativeWindow::ProgressState::kIndeterminate;
+    state = NativeWindow::PROGRESS_INDETERMINATE;
   else if (mode == "none")
-    state = NativeWindow::ProgressState::kNone;
+    state = NativeWindow::PROGRESS_NONE;
 
   window_->SetProgressBar(progress, state);
 }
@@ -1070,31 +1064,21 @@ void TopLevelWindow::BuildPrototype(v8::Isolate* isolate,
       .SetMethod("setMaximumSize", &TopLevelWindow::SetMaximumSize)
       .SetMethod("getMaximumSize", &TopLevelWindow::GetMaximumSize)
       .SetMethod("setSheetOffset", &TopLevelWindow::SetSheetOffset)
+      .SetMethod("setResizable", &TopLevelWindow::SetResizable)
+      .SetMethod("isResizable", &TopLevelWindow::IsResizable)
+      .SetMethod("setMovable", &TopLevelWindow::SetMovable)
+#if defined(OS_WIN) || defined(OS_MACOSX)
       .SetMethod("moveTop", &TopLevelWindow::MoveTop)
-      .SetMethod("_setResizable", &TopLevelWindow::SetResizable)
-      .SetMethod("_isResizable", &TopLevelWindow::IsResizable)
-      .SetProperty("resizable", &TopLevelWindow::IsResizable,
-                   &TopLevelWindow::SetResizable)
-      .SetMethod("_setMovable", &TopLevelWindow::SetMovable)
-      .SetMethod("_isMovable", &TopLevelWindow::IsMovable)
-      .SetProperty("movable", &TopLevelWindow::IsMovable,
-                   &TopLevelWindow::SetMovable)
-      .SetMethod("_setMinimizable", &TopLevelWindow::SetMinimizable)
-      .SetMethod("_isMinimizable", &TopLevelWindow::IsMinimizable)
-      .SetProperty("minimizable", &TopLevelWindow::IsMinimizable,
-                   &TopLevelWindow::SetMinimizable)
-      .SetMethod("_setMaximizable", &TopLevelWindow::SetMaximizable)
-      .SetMethod("_isMaximizable", &TopLevelWindow::IsMaximizable)
-      .SetProperty("maximizable", &TopLevelWindow::IsMaximizable,
-                   &TopLevelWindow::SetMaximizable)
-      .SetMethod("_setFullScreenable", &TopLevelWindow::SetFullScreenable)
-      .SetMethod("_isFullScreenable", &TopLevelWindow::IsFullScreenable)
-      .SetProperty("fullScreenable", &TopLevelWindow::IsFullScreenable,
-                   &TopLevelWindow::SetFullScreenable)
-      .SetMethod("_setClosable", &TopLevelWindow::SetClosable)
-      .SetMethod("_isClosable", &TopLevelWindow::IsClosable)
-      .SetProperty("closable", &TopLevelWindow::IsClosable,
-                   &TopLevelWindow::SetClosable)
+#endif
+      .SetMethod("isMovable", &TopLevelWindow::IsMovable)
+      .SetMethod("setMinimizable", &TopLevelWindow::SetMinimizable)
+      .SetMethod("isMinimizable", &TopLevelWindow::IsMinimizable)
+      .SetMethod("setMaximizable", &TopLevelWindow::SetMaximizable)
+      .SetMethod("isMaximizable", &TopLevelWindow::IsMaximizable)
+      .SetMethod("setFullScreenable", &TopLevelWindow::SetFullScreenable)
+      .SetMethod("isFullScreenable", &TopLevelWindow::IsFullScreenable)
+      .SetMethod("setClosable", &TopLevelWindow::SetClosable)
+      .SetMethod("isClosable", &TopLevelWindow::IsClosable)
       .SetMethod("setAlwaysOnTop", &TopLevelWindow::SetAlwaysOnTop)
       .SetMethod("isAlwaysOnTop", &TopLevelWindow::IsAlwaysOnTop)
       .SetMethod("center", &TopLevelWindow::Center)
@@ -1154,14 +1138,10 @@ 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)
-      .SetProperty("autoHideMenuBar", &TopLevelWindow::IsMenuBarAutoHide,
-                   &TopLevelWindow::SetAutoHideMenuBar)
+      .SetMethod("setAutoHideMenuBar", &TopLevelWindow::SetAutoHideMenuBar)
+      .SetMethod("isMenuBarAutoHide", &TopLevelWindow::IsMenuBarAutoHide)
+      .SetMethod("setMenuBarVisibility", &TopLevelWindow::SetMenuBarVisibility)
       .SetMethod("isMenuBarVisible", &TopLevelWindow::IsMenuBarVisible)
       .SetMethod("setAspectRatio", &TopLevelWindow::SetAspectRatio)
       .SetMethod("previewFile", &TopLevelWindow::PreviewFile)
@@ -1203,8 +1183,7 @@ void Initialize(v8::Local<v8::Object> exports,
                 v8::Local<v8::Context> context,
                 void* priv) {
   v8::Isolate* isolate = context->GetIsolate();
-  TopLevelWindow::SetConstructor(isolate,
-                                 base::BindRepeating(&TopLevelWindow::New));
+  TopLevelWindow::SetConstructor(isolate, base::Bind(&TopLevelWindow::New));
 
   mate::Dictionary constructor(isolate, TopLevelWindow::GetConstructor(isolate)
                                             ->GetFunction(context)

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);
@@ -211,8 +211,7 @@ class TopLevelWindow : public mate::TrackableObject<TopLevelWindow>,
   void SetIcon(mate::Handle<NativeImage> icon);
 #endif
 #if defined(OS_WIN)
-  typedef base::RepeatingCallback<void(v8::Local<v8::Value>,
-                                       v8::Local<v8::Value>)>
+  typedef base::Callback<void(v8::Local<v8::Value>, v8::Local<v8::Value>)>
       MessageCallback;
   bool HookWindowMessage(UINT message, const MessageCallback& callback);
   bool IsWindowMessageHooked(UINT message);

atom/browser/api/atom_api_tray.cc

@@ -25,19 +25,18 @@ struct Converter<atom::TrayIcon::HighlightMode> {
   static bool FromV8(v8::Isolate* isolate,
                      v8::Local<v8::Value> val,
                      atom::TrayIcon::HighlightMode* out) {
-    using HighlightMode = atom::TrayIcon::HighlightMode;
     std::string mode;
     if (ConvertFromV8(isolate, val, &mode)) {
       if (mode == "always") {
-        *out = HighlightMode::ALWAYS;
+        *out = atom::TrayIcon::HighlightMode::ALWAYS;
         return true;
       }
       if (mode == "selection") {
-        *out = HighlightMode::SELECTION;
+        *out = atom::TrayIcon::HighlightMode::SELECTION;
         return true;
       }
       if (mode == "never") {
-        *out = HighlightMode::NEVER;
+        *out = atom::TrayIcon::HighlightMode::NEVER;
         return true;
       }
     }
@@ -60,7 +59,11 @@ Tray::Tray(v8::Isolate* isolate,
   InitWith(isolate, wrapper);
 }
 
-Tray::~Tray() = default;
+Tray::~Tray() {
+  // Destroy the native tray in next tick.
+  base::ThreadTaskRunnerHandle::Get()->DeleteSoon(FROM_HERE,
+                                                  tray_icon_.release());
+}
 
 // static
 mate::WrappableBase* Tray::New(mate::Handle<NativeImage> image,
@@ -156,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) {
@@ -234,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)
@@ -259,7 +251,7 @@ void Initialize(v8::Local<v8::Object> exports,
                 v8::Local<v8::Context> context,
                 void* priv) {
   v8::Isolate* isolate = context->GetIsolate();
-  Tray::SetConstructor(isolate, base::BindRepeating(&Tray::New));
+  Tray::SetConstructor(isolate, base::Bind(&Tray::New));
 
   mate::Dictionary dict(isolate, exports);
   dict.Set(

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

@@ -9,9 +9,9 @@
 #include "atom/browser/api/atom_api_session.h"
 #include "atom/browser/net/atom_url_request.h"
 #include "atom/common/api/event_emitter_caller.h"
+#include "atom/common/native_mate_converters/callback.h"
 #include "atom/common/native_mate_converters/gurl_converter.h"
 #include "atom/common/native_mate_converters/net_converter.h"
-#include "atom/common/native_mate_converters/once_callback.h"
 #include "atom/common/native_mate_converters/string16_converter.h"
 #include "atom/common/node_includes.h"
 #include "native_mate/dictionary.h"
@@ -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,8 +364,8 @@ void URLRequest::OnAuthenticationRequired(
     return;
   }
 
-  Emit("login", auth_info,
-       base::BindOnce(&AtomURLRequest::PassLoginInformation, atom_request_));
+  Emit("login", auth_info.get(),
+       base::Bind(&AtomURLRequest::PassLoginInformation, atom_request_));
 }
 
 void URLRequest::OnResponseStarted(

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 {
@@ -73,7 +74,7 @@ void Initialize(v8::Local<v8::Object> exports,
                 v8::Local<v8::Context> context,
                 void* priv) {
   v8::Isolate* isolate = context->GetIsolate();
-  View::SetConstructor(isolate, base::BindRepeating(&View::New));
+  View::SetConstructor(isolate, base::Bind(&View::New));
 
   mate::Dictionary constructor(
       isolate,

atom/browser/api/atom_api_web_contents.cc

@@ -35,32 +35,29 @@
 #include "atom/common/color_util.h"
 #include "atom/common/mouse_util.h"
 #include "atom/common/native_mate_converters/blink_converter.h"
+#include "atom/common/native_mate_converters/callback.h"
 #include "atom/common/native_mate_converters/content_converter.h"
 #include "atom/common/native_mate_converters/file_path_converter.h"
 #include "atom/common/native_mate_converters/gfx_converter.h"
 #include "atom/common/native_mate_converters/gurl_converter.h"
 #include "atom/common/native_mate_converters/image_converter.h"
-#include "atom/common/native_mate_converters/map_converter.h"
 #include "atom/common/native_mate_converters/net_converter.h"
 #include "atom/common/native_mate_converters/network_converter.h"
-#include "atom/common/native_mate_converters/once_callback.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"
-#include "base/optional.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/values.h"
 #include "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"
@@ -80,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"
@@ -103,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
 
@@ -112,6 +105,8 @@
 #include "components/printing/common/print_messages.h"
 #endif
 
+#include "atom/common/node_includes.h"
+
 namespace mate {
 
 #if BUILDFLAG(ENABLE_PRINTING)
@@ -244,52 +239,97 @@ 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));
 }
 
 }  // namespace
 
+struct WebContents::FrameDispatchHelper {
+  WebContents* api_web_contents;
+  content::RenderFrameHost* rfh;
+
+  bool Send(IPC::Message* msg) { return rfh->Send(msg); }
+
+  void OnSetTemporaryZoomLevel(double level, IPC::Message* reply_msg) {
+    api_web_contents->OnSetTemporaryZoomLevel(rfh, level, reply_msg);
+  }
+
+  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,
                          content::WebContents* web_contents)
-    : content::WebContentsObserver(web_contents), type_(Type::REMOTE) {
+    : content::WebContentsObserver(web_contents),
+      type_(REMOTE),
+      weak_factory_(this) {
   web_contents->SetUserAgentOverride(GetBrowserContext()->GetUserAgent(),
                                      false);
   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,
                          std::unique_ptr<content::WebContents> web_contents,
                          Type type)
-    : content::WebContentsObserver(web_contents.get()), type_(type) {
-  DCHECK(type != Type::REMOTE)
-      << "Can't take ownership of a remote WebContents";
+    : content::WebContentsObserver(web_contents.get()),
+      type_(type),
+      weak_factory_(this) {
+  DCHECK(type != REMOTE) << "Can't take ownership of a remote WebContents";
   auto session = Session::CreateFrom(isolate, GetBrowserContext());
   session_.Reset(isolate, session.ToV8());
   InitWithSessionAndOptions(isolate, std::move(web_contents), session,
                             mate::Dictionary::CreateEmpty(isolate));
 }
 
-WebContents::WebContents(v8::Isolate* isolate,
-                         const mate::Dictionary& options) {
+WebContents::WebContents(v8::Isolate* isolate, const mate::Dictionary& options)
+    : weak_factory_(this) {
   // Read options.
   options.Get("backgroundThrottling", &background_throttling_);
 
-  // Get type
-  options.Get("type", &type_);
-
+  // FIXME(zcbenz): We should read "type" parameter for better design, but
+  // on Windows we have encountered a compiler bug that if we read "type"
+  // from |options| and then set |type_|, a memory corruption will happen
+  // and Electron will soon crash.
+  // Remvoe this after we upgraded to use VS 2015 Update 3.
   bool b = false;
+  if (options.Get("isGuest", &b) && b)
+    type_ = WEB_VIEW;
+  else if (options.Get("isBackgroundPage", &b) && b)
+    type_ = BACKGROUND_PAGE;
+  else if (options.Get("isBrowserView", &b) && b)
+    type_ = BROWSER_VIEW;
 #if BUILDFLAG(ENABLE_OSR)
-  if (options.Get(options::kOffscreen, &b) && b)
-    type_ = Type::OFF_SCREEN;
+  else if (options.Get(options::kOffscreen, &b) && b)
+    type_ = OFF_SCREEN;
 #endif
 
   // Init embedder earlier
@@ -324,8 +364,7 @@ WebContents::WebContents(v8::Isolate* isolate,
 #if BUILDFLAG(ENABLE_OSR)
     if (embedder_ && embedder_->IsOffScreen()) {
       auto* view = new OffScreenWebContentsView(
-          false,
-          base::BindRepeating(&WebContents::OnPaint, base::Unretained(this)));
+          false, base::Bind(&WebContents::OnPaint, base::Unretained(this)));
       params.view = view;
       params.delegate_view = view;
 
@@ -342,8 +381,7 @@ WebContents::WebContents(v8::Isolate* isolate,
 
     content::WebContents::CreateParams params(session->browser_context());
     auto* view = new OffScreenWebContentsView(
-        transparent,
-        base::BindRepeating(&WebContents::OnPaint, base::Unretained(this)));
+        transparent, base::Bind(&WebContents::OnPaint, base::Unretained(this)));
     params.view = view;
     params.delegate_view = view;
 
@@ -406,11 +444,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);
 
@@ -438,12 +471,12 @@ WebContents::~WebContents() {
 
     RenderViewDeleted(web_contents()->GetRenderViewHost());
 
-    if (type_ == Type::WEB_VIEW) {
+    if (type_ == WEB_VIEW) {
       DCHECK(!web_contents()->GetOuterWebContents())
           << "Should never manually destroy an attached webview";
       // For webview simply destroy the WebContents immediately.
       DestroyWebContents(false /* async */);
-    } else if (type_ == Type::BROWSER_WINDOW && owner_window()) {
+    } else if (type_ == BROWSER_WINDOW && owner_window()) {
       // For BrowserWindow we should close the window and clean up everything
       // before WebContents is destroyed.
       for (ExtendedWebContentsObserver& observer : observers_)
@@ -473,14 +506,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(
@@ -490,7 +521,7 @@ void WebContents::OnCreateWindow(
     WindowOpenDisposition disposition,
     const std::vector<std::string>& features,
     const scoped_refptr<network::ResourceRequestBody>& body) {
-  if (type_ == Type::BROWSER_WINDOW || type_ == Type::OFF_SCREEN)
+  if (type_ == BROWSER_WINDOW || type_ == OFF_SCREEN)
     Emit("-new-window", target_url, frame_name, disposition, features, body,
          referrer);
   else
@@ -522,7 +553,7 @@ void WebContents::AddNewContents(
   v8::Locker locker(isolate());
   v8::HandleScope handle_scope(isolate());
   auto api_web_contents =
-      CreateAndTake(isolate(), std::move(new_contents), Type::BROWSER_WINDOW);
+      CreateAndTake(isolate(), std::move(new_contents), BROWSER_WINDOW);
   if (Emit("-add-new-contents", api_web_contents, disposition, user_gesture,
            initial_rect.x(), initial_rect.y(), initial_rect.width(),
            initial_rect.height(), tracker->url, tracker->frame_name)) {
@@ -535,7 +566,7 @@ content::WebContents* WebContents::OpenURLFromTab(
     content::WebContents* source,
     const content::OpenURLParams& params) {
   if (params.disposition != WindowOpenDisposition::CURRENT_TAB) {
-    if (type_ == Type::BROWSER_WINDOW || type_ == Type::OFF_SCREEN)
+    if (type_ == BROWSER_WINDOW || type_ == OFF_SCREEN)
       Emit("-new-window", params.url, "", params.disposition);
     else
       Emit("new-window", params.url, "", params.disposition);
@@ -557,7 +588,7 @@ content::WebContents* WebContents::OpenURLFromTab(
 void WebContents::BeforeUnloadFired(content::WebContents* tab,
                                     bool proceed,
                                     bool* proceed_to_fire_unload) {
-  if (type_ == Type::BROWSER_WINDOW || type_ == Type::OFF_SCREEN)
+  if (type_ == BROWSER_WINDOW || type_ == OFF_SCREEN)
     *proceed_to_fire_unload = proceed;
   else
     *proceed_to_fire_unload = true;
@@ -591,7 +622,7 @@ void WebContents::UpdateTargetURL(content::WebContents* source,
 bool WebContents::HandleKeyboardEvent(
     content::WebContents* source,
     const content::NativeWebKeyboardEvent& event) {
-  if (type_ == Type::WEB_VIEW && embedder_) {
+  if (type_ == WEB_VIEW && embedder_) {
     // Send the unhandled keyboard events back to the embedder.
     return embedder_->HandleKeyboardEvent(source, event);
   } else {
@@ -614,19 +645,14 @@ content::KeyboardEventProcessingResult WebContents::PreHandleKeyboardEvent(
   return content::KeyboardEventProcessingResult::NOT_HANDLED;
 }
 
-void WebContents::ContentsZoomChange(bool zoom_in) {
-  Emit("zoom-changed", zoom_in ? "in" : "out");
-}
-
 void WebContents::EnterFullscreenModeForTab(
     content::WebContents* source,
     const GURL& origin,
     const blink::WebFullscreenOptions& options) {
   auto* permission_helper =
       WebContentsPermissionHelper::FromWebContents(source);
-  auto callback =
-      base::BindRepeating(&WebContents::OnEnterFullscreenModeForTab,
-                          base::Unretained(this), source, origin, options);
+  auto callback = base::Bind(&WebContents::OnEnterFullscreenModeForTab,
+                             base::Unretained(this), source, origin, options);
   permission_helper->RequestFullscreenPermission(callback);
 }
 
@@ -661,13 +687,11 @@ 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::BindOnce(&content::WebContents::NotifyContextMenuClosed,
-                        base::Unretained(web_contents()),
-                        params.custom_context));
+         base::Bind(&content::WebContents::NotifyContextMenuClosed,
+                    base::Unretained(web_contents()), params.custom_context));
   } else {
     Emit("context-menu", std::make_pair(params, web_contents()));
   }
@@ -798,30 +822,27 @@ 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::DidAcquireFullscreen(content::RenderFrameHost* rfh) {
+  set_fullscreen_frame(rfh);
 }
 
 void WebContents::DocumentLoadedInFrame(
@@ -887,89 +908,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::Invoke(const std::string& channel,
-                         base::Value arguments,
-                         InvokeCallback callback) {
-  // webContents.emit('-ipc-invoke', new Event(), channel, arguments);
-  EmitWithSender("-ipc-invoke", bindings_.dispatch_context(),
-                 std::move(callback), 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::UpdateDraggableRegions(
-    std::vector<mojom::DraggableRegionPtr> regions) {
-  for (ExtendedWebContentsObserver& observer : observers_)
-    observer.OnDraggableRegionsUpdated(regions);
-}
-
-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,7 +1069,17 @@ bool WebContents::OnMessageReceived(const IPC::Message& message) {
 bool WebContents::OnMessageReceived(const IPC::Message& message,
                                     content::RenderFrameHost* frame_host) {
   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)
+    IPC_MESSAGE_FORWARD_DELAY_REPLY(AtomFrameHostMsg_GetZoomLevel, &helper,
+                                    FrameDispatchHelper::OnGetZoomLevel)
 #if defined(TOOLKIT_VIEWS)
     IPC_MESSAGE_HANDLER(AtomAutofillFrameHostMsg_ShowPopup, ShowAutofillPopup)
     IPC_MESSAGE_HANDLER(AtomAutofillFrameHostMsg_HidePopup, HideAutofillPopup)
@@ -1191,7 +1139,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;
   }
@@ -1210,7 +1158,7 @@ void WebContents::SetBackgroundThrottling(bool allowed) {
   render_widget_host_impl->disable_hidden_ = !background_throttling_;
 
   if (render_widget_host_impl->is_hidden()) {
-    render_widget_host_impl->WasShown(base::nullopt);
+    render_widget_host_impl->WasShown(false);
   }
 }
 
@@ -1372,27 +1320,22 @@ 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) {
-  if (type_ == Type::REMOTE)
+  if (type_ == REMOTE)
     return;
 
   if (!enable_devtools_)
     return;
 
   std::string state;
-  if (type_ == Type::WEB_VIEW || !owner_window()) {
+  if (type_ == WEB_VIEW || !owner_window()) {
     state = "detach";
   }
   bool activate = true;
@@ -1408,21 +1351,21 @@ void WebContents::OpenDevTools(mate::Arguments* args) {
 }
 
 void WebContents::CloseDevTools() {
-  if (type_ == Type::REMOTE)
+  if (type_ == REMOTE)
     return;
 
   managed_web_contents()->CloseDevTools();
 }
 
 bool WebContents::IsDevToolsOpened() {
-  if (type_ == Type::REMOTE)
+  if (type_ == REMOTE)
     return false;
 
   return managed_web_contents()->IsDevToolsViewShowing();
 }
 
 bool WebContents::IsDevToolsFocused() {
-  if (type_ == Type::REMOTE)
+  if (type_ == REMOTE)
     return false;
 
   return managed_web_contents()->GetView()->IsDevToolsViewFocused();
@@ -1430,7 +1373,7 @@ bool WebContents::IsDevToolsFocused() {
 
 void WebContents::EnableDeviceEmulation(
     const blink::WebDeviceEmulationParams& params) {
-  if (type_ == Type::REMOTE)
+  if (type_ == REMOTE)
     return;
 
   auto* frame_host = web_contents()->GetMainFrame();
@@ -1445,7 +1388,7 @@ void WebContents::EnableDeviceEmulation(
 }
 
 void WebContents::DisableDeviceEmulation() {
-  if (type_ == Type::REMOTE)
+  if (type_ == REMOTE)
     return;
 
   auto* frame_host = web_contents()->GetMainFrame();
@@ -1467,7 +1410,7 @@ void WebContents::ToggleDevTools() {
 }
 
 void WebContents::InspectElement(int x, int y) {
-  if (type_ == Type::REMOTE)
+  if (type_ == REMOTE)
     return;
 
   if (!enable_devtools_)
@@ -1478,25 +1421,8 @@ void WebContents::InspectElement(int x, int y) {
   managed_web_contents()->InspectElement(x, y);
 }
 
-void WebContents::InspectSharedWorker() {
-  if (type_ == 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_ == Type::REMOTE)
+  if (type_ == REMOTE)
     return;
 
   if (!enable_devtools_)
@@ -1512,6 +1438,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);
@@ -1576,13 +1536,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
 
@@ -1696,7 +1654,7 @@ bool WebContents::IsFocused() const {
   if (!view)
     return false;
 
-  if (GetType() != Type::BACKGROUND_PAGE) {
+  if (GetType() != BACKGROUND_PAGE) {
     auto* window = web_contents()->GetNativeView()->GetToplevelWindow();
     if (window && !window->IsVisible())
       return false;
@@ -1732,13 +1690,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,
@@ -1754,13 +1713,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,
@@ -1836,7 +1790,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() {
@@ -1914,9 +1868,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,
@@ -1928,7 +1883,7 @@ void WebContents::OnCursorChange(const content::WebCursor& cursor) {
 }
 
 bool WebContents::IsGuest() const {
-  return type_ == Type::WEB_VIEW;
+  return type_ == WEB_VIEW;
 }
 
 void WebContents::AttachToIframe(content::WebContents* embedder_web_contents,
@@ -1939,7 +1894,7 @@ void WebContents::AttachToIframe(content::WebContents* embedder_web_contents,
 
 bool WebContents::IsOffScreen() const {
 #if BUILDFLAG(ENABLE_OSR)
-  return type_ == Type::OFF_SCREEN;
+  return type_ == OFF_SCREEN;
 #else
   return false;
 #endif
@@ -2023,12 +1978,20 @@ double WebContents::GetZoomFactor() const {
   return content::ZoomLevelToZoomFactor(level);
 }
 
-void WebContents::SetTemporaryZoomLevel(double level) {
+void WebContents::OnSetTemporaryZoomLevel(content::RenderFrameHost* rfh,
+                                          double level,
+                                          IPC::Message* reply_msg) {
   zoom_controller_->SetTemporaryZoomLevel(level);
+  double new_level = zoom_controller_->GetZoomLevel();
+  AtomFrameHostMsg_SetTemporaryZoomLevel::WriteReplyParams(reply_msg,
+                                                           new_level);
+  rfh->Send(reply_msg);
 }
 
-void WebContents::DoGetZoomLevel(DoGetZoomLevelCallback callback) {
-  std::move(callback).Run(GetZoomLevel());
+void WebContents::OnGetZoomLevel(content::RenderFrameHost* rfh,
+                                 IPC::Message* reply_msg) {
+  AtomFrameHostMsg_GetZoomLevel::WriteReplyParams(reply_msg, GetZoomLevel());
+  rfh->Send(reply_msg);
 }
 
 v8::Local<v8::Value> WebContents::GetPreloadPath(v8::Isolate* isolate) const {
@@ -2058,9 +2021,6 @@ v8::Local<v8::Value> WebContents::GetLastWebPreferences(
 }
 
 bool WebContents::IsRemoteModuleEnabled() const {
-  if (web_contents()->GetVisibleURL().SchemeIs("devtools")) {
-    return false;
-  }
   if (auto* web_preferences = WebContentsPreferences::From(web_contents())) {
     return web_preferences->IsRemoteModuleEnabled();
   }
@@ -2143,45 +2103,22 @@ void WebContents::GrantOriginAccess(const GURL& url) {
       url::Origin::Create(url));
 }
 
-v8::Local<v8::Promise> WebContents::TakeHeapSnapshot(
-    const base::FilePath& file_path) {
-  util::Promise promise(isolate());
-  v8::Local<v8::Promise> handle = promise.GetHandle();
-
+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()) {
-    promise.RejectWithErrorMessage("takeHeapSnapshot failed");
-    return handle;
-  }
+  if (!file.IsValid())
+    return false;
 
   auto* frame_host = web_contents()->GetMainFrame();
-  if (!frame_host) {
-    promise.RejectWithErrorMessage("takeHeapSnapshot failed");
-    return handle;
-  }
+  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, util::Promise promise,
-             bool success) {
-            if (success) {
-              promise.Resolve();
-            } else {
-              promise.RejectWithErrorMessage("takeHeapSnapshot failed");
-            }
-          },
-          base::Owned(std::move(electron_ptr)), std::move(promise)));
-  return handle;
+  return frame_host->Send(new AtomFrameMsg_TakeHeapSnapshot(
+      frame_host->GetRoutingID(),
+      IPC::TakePlatformFileForTransit(std::move(file)), channel));
 }
 
 // static
@@ -2244,6 +2181,7 @@ void WebContents::BuildPrototype(v8::Isolate* isolate,
       .SetMethod("beginFrameSubscription", &WebContents::BeginFrameSubscription)
       .SetMethod("endFrameSubscription", &WebContents::EndFrameSubscription)
       .SetMethod("startDrag", &WebContents::StartDrag)
+      .SetMethod("isGuest", &WebContents::IsGuest)
       .SetMethod("attachToIframe", &WebContents::AttachToIframe)
       .SetMethod("detachFromOuterFrame", &WebContents::DetachFromOuterFrame)
       .SetMethod("isOffscreen", &WebContents::IsOffScreen)
@@ -2265,8 +2203,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)
@@ -2286,7 +2226,7 @@ void WebContents::BuildPrototype(v8::Isolate* isolate,
       .SetMethod("getWebRTCIPHandlingPolicy",
                  &WebContents::GetWebRTCIPHandlingPolicy)
       .SetMethod("_grantOriginAccess", &WebContents::GrantOriginAccess)
-      .SetMethod("takeHeapSnapshot", &WebContents::TakeHeapSnapshot)
+      .SetMethod("_takeHeapSnapshot", &WebContents::TakeHeapSnapshot)
       .SetProperty("id", &WebContents::ID)
       .SetProperty("session", &WebContents::Session)
       .SetProperty("hostWebContents", &WebContents::HostWebContents)
@@ -2298,6 +2238,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)
@@ -69,8 +65,6 @@ class ExtendedWebContentsObserver : public base::CheckedObserver {
  public:
   virtual void OnCloseContents() {}
   virtual void OnRendererResponsive() {}
-  virtual void OnDraggableRegionsUpdated(
-      const std::vector<mojom::DraggableRegionPtr>& regions) {}
 
  protected:
   ~ExtendedWebContentsObserver() override {}
@@ -79,10 +73,9 @@ 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 class Type {
+  enum Type {
     BACKGROUND_PAGE,  // A DevTools extension background page.
     BROWSER_WINDOW,   // Used by BrowserWindow.
     BROWSER_VIEW,     // Used by BrowserView.
@@ -118,6 +111,8 @@ class WebContents : public mate::TrackableObject<WebContents>,
   static void BuildPrototype(v8::Isolate* isolate,
                              v8::Local<v8::FunctionTemplate> prototype);
 
+  base::WeakPtr<WebContents> GetWeakPtr() { return weak_factory_.GetWeakPtr(); }
+
   // Destroy the managed content::WebContents instance.
   //
   // Note: The |async| should only be |true| when users are expecting to use the
@@ -156,8 +151,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();
@@ -166,8 +162,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();
@@ -180,7 +177,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.
@@ -296,7 +295,8 @@ class WebContents : public mate::TrackableObject<WebContents>,
   // the specified URL.
   void GrantOriginAccess(const GURL& url);
 
-  v8::Local<v8::Promise> TakeHeapSnapshot(const base::FilePath& file_path);
+  bool TakeHeapSnapshot(const base::FilePath& file_path,
+                        const std::string& channel);
 
   // Properties.
   int32_t ID() const;
@@ -338,7 +338,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;
@@ -371,7 +371,6 @@ class WebContents : public mate::TrackableObject<WebContents>,
   content::KeyboardEventProcessingResult PreHandleKeyboardEvent(
       content::WebContents* source,
       const content::NativeWebKeyboardEvent& event) override;
-  void ContentsZoomChange(bool zoom_in) override;
   void EnterFullscreenModeForTab(
       content::WebContents* source,
       const GURL& origin,
@@ -384,8 +383,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,
@@ -418,7 +416,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,
@@ -447,16 +444,13 @@ 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;
+  void DidAcquireFullscreen(content::RenderFrameHost* rfh) override;
 
   // InspectableWebContentsDelegate:
   void DevToolsReloadPage() override;
@@ -474,14 +468,9 @@ class WebContents : public mate::TrackableObject<WebContents>,
 #endif
 
  private:
+  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)
@@ -489,31 +478,34 @@ 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 Invoke(const std::string& channel,
-              base::Value arguments,
-              InvokeCallback callback) 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;
-  void UpdateDraggableRegions(
-      std::vector<mojom::DraggableRegionPtr> regions) override;
-  void SetTemporaryZoomLevel(double level) override;
-  void DoGetZoomLevel(DoGetZoomLevelCallback callback) 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,
+                               double level,
+                               IPC::Message* reply_msg);
+
   // Called when received a synchronous message from renderer to
   // get the zoom level.
   void OnGetZoomLevel(content::RenderFrameHost* frame_host,
@@ -537,7 +529,7 @@ class WebContents : public mate::TrackableObject<WebContents>,
   WebContentsZoomController* zoom_controller_ = nullptr;
 
   // The type of current WebContents.
-  Type type_ = Type::BROWSER_WINDOW;
+  Type type_ = BROWSER_WINDOW;
 
   // Request id used for findInPage request.
   uint32_t request_id_ = 0;
@@ -555,10 +547,7 @@ 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_;
+  base::WeakPtrFactory<WebContents> weak_factory_;
 
   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_mac.mm

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

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.
@@ -124,9 +125,8 @@ void Initialize(v8::Local<v8::Object> exports,
                 void* priv) {
   v8::Isolate* isolate = context->GetIsolate();
   mate::Dictionary dict(isolate, exports);
-  dict.Set("WebContentsView",
-           mate::CreateConstructor<WebContentsView>(
-               isolate, base::BindRepeating(&WebContentsView::New)));
+  dict.Set("WebContentsView", mate::CreateConstructor<WebContentsView>(
+                                  isolate, base::Bind(&WebContentsView::New)));
 }
 
 }  // namespace

atom/browser/api/atom_api_web_request.cc

@@ -9,8 +9,8 @@
 
 #include "atom/browser/atom_browser_context.h"
 #include "atom/browser/net/atom_network_delegate.h"
+#include "atom/common/native_mate_converters/callback.h"
 #include "atom/common/native_mate_converters/net_converter.h"
-#include "atom/common/native_mate_converters/once_callback.h"
 #include "atom/common/native_mate_converters/value_converter.h"
 #include "base/task/post_task.h"
 #include "content/public/browser/browser_task_traits.h"

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::Value& result) {
-  if (!callback_ || sender_ == nullptr)
+bool Event::SendReply(const base::ListValue& result) {
+  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,14 +24,13 @@ 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);
 
-  // event.sendReply(value), used for replying to synchronous messages and
-  // `invoke` calls.
-  bool SendReply(const base::Value& result);
+  // event.sendReply(array), used for replying synchronous message.
+  bool SendReply(const base::ListValue& result);
 
  protected:
   explicit Event(v8::Isolate* isolate);
@@ -49,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);
@@ -46,52 +46,47 @@ class EventEmitter : public Wrappable<T> {
   v8::Local<v8::Object> GetWrapper() const {
     return Wrappable<T>::GetWrapper();
   }
-  v8::MaybeLocal<v8::Object> GetWrapper(v8::Isolate* isolate) const {
-    return Wrappable<T>::GetWrapper(isolate);
-  }
 
   // this.emit(name, event, args...);
   template <typename... Args>
   bool EmitCustomEvent(const base::StringPiece& name,
                        v8::Local<v8::Object> event,
-                       Args&&... args) {
+                       const Args&... args) {
     return EmitWithEvent(
         name, internal::CreateCustomEvent(isolate(), GetWrapper(), event),
-        std::forward<Args>(args)...);
+        args...);
   }
 
   // this.emit(name, new Event(flags), args...);
   template <typename... Args>
-  bool EmitWithFlags(const base::StringPiece& name, int flags, Args&&... args) {
-    return EmitCustomEvent(name,
-                           internal::CreateEventFromFlags(isolate(), flags),
-                           std::forward<Args>(args)...);
+  bool EmitWithFlags(const base::StringPiece& name,
+                     int flags,
+                     const Args&... args) {
+    return EmitCustomEvent(
+        name, internal::CreateEventFromFlags(isolate(), flags), args...);
   }
 
   // this.emit(name, new Event(), args...);
   template <typename... Args>
-  bool Emit(const base::StringPiece& name, Args&&... args) {
-    return EmitWithSender(name, nullptr, base::nullopt,
-                          std::forward<Args>(args)...);
+  bool Emit(const base::StringPiece& name, const Args&... 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,
-      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));
-    return EmitWithEvent(name, event, std::forward<Args>(args)...);
+    v8::Local<v8::Object> event =
+        internal::CreateJSEvent(isolate(), wrapper, sender, message);
+    return EmitWithEvent(name, event, args...);
   }
 
  protected:
@@ -102,19 +97,14 @@ class EventEmitter : public Wrappable<T> {
   template <typename... Args>
   bool EmitWithEvent(const base::StringPiece& name,
                      v8::Local<v8::Object> event,
-                     Args&&... args) {
+                     const Args&... args) {
     DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
     v8::Locker locker(isolate());
     v8::HandleScope handle_scope(isolate());
-    EmitEvent(isolate(), GetWrapper(), name, event,
-              std::forward<Args>(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;
+    EmitEvent(isolate(), GetWrapper(), name, event, args...);
+    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::RepeatingCallback<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>();
@@ -108,6 +95,18 @@ void GPUInfoEnumerator::EndAuxAttributes() {
   value_stack.pop();
 }
 
+void GPUInfoEnumerator::BeginOverlayCapability() {
+  value_stack.push(std::move(current));
+  current = std::make_unique<base::DictionaryValue>();
+}
+
+void GPUInfoEnumerator::EndOverlayCapability() {
+  auto& top_value = value_stack.top();
+  top_value->SetDictionary(kOverlayCapabilityKey, std::move(current));
+  current = std::move(top_value);
+  value_stack.pop();
+}
+
 void GPUInfoEnumerator::BeginDx12VulkanVersionInfo() {
   value_stack.push(std::move(current));
   current = std::make_unique<base::DictionaryValue>();

atom/browser/api/gpu_info_enumerator.h

@@ -22,9 +22,8 @@ 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";
 
  public:
@@ -42,10 +41,10 @@ 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;
+  void EndOverlayCapability() override;
   void BeginDx12VulkanVersionInfo() override;
   void EndDx12VulkanVersionInfo() override;
   std::unique_ptr<base::DictionaryValue> GetDictionary();

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